30 Nov '23
The package rpms/digikam.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/digikam.git/commit/?id=dd68443620ab….
Change:
+%ifarch %{?qt6_qtwebengine_arches}
Thanks.
Full change:
============
commit dd68443620abd5826538b1a9813273992b22d611
Author: nucleo <nucleo(a)fedoraproject.org>
Date: Fri Dec 1 01:02:21 2023 +0200
Build with Qt6 for F40+ and qt6_qtwebengine_arches
diff --git a/digikam.spec b/digikam.spec
index c430532..be2d06f 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,3 +1,11 @@
+%bcond_with build_with_qt6
+%if 0%{?fedora} > 39
+%ifarch %{?qt6_qtwebengine_arches}
+%bcond_without build_with_qt6
+%global qwebengine 1
+%endif
+%endif
+
# use ninja or not
%global ninja 1
@@ -6,7 +14,7 @@
Name: digikam
Summary: A digital camera accessing & photo management application
Version: 8.2.0
-Release: 1%{?beta}%{?dist}
+Release: 2%{?beta}%{?dist}
License: GPL-2.0-or-later
URL: http://www.digikam.org/
@@ -42,8 +50,6 @@ BuildRequires: ImageMagick-devel
BuildRequires: ImageMagick-c++-devel >= 6.7
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
-BuildRequires: marble-astro-devel
-BuildRequires: marble-widget-qt5-devel
BuildRequires: perl-generators
BuildRequires: pkgconfig(exiv2) >= 0.26
BuildRequires: pkgconfig(glib-2.0)
@@ -52,27 +58,57 @@ BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(libgphoto2_port) pkgconfig(libusb-1.0) pkgconfig(libusb)
BuildRequires: pkgconfig(libpng) >= 1.2.7
BuildRequires: pkgconfig(glu)
+BuildRequires: pkgconfig(x11) pkgconfig(xproto)
+%if %{with build_with_qt6}
+BuildRequires: pkgconfig(Qt6NetworkAuth)
+BuildRequires: pkgconfig(Qt6OpenGL)
+BuildRequires: pkgconfig(Qt6Svg)
+BuildRequires: pkgconfig(Qt6Multimedia)
+BuildRequires: pkgconfig(Qt6StateMachine)
+BuildRequires: pkgconfig(Qt6WebEngineWidgets)
+# missing Qt6 deps
+#BuildRequires: marble-astro-devel
+#BuildRequires: marble-widget-qt6-devel
+#BuildRequires: kf6-libksane-devel
+BuildRequires: kf6-kcalendarcore-devel
+BuildRequires: kf6-kconfig-devel
+BuildRequires: kf6-kdoctools-devel
+BuildRequires: kf6-kfilemetadata-devel
+BuildRequires: kf6-kwindowsystem-devel
+BuildRequires: kf6-kxmlgui-devel
+BuildRequires: kf6-ki18n-devel
+BuildRequires: kf6-kitemmodels-devel
+BuildRequires: kf6-kio-devel
+BuildRequires: kf6-kservice-devel
+BuildRequires: kf6-kiconthemes-devel
+BuildRequires: kf6-karchive-devel
+BuildRequires: kf6-threadweaver-devel
+BuildRequires: kf6-kcoreaddons-devel
+BuildRequires: kf6-knotifyconfig-devel
+BuildRequires: kf6-knotifications-devel
+BuildRequires: kf6-solid-devel
+BuildRequires: kf6-sonnet-devel
+BuildRequires: kf6-kitemviews-devel
+BuildRequires: kf6-kbookmarks-devel
+BuildRequires: kf6-rpm-macros
+BuildRequires: qt6-qtbase-private-devel
+%else
BuildRequires: pkgconfig(Qt5NetworkAuth)
BuildRequires: pkgconfig(Qt5OpenGL)
BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: pkgconfig(Qt5XmlPatterns)
BuildRequires: pkgconfig(Qt5X11Extras)
BuildRequires: pkgconfig(Qt5WebKit)
-BuildRequires: pkgconfig(x11) pkgconfig(xproto)
%if 0%{?qt5_qtwebengine_arches:1}
%ifarch %{?qt5_qtwebengine_arches}
%global qwebengine 1
-%if 0%{?fedora} >= 38
-BuildRequires: cmake(KF5Akonadi)
-BuildRequires: cmake(KF5Contacts)
-%else
-BuildRequires: cmake(KF5AkonadiContact)
-%endif
BuildRequires: pkgconfig(Qt5WebEngine)
%else
BuildRequires: pkgconfig(Qt5WebKit)
%endif
%endif
+BuildRequires: marble-astro-devel
+BuildRequires: marble-widget-qt5-devel
BuildRequires: kf5-libksane-devel >= 16.03
BuildRequires: kf5-kcalendarcore-devel
BuildRequires: kf5-kconfig-devel
@@ -95,6 +131,7 @@ BuildRequires: kf5-sonnet-devel
BuildRequires: kf5-kitemviews-devel
BuildRequires: kf5-kbookmarks-devel
BuildRequires: kf5-rpm-macros
+%endif
## not actually checked-for or used -- rex
## rely on explicit cmake build options instead
@@ -135,8 +172,13 @@ Recommends: hugin-base
#Recommends: kf5-kipi-plugins
# thumbnailers, better default access to mtp-enabled devices
Recommends: kio-extras
+%if %{with build_with_qt6}
+Recommends: qt6-qtbase-mysql%{?_isa}
+Recommends: qt6-qtimageformats%{?_isa}
+%else
Recommends: qt5-qtbase-mysql%{?_isa}
Recommends: qt5-qtimageformats%{?_isa}
+%endif
# core/libs/rawengine/libraw/
Provides: bundled(LibRaw) = 0.21.1
@@ -176,9 +218,14 @@ needed to develop applications using %{name}.
%build
+%if %{with build_with_qt6}
+%cmake_kf6 \
+ -DBUILD_WITH_QT6:BOOL=ON \
+ -DENABLE_QTMULTIMEDIA:BOOL=ON \
+%else
%cmake_kf5 \
+%endif
%{?ninja:-G Ninja} \
- -DENABLE_AKONADICONTACTSUPPORT:BOOL=ON \
-DENABLE_APPSTYLES:BOOL=ON \
-DENABLE_KFILEMETADATASUPPORT:BOOL=ON \
%if 0%{?rhel} && 0%{?rhel} < 9
@@ -202,26 +249,68 @@ desktop-file-install --vendor="" \
%check
-for i in %{buildroot}%{_kf5_datadir}/applications/*.desktop ; do
+for i in %{buildroot}%{_datadir}/applications/*.desktop ; do
desktop-file-validate $i ||:
done
%if 0%{?rhel} && 0%{?rhel} < 8
%post
-touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
%postun
if [ $1 -eq 0 ] ; then
- touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null
- gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
+ touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
update-desktop-database -q &> /dev/null
fi
%posttrans
-gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
update-desktop-database -q &> /dev/null
%endif
+
+%ldconfig_scriptlets libs
+
+
+%if %{with build_with_qt6}
+%files -f %{name}.lang
+%doc AUTHORS ChangeLog
+%doc NEWS README.md
+%license LICENSES/GPL-2.0-or-later.txt
+%{_kf6_bindir}/digikam
+%{_kf6_bindir}/digitaglinktree
+%{_kf6_bindir}/cleanup_digikamdb
+%{_kf6_bindir}/showfoto
+%{_kf6_datadir}/kxmlgui5/digikam/
+%{_kf6_datadir}/kxmlgui5/showfoto/
+%{_kf6_datadir}/knotifications6/digikam.notifyrc
+%{_kf6_datadir}/digikam/
+%{_kf6_datadir}/showfoto/
+%{_kf6_datadir}/solid/actions/digikam*.desktop
+%{_kf6_metainfodir}/org.kde.digikam.appdata.xml
+%{_kf6_metainfodir}/org.kde.showfoto.appdata.xml
+%{_kf6_datadir}/applications/digikam-import.desktop
+%{_kf6_datadir}/applications/org.kde.digikam.desktop
+%{_kf6_datadir}/applications/org.kde.showfoto.desktop
+%{_mandir}/man1/digitaglinktree.1*
+%{_mandir}/man1/cleanup_digikamdb.1*
+%{_kf6_datadir}/icons/hicolor/*/*/*
+
+%files libs
+%{_kf6_libdir}/libdigikamcore.so.*
+%{_kf6_libdir}/libdigikamdatabase.so.*
+%{_kf6_libdir}/libdigikamgui.so.*
+%{_kf6_qtplugindir}/digikam/
+
+%files devel
+%{_kf6_libdir}/libdigikamcore.so
+%{_kf6_libdir}/libdigikamdatabase.so
+%{_kf6_libdir}/libdigikamgui.so
+%{_kf6_libdir}/cmake/Digikam*/
+%{_includedir}/digikam/
+
+%else
%files -f %{name}.lang
%doc AUTHORS ChangeLog
%doc NEWS README.md
@@ -245,8 +334,6 @@ update-desktop-database -q &> /dev/null
%{_mandir}/man1/cleanup_digikamdb.1*
%{_kf5_datadir}/icons/hicolor/*/*/*
-%ldconfig_scriptlets libs
-
%files libs
%{_kf5_libdir}/libdigikamcore.so.*
%{_kf5_libdir}/libdigikamdatabase.so.*
@@ -259,9 +346,13 @@ update-desktop-database -q &> /dev/null
%{_kf5_libdir}/libdigikamgui.so
%{_kf5_libdir}/cmake/Digikam*/
%{_includedir}/digikam/
+%endif
%changelog
+* Thu Nov 30 2023 Alexey Kurov <nucleo(a)fedoraproject.org> - 8.2.0-2
+- Build with Qt6 for F40+ and qt6_qtwebengine_arches
+
* Thu Nov 30 2023 Alexey Kurov <nucleo(a)fedoraproject.org> - 8.2.0-1
- digiKam-8.2.0
commit 263a117ac76a5991bc6d915f618165bf8e42b804
Author: nucleo <nucleo(a)fedoraproject.org>
Date: Thu Nov 30 21:06:45 2023 +0200
digiKam-8.2.0
diff --git a/.gitignore b/.gitignore
index 5782806..ecf4353 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
/digiKam-7.10.0.tar.xz
/digiKam-8.0.0.tar.xz
/digiKam-8.1.0.tar.xz
+/digiKam-8.2.0.tar.xz
diff --git a/digikam.spec b/digikam.spec
index e503e74..c430532 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -5,8 +5,8 @@
Name: digikam
Summary: A digital camera accessing & photo management application
-Version: 8.1.0
-Release: 4%{?beta}%{?dist}
+Version: 8.2.0
+Release: 1%{?beta}%{?dist}
License: GPL-2.0-or-later
URL: http://www.digikam.org/
@@ -119,7 +119,6 @@ BuildRequires: pkgconfig(libavfilter)
BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libswscale)
BuildRequires: pkgconfig(libass)
-BuildRequires: pkgconfig(openal)
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libva)
BuildRequires: pkgconfig(xext)
@@ -263,6 +262,9 @@ update-desktop-database -q &> /dev/null
%changelog
+* Thu Nov 30 2023 Alexey Kurov <nucleo(a)fedoraproject.org> - 8.2.0-1
+- digiKam-8.2.0
+
* Tue Nov 28 2023 Orion Poplawski <orion(a)nwra.com> - 8.1.0-4
- Rebuild for jasper 4.1
diff --git a/sources b/sources
index 3e2307a..d4a8184 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (digiKam-8.1.0.tar.xz) = cbf5a776b4138f4f05d074721324b046dfa07ddc01259f569ae46c46a6d5b0b00824ef0962a09041081703348e4defecf15cff800b2c6cf5e04a0e7e963a3ef4
+SHA512 (digiKam-8.2.0.tar.xz) = a34c5bde0e579b5f6de1fe90977e01bc385e5c28155d24db09e3cdfe7958c979d2e27cbce402d6c5b70f952fc0ead88318dfa025bb67e540c4d763cb139db7bb
commit e899b13a34751e3f8cec991c59f4b93abb38a5df
Author: Orion Poplawski <orion(a)nwra.com>
Date: Mon Nov 27 19:23:50 2023 -0700
Fix up KF5Akonadi/Contacs BR
diff --git a/digikam.spec b/digikam.spec
index ed34651..e503e74 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -62,7 +62,12 @@ BuildRequires: pkgconfig(x11) pkgconfig(xproto)
%if 0%{?qt5_qtwebengine_arches:1}
%ifarch %{?qt5_qtwebengine_arches}
%global qwebengine 1
+%if 0%{?fedora} >= 38
+BuildRequires: cmake(KF5Akonadi)
+BuildRequires: cmake(KF5Contacts)
+%else
BuildRequires: cmake(KF5AkonadiContact)
+%endif
BuildRequires: pkgconfig(Qt5WebEngine)
%else
BuildRequires: pkgconfig(Qt5WebKit)
commit b587a7fae339dc7084e6cc26caa11728b7a5ccb9
Author: Orion Poplawski <orion(a)nwra.com>
Date: Mon Nov 27 18:57:28 2023 -0700
Rebuild for jasper 4.1
diff --git a/digikam.spec b/digikam.spec
index 1e5454d..ed34651 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -6,7 +6,7 @@
Name: digikam
Summary: A digital camera accessing & photo management application
Version: 8.1.0
-Release: 3%{?beta}%{?dist}
+Release: 4%{?beta}%{?dist}
License: GPL-2.0-or-later
URL: http://www.digikam.org/
@@ -258,6 +258,9 @@ update-desktop-database -q &> /dev/null
%changelog
+* Tue Nov 28 2023 Orion Poplawski <orion(a)nwra.com> - 8.1.0-4
+- Rebuild for jasper 4.1
+
* Mon Aug 07 2023 Sérgio Basto <sergio(a)serjux.com> - 8.1.0-3
- Rebuild for opencv 4.8.0
commit 16dbc1d48af939e18ffff53fb0cfb3f42c4055e4
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Aug 7 03:56:32 2023 +0100
Rebuild for opencv 4.8.0
diff --git a/digikam.spec b/digikam.spec
index 16911c2..1e5454d 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -6,7 +6,7 @@
Name: digikam
Summary: A digital camera accessing & photo management application
Version: 8.1.0
-Release: 2%{?beta}%{?dist}
+Release: 3%{?beta}%{?dist}
License: GPL-2.0-or-later
URL: http://www.digikam.org/
@@ -258,6 +258,9 @@ update-desktop-database -q &> /dev/null
%changelog
+* Mon Aug 07 2023 Sérgio Basto <sergio(a)serjux.com> - 8.1.0-3
+- Rebuild for opencv 4.8.0
+
* Wed Jul 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 8.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
commit c5bc4d0a030c6b6fed8136d81d3d5901d096dd10
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 19 17:28:56 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/digikam.spec b/digikam.spec
index 640893c..16911c2 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -6,7 +6,7 @@
Name: digikam
Summary: A digital camera accessing & photo management application
Version: 8.1.0
-Release: 1%{?beta}%{?dist}
+Release: 2%{?beta}%{?dist}
License: GPL-2.0-or-later
URL: http://www.digikam.org/
@@ -258,6 +258,9 @@ update-desktop-database -q &> /dev/null
%changelog
+* Wed Jul 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 8.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
* Thu Jul 06 2023 Alexey Kurov <nucleo(a)fedoraproject.org> - 8.1.0-1
- digiKam-8.1.0
- BR: kf5-kcalendarcore-devel
1
0
30 Nov '23
The package rpms/digikam.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/digikam.git/commit/?id=dd68443620ab….
Change:
+%ifarch %{?qt6_qtwebengine_arches}
Thanks.
Full change:
============
commit dd68443620abd5826538b1a9813273992b22d611
Author: nucleo <nucleo(a)fedoraproject.org>
Date: Fri Dec 1 01:02:21 2023 +0200
Build with Qt6 for F40+ and qt6_qtwebengine_arches
diff --git a/digikam.spec b/digikam.spec
index c430532..be2d06f 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,3 +1,11 @@
+%bcond_with build_with_qt6
+%if 0%{?fedora} > 39
+%ifarch %{?qt6_qtwebengine_arches}
+%bcond_without build_with_qt6
+%global qwebengine 1
+%endif
+%endif
+
# use ninja or not
%global ninja 1
@@ -6,7 +14,7 @@
Name: digikam
Summary: A digital camera accessing & photo management application
Version: 8.2.0
-Release: 1%{?beta}%{?dist}
+Release: 2%{?beta}%{?dist}
License: GPL-2.0-or-later
URL: http://www.digikam.org/
@@ -42,8 +50,6 @@ BuildRequires: ImageMagick-devel
BuildRequires: ImageMagick-c++-devel >= 6.7
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
-BuildRequires: marble-astro-devel
-BuildRequires: marble-widget-qt5-devel
BuildRequires: perl-generators
BuildRequires: pkgconfig(exiv2) >= 0.26
BuildRequires: pkgconfig(glib-2.0)
@@ -52,27 +58,57 @@ BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(libgphoto2_port) pkgconfig(libusb-1.0) pkgconfig(libusb)
BuildRequires: pkgconfig(libpng) >= 1.2.7
BuildRequires: pkgconfig(glu)
+BuildRequires: pkgconfig(x11) pkgconfig(xproto)
+%if %{with build_with_qt6}
+BuildRequires: pkgconfig(Qt6NetworkAuth)
+BuildRequires: pkgconfig(Qt6OpenGL)
+BuildRequires: pkgconfig(Qt6Svg)
+BuildRequires: pkgconfig(Qt6Multimedia)
+BuildRequires: pkgconfig(Qt6StateMachine)
+BuildRequires: pkgconfig(Qt6WebEngineWidgets)
+# missing Qt6 deps
+#BuildRequires: marble-astro-devel
+#BuildRequires: marble-widget-qt6-devel
+#BuildRequires: kf6-libksane-devel
+BuildRequires: kf6-kcalendarcore-devel
+BuildRequires: kf6-kconfig-devel
+BuildRequires: kf6-kdoctools-devel
+BuildRequires: kf6-kfilemetadata-devel
+BuildRequires: kf6-kwindowsystem-devel
+BuildRequires: kf6-kxmlgui-devel
+BuildRequires: kf6-ki18n-devel
+BuildRequires: kf6-kitemmodels-devel
+BuildRequires: kf6-kio-devel
+BuildRequires: kf6-kservice-devel
+BuildRequires: kf6-kiconthemes-devel
+BuildRequires: kf6-karchive-devel
+BuildRequires: kf6-threadweaver-devel
+BuildRequires: kf6-kcoreaddons-devel
+BuildRequires: kf6-knotifyconfig-devel
+BuildRequires: kf6-knotifications-devel
+BuildRequires: kf6-solid-devel
+BuildRequires: kf6-sonnet-devel
+BuildRequires: kf6-kitemviews-devel
+BuildRequires: kf6-kbookmarks-devel
+BuildRequires: kf6-rpm-macros
+BuildRequires: qt6-qtbase-private-devel
+%else
BuildRequires: pkgconfig(Qt5NetworkAuth)
BuildRequires: pkgconfig(Qt5OpenGL)
BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: pkgconfig(Qt5XmlPatterns)
BuildRequires: pkgconfig(Qt5X11Extras)
BuildRequires: pkgconfig(Qt5WebKit)
-BuildRequires: pkgconfig(x11) pkgconfig(xproto)
%if 0%{?qt5_qtwebengine_arches:1}
%ifarch %{?qt5_qtwebengine_arches}
%global qwebengine 1
-%if 0%{?fedora} >= 38
-BuildRequires: cmake(KF5Akonadi)
-BuildRequires: cmake(KF5Contacts)
-%else
-BuildRequires: cmake(KF5AkonadiContact)
-%endif
BuildRequires: pkgconfig(Qt5WebEngine)
%else
BuildRequires: pkgconfig(Qt5WebKit)
%endif
%endif
+BuildRequires: marble-astro-devel
+BuildRequires: marble-widget-qt5-devel
BuildRequires: kf5-libksane-devel >= 16.03
BuildRequires: kf5-kcalendarcore-devel
BuildRequires: kf5-kconfig-devel
@@ -95,6 +131,7 @@ BuildRequires: kf5-sonnet-devel
BuildRequires: kf5-kitemviews-devel
BuildRequires: kf5-kbookmarks-devel
BuildRequires: kf5-rpm-macros
+%endif
## not actually checked-for or used -- rex
## rely on explicit cmake build options instead
@@ -135,8 +172,13 @@ Recommends: hugin-base
#Recommends: kf5-kipi-plugins
# thumbnailers, better default access to mtp-enabled devices
Recommends: kio-extras
+%if %{with build_with_qt6}
+Recommends: qt6-qtbase-mysql%{?_isa}
+Recommends: qt6-qtimageformats%{?_isa}
+%else
Recommends: qt5-qtbase-mysql%{?_isa}
Recommends: qt5-qtimageformats%{?_isa}
+%endif
# core/libs/rawengine/libraw/
Provides: bundled(LibRaw) = 0.21.1
@@ -176,9 +218,14 @@ needed to develop applications using %{name}.
%build
+%if %{with build_with_qt6}
+%cmake_kf6 \
+ -DBUILD_WITH_QT6:BOOL=ON \
+ -DENABLE_QTMULTIMEDIA:BOOL=ON \
+%else
%cmake_kf5 \
+%endif
%{?ninja:-G Ninja} \
- -DENABLE_AKONADICONTACTSUPPORT:BOOL=ON \
-DENABLE_APPSTYLES:BOOL=ON \
-DENABLE_KFILEMETADATASUPPORT:BOOL=ON \
%if 0%{?rhel} && 0%{?rhel} < 9
@@ -202,26 +249,68 @@ desktop-file-install --vendor="" \
%check
-for i in %{buildroot}%{_kf5_datadir}/applications/*.desktop ; do
+for i in %{buildroot}%{_datadir}/applications/*.desktop ; do
desktop-file-validate $i ||:
done
%if 0%{?rhel} && 0%{?rhel} < 8
%post
-touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
%postun
if [ $1 -eq 0 ] ; then
- touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null
- gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
+ touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
update-desktop-database -q &> /dev/null
fi
%posttrans
-gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
update-desktop-database -q &> /dev/null
%endif
+
+%ldconfig_scriptlets libs
+
+
+%if %{with build_with_qt6}
+%files -f %{name}.lang
+%doc AUTHORS ChangeLog
+%doc NEWS README.md
+%license LICENSES/GPL-2.0-or-later.txt
+%{_kf6_bindir}/digikam
+%{_kf6_bindir}/digitaglinktree
+%{_kf6_bindir}/cleanup_digikamdb
+%{_kf6_bindir}/showfoto
+%{_kf6_datadir}/kxmlgui5/digikam/
+%{_kf6_datadir}/kxmlgui5/showfoto/
+%{_kf6_datadir}/knotifications6/digikam.notifyrc
+%{_kf6_datadir}/digikam/
+%{_kf6_datadir}/showfoto/
+%{_kf6_datadir}/solid/actions/digikam*.desktop
+%{_kf6_metainfodir}/org.kde.digikam.appdata.xml
+%{_kf6_metainfodir}/org.kde.showfoto.appdata.xml
+%{_kf6_datadir}/applications/digikam-import.desktop
+%{_kf6_datadir}/applications/org.kde.digikam.desktop
+%{_kf6_datadir}/applications/org.kde.showfoto.desktop
+%{_mandir}/man1/digitaglinktree.1*
+%{_mandir}/man1/cleanup_digikamdb.1*
+%{_kf6_datadir}/icons/hicolor/*/*/*
+
+%files libs
+%{_kf6_libdir}/libdigikamcore.so.*
+%{_kf6_libdir}/libdigikamdatabase.so.*
+%{_kf6_libdir}/libdigikamgui.so.*
+%{_kf6_qtplugindir}/digikam/
+
+%files devel
+%{_kf6_libdir}/libdigikamcore.so
+%{_kf6_libdir}/libdigikamdatabase.so
+%{_kf6_libdir}/libdigikamgui.so
+%{_kf6_libdir}/cmake/Digikam*/
+%{_includedir}/digikam/
+
+%else
%files -f %{name}.lang
%doc AUTHORS ChangeLog
%doc NEWS README.md
@@ -245,8 +334,6 @@ update-desktop-database -q &> /dev/null
%{_mandir}/man1/cleanup_digikamdb.1*
%{_kf5_datadir}/icons/hicolor/*/*/*
-%ldconfig_scriptlets libs
-
%files libs
%{_kf5_libdir}/libdigikamcore.so.*
%{_kf5_libdir}/libdigikamdatabase.so.*
@@ -259,9 +346,13 @@ update-desktop-database -q &> /dev/null
%{_kf5_libdir}/libdigikamgui.so
%{_kf5_libdir}/cmake/Digikam*/
%{_includedir}/digikam/
+%endif
%changelog
+* Thu Nov 30 2023 Alexey Kurov <nucleo(a)fedoraproject.org> - 8.2.0-2
+- Build with Qt6 for F40+ and qt6_qtwebengine_arches
+
* Thu Nov 30 2023 Alexey Kurov <nucleo(a)fedoraproject.org> - 8.2.0-1
- digiKam-8.2.0
commit 263a117ac76a5991bc6d915f618165bf8e42b804
Author: nucleo <nucleo(a)fedoraproject.org>
Date: Thu Nov 30 21:06:45 2023 +0200
digiKam-8.2.0
diff --git a/.gitignore b/.gitignore
index 5782806..ecf4353 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
/digiKam-7.10.0.tar.xz
/digiKam-8.0.0.tar.xz
/digiKam-8.1.0.tar.xz
+/digiKam-8.2.0.tar.xz
diff --git a/digikam.spec b/digikam.spec
index e503e74..c430532 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -5,8 +5,8 @@
Name: digikam
Summary: A digital camera accessing & photo management application
-Version: 8.1.0
-Release: 4%{?beta}%{?dist}
+Version: 8.2.0
+Release: 1%{?beta}%{?dist}
License: GPL-2.0-or-later
URL: http://www.digikam.org/
@@ -119,7 +119,6 @@ BuildRequires: pkgconfig(libavfilter)
BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libswscale)
BuildRequires: pkgconfig(libass)
-BuildRequires: pkgconfig(openal)
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libva)
BuildRequires: pkgconfig(xext)
@@ -263,6 +262,9 @@ update-desktop-database -q &> /dev/null
%changelog
+* Thu Nov 30 2023 Alexey Kurov <nucleo(a)fedoraproject.org> - 8.2.0-1
+- digiKam-8.2.0
+
* Tue Nov 28 2023 Orion Poplawski <orion(a)nwra.com> - 8.1.0-4
- Rebuild for jasper 4.1
diff --git a/sources b/sources
index 3e2307a..d4a8184 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (digiKam-8.1.0.tar.xz) = cbf5a776b4138f4f05d074721324b046dfa07ddc01259f569ae46c46a6d5b0b00824ef0962a09041081703348e4defecf15cff800b2c6cf5e04a0e7e963a3ef4
+SHA512 (digiKam-8.2.0.tar.xz) = a34c5bde0e579b5f6de1fe90977e01bc385e5c28155d24db09e3cdfe7958c979d2e27cbce402d6c5b70f952fc0ead88318dfa025bb67e540c4d763cb139db7bb
commit e899b13a34751e3f8cec991c59f4b93abb38a5df
Author: Orion Poplawski <orion(a)nwra.com>
Date: Mon Nov 27 19:23:50 2023 -0700
Fix up KF5Akonadi/Contacs BR
diff --git a/digikam.spec b/digikam.spec
index ed34651..e503e74 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -62,7 +62,12 @@ BuildRequires: pkgconfig(x11) pkgconfig(xproto)
%if 0%{?qt5_qtwebengine_arches:1}
%ifarch %{?qt5_qtwebengine_arches}
%global qwebengine 1
+%if 0%{?fedora} >= 38
+BuildRequires: cmake(KF5Akonadi)
+BuildRequires: cmake(KF5Contacts)
+%else
BuildRequires: cmake(KF5AkonadiContact)
+%endif
BuildRequires: pkgconfig(Qt5WebEngine)
%else
BuildRequires: pkgconfig(Qt5WebKit)
commit b587a7fae339dc7084e6cc26caa11728b7a5ccb9
Author: Orion Poplawski <orion(a)nwra.com>
Date: Mon Nov 27 18:57:28 2023 -0700
Rebuild for jasper 4.1
diff --git a/digikam.spec b/digikam.spec
index 1e5454d..ed34651 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -6,7 +6,7 @@
Name: digikam
Summary: A digital camera accessing & photo management application
Version: 8.1.0
-Release: 3%{?beta}%{?dist}
+Release: 4%{?beta}%{?dist}
License: GPL-2.0-or-later
URL: http://www.digikam.org/
@@ -258,6 +258,9 @@ update-desktop-database -q &> /dev/null
%changelog
+* Tue Nov 28 2023 Orion Poplawski <orion(a)nwra.com> - 8.1.0-4
+- Rebuild for jasper 4.1
+
* Mon Aug 07 2023 Sérgio Basto <sergio(a)serjux.com> - 8.1.0-3
- Rebuild for opencv 4.8.0
commit 16dbc1d48af939e18ffff53fb0cfb3f42c4055e4
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Aug 7 03:56:32 2023 +0100
Rebuild for opencv 4.8.0
diff --git a/digikam.spec b/digikam.spec
index 16911c2..1e5454d 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -6,7 +6,7 @@
Name: digikam
Summary: A digital camera accessing & photo management application
Version: 8.1.0
-Release: 2%{?beta}%{?dist}
+Release: 3%{?beta}%{?dist}
License: GPL-2.0-or-later
URL: http://www.digikam.org/
@@ -258,6 +258,9 @@ update-desktop-database -q &> /dev/null
%changelog
+* Mon Aug 07 2023 Sérgio Basto <sergio(a)serjux.com> - 8.1.0-3
+- Rebuild for opencv 4.8.0
+
* Wed Jul 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 8.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
commit c5bc4d0a030c6b6fed8136d81d3d5901d096dd10
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 19 17:28:56 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/digikam.spec b/digikam.spec
index 640893c..16911c2 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -6,7 +6,7 @@
Name: digikam
Summary: A digital camera accessing & photo management application
Version: 8.1.0
-Release: 1%{?beta}%{?dist}
+Release: 2%{?beta}%{?dist}
License: GPL-2.0-or-later
URL: http://www.digikam.org/
@@ -258,6 +258,9 @@ update-desktop-database -q &> /dev/null
%changelog
+* Wed Jul 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 8.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
* Thu Jul 06 2023 Alexey Kurov <nucleo(a)fedoraproject.org> - 8.1.0-1
- digiKam-8.1.0
- BR: kf5-kcalendarcore-devel
1
0
30 Nov '23
The package rpms/digikam.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/digikam.git/commit/?id=dd68443620ab….
Change:
+%ifarch %{?qt6_qtwebengine_arches}
Thanks.
Full change:
============
commit dd68443620abd5826538b1a9813273992b22d611
Author: nucleo <nucleo(a)fedoraproject.org>
Date: Fri Dec 1 01:02:21 2023 +0200
Build with Qt6 for F40+ and qt6_qtwebengine_arches
diff --git a/digikam.spec b/digikam.spec
index c430532..be2d06f 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,3 +1,11 @@
+%bcond_with build_with_qt6
+%if 0%{?fedora} > 39
+%ifarch %{?qt6_qtwebengine_arches}
+%bcond_without build_with_qt6
+%global qwebengine 1
+%endif
+%endif
+
# use ninja or not
%global ninja 1
@@ -6,7 +14,7 @@
Name: digikam
Summary: A digital camera accessing & photo management application
Version: 8.2.0
-Release: 1%{?beta}%{?dist}
+Release: 2%{?beta}%{?dist}
License: GPL-2.0-or-later
URL: http://www.digikam.org/
@@ -42,8 +50,6 @@ BuildRequires: ImageMagick-devel
BuildRequires: ImageMagick-c++-devel >= 6.7
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
-BuildRequires: marble-astro-devel
-BuildRequires: marble-widget-qt5-devel
BuildRequires: perl-generators
BuildRequires: pkgconfig(exiv2) >= 0.26
BuildRequires: pkgconfig(glib-2.0)
@@ -52,27 +58,57 @@ BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(libgphoto2_port) pkgconfig(libusb-1.0) pkgconfig(libusb)
BuildRequires: pkgconfig(libpng) >= 1.2.7
BuildRequires: pkgconfig(glu)
+BuildRequires: pkgconfig(x11) pkgconfig(xproto)
+%if %{with build_with_qt6}
+BuildRequires: pkgconfig(Qt6NetworkAuth)
+BuildRequires: pkgconfig(Qt6OpenGL)
+BuildRequires: pkgconfig(Qt6Svg)
+BuildRequires: pkgconfig(Qt6Multimedia)
+BuildRequires: pkgconfig(Qt6StateMachine)
+BuildRequires: pkgconfig(Qt6WebEngineWidgets)
+# missing Qt6 deps
+#BuildRequires: marble-astro-devel
+#BuildRequires: marble-widget-qt6-devel
+#BuildRequires: kf6-libksane-devel
+BuildRequires: kf6-kcalendarcore-devel
+BuildRequires: kf6-kconfig-devel
+BuildRequires: kf6-kdoctools-devel
+BuildRequires: kf6-kfilemetadata-devel
+BuildRequires: kf6-kwindowsystem-devel
+BuildRequires: kf6-kxmlgui-devel
+BuildRequires: kf6-ki18n-devel
+BuildRequires: kf6-kitemmodels-devel
+BuildRequires: kf6-kio-devel
+BuildRequires: kf6-kservice-devel
+BuildRequires: kf6-kiconthemes-devel
+BuildRequires: kf6-karchive-devel
+BuildRequires: kf6-threadweaver-devel
+BuildRequires: kf6-kcoreaddons-devel
+BuildRequires: kf6-knotifyconfig-devel
+BuildRequires: kf6-knotifications-devel
+BuildRequires: kf6-solid-devel
+BuildRequires: kf6-sonnet-devel
+BuildRequires: kf6-kitemviews-devel
+BuildRequires: kf6-kbookmarks-devel
+BuildRequires: kf6-rpm-macros
+BuildRequires: qt6-qtbase-private-devel
+%else
BuildRequires: pkgconfig(Qt5NetworkAuth)
BuildRequires: pkgconfig(Qt5OpenGL)
BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: pkgconfig(Qt5XmlPatterns)
BuildRequires: pkgconfig(Qt5X11Extras)
BuildRequires: pkgconfig(Qt5WebKit)
-BuildRequires: pkgconfig(x11) pkgconfig(xproto)
%if 0%{?qt5_qtwebengine_arches:1}
%ifarch %{?qt5_qtwebengine_arches}
%global qwebengine 1
-%if 0%{?fedora} >= 38
-BuildRequires: cmake(KF5Akonadi)
-BuildRequires: cmake(KF5Contacts)
-%else
-BuildRequires: cmake(KF5AkonadiContact)
-%endif
BuildRequires: pkgconfig(Qt5WebEngine)
%else
BuildRequires: pkgconfig(Qt5WebKit)
%endif
%endif
+BuildRequires: marble-astro-devel
+BuildRequires: marble-widget-qt5-devel
BuildRequires: kf5-libksane-devel >= 16.03
BuildRequires: kf5-kcalendarcore-devel
BuildRequires: kf5-kconfig-devel
@@ -95,6 +131,7 @@ BuildRequires: kf5-sonnet-devel
BuildRequires: kf5-kitemviews-devel
BuildRequires: kf5-kbookmarks-devel
BuildRequires: kf5-rpm-macros
+%endif
## not actually checked-for or used -- rex
## rely on explicit cmake build options instead
@@ -135,8 +172,13 @@ Recommends: hugin-base
#Recommends: kf5-kipi-plugins
# thumbnailers, better default access to mtp-enabled devices
Recommends: kio-extras
+%if %{with build_with_qt6}
+Recommends: qt6-qtbase-mysql%{?_isa}
+Recommends: qt6-qtimageformats%{?_isa}
+%else
Recommends: qt5-qtbase-mysql%{?_isa}
Recommends: qt5-qtimageformats%{?_isa}
+%endif
# core/libs/rawengine/libraw/
Provides: bundled(LibRaw) = 0.21.1
@@ -176,9 +218,14 @@ needed to develop applications using %{name}.
%build
+%if %{with build_with_qt6}
+%cmake_kf6 \
+ -DBUILD_WITH_QT6:BOOL=ON \
+ -DENABLE_QTMULTIMEDIA:BOOL=ON \
+%else
%cmake_kf5 \
+%endif
%{?ninja:-G Ninja} \
- -DENABLE_AKONADICONTACTSUPPORT:BOOL=ON \
-DENABLE_APPSTYLES:BOOL=ON \
-DENABLE_KFILEMETADATASUPPORT:BOOL=ON \
%if 0%{?rhel} && 0%{?rhel} < 9
@@ -202,26 +249,68 @@ desktop-file-install --vendor="" \
%check
-for i in %{buildroot}%{_kf5_datadir}/applications/*.desktop ; do
+for i in %{buildroot}%{_datadir}/applications/*.desktop ; do
desktop-file-validate $i ||:
done
%if 0%{?rhel} && 0%{?rhel} < 8
%post
-touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
%postun
if [ $1 -eq 0 ] ; then
- touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null
- gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
+ touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
update-desktop-database -q &> /dev/null
fi
%posttrans
-gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
update-desktop-database -q &> /dev/null
%endif
+
+%ldconfig_scriptlets libs
+
+
+%if %{with build_with_qt6}
+%files -f %{name}.lang
+%doc AUTHORS ChangeLog
+%doc NEWS README.md
+%license LICENSES/GPL-2.0-or-later.txt
+%{_kf6_bindir}/digikam
+%{_kf6_bindir}/digitaglinktree
+%{_kf6_bindir}/cleanup_digikamdb
+%{_kf6_bindir}/showfoto
+%{_kf6_datadir}/kxmlgui5/digikam/
+%{_kf6_datadir}/kxmlgui5/showfoto/
+%{_kf6_datadir}/knotifications6/digikam.notifyrc
+%{_kf6_datadir}/digikam/
+%{_kf6_datadir}/showfoto/
+%{_kf6_datadir}/solid/actions/digikam*.desktop
+%{_kf6_metainfodir}/org.kde.digikam.appdata.xml
+%{_kf6_metainfodir}/org.kde.showfoto.appdata.xml
+%{_kf6_datadir}/applications/digikam-import.desktop
+%{_kf6_datadir}/applications/org.kde.digikam.desktop
+%{_kf6_datadir}/applications/org.kde.showfoto.desktop
+%{_mandir}/man1/digitaglinktree.1*
+%{_mandir}/man1/cleanup_digikamdb.1*
+%{_kf6_datadir}/icons/hicolor/*/*/*
+
+%files libs
+%{_kf6_libdir}/libdigikamcore.so.*
+%{_kf6_libdir}/libdigikamdatabase.so.*
+%{_kf6_libdir}/libdigikamgui.so.*
+%{_kf6_qtplugindir}/digikam/
+
+%files devel
+%{_kf6_libdir}/libdigikamcore.so
+%{_kf6_libdir}/libdigikamdatabase.so
+%{_kf6_libdir}/libdigikamgui.so
+%{_kf6_libdir}/cmake/Digikam*/
+%{_includedir}/digikam/
+
+%else
%files -f %{name}.lang
%doc AUTHORS ChangeLog
%doc NEWS README.md
@@ -245,8 +334,6 @@ update-desktop-database -q &> /dev/null
%{_mandir}/man1/cleanup_digikamdb.1*
%{_kf5_datadir}/icons/hicolor/*/*/*
-%ldconfig_scriptlets libs
-
%files libs
%{_kf5_libdir}/libdigikamcore.so.*
%{_kf5_libdir}/libdigikamdatabase.so.*
@@ -259,9 +346,13 @@ update-desktop-database -q &> /dev/null
%{_kf5_libdir}/libdigikamgui.so
%{_kf5_libdir}/cmake/Digikam*/
%{_includedir}/digikam/
+%endif
%changelog
+* Thu Nov 30 2023 Alexey Kurov <nucleo(a)fedoraproject.org> - 8.2.0-2
+- Build with Qt6 for F40+ and qt6_qtwebengine_arches
+
* Thu Nov 30 2023 Alexey Kurov <nucleo(a)fedoraproject.org> - 8.2.0-1
- digiKam-8.2.0
commit 263a117ac76a5991bc6d915f618165bf8e42b804
Author: nucleo <nucleo(a)fedoraproject.org>
Date: Thu Nov 30 21:06:45 2023 +0200
digiKam-8.2.0
diff --git a/.gitignore b/.gitignore
index 5782806..ecf4353 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
/digiKam-7.10.0.tar.xz
/digiKam-8.0.0.tar.xz
/digiKam-8.1.0.tar.xz
+/digiKam-8.2.0.tar.xz
diff --git a/digikam.spec b/digikam.spec
index e503e74..c430532 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -5,8 +5,8 @@
Name: digikam
Summary: A digital camera accessing & photo management application
-Version: 8.1.0
-Release: 4%{?beta}%{?dist}
+Version: 8.2.0
+Release: 1%{?beta}%{?dist}
License: GPL-2.0-or-later
URL: http://www.digikam.org/
@@ -119,7 +119,6 @@ BuildRequires: pkgconfig(libavfilter)
BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libswscale)
BuildRequires: pkgconfig(libass)
-BuildRequires: pkgconfig(openal)
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libva)
BuildRequires: pkgconfig(xext)
@@ -263,6 +262,9 @@ update-desktop-database -q &> /dev/null
%changelog
+* Thu Nov 30 2023 Alexey Kurov <nucleo(a)fedoraproject.org> - 8.2.0-1
+- digiKam-8.2.0
+
* Tue Nov 28 2023 Orion Poplawski <orion(a)nwra.com> - 8.1.0-4
- Rebuild for jasper 4.1
diff --git a/sources b/sources
index 3e2307a..d4a8184 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (digiKam-8.1.0.tar.xz) = cbf5a776b4138f4f05d074721324b046dfa07ddc01259f569ae46c46a6d5b0b00824ef0962a09041081703348e4defecf15cff800b2c6cf5e04a0e7e963a3ef4
+SHA512 (digiKam-8.2.0.tar.xz) = a34c5bde0e579b5f6de1fe90977e01bc385e5c28155d24db09e3cdfe7958c979d2e27cbce402d6c5b70f952fc0ead88318dfa025bb67e540c4d763cb139db7bb
commit e899b13a34751e3f8cec991c59f4b93abb38a5df
Author: Orion Poplawski <orion(a)nwra.com>
Date: Mon Nov 27 19:23:50 2023 -0700
Fix up KF5Akonadi/Contacs BR
diff --git a/digikam.spec b/digikam.spec
index ed34651..e503e74 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -62,7 +62,12 @@ BuildRequires: pkgconfig(x11) pkgconfig(xproto)
%if 0%{?qt5_qtwebengine_arches:1}
%ifarch %{?qt5_qtwebengine_arches}
%global qwebengine 1
+%if 0%{?fedora} >= 38
+BuildRequires: cmake(KF5Akonadi)
+BuildRequires: cmake(KF5Contacts)
+%else
BuildRequires: cmake(KF5AkonadiContact)
+%endif
BuildRequires: pkgconfig(Qt5WebEngine)
%else
BuildRequires: pkgconfig(Qt5WebKit)
commit b587a7fae339dc7084e6cc26caa11728b7a5ccb9
Author: Orion Poplawski <orion(a)nwra.com>
Date: Mon Nov 27 18:57:28 2023 -0700
Rebuild for jasper 4.1
diff --git a/digikam.spec b/digikam.spec
index 1e5454d..ed34651 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -6,7 +6,7 @@
Name: digikam
Summary: A digital camera accessing & photo management application
Version: 8.1.0
-Release: 3%{?beta}%{?dist}
+Release: 4%{?beta}%{?dist}
License: GPL-2.0-or-later
URL: http://www.digikam.org/
@@ -258,6 +258,9 @@ update-desktop-database -q &> /dev/null
%changelog
+* Tue Nov 28 2023 Orion Poplawski <orion(a)nwra.com> - 8.1.0-4
+- Rebuild for jasper 4.1
+
* Mon Aug 07 2023 Sérgio Basto <sergio(a)serjux.com> - 8.1.0-3
- Rebuild for opencv 4.8.0
1
0
30 Nov '23
The package rpms/rustup.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rustup.git/commit/?id=fa7bcfa4e327c….
Change:
+ExclusiveArch: x86_64 aarch64
Thanks.
Full change:
============
commit fa7bcfa4e327caea228f975b22bdd71748733156
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Thu Nov 30 21:33:02 2023 +0100
Initial import (#2251579)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f13364b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/rustup-1.26.0.tar.gz
diff --git a/0001-Drop-Windows-specific-dependencies.patch b/0001-Drop-Windows-specific-dependencies.patch
new file mode 100644
index 0000000..400b24c
--- /dev/null
+++ b/0001-Drop-Windows-specific-dependencies.patch
@@ -0,0 +1,53 @@
+From 50e9805a689adc522b92412525c3676de1b4af49 Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe(a)gmail.com>
+Date: Wed, 8 Nov 2023 17:47:31 +0100
+Subject: [PATCH 1/5] Drop Windows-specific dependencies
+
+---
+ Cargo.toml | 30 ------------------------------
+ 1 file changed, 30 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 406cb37..23eb61a 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -85,36 +85,6 @@ version = "1.3.1"
+ features = ["rs_tracing"]
+ version = "1.1.0"
+
+-[target."cfg(windows)".dependencies]
+-cc = "1"
+-winreg = "0.11"
+-
+-[target."cfg(windows)".dependencies.winapi]
+-features = [
+- "combaseapi",
+- "errhandlingapi",
+- "fileapi",
+- "handleapi",
+- "ioapiset",
+- "jobapi",
+- "jobapi2",
+- "minwindef",
+- "processthreadsapi",
+- "psapi",
+- "shlobj",
+- "shtypes",
+- "synchapi",
+- "sysinfoapi",
+- "tlhelp32",
+- "userenv",
+- "winbase",
+- "winerror",
+- "winioctl",
+- "winnt",
+- "winuser",
+-]
+-version = "0.3"
+-
+ [dev-dependencies]
+ enum-map = "2.4.2"
+ once_cell = "1.17.1"
+--
+2.43.0
+
diff --git a/0002-Drop-feature-for-statically-linking-against-vendored.patch b/0002-Drop-feature-for-statically-linking-against-vendored.patch
new file mode 100644
index 0000000..fbffe08
--- /dev/null
+++ b/0002-Drop-feature-for-statically-linking-against-vendored.patch
@@ -0,0 +1,25 @@
+From 6e62451af518059056dd2e9352081670b0e8fc30 Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe(a)gmail.com>
+Date: Wed, 8 Nov 2023 17:53:44 +0100
+Subject: [PATCH 2/5] Drop feature for statically linking against vendored
+ OpenSSL
+
+---
+ Cargo.toml | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 23eb61a..3e878ac 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -24,7 +24,6 @@ default = [
+ ]
+
+ reqwest-backend = ["download/reqwest-backend"]
+-vendored-openssl = ['openssl/vendored']
+
+ reqwest-default-tls = ["download/reqwest-default-tls"]
+ reqwest-rustls-tls = ["download/reqwest-rustls-tls"]
+--
+2.43.0
+
diff --git a/0003-Bump-term-dependency-from-0.5.1-to-0.7.patch b/0003-Bump-term-dependency-from-0.5.1-to-0.7.patch
new file mode 100644
index 0000000..6b97a7c
--- /dev/null
+++ b/0003-Bump-term-dependency-from-0.5.1-to-0.7.patch
@@ -0,0 +1,26 @@
+From 10e8f24e297d66db1c6cce1be94b4a8850f64f73 Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe(a)gmail.com>
+Date: Wed, 8 Nov 2023 17:55:55 +0100
+Subject: [PATCH 3/5] Bump term dependency from =0.5.1 to 0.7
+
+---
+ Cargo.toml | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 3e878ac..3aec3b1 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -65,8 +65,7 @@ sharded-slab = "0.1.1"
+ strsim = "0.10"
+ tar = "0.4.26"
+ tempfile.workspace = true
+-# FIXME(issue #1818, #1826, and friends)
+-term = "=0.5.1"
++term = "0.7"
+ thiserror.workspace = true
+ threadpool = "1"
+ toml = "0.5"
+--
+2.43.0
+
diff --git a/0004-Remove-unused-tracing-support.patch b/0004-Remove-unused-tracing-support.patch
new file mode 100644
index 0000000..d7da35b
--- /dev/null
+++ b/0004-Remove-unused-tracing-support.patch
@@ -0,0 +1,154 @@
+From cdc1e26072bf1183a9fd784d33553fe6167e7969 Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe(a)gmail.com>
+Date: Wed, 8 Nov 2023 17:56:26 +0100
+Subject: [PATCH 4/5] Remove unused tracing support
+
+---
+ Cargo.toml | 4 ----
+ src/bin/rustup-init.rs | 7 -------
+ src/diskio/immediate.rs | 3 ---
+ src/diskio/mod.rs | 8 --------
+ src/lib.rs | 3 ---
+ 5 files changed, 25 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 3aec3b1..aae3d01 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -79,10 +79,6 @@ default-features = false
+ features = ["random"]
+ version = "1.3.1"
+
+-[dependencies.rs_tracing]
+-features = ["rs_tracing"]
+-version = "1.1.0"
+-
+ [dev-dependencies]
+ enum-map = "2.4.2"
+ once_cell = "1.17.1"
+diff --git a/src/bin/rustup-init.rs b/src/bin/rustup-init.rs
+index 35ed986..22d29b6 100644
+--- a/src/bin/rustup-init.rs
++++ b/src/bin/rustup-init.rs
+@@ -15,7 +15,6 @@
+
+ use anyhow::{anyhow, Result};
+ use cfg_if::cfg_if;
+-use rs_tracing::*;
+
+ use rustup::cli::common;
+ use rustup::cli::proxy_mode;
+@@ -40,13 +39,7 @@ fn main() {
+ }
+
+ fn run_rustup() -> Result<utils::ExitCode> {
+- if let Ok(dir) = process().var("RUSTUP_TRACE_DIR") {
+- open_trace_file!(dir)?;
+- }
+ let result = run_rustup_inner();
+- if process().var("RUSTUP_TRACE_DIR").is_ok() {
+- close_trace_file!();
+- }
+ result
+ }
+
+diff --git a/src/diskio/immediate.rs b/src/diskio/immediate.rs
+index 2bc2a5d..5818b58 100644
+--- a/src/diskio/immediate.rs
++++ b/src/diskio/immediate.rs
+@@ -167,7 +167,6 @@ impl IncrementalFileWriter {
+ let path = path.as_ref();
+ let path_display = format!("{}", path.display());
+ let file = Some({
+- trace_scoped!("creat", "name": path_display);
+ opts.write(true).create(true).truncate(true).open(path)?
+ });
+ Ok(IncrementalFileWriter {
+@@ -207,11 +206,9 @@ impl IncrementalFileWriter {
+ if let Some(ref mut file) = self.file.as_mut() {
+ // Length 0 vector is used for clean EOF signalling.
+ if chunk.is_empty() {
+- trace_scoped!("close", "name:": self.path_display);
+ drop(std::mem::take(&mut self.file));
+ state.finished = true;
+ } else {
+- trace_scoped!("write_segment", "name": self.path_display, "len": chunk.len());
+ file.write_all(&chunk)?;
+
+ state.completed_chunks.push(chunk.len());
+diff --git a/src/diskio/mod.rs b/src/diskio/mod.rs
+index a5e597c..488be46 100644
+--- a/src/diskio/mod.rs
++++ b/src/diskio/mod.rs
+@@ -373,17 +373,14 @@ pub(crate) fn write_file<P: AsRef<Path>, C: AsRef<[u8]>>(
+ let path = path.as_ref();
+ let path_display = format!("{}", path.display());
+ let mut f = {
+- trace_scoped!("creat", "name": path_display);
+ opts.write(true).create(true).truncate(true).open(path)?
+ };
+ let contents = contents.as_ref();
+ let len = contents.len();
+ {
+- trace_scoped!("write", "name": path_display, "len": len);
+ f.write_all(contents)?;
+ }
+ {
+- trace_scoped!("close", "name:": path_display);
+ drop(f);
+ }
+ Ok(())
+@@ -405,7 +402,6 @@ pub(crate) fn write_file_incremental<P: AsRef<Path>, F: Fn(usize)>(
+ let path = path.as_ref();
+ let path_display = format!("{}", path.display());
+ let mut f = {
+- trace_scoped!("creat", "name": path_display);
+ opts.write(true).create(true).truncate(true).open(path)?
+ };
+ if let IncrementalFile::ThreadedReceiver(recv) = content_callback {
+@@ -416,12 +412,10 @@ pub(crate) fn write_file_incremental<P: AsRef<Path>, F: Fn(usize)>(
+ let len = contents.len();
+ // Length 0 vector is used for clean EOF signalling.
+ if len == 0 {
+- trace_scoped!("EOF_chunk", "name": path_display, "len": len);
+ drop(contents);
+ chunk_complete_callback(len);
+ break;
+ } else {
+- trace_scoped!("write_segment", "name": path_display, "len": len);
+ f.write_all(&contents)?;
+ drop(contents);
+ chunk_complete_callback(len);
+@@ -431,7 +425,6 @@ pub(crate) fn write_file_incremental<P: AsRef<Path>, F: Fn(usize)>(
+ unreachable!();
+ }
+ {
+- trace_scoped!("close", "name:": path_display);
+ drop(f);
+ }
+ Ok(())
+@@ -440,7 +433,6 @@ pub(crate) fn write_file_incremental<P: AsRef<Path>, F: Fn(usize)>(
+ pub(crate) fn create_dir<P: AsRef<Path>>(path: P) -> io::Result<()> {
+ let path = path.as_ref();
+ let path_display = format!("{}", path.display());
+- trace_scoped!("create_dir", "name": path_display);
+ std::fs::create_dir(path)
+ }
+
+diff --git a/src/lib.rs b/src/lib.rs
+index b4e88fa..c34c6d1 100644
+--- a/src/lib.rs
++++ b/src/lib.rs
+@@ -15,9 +15,6 @@ use crate::toolchain::*;
+ pub(crate) use crate::utils::toml_utils;
+ use anyhow::{anyhow, Result};
+
+-#[macro_use]
+-extern crate rs_tracing;
+-
+ // A list of all binaries which Rustup will proxy.
+ pub static TOOLS: &[&str] = &[
+ "rustc",
+--
+2.43.0
+
diff --git a/0005-Remove-unused-git-based-versioning.patch b/0005-Remove-unused-git-based-versioning.patch
new file mode 100644
index 0000000..9808bea
--- /dev/null
+++ b/0005-Remove-unused-git-based-versioning.patch
@@ -0,0 +1,136 @@
+From 7e7ffd44e6284de55df4e5eb050635ab5bce6ad2 Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe(a)gmail.com>
+Date: Wed, 8 Nov 2023 18:08:54 +0100
+Subject: [PATCH 5/5] Remove unused git-based versioning
+
+---
+ Cargo.toml | 1 -
+ src/cli/common.rs | 61 +-----------------------------------------
+ src/cli/rustup_mode.rs | 1 -
+ src/cli/setup_mode.rs | 6 -----
+ 4 files changed, 1 insertion(+), 68 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index aae3d01..f33f4a9 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -42,7 +42,6 @@ download = { path = "download", default-features = false }
+ effective-limits = "0.5.5"
+ enum-map = "2.4.2"
+ flate2 = "1"
+-git-testament = "0.2"
+ home = "0.5.4"
+ lazy_static.workspace = true
+ libc = "0.2"
+diff --git a/src/cli/common.rs b/src/cli/common.rs
+index 9a6a68d..3bb0a2c 100644
+--- a/src/cli/common.rs
++++ b/src/cli/common.rs
+@@ -7,8 +7,6 @@ use std::sync::Arc;
+ use std::{cmp, env};
+
+ use anyhow::{anyhow, Context, Result};
+-use git_testament::{git_testament, render_testament};
+-use lazy_static::lazy_static;
+ use term2::Terminal;
+
+ use super::self_update;
+@@ -513,65 +511,8 @@ pub(crate) fn list_overrides(cfg: &Cfg) -> Result<utils::ExitCode> {
+ Ok(utils::ExitCode(0))
+ }
+
+-git_testament!(TESTAMENT);
+-
+ pub(crate) fn version() -> &'static str {
+- lazy_static! {
+- // Because we trust our `stable` branch given the careful release
+- // process, we mark it trusted here so that our version numbers look
+- // right when built from CI before the tag is pushed
+- static ref RENDERED: String = render_testament!(TESTAMENT, "stable");
+- }
+- &RENDERED
+-}
+-
+-pub(crate) fn dump_testament() -> Result<utils::ExitCode> {
+- use git_testament::GitModification::*;
+- writeln!(
+- process().stdout(),
+- "Rustup version renders as: {}",
+- version()
+- )?;
+- writeln!(
+- process().stdout(),
+- "Current crate version: {}",
+- env!("CARGO_PKG_VERSION")
+- )?;
+- if TESTAMENT.branch_name.is_some() {
+- writeln!(
+- process().stdout(),
+- "Built from branch: {}",
+- TESTAMENT.branch_name.unwrap()
+- )?;
+- } else {
+- writeln!(process().stdout(), "Branch information missing")?;
+- }
+- writeln!(process().stdout(), "Commit info: {}", TESTAMENT.commit)?;
+- if TESTAMENT.modifications.is_empty() {
+- writeln!(process().stdout(), "Working tree is clean")?;
+- } else {
+- for fmod in TESTAMENT.modifications {
+- match fmod {
+- Added(f) => writeln!(process().stdout(), "Added: {}", String::from_utf8_lossy(f))?,
+- Removed(f) => writeln!(
+- process().stdout(),
+- "Removed: {}",
+- String::from_utf8_lossy(f)
+- )?,
+- Modified(f) => writeln!(
+- process().stdout(),
+- "Modified: {}",
+- String::from_utf8_lossy(f)
+- )?,
+- Untracked(f) => writeln!(
+- process().stdout(),
+- "Untracked: {}",
+- String::from_utf8_lossy(f)
+- )?,
+- }
+- }
+- }
+- Ok(utils::ExitCode(0))
++ "1.26.0"
+ }
+
+ fn show_backtrace() -> bool {
+diff --git a/src/cli/rustup_mode.rs b/src/cli/rustup_mode.rs
+index 09d1379..06a0af7 100644
+--- a/src/cli/rustup_mode.rs
++++ b/src/cli/rustup_mode.rs
+@@ -137,7 +137,6 @@ pub fn main() -> Result<utils::ExitCode> {
+
+ Ok(match matches.subcommand() {
+ Some(s) => match s {
+- ("dump-testament", _) => common::dump_testament()?,
+ ("show", c) => match c.subcommand() {
+ Some(s) => match s {
+ ("active-toolchain", m) => handle_epipe(show_active_toolchain(cfg, m))?,
+diff --git a/src/cli/setup_mode.rs b/src/cli/setup_mode.rs
+index 6dd04ec..eaa814b 100644
+--- a/src/cli/setup_mode.rs
++++ b/src/cli/setup_mode.rs
+@@ -16,12 +16,6 @@ pub fn main() -> Result<utils::ExitCode> {
+ return self_update::self_replace();
+ }
+
+- // Internal testament dump used during CI. Not for users.
+- if arg1 == Some("--dump-testament") {
+- common::dump_testament()?;
+- return Ok(utils::ExitCode(0));
+- }
+-
+ // NOTICE: If you change anything here, please make the same changes in rustup-init.sh
+ let cli = Command::new("rustup-init")
+ .version(common::version())
+--
+2.43.0
+
diff --git a/README.md b/README.md
deleted file mode 100644
index d2418c5..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rustup
-
-The rustup package
diff --git a/rustup.spec b/rustup.spec
new file mode 100644
index 0000000..3b875d5
--- /dev/null
+++ b/rustup.spec
@@ -0,0 +1,101 @@
+# Generated by rust2rpm 25
+%bcond_without check
+
+Name: rustup
+Version: 1.26.0
+Release: %autorelease
+Summary: Manage multiple rust installations with ease
+
+SourceLicense: MIT OR Apache-2.0
+# (Apache-2.0 OR MIT) AND BSD-3-Clause
+# (MIT OR Apache-2.0) AND Unicode-DFS-2016
+# 0BSD OR MIT OR Apache-2.0
+# Apache-2.0
+# Apache-2.0 OR BSL-1.0
+# Apache-2.0 OR ISC OR MIT
+# Apache-2.0 OR MIT
+# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
+# ISC
+# ISC AND MIT AND OpenSSL
+# MIT
+# MIT OR Apache-2.0
+# MIT OR Apache-2.0 OR Zlib
+# MIT OR Zlib OR Apache-2.0
+# Unlicense OR MIT
+# Zlib OR Apache-2.0 OR MIT
+License: Apache-2.0 AND BSD-3-Clause AND ISC AND MIT AND OpenSSL AND Unicode-DFS-2016 AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) AND (Unlicense OR MIT)
+# LICENSE.dependencies contains a full license breakdown
+
+URL: https://github.com/rust-lang/rustup
+Source: %{url}/archive/%{version}/rustup-%{version}.tar.gz
+
+# non-upstreamable patches:
+# * drop Windows-specific dependencies
+Patch: 0001-Drop-Windows-specific-dependencies.patch
+# * drop unavailable "openssl/vendored" feature
+Patch: 0002-Drop-feature-for-statically-linking-against-vendored.patch
+# * bump "term" dependency from 0.5.1 to 0.7 (blocked upstream)
+Patch: 0003-Bump-term-dependency-from-0.5.1-to-0.7.patch
+# * remove unused tracing support and unnecessary "rs_tracing" dependency
+Patch: 0004-Remove-unused-tracing-support.patch
+# * remove unused git-based versioning and unnecessary "git-testament" dependency
+Patch: 0005-Remove-unused-git-based-versioning.patch
+
+# rustup is only fully functional on Rust "Tier 1" architectures
+ExclusiveArch: x86_64 aarch64
+
+BuildRequires: cargo-rpm-macros >= 24
+
+%global _description %{expand:
+Manage multiple rust installations with ease.}
+
+%description %{_description}
+
+%prep
+%autosetup -n rustup-%{version} -p1
+%cargo_prep
+
+%generate_buildrequires
+%cargo_generate_buildrequires
+
+%build
+%cargo_build -f no-self-update
+%{cargo_license_summary -f no-self-update}
+%{cargo_license -f no-self-update} > LICENSE.dependencies
+
+%install
+%cargo_install -f no-self-update
+
+# generate and install shell completions
+cp -pav target/rpm/rustup-init target/rpm/rustup
+target/rpm/rustup completions bash > rustup.bash
+target/rpm/rustup completions fish > rustup.fish
+target/rpm/rustup completions zsh > _rustup
+
+install -Dpm 0644 rustup.bash -t %{buildroot}/%{bash_completions_dir}
+install -Dpm 0644 rustup.fish -t %{buildroot}/%{fish_completions_dir}
+install -Dpm 0644 _rustup -t %{buildroot}/%{zsh_completions_dir}
+
+%if %{with check}
+%check
+# * skip tests that require internet access
+# * skip tests for the "rustup" binary that is not built in this package
+%cargo_test -- -- --skip suite::cli_exact::check_updates --skip suite::cli_ui::rustup_ui_doc_text_tests
+%endif
+
+%files
+%license LICENSE-APACHE
+%license LICENSE-MIT
+%license LICENSE.dependencies
+%doc CHANGELOG.md
+%doc CONTRIBUTING.md
+%doc README.md
+
+%{_bindir}/rustup-init
+
+%{bash_completions_dir}/rustup.bash
+%{fish_completions_dir}/rustup.fish
+%{zsh_completions_dir}/_rustup
+
+%changelog
+%autochangelog
diff --git a/sources b/sources
new file mode 100644
index 0000000..f732aa6
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (rustup-1.26.0.tar.gz) = bc7cb580640248a601dbafb87c3a9e908b6c687377b4e0f88280576af15527f5837d9463f7831c14b0c274cd3170449e634cd851e0d03ea4ff1d0461d4a941be
1
0
30 Nov '23
The package rpms/rustup.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rustup.git/commit/?id=fa7bcfa4e327c….
Change:
+ExclusiveArch: x86_64 aarch64
Thanks.
Full change:
============
commit fa7bcfa4e327caea228f975b22bdd71748733156
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Thu Nov 30 21:33:02 2023 +0100
Initial import (#2251579)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f13364b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/rustup-1.26.0.tar.gz
diff --git a/0001-Drop-Windows-specific-dependencies.patch b/0001-Drop-Windows-specific-dependencies.patch
new file mode 100644
index 0000000..400b24c
--- /dev/null
+++ b/0001-Drop-Windows-specific-dependencies.patch
@@ -0,0 +1,53 @@
+From 50e9805a689adc522b92412525c3676de1b4af49 Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe(a)gmail.com>
+Date: Wed, 8 Nov 2023 17:47:31 +0100
+Subject: [PATCH 1/5] Drop Windows-specific dependencies
+
+---
+ Cargo.toml | 30 ------------------------------
+ 1 file changed, 30 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 406cb37..23eb61a 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -85,36 +85,6 @@ version = "1.3.1"
+ features = ["rs_tracing"]
+ version = "1.1.0"
+
+-[target."cfg(windows)".dependencies]
+-cc = "1"
+-winreg = "0.11"
+-
+-[target."cfg(windows)".dependencies.winapi]
+-features = [
+- "combaseapi",
+- "errhandlingapi",
+- "fileapi",
+- "handleapi",
+- "ioapiset",
+- "jobapi",
+- "jobapi2",
+- "minwindef",
+- "processthreadsapi",
+- "psapi",
+- "shlobj",
+- "shtypes",
+- "synchapi",
+- "sysinfoapi",
+- "tlhelp32",
+- "userenv",
+- "winbase",
+- "winerror",
+- "winioctl",
+- "winnt",
+- "winuser",
+-]
+-version = "0.3"
+-
+ [dev-dependencies]
+ enum-map = "2.4.2"
+ once_cell = "1.17.1"
+--
+2.43.0
+
diff --git a/0002-Drop-feature-for-statically-linking-against-vendored.patch b/0002-Drop-feature-for-statically-linking-against-vendored.patch
new file mode 100644
index 0000000..fbffe08
--- /dev/null
+++ b/0002-Drop-feature-for-statically-linking-against-vendored.patch
@@ -0,0 +1,25 @@
+From 6e62451af518059056dd2e9352081670b0e8fc30 Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe(a)gmail.com>
+Date: Wed, 8 Nov 2023 17:53:44 +0100
+Subject: [PATCH 2/5] Drop feature for statically linking against vendored
+ OpenSSL
+
+---
+ Cargo.toml | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 23eb61a..3e878ac 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -24,7 +24,6 @@ default = [
+ ]
+
+ reqwest-backend = ["download/reqwest-backend"]
+-vendored-openssl = ['openssl/vendored']
+
+ reqwest-default-tls = ["download/reqwest-default-tls"]
+ reqwest-rustls-tls = ["download/reqwest-rustls-tls"]
+--
+2.43.0
+
diff --git a/0003-Bump-term-dependency-from-0.5.1-to-0.7.patch b/0003-Bump-term-dependency-from-0.5.1-to-0.7.patch
new file mode 100644
index 0000000..6b97a7c
--- /dev/null
+++ b/0003-Bump-term-dependency-from-0.5.1-to-0.7.patch
@@ -0,0 +1,26 @@
+From 10e8f24e297d66db1c6cce1be94b4a8850f64f73 Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe(a)gmail.com>
+Date: Wed, 8 Nov 2023 17:55:55 +0100
+Subject: [PATCH 3/5] Bump term dependency from =0.5.1 to 0.7
+
+---
+ Cargo.toml | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 3e878ac..3aec3b1 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -65,8 +65,7 @@ sharded-slab = "0.1.1"
+ strsim = "0.10"
+ tar = "0.4.26"
+ tempfile.workspace = true
+-# FIXME(issue #1818, #1826, and friends)
+-term = "=0.5.1"
++term = "0.7"
+ thiserror.workspace = true
+ threadpool = "1"
+ toml = "0.5"
+--
+2.43.0
+
diff --git a/0004-Remove-unused-tracing-support.patch b/0004-Remove-unused-tracing-support.patch
new file mode 100644
index 0000000..d7da35b
--- /dev/null
+++ b/0004-Remove-unused-tracing-support.patch
@@ -0,0 +1,154 @@
+From cdc1e26072bf1183a9fd784d33553fe6167e7969 Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe(a)gmail.com>
+Date: Wed, 8 Nov 2023 17:56:26 +0100
+Subject: [PATCH 4/5] Remove unused tracing support
+
+---
+ Cargo.toml | 4 ----
+ src/bin/rustup-init.rs | 7 -------
+ src/diskio/immediate.rs | 3 ---
+ src/diskio/mod.rs | 8 --------
+ src/lib.rs | 3 ---
+ 5 files changed, 25 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 3aec3b1..aae3d01 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -79,10 +79,6 @@ default-features = false
+ features = ["random"]
+ version = "1.3.1"
+
+-[dependencies.rs_tracing]
+-features = ["rs_tracing"]
+-version = "1.1.0"
+-
+ [dev-dependencies]
+ enum-map = "2.4.2"
+ once_cell = "1.17.1"
+diff --git a/src/bin/rustup-init.rs b/src/bin/rustup-init.rs
+index 35ed986..22d29b6 100644
+--- a/src/bin/rustup-init.rs
++++ b/src/bin/rustup-init.rs
+@@ -15,7 +15,6 @@
+
+ use anyhow::{anyhow, Result};
+ use cfg_if::cfg_if;
+-use rs_tracing::*;
+
+ use rustup::cli::common;
+ use rustup::cli::proxy_mode;
+@@ -40,13 +39,7 @@ fn main() {
+ }
+
+ fn run_rustup() -> Result<utils::ExitCode> {
+- if let Ok(dir) = process().var("RUSTUP_TRACE_DIR") {
+- open_trace_file!(dir)?;
+- }
+ let result = run_rustup_inner();
+- if process().var("RUSTUP_TRACE_DIR").is_ok() {
+- close_trace_file!();
+- }
+ result
+ }
+
+diff --git a/src/diskio/immediate.rs b/src/diskio/immediate.rs
+index 2bc2a5d..5818b58 100644
+--- a/src/diskio/immediate.rs
++++ b/src/diskio/immediate.rs
+@@ -167,7 +167,6 @@ impl IncrementalFileWriter {
+ let path = path.as_ref();
+ let path_display = format!("{}", path.display());
+ let file = Some({
+- trace_scoped!("creat", "name": path_display);
+ opts.write(true).create(true).truncate(true).open(path)?
+ });
+ Ok(IncrementalFileWriter {
+@@ -207,11 +206,9 @@ impl IncrementalFileWriter {
+ if let Some(ref mut file) = self.file.as_mut() {
+ // Length 0 vector is used for clean EOF signalling.
+ if chunk.is_empty() {
+- trace_scoped!("close", "name:": self.path_display);
+ drop(std::mem::take(&mut self.file));
+ state.finished = true;
+ } else {
+- trace_scoped!("write_segment", "name": self.path_display, "len": chunk.len());
+ file.write_all(&chunk)?;
+
+ state.completed_chunks.push(chunk.len());
+diff --git a/src/diskio/mod.rs b/src/diskio/mod.rs
+index a5e597c..488be46 100644
+--- a/src/diskio/mod.rs
++++ b/src/diskio/mod.rs
+@@ -373,17 +373,14 @@ pub(crate) fn write_file<P: AsRef<Path>, C: AsRef<[u8]>>(
+ let path = path.as_ref();
+ let path_display = format!("{}", path.display());
+ let mut f = {
+- trace_scoped!("creat", "name": path_display);
+ opts.write(true).create(true).truncate(true).open(path)?
+ };
+ let contents = contents.as_ref();
+ let len = contents.len();
+ {
+- trace_scoped!("write", "name": path_display, "len": len);
+ f.write_all(contents)?;
+ }
+ {
+- trace_scoped!("close", "name:": path_display);
+ drop(f);
+ }
+ Ok(())
+@@ -405,7 +402,6 @@ pub(crate) fn write_file_incremental<P: AsRef<Path>, F: Fn(usize)>(
+ let path = path.as_ref();
+ let path_display = format!("{}", path.display());
+ let mut f = {
+- trace_scoped!("creat", "name": path_display);
+ opts.write(true).create(true).truncate(true).open(path)?
+ };
+ if let IncrementalFile::ThreadedReceiver(recv) = content_callback {
+@@ -416,12 +412,10 @@ pub(crate) fn write_file_incremental<P: AsRef<Path>, F: Fn(usize)>(
+ let len = contents.len();
+ // Length 0 vector is used for clean EOF signalling.
+ if len == 0 {
+- trace_scoped!("EOF_chunk", "name": path_display, "len": len);
+ drop(contents);
+ chunk_complete_callback(len);
+ break;
+ } else {
+- trace_scoped!("write_segment", "name": path_display, "len": len);
+ f.write_all(&contents)?;
+ drop(contents);
+ chunk_complete_callback(len);
+@@ -431,7 +425,6 @@ pub(crate) fn write_file_incremental<P: AsRef<Path>, F: Fn(usize)>(
+ unreachable!();
+ }
+ {
+- trace_scoped!("close", "name:": path_display);
+ drop(f);
+ }
+ Ok(())
+@@ -440,7 +433,6 @@ pub(crate) fn write_file_incremental<P: AsRef<Path>, F: Fn(usize)>(
+ pub(crate) fn create_dir<P: AsRef<Path>>(path: P) -> io::Result<()> {
+ let path = path.as_ref();
+ let path_display = format!("{}", path.display());
+- trace_scoped!("create_dir", "name": path_display);
+ std::fs::create_dir(path)
+ }
+
+diff --git a/src/lib.rs b/src/lib.rs
+index b4e88fa..c34c6d1 100644
+--- a/src/lib.rs
++++ b/src/lib.rs
+@@ -15,9 +15,6 @@ use crate::toolchain::*;
+ pub(crate) use crate::utils::toml_utils;
+ use anyhow::{anyhow, Result};
+
+-#[macro_use]
+-extern crate rs_tracing;
+-
+ // A list of all binaries which Rustup will proxy.
+ pub static TOOLS: &[&str] = &[
+ "rustc",
+--
+2.43.0
+
diff --git a/0005-Remove-unused-git-based-versioning.patch b/0005-Remove-unused-git-based-versioning.patch
new file mode 100644
index 0000000..9808bea
--- /dev/null
+++ b/0005-Remove-unused-git-based-versioning.patch
@@ -0,0 +1,136 @@
+From 7e7ffd44e6284de55df4e5eb050635ab5bce6ad2 Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe(a)gmail.com>
+Date: Wed, 8 Nov 2023 18:08:54 +0100
+Subject: [PATCH 5/5] Remove unused git-based versioning
+
+---
+ Cargo.toml | 1 -
+ src/cli/common.rs | 61 +-----------------------------------------
+ src/cli/rustup_mode.rs | 1 -
+ src/cli/setup_mode.rs | 6 -----
+ 4 files changed, 1 insertion(+), 68 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index aae3d01..f33f4a9 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -42,7 +42,6 @@ download = { path = "download", default-features = false }
+ effective-limits = "0.5.5"
+ enum-map = "2.4.2"
+ flate2 = "1"
+-git-testament = "0.2"
+ home = "0.5.4"
+ lazy_static.workspace = true
+ libc = "0.2"
+diff --git a/src/cli/common.rs b/src/cli/common.rs
+index 9a6a68d..3bb0a2c 100644
+--- a/src/cli/common.rs
++++ b/src/cli/common.rs
+@@ -7,8 +7,6 @@ use std::sync::Arc;
+ use std::{cmp, env};
+
+ use anyhow::{anyhow, Context, Result};
+-use git_testament::{git_testament, render_testament};
+-use lazy_static::lazy_static;
+ use term2::Terminal;
+
+ use super::self_update;
+@@ -513,65 +511,8 @@ pub(crate) fn list_overrides(cfg: &Cfg) -> Result<utils::ExitCode> {
+ Ok(utils::ExitCode(0))
+ }
+
+-git_testament!(TESTAMENT);
+-
+ pub(crate) fn version() -> &'static str {
+- lazy_static! {
+- // Because we trust our `stable` branch given the careful release
+- // process, we mark it trusted here so that our version numbers look
+- // right when built from CI before the tag is pushed
+- static ref RENDERED: String = render_testament!(TESTAMENT, "stable");
+- }
+- &RENDERED
+-}
+-
+-pub(crate) fn dump_testament() -> Result<utils::ExitCode> {
+- use git_testament::GitModification::*;
+- writeln!(
+- process().stdout(),
+- "Rustup version renders as: {}",
+- version()
+- )?;
+- writeln!(
+- process().stdout(),
+- "Current crate version: {}",
+- env!("CARGO_PKG_VERSION")
+- )?;
+- if TESTAMENT.branch_name.is_some() {
+- writeln!(
+- process().stdout(),
+- "Built from branch: {}",
+- TESTAMENT.branch_name.unwrap()
+- )?;
+- } else {
+- writeln!(process().stdout(), "Branch information missing")?;
+- }
+- writeln!(process().stdout(), "Commit info: {}", TESTAMENT.commit)?;
+- if TESTAMENT.modifications.is_empty() {
+- writeln!(process().stdout(), "Working tree is clean")?;
+- } else {
+- for fmod in TESTAMENT.modifications {
+- match fmod {
+- Added(f) => writeln!(process().stdout(), "Added: {}", String::from_utf8_lossy(f))?,
+- Removed(f) => writeln!(
+- process().stdout(),
+- "Removed: {}",
+- String::from_utf8_lossy(f)
+- )?,
+- Modified(f) => writeln!(
+- process().stdout(),
+- "Modified: {}",
+- String::from_utf8_lossy(f)
+- )?,
+- Untracked(f) => writeln!(
+- process().stdout(),
+- "Untracked: {}",
+- String::from_utf8_lossy(f)
+- )?,
+- }
+- }
+- }
+- Ok(utils::ExitCode(0))
++ "1.26.0"
+ }
+
+ fn show_backtrace() -> bool {
+diff --git a/src/cli/rustup_mode.rs b/src/cli/rustup_mode.rs
+index 09d1379..06a0af7 100644
+--- a/src/cli/rustup_mode.rs
++++ b/src/cli/rustup_mode.rs
+@@ -137,7 +137,6 @@ pub fn main() -> Result<utils::ExitCode> {
+
+ Ok(match matches.subcommand() {
+ Some(s) => match s {
+- ("dump-testament", _) => common::dump_testament()?,
+ ("show", c) => match c.subcommand() {
+ Some(s) => match s {
+ ("active-toolchain", m) => handle_epipe(show_active_toolchain(cfg, m))?,
+diff --git a/src/cli/setup_mode.rs b/src/cli/setup_mode.rs
+index 6dd04ec..eaa814b 100644
+--- a/src/cli/setup_mode.rs
++++ b/src/cli/setup_mode.rs
+@@ -16,12 +16,6 @@ pub fn main() -> Result<utils::ExitCode> {
+ return self_update::self_replace();
+ }
+
+- // Internal testament dump used during CI. Not for users.
+- if arg1 == Some("--dump-testament") {
+- common::dump_testament()?;
+- return Ok(utils::ExitCode(0));
+- }
+-
+ // NOTICE: If you change anything here, please make the same changes in rustup-init.sh
+ let cli = Command::new("rustup-init")
+ .version(common::version())
+--
+2.43.0
+
diff --git a/README.md b/README.md
deleted file mode 100644
index d2418c5..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rustup
-
-The rustup package
diff --git a/rustup.spec b/rustup.spec
new file mode 100644
index 0000000..3b875d5
--- /dev/null
+++ b/rustup.spec
@@ -0,0 +1,101 @@
+# Generated by rust2rpm 25
+%bcond_without check
+
+Name: rustup
+Version: 1.26.0
+Release: %autorelease
+Summary: Manage multiple rust installations with ease
+
+SourceLicense: MIT OR Apache-2.0
+# (Apache-2.0 OR MIT) AND BSD-3-Clause
+# (MIT OR Apache-2.0) AND Unicode-DFS-2016
+# 0BSD OR MIT OR Apache-2.0
+# Apache-2.0
+# Apache-2.0 OR BSL-1.0
+# Apache-2.0 OR ISC OR MIT
+# Apache-2.0 OR MIT
+# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
+# ISC
+# ISC AND MIT AND OpenSSL
+# MIT
+# MIT OR Apache-2.0
+# MIT OR Apache-2.0 OR Zlib
+# MIT OR Zlib OR Apache-2.0
+# Unlicense OR MIT
+# Zlib OR Apache-2.0 OR MIT
+License: Apache-2.0 AND BSD-3-Clause AND ISC AND MIT AND OpenSSL AND Unicode-DFS-2016 AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) AND (Unlicense OR MIT)
+# LICENSE.dependencies contains a full license breakdown
+
+URL: https://github.com/rust-lang/rustup
+Source: %{url}/archive/%{version}/rustup-%{version}.tar.gz
+
+# non-upstreamable patches:
+# * drop Windows-specific dependencies
+Patch: 0001-Drop-Windows-specific-dependencies.patch
+# * drop unavailable "openssl/vendored" feature
+Patch: 0002-Drop-feature-for-statically-linking-against-vendored.patch
+# * bump "term" dependency from 0.5.1 to 0.7 (blocked upstream)
+Patch: 0003-Bump-term-dependency-from-0.5.1-to-0.7.patch
+# * remove unused tracing support and unnecessary "rs_tracing" dependency
+Patch: 0004-Remove-unused-tracing-support.patch
+# * remove unused git-based versioning and unnecessary "git-testament" dependency
+Patch: 0005-Remove-unused-git-based-versioning.patch
+
+# rustup is only fully functional on Rust "Tier 1" architectures
+ExclusiveArch: x86_64 aarch64
+
+BuildRequires: cargo-rpm-macros >= 24
+
+%global _description %{expand:
+Manage multiple rust installations with ease.}
+
+%description %{_description}
+
+%prep
+%autosetup -n rustup-%{version} -p1
+%cargo_prep
+
+%generate_buildrequires
+%cargo_generate_buildrequires
+
+%build
+%cargo_build -f no-self-update
+%{cargo_license_summary -f no-self-update}
+%{cargo_license -f no-self-update} > LICENSE.dependencies
+
+%install
+%cargo_install -f no-self-update
+
+# generate and install shell completions
+cp -pav target/rpm/rustup-init target/rpm/rustup
+target/rpm/rustup completions bash > rustup.bash
+target/rpm/rustup completions fish > rustup.fish
+target/rpm/rustup completions zsh > _rustup
+
+install -Dpm 0644 rustup.bash -t %{buildroot}/%{bash_completions_dir}
+install -Dpm 0644 rustup.fish -t %{buildroot}/%{fish_completions_dir}
+install -Dpm 0644 _rustup -t %{buildroot}/%{zsh_completions_dir}
+
+%if %{with check}
+%check
+# * skip tests that require internet access
+# * skip tests for the "rustup" binary that is not built in this package
+%cargo_test -- -- --skip suite::cli_exact::check_updates --skip suite::cli_ui::rustup_ui_doc_text_tests
+%endif
+
+%files
+%license LICENSE-APACHE
+%license LICENSE-MIT
+%license LICENSE.dependencies
+%doc CHANGELOG.md
+%doc CONTRIBUTING.md
+%doc README.md
+
+%{_bindir}/rustup-init
+
+%{bash_completions_dir}/rustup.bash
+%{fish_completions_dir}/rustup.fish
+%{zsh_completions_dir}/_rustup
+
+%changelog
+%autochangelog
diff --git a/sources b/sources
new file mode 100644
index 0000000..f732aa6
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (rustup-1.26.0.tar.gz) = bc7cb580640248a601dbafb87c3a9e908b6c687377b4e0f88280576af15527f5837d9463f7831c14b0c274cd3170449e634cd851e0d03ea4ff1d0461d4a941be
1
0
Architecture specific change in rpms/java-11-openjdk-portable.git
by githook-noreply＠fedoraproject.org 30 Nov '23
by githook-noreply＠fedoraproject.org 30 Nov '23
30 Nov '23
The package rpms/java-11-openjdk-portable.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-11-openjdk-portable.git/commit….
Change:
+%ifarch %{gdb_arches}
Thanks.
Full change:
============
commit dd97e2b708b53c8ad9011ad0172daeddc37f6066
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Wed Nov 29 18:06:03 2023 +0100
Fixed doc and misc name macro
diff --git a/java-11-openjdk-portable.spec b/java-11-openjdk-portable.spec
index 986cd5f..88ec160 100644
--- a/java-11-openjdk-portable.spec
+++ b/java-11-openjdk-portable.spec
@@ -469,12 +469,11 @@
# Intentionally use jdkportablenameimpl here since we want to have static-libs files overlayed on
# top of the JDK archive
%define staticlibsportablename() %{expand:%{jdkportablenameimpl -- %%{1}}}
-%define docportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable.docs;g")
+%define docportablename() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable.docs;g" | sed "s;openjdkportable;el;g")
%define docportablearchive() %{docportablename}.tar.xz
-%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable.misc;g")
+%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable.misc;g" | sed "s;openjdkportable;el;g")
%define miscportablearchive() %{miscportablename}.tar.xz
-
# RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1}
# so we have to pass in "" but evaluate it, otherwise files record will include it
%define jreportablearchiveForFiles() %(echo %{jreportablearchive -- ""})
@@ -1299,8 +1298,6 @@ function packagejdk() {
mkdir -p ${packagesdir}
pushd ${imagesdir}
- echo "Packaging build from ${imagesdir} to ${packagesdir}..."
-
if [ "x$suffix" = "x" ] ; then
nameSuffix=""
else
commit 138da70acb492bff9e4f0777f4216c3f93b0603f
Author: Jiri <jvanek(a)redhat.com>
Date: Wed Nov 29 11:08:00 2023 +0100
Updated to OpenJDK 11.0.21+9 (GA)
- adjsuted generate_source_tarball
- removed icedtea_sync
- dropped standalone licenses
- added usntripped subpkg
- added docs subpkg
- adjsuted versions of bundled libraries
- build refactored to several solid methods following gnu_andrew
- Drop local backport of JDK-8243210 which is upstream from 11.0.21+2
- Bump freetype version to 2.13.0 following JDK-8306881
- fixed '--without release' build-ability by moving docs and misc to if-release only
diff --git a/.gitignore b/.gitignore
index 0a19a08..1aa9a04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -114,3 +114,4 @@
/openjdk-jdk11u-jdk-11.0.19+7-4curve.tar.xz
/openjdk-jdk11u-jdk-11.0.19+7.tar.xz
/openjdk-jdk11u-jdk-11.0.20+8.tar.xz
+/openjdk-jdk11u-jdk-11.0.21+9.tar.xz
diff --git a/NEWS b/NEWS
index 04b170f..b99b7c6 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,308 @@ Key:
JDK-X - https://bugs.openjdk.java.net/browse/JDK-X
CVE-XXXX-YYYY: https://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
+New in release OpenJDK 11.0.21 (2023-10-17):
+============================================
+Live versions of these release notes can be found at:
+ * https://bit.ly/openjdk11021
+
+* CVEs
+ - CVE-2023-22081
+* Security fixes
+ - JDK-8286503, JDK-8312367: Enhance security classes
+ - JDK-8296581: Better system proxy support
+ - JDK-8297856: Improve handling of Bidi characters
+ - JDK-8305815, JDK-8307278: Update Libpng to 1.6.39
+ - JDK-8306881, JDK-8307286: Update FreeType to 2.13.0
+ - JDK-8309966: Enhanced TLS connections
+* Other changes
+ - JDK-6176679: Application freezes when copying an animated gif image to the system clipboard
+ - JDK-8023980: JCE doesn't provide any class to handle RSA private key in PKCS#1
+ - JDK-8155246: Throw error if default java.security file is missing
+ - JDK-8158880: test/java/time/tck/java/time/format/TCKDateTimeFormatterBuilder.java fail with zh_CN locale
+ - JDK-8168261: Use server cipher suites preference by default
+ - JDK-8181383: com/sun/jdi/OptionTest.java fails intermittently with bind failed: Address already in use
+ - JDK-8201516: DebugNonSafepoints generates incorrect information
+ - JDK-8209398: sun/security/pkcs11/KeyStore/SecretKeysBasic.sh failed with "PKCS11Exception: CKR_ATTRIBUTE_SENSITIVE"
+ - JDK-8211343: nsk_jvmti_parseoptions should handle multiple suboptions
+ - JDK-8212045: Add back the tests that were removed from HashesTest.java and AddExportsTest.java
+ - JDK-8216059: nsk_jvmti_parseoptions still has dependency on tilde separator
+ - JDK-8217237: HttpClient does not deal well with multi-valued WWW-Authenticate challenge headers
+ - JDK-8217395: Update langtools shell tests to use ${EXE_SUFFIX}
+ - JDK-8217612: (CL)HSDB cannot show some JVM flags
+ - JDK-8217850: CompressedClassSpaceSizeInJmapHeap fails after JDK-8217612
+ - JDK-8218471: generate-unsafe-access-tests.sh does not correctly invoke build.tools.spp.Spp
+ - JDK-8219628: [TESTBUG] javadoc/doclet/InheritDocForUserTags fails with -othervm
+ - JDK-8220410: sun/security/tools/jarsigner/warnings/NoTimestampTest.java failed with missing expected output
+ - JDK-8221372: Test vmTestbase/nsk/jvmti/GetThreadState/thrstat001/TestDescription.java times out
+ - JDK-8222323: ChildAlwaysOnTopTest.java fails with "RuntimeException: Failed to unset alwaysOnTop"
+ - JDK-8223573: Replace wildcard address with loopback or local host in tests - part 4
+ - JDK-8223714: HTTPSetAuthenticatorTest could be made more resilient
+ - JDK-8223783: sun/net/www/http/HttpClient/MultiThreadTest.java sometimes detect threads+1 connections
+ - JDK-8223856: Replace wildcard address with loopback or local host in tests - part 8
+ - JDK-8224617: (fs) java/nio/file/FileStore/Basic.java found filesystem twice
+ - JDK-8224729: Cleanups in sun/security/provider/certpath/ldap/LDAPCertStoreImpl.java
+ - JDK-8224768: Test ActalisCA.java fails
+ - JDK-8225012: sanity/client/SwingSet/src/ToolTipDemoTest.java fails on Windows
+ - JDK-8226221: Update PKCS11 tests to use NSS 3.46 libs
+ - JDK-8228341: SignTwice.java fails intermittently on Windows
+ - JDK-8228403: SignTwice.java failed with java.io.FileNotFoundException: File name too long
+ - JDK-8229147: Linux os::create_thread() overcounts guardpage size with newer glibc (>=2.27)
+ - JDK-8229333: java/io/File/SetLastModified.java timed out
+ - JDK-8229338: clean up test/jdk/java/util/RandomAccess/Basic.java
+ - JDK-8229348: java/net/DatagramSocket/UnreferencedDatagramSockets.java fails intermittently
+ - JDK-8229481: sun/net/www/protocol/https/ChunkedOutputStream.java failed with a SSLException
+ - JDK-8229912: [TESTBUG] java/net/Socks/SocksIPv6Test fails without IPv6
+ - JDK-8230132: java/net/NetworkInterface/NetworkInterfaceRetrievalTests.java to skip Teredo Tunneling Pseudo-Interface
+ - JDK-8231037: java/net/InetAddress/ptr/Lookup.java fails intermittently due to reverse lookup failed
+ - JDK-8231357: sun/security/pkcs11/Cipher/TestKATForGCM.java fails on SLES11 using mozilla-nss-3.14
+ - JDK-8231516: network QuickAckTest.java failed due to "SocketException: maximum number of DatagramSockets reached"
+ - JDK-8232101: (sctp) Add minimal sanity tests for SCTP
+ - JDK-8232195: Enable BigInteger tests: DivisionOverflow, SymmetricRangeTests and StringConstructorOverflow
+ - JDK-8232840: java/math/BigInteger/largeMemory/SymmetricRangeTests.java fails due to "OutOfMemoryError: Requested array size exceeds VM limit"
+ - JDK-8232922: Add java/math/BigInteger/largeMemory/SymmetricRangeTests.java to ProblemList-Xcomp
+ - JDK-8234808: jdb quoted option parsing broken
+ - JDK-8236045: [TESTBUG] MismatchedWhiteBox test fails with missing WhiteBox$WhiteBoxPermission.class
+ - JDK-8237183: Bug ID missing for test in patch which fixed JDK-8230665
+ - JDK-8238157: security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java test failures because of revocation date
+ - JDK-8239007: java/math/BigInteger/largeMemory/ tests should be disabled on 32-bit platforms
+ - JDK-8239264: Clearup the legacy ObjectIdentifier constructor from int array
+ - JDK-8239333: Mark test AmazonCA.java with intermittent key
+ - JDK-8239537: cgroup MetricsTester testMemorySubsystem fails sometimes when testing memory.kmem.tcp.usage_in_bytes
+ - JDK-8240193: loadLibrary("osxsecurity") should not be removed
+ - JDK-8241097: java/math/BigInteger/largeMemory/SymmetricRangeTests.java requires -XX:+CompactStrings
+ - JDK-8242151: Improve OID mapping and reuse among JDK security providers for aliases registration
+ - JDK-8242330: Arrays should be cloned in several JAAS Callback classes
+ - JDK-8242897: KeyFactory.generatePublic( x509Spec ) failed with java.security.InvalidKeyException
+ - JDK-8243210: ClhsdbScanOops fails with NullPointerException in FileMapHeader.inCopiedVtableSpace
+ - JDK-8244078: ProcessTools executeTestJvm and createJavaProcessBuilder have inconsistent handling of test.*.opts
+ - JDK-8247895: SHA1PRNGReseed.java is calling setSeed(0)
+ - JDK-8247968: test/jdk/javax/crypto/SecretKeyFactory/security.properties has wrong header
+ - JDK-8248001: javadoc generates invalid HTML pages whose ftp:// links are broken
+ - JDK-8249699: java/io/ByteArrayOutputStream/MaxCapacity.java should use @requires instead of @ignore
+ - JDK-8251517: [TESTBUG] com/sun/net/httpserver/bugs/B6393710.java does not scale socket timeout
+ - JDK-8252530: Fix inconsistencies in hotspot whitebox
+ - JDK-8254350: CompletableFuture.get may swallow InterruptedException
+ - JDK-8255348: NPE in PKIXCertPathValidator event logging code
+ - JDK-8257993: vmTestbase/nsk/jvmti/RedefineClasses/StressRedefine/TestDescription.java crash intermittently
+ - JDK-8259796: timed CompletableFuture.get may swallow InterruptedException
+ - JDK-8260274: Cipher.init(int, key) does not use highest priority provider for random bytes
+ - JDK-8260878: com/sun/jdi/JdbOptions.java fails without jfr
+ - JDK-8260934: java/lang/StringBuilder/HugeCapacity.java fails without Compact Strings
+ - JDK-8263970: Manual test javax/swing/JTextField/JapaneseReadingAttributes/JapaneseReadingAttributes.java failed
+ - JDK-8265980: Fix systemDictionary and loaderConstraints printing
+ - JDK-8268457: XML Transformer outputs Unicode supplementary character incorrectly to HTML
+ - JDK-8268464: Remove dependancy of TestHttpsServer, HttpTransaction, HttpCallback from open/test/jdk/sun/net/www/protocol/https/ tests
+ - JDK-8269091: javax/sound/sampled/Clip/SetPositionHang.java failed with ArrayIndexOutOfBoundsException: Array index out of range: -4
+ - JDK-8270331: [TESTBUG] Error: Not a test or directory containing tests: java/awt/print/PrinterJob/InitToBlack.java
+ - JDK-8271838: AmazonCA.java interop test fails
+ - JDK-8273807: Zero: Drop incorrect test block from compiler/startup/NumCompilerThreadsCheck.java
+ - JDK-8274205: Handle KDC_ERR_SVC_UNAVAILABLE error code from KDC
+ - JDK-8274606: Fix jaxp/javax/xml/jaxp/unittest/transform/SurrogateTest.java test
+ - JDK-8275234: java/awt/GraphicsDevice/DisplayModes/CycleDMImage.java is entered twice in ProblemList
+ - JDK-8275303: sun/java2d/pipe/InterpolationQualityTest.java fails with D3D basic render driver
+ - JDK-8276651: java/lang/ProcessHandle tests fail with "RuntimeException: Input/output error" in java.lang.ProcessHandleImpl$Info.info0
+ - JDK-8277353: java/security/MessageDigest/ThreadSafetyTest.java test times out
+ - JDK-8279536: jdk/nio/zipfs/ZipFSOutputStreamTest.java timed out
+ - JDK-8283756: (zipfs) ZipFSOutputStreamTest.testOutputStream should only check inflated bytes
+ - JDK-8284524: Create an automated test for JDK-4422362
+ - JDK-8284767: Create an automated test for JDK-4422535
+ - JDK-8284772: GHA: Use GCC Major Version Dependencies Only
+ - JDK-8284910: Buffer clean in PasswordCallback
+ - JDK-8285635: javax/swing/JRootPane/DefaultButtonTest.java failed with Default Button not pressed for L&F: com.sun.java.swing.plaf.motif.MotifLookAndFeel
+ - JDK-8286172: Create an automated test for JDK-4516019
+ - JDK-8286481: Exception printed to stdout on Windows when storing transparent image in clipboard
+ - JDK-8286620: Create regression test for verifying setMargin() of JRadioButton
+ - JDK-8289508: Improve test coverage for XPath Axes: ancestor, ancestor-or-self, preceding, and preceding-sibling
+ - JDK-8289748: C2 compiled code crashes with SIGFPE with -XX:+StressLCM and -XX:+StressGCM
+ - JDK-8291444: GHA builds/tests won't run manually if disabled from automatic running
+ - JDK-8291830: jvmti/RedefineClasses/StressRedefine failed: assert(!is_null(v)) failed: narrow klass value can never be zero
+ - JDK-8292033: Move jdk.X509Certificate event logic to JCA layer
+ - JDK-8292297: Fix up loading of override java.security properties file
+ - JDK-8292443: Weak CAS VarHandle/Unsafe tests should test always-failing cases
+ - JDK-8293180: JQuery UI license file not updated
+ - JDK-8293562: KeepAliveCache Blocks Threads while Closing Connections
+ - JDK-8293657: sun/management/jmxremote/bootstrap/RmiBootstrapTest.java#id1 failed with "SSLHandshakeException: Remote host terminated the handshake"
+ - JDK-8293858: Change PKCS7 code to use default SecureRandom impl instead of SHA1PRNG
+ - JDK-8295737: macOS: Print content cut off when width > height with portrait orientation
+ - JDK-8295894: Remove SECOM certificate that is expiring in September 2023
+ - JDK-8296084: javax/swing/JSpinner/4788637/bug4788637.java fails intermittently on a VM
+ - JDK-8297437: javadoc cannot link to old docs (with old style anchors)
+ - JDK-8297523: Various GetPrimitiveArrayCritical miss result - NULL check
+ - JDK-8297587: Upgrade JLine to 3.22.0
+ - JDK-8297681: Unnecessary color conversion during 4BYTE_ABGR_PRE to INT_ARGB_PRE blit
+ - JDK-8297730: C2: Arraycopy intrinsic throws incorrect exception
+ - JDK-8297887: Update Siphash
+ - JDK-8297923: java.awt.ScrollPane broken after multiple scroll up/down
+ - JDK-8297955: LDAP CertStore should use LdapName and not String for DNs
+ - JDK-8298921: Create a regression test for JDK-8139581
+ - JDK-8298974: Add ftcolor.c to imported freetype sources
+ - JDK-8299424: containers/docker/TestMemoryWithCgroupV1.java fails on SLES12 ppc64le when testing Memory and Swap Limit
+ - JDK-8299658: C1 compilation crashes in LinearScan::resolve_exception_edge
+ - JDK-8299713: Test javax/swing/JTableHeader/6889007/bug6889007.java failed: Wrong type of cursor
+ - JDK-8300098: java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java fails with internal timeout when executed with TieredCompilation1/3
+ - JDK-8300659: Refactor TestMemoryAwareness to use WhiteBox api for host values
+ - JDK-8300751: [17u] Remove duplicate entry in javac.properties
+ - JDK-8301269: Update Commons BCEL to Version 6.7.0
+ - JDK-8301491: C2: java.lang.StringUTF16::indexOfChar intrinsic called with negative character argument
+ - JDK-8301700: Increase the default TLS Diffie-Hellman group size from 1024-bit to 2048-bit
+ - JDK-8301959: Compile command in compiler.loopopts.TestRemoveEmptyCountedLoop does not work
+ - JDK-8302161: Upgrade jQuery UI to version 1.13.2
+ - JDK-8302182: Update Public Suffix List to 88467c9
+ - JDK-8303511: C2: assert(get_ctrl(n) == cle_out) during unrolling
+ - JDK-8303809: Dispose context in SPNEGO NegotiatorImpl
+ - JDK-8304054: Linux: NullPointerException from FontConfiguration.getVersion in case no fonts are installed
+ - JDK-8304498: JShell does not switch to raw mode when there is no /bin/test
+ - JDK-8304867: Explicitly disable dtrace for ppc builds
+ - JDK-8305074: ProblemList javax/net/ssl/DTLS/RespondToRetransmit.java
+ - JDK-8305421: Work around JDK-8305420 in CDSJDITest.java
+ - JDK-8305763: Parsing a URI with an underscore goes through a silent exception, negatively impacting performance
+ - JDK-8305766: ProblemList runtime/CompressedOops/CompressedClassPointers.java
+ - JDK-8305950: Have -XshowSettings option display tzdata version
+ - JDK-8306133: Open source few AWT Drag & Drop related tests
+ - JDK-8306137: Open source several AWT ScrollPane related tests
+ - JDK-8306484: Open source several AWT Choice jtreg tests
+ - JDK-8306636: Disable compiler/c2/Test6905845.java with -XX:TieredStopAtLevel=3
+ - JDK-8306638: Open source some AWT tests related to datatransfer and Toolkit
+ - JDK-8306682: Open source a few more AWT Choice tests
+ - JDK-8306718: Optimize and opensource some old AWT tests
+ - JDK-8306954: Open source five Focus related tests
+ - JDK-8306955: Open source several JComboBox jtreg tests
+ - JDK-8307078: Opensource and clean up five more AWT Focus related tests
+ - JDK-8307080: Open source some more JComboBox jtreg tests
+ - JDK-8307128: Open source some drag and drop tests 4
+ - JDK-8307133: Open source some JTable jtreg tests
+ - JDK-8307135: java/awt/dnd/NotReallySerializableTest/NotReallySerializableTest.java failed
+ - JDK-8307301: Update HarfBuzz to 7.2.0
+ - JDK-8307569: Build with gcc8 is broken after JDK-8307301
+ - JDK-8307572: AArch64: Vector registers are clobbered by some macroassemblers
+ - JDK-8307603: [AIX] Broken build after JDK-8307301
+ - JDK-8307604: gcc12 based Alpine build broken build after JDK-8307301
+ - JDK-8307799: Newly added java/awt/dnd/MozillaDnDTest.java has invalid jtreg `@requires` clause
+ - JDK-8308156: VerifyCACerts.java misses blank in error output
+ - JDK-8309088: security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java fails
+ - JDK-8309108: Bump update version for OpenJDK: jdk-11.0.21
+ - JDK-8309138: Fix container tests for jdks with symlinked conf dir
+ - JDK-8310054: ScrollPane insets are incorrect
+ - JDK-8310176: JDK 11 G1 crash during full GC with +UseStringDeduplication
+ - JDK-8310620: [11u] Problemlist failing aot tests on macos x64
+ - JDK-8311033: [macos] PrinterJob does not take into account Sides attribute
+ - JDK-8311689: Wrong visible amount in Adjustable of ScrollPane
+ - JDK-8312138: jcmd VM.metaspace vslist has no newline character before the Class: label.
+ - JDK-8312555: Ideographic characters aren't stretched by AffineTransform.scale(2, 1)
+ - JDK-8313159: [11u] Fix test SSLEngineKeyLimit.java after Merge error
+ - JDK-8313765: Invalid CEN header (invalid zip64 extra data field size)
+ - JDK-8313796: AsyncGetCallTrace crash on unreadable interpreter method pointer
+ - JDK-8313803: [11u] Exclude jdk/jfr/event/sampling/TestStackFrameLineNumbers.java
+ - JDK-8313878: Exclude two compiler/rtm/locking tests on ppc64le
+ - JDK-8314086: [11u] A typo in the fix for JDK-8312462 is causing test failure in ChildAlwaysOnTopTest.java
+ - JDK-8314950: CMS may miss NMT tag after mark stack expansion
+ - JDK-8314960: Add Certigna Root CA - 2
+ - JDK-8315135: Memory leak in the native implementation of Pack200.Unpacker.unpack()
+ - JDK-8315529: [11u] Exclude some failing Z-GC tests
+ - JDK-8317040: Exclude cleaner test failing on older releases
+ - JDK-8317644: [11u] Remove designator DEFAULT_PROMOTED_VERSION_PRE=ea for release 11.0.21
+
+Notes on individual issues:
+===========================
+
+security-libs/javax.net.ssl:
+
+JDK-8301700: The Default TLS Diffie-Hellman Group Size Has Been Increased from 1024-bit to 2048-bit
+===================================================================================================
+The JDK implementation of TLS 1.2 now uses a default Diffie Hellman
+keysize of 2048 bits when a TLS_DHE cipher suite is negotiated and
+either the client or server does not support FFDHE.
+
+The JDK TLS implementation supports FFDHE, which can negotiate a
+stronger keysize, and this is enabled by default.
+
+As a workaround, users can revert to the previous key size by setting
+the `jdk.tls.ephemeralDHKeySize` system property to 1024 (at their own
+risk).
+
+This change does not affect TLS 1.3 as the minimum DH group size is
+already 2048 bits.
+
+JDK-8168261: Use Server Cipher Suites Preference by Default
+===========================================================
+The SunJSSE provider has been updated to use the local server-side
+cipher suite preferences by default. Previously, the server would use
+the preferences specified by the connecting client. To revert to the
+previous behaviour, use `SSLParameters.setUseCipherSuitesOrder(false)`
+on the server side.
+
+security-libs/javax.crypto:
+
+JDK-8023980: JDK Now Accepts RSA Keys in PKCS#1 Format
+======================================================
+RSA private and public keys in PKCS#1 format can now be accepted by
+JDK providers, such as the RSA `KeyFactory.impl` from the SunRsaSign
+provider. The RSA private or public key object should have the PKCS#1
+format and an encoding matching the ASN.1 syntax for a PKCS#1 RSA
+private key and public key.
+
+security-libs/javax.security:
+
+JDK-8242330: Arrays should be cloned in several JAAS Callback classes
+=====================================================================
+In the JAAS classes, ChoiceCallback and ConfirmationCallback, arrays
+were not cloned when passed into a constructor or returned. This
+allowed an external program to get access to the internal fields of
+these classes. The classes have been updated to return cloned arrays.
+
+tools/launcher:
+
+JDK-8305950: `-XshowSettings:locale` Output Now Includes Tzdata Version
+=======================================================================
+The `-XshowSettings` launcher option has been enhanced to print the
+tzdata version used by the JDK. The tzdata version is displayed as
+part of the `locale` showSettings option.
+
+Example output using `-X:showSettings:locale`:
+
+Locale settings:
+ default locale = English
+ default display locale = English
+ default format locale = English
+ tzdata version = 2023c
+
+security-libs/java.security:
+
+JDK-8295894: Removed SECOM Trust System's RootCA1 Root Certificate
+==================================================================
+The following root certificate from SECOM Trust System has been
+removed from the `cacerts` keystore:
+
+Alias Name: secomscrootca1 [jdk]
+Distinguished Name: OU=Security Communication RootCA1, O=SECOM Trust.net, C=JP
+
+JDK-8314960: Added Certigna Root CA Certificate
+===============================================
+The following root certificate has been added to the cacerts
+truststore:
+
+Name: Certigna (Dhimyotis)
+Alias Name: certignarootca
+Distinguished Name: CN=Certigna Root CA, OU=0002 48146308100036, O=Dhimyotis, C=FR
+
+JDK-8155246: Throw Error If Default java.security File Fails to Load
+====================================================================
+A hardcoded set of security properties was used in previous releases
+when the `java.security` file could not be loaded. This set of
+properties were poorly maintained and it was not obvious to the user
+that they were being utilised. This release instead throws an
+`InternalError` if the `java.security` file can not be loaded.
+
+New in release OpenJDK 11.0.20.1 (2023-08-24):
+==============================================
+Live versions of these release notes can be found at:
+ * https://bit.ly/openjdk110201
+
+* Other changes
+ - JDK-8313765: Invalid CEN header (invalid zip64 extra data field size)
+ - JDK-8314678: Bump update version for OpenJDK: jdk-11.0.20.1
+
New in release OpenJDK 11.0.20 (2023-07-18):
=============================================
Live versions of these release notes can be found at:
@@ -4842,4 +5144,3 @@ This new system property sets the pool size of the internal
function is equivalent to the
`org.apache.xml.security.parser.pool-size` system property used in
Apache Santuario and has the same default value of 20.
-
diff --git a/discover_trees.sh b/discover_trees.sh
new file mode 100755
index 0000000..8c31278
--- /dev/null
+++ b/discover_trees.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# Copyright (C) 2020 Red Hat, Inc.
+# Written by Andrew John Hughes <gnu.andrew(a)redhat.com>.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+TREE=${1}
+
+if test "x${TREE}" = "x"; then
+ TREE=${PWD}
+fi
+
+if [ -e ${TREE}/nashorn/.hg -o -e ${TREE}/nashorn/merge.changeset ] ; then
+ NASHORN="nashorn" ;
+fi
+
+if [ -e ${TREE}/corba/.hg -o -e ${TREE}/corba/merge.changeset ] ; then
+ CORBA="corba";
+fi
+
+if [ -e ${TREE}/jaxp/.hg -o -e ${TREE}/jaxp/merge.changeset ] ; then
+ JAXP="jaxp";
+fi
+
+if [ -e ${TREE}/jaxws/.hg -o -e ${TREE}/jaxws/merge.changeset ] ; then
+ JAXWS="jaxws";
+fi
+
+if [ -e ${TREE}/langtools/.hg -o -e ${TREE}/langtools/merge.changeset ] ; then
+ LANGTOOLS="langtools";
+fi
+
+if [ -e ${TREE}/jdk/.hg -o -e ${TREE}/jdk/merge.changeset ] ; then
+ JDK="jdk";
+fi
+
+if [ -e ${TREE}/hotspot/.hg -o -e ${TREE}/hotspot/merge.changeset ] ; then
+ HOTSPOT="hotspot";
+fi
+
+SUBTREES="${CORBA} ${JAXP} ${JAXWS} ${LANGTOOLS} ${NASHORN} ${JDK} ${HOTSPOT}";
+echo ${SUBTREES}
diff --git a/fips-11u-b34fb09a5c.patch b/fips-11u-f93a863b56.patch
similarity index 96%
rename from fips-11u-b34fb09a5c.patch
rename to fips-11u-f93a863b56.patch
index 02ce6df..3690cb8 100644
--- a/fips-11u-b34fb09a5c.patch
+++ b/fips-11u-f93a863b56.patch
@@ -89,7 +89,7 @@ index 3787b12600..dab108a82b 100644
LCMS_CFLAGS:=@LCMS_CFLAGS@
LCMS_LIBS:=@LCMS_LIBS@
diff --git a/make/lib/Lib-java.base.gmk b/make/lib/Lib-java.base.gmk
-index 4cd656a086..e1fc94b5b4 100644
+index b40d3114b9..0d1d83cf3e 100644
--- a/make/lib/Lib-java.base.gmk
+++ b/make/lib/Lib-java.base.gmk
@@ -178,6 +178,31 @@ ifeq ($(call isTargetOsType, unix), true)
@@ -401,7 +401,7 @@ index 0000000000..8dcb7d9073
+ }
+}
diff --git a/src/java.base/share/classes/java/security/Security.java b/src/java.base/share/classes/java/security/Security.java
-index b36510a376..ad5182e1e7 100644
+index 5b9552058b..b46de49211 100644
--- a/src/java.base/share/classes/java/security/Security.java
+++ b/src/java.base/share/classes/java/security/Security.java
@@ -32,6 +32,7 @@ import java.net.URL;
@@ -412,16 +412,17 @@ index b36510a376..ad5182e1e7 100644
import jdk.internal.misc.SharedSecrets;
import jdk.internal.util.StaticProperty;
import sun.security.util.Debug;
-@@ -47,12 +48,20 @@ import sun.security.jca.*;
+@@ -47,6 +48,9 @@ import sun.security.jca.*;
* implementation-specific location, which is typically the properties file
* {@code conf/security/java.security} in the Java installation directory.
*
+ * <p>Additional default values of security properties are read from a
+ * system-specific location, if available.</p>
+ *
- * @author Benjamin Renaud
- * @since 1.1
- */
+ * @implNote If the properties file fails to load, the JDK implementation will
+ * throw an unspecified error when initializing the {@code Security} class.
+ *
+@@ -56,6 +60,11 @@ import sun.security.jca.*;
public final class Security {
@@ -433,7 +434,7 @@ index b36510a376..ad5182e1e7 100644
/* Are we debugging? -- for developers */
private static final Debug sdebug =
Debug.getInstance("properties");
-@@ -67,6 +76,19 @@ public final class Security {
+@@ -70,6 +79,19 @@ public final class Security {
}
static {
@@ -453,26 +454,19 @@ index b36510a376..ad5182e1e7 100644
// doPrivileged here because there are multiple
// things in initialize that might require privs.
// (the FileInputStream call and the File.exists call,
-@@ -83,6 +105,7 @@ public final class Security {
+@@ -85,6 +107,7 @@ public final class Security {
+ private static void initialize() {
props = new Properties();
- boolean loadedProps = false;
boolean overrideAll = false;
+ boolean systemSecPropsEnabled = false;
// first load the system properties file
// to determine the value of security.overridePropertiesFile
-@@ -98,6 +121,7 @@ public final class Security {
- if (sdebug != null) {
- sdebug.println("reading security properties file: " +
- propFile);
-+ sdebug.println(props.toString());
- }
- } catch (IOException e) {
- if (sdebug != null) {
-@@ -192,6 +216,61 @@ public final class Security {
+@@ -105,9 +128,63 @@ public final class Security {
}
+ loadProps(null, extraPropFile, overrideAll);
}
-
++
+ boolean sysUseProps = Boolean.valueOf(System.getProperty(SYS_PROP_SWITCH, "false"));
+ boolean secUseProps = Boolean.valueOf(props.getProperty(SEC_PROP_SWITCH));
+ if (sdebug != null) {
@@ -492,9 +486,7 @@ index b36510a376..ad5182e1e7 100644
+ }
+ }
+
-+ // FIPS support depends on the contents of java.security so
-+ // ensure it has loaded first
-+ if (loadedProps && systemSecPropsEnabled) {
++ if (systemSecPropsEnabled) {
+ boolean shouldEnable;
+ String sysProp = System.getProperty("com.redhat.fips");
+ if (sysProp == null) {
@@ -530,15 +522,19 @@ index b36510a376..ad5182e1e7 100644
+ }
}
- /*
+- private static boolean loadProps(File masterFile, String extraPropFile, boolean overrideAll) {
++ static boolean loadProps(File masterFile, String extraPropFile, boolean overrideAll) {
+ InputStream is = null;
+ try {
+ if (masterFile != null && masterFile.exists()) {
diff --git a/src/java.base/share/classes/java/security/SystemConfigurator.java b/src/java.base/share/classes/java/security/SystemConfigurator.java
new file mode 100644
-index 0000000000..90f6dd2ebc
+index 0000000000..49bf17ea17
--- /dev/null
+++ b/src/java.base/share/classes/java/security/SystemConfigurator.java
-@@ -0,0 +1,248 @@
+@@ -0,0 +1,231 @@
+/*
-+ * Copyright (c) 2019, 2021, Red Hat, Inc.
++ * Copyright (c) 2019, 2023, Red Hat, Inc.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
@@ -616,26 +612,9 @@ index 0000000000..90f6dd2ebc
+ * security.useSystemPropertiesFile is true.
+ */
+ static boolean configureSysProps(Properties props) {
-+ boolean systemSecPropsLoaded = false;
-+
-+ try (BufferedInputStream bis =
-+ new BufferedInputStream(
-+ new FileInputStream(CRYPTO_POLICIES_JAVA_CONFIG))) {
-+ props.load(bis);
-+ systemSecPropsLoaded = true;
-+ if (sdebug != null) {
-+ sdebug.println("reading system security properties file " +
-+ CRYPTO_POLICIES_JAVA_CONFIG);
-+ sdebug.println(props.toString());
-+ }
-+ } catch (IOException e) {
-+ if (sdebug != null) {
-+ sdebug.println("unable to load security properties from " +
-+ CRYPTO_POLICIES_JAVA_CONFIG);
-+ e.printStackTrace();
-+ }
-+ }
-+ return systemSecPropsLoaded;
++ // now load the system file, if it exists, so its values
++ // will win if they conflict with the earlier values
++ return Security.loadProps(null, CRYPTO_POLICIES_JAVA_CONFIG, false);
+ }
+
+ /*
@@ -1035,7 +1014,7 @@ index e06b2a588c..315a2ce370 100644
candidates = new ProtocolVersion[] {
ProtocolVersion.TLS13,
diff --git a/src/java.base/share/classes/sun/security/ssl/SunJSSE.java b/src/java.base/share/classes/sun/security/ssl/SunJSSE.java
-index c50ba93ecf..de2a91a478 100644
+index 2a2b5d7568..891796f19b 100644
--- a/src/java.base/share/classes/sun/security/ssl/SunJSSE.java
+++ b/src/java.base/share/classes/sun/security/ssl/SunJSSE.java
@@ -27,6 +27,8 @@ package sun.security.ssl;
@@ -1046,7 +1025,7 @@ index c50ba93ecf..de2a91a478 100644
+import jdk.internal.misc.SharedSecrets;
import sun.security.rsa.SunRsaSignEntries;
import static sun.security.util.SecurityConstants.PROVIDER_VER;
- import static sun.security.provider.SunEntries.createAliases;
+ import static sun.security.util.SecurityProviderConstants.*;
@@ -195,8 +197,13 @@ public abstract class SunJSSE extends java.security.Provider {
"sun.security.ssl.SSLContextImpl$TLS11Context", null, null);
ps("SSLContext", "TLSv1.2",
@@ -1062,12 +1041,12 @@ index c50ba93ecf..de2a91a478 100644
+ }
ps("SSLContext", "TLS",
"sun.security.ssl.SSLContextImpl$TLSContext",
- (isfips? null : createAliases("SSL")), null);
+ (isfips? null : List.of("SSL")), null);
diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
-index 9af64321c4..957cd78a55 100644
+index c0eed3f884..b03bd9f896 100644
--- a/src/java.base/share/conf/security/java.security
+++ b/src/java.base/share/conf/security/java.security
-@@ -85,6 +85,14 @@ security.provider.tbd=Apple
+@@ -88,6 +88,14 @@ security.provider.tbd=Apple
security.provider.tbd=SunPKCS11
#endif
@@ -1082,7 +1061,7 @@ index 9af64321c4..957cd78a55 100644
#
# A list of preferred providers for specific algorithms. These providers will
# be searched for matching algorithms before the list of registered providers.
-@@ -298,6 +306,11 @@ policy.ignoreIdentityScope=false
+@@ -301,6 +309,11 @@ policy.ignoreIdentityScope=false
#
keystore.type=pkcs12
@@ -1094,7 +1073,7 @@ index 9af64321c4..957cd78a55 100644
#
# Controls compatibility mode for JKS and PKCS12 keystore types.
#
-@@ -335,6 +348,13 @@ package.definition=sun.misc.,\
+@@ -338,6 +351,13 @@ package.definition=sun.misc.,\
#
security.overridePropertiesFile=true
@@ -1405,7 +1384,7 @@ index 0000000000..b848a1fd78
+ }
+}
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
-index cf7cd19b68..69cda46f85 100644
+index ffbd671246..bdaad67e06 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
@@ -26,6 +26,9 @@
@@ -1427,7 +1406,7 @@ index cf7cd19b68..69cda46f85 100644
import sun.security.util.Debug;
import sun.security.util.ResourcesMgr;
import static sun.security.util.SecurityConstants.PROVIDER_VER;
-@@ -60,6 +65,29 @@ import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
+@@ -61,6 +66,29 @@ import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
*/
public final class SunPKCS11 extends AuthProvider {
@@ -1457,7 +1436,7 @@ index cf7cd19b68..69cda46f85 100644
private static final long serialVersionUID = -1354835039035306505L;
static final Debug debug = Debug.getInstance("sunpkcs11");
-@@ -317,10 +345,15 @@ public final class SunPKCS11 extends AuthProvider {
+@@ -318,10 +346,15 @@ public final class SunPKCS11 extends AuthProvider {
// request multithreaded access first
initArgs.flags = CKF_OS_LOCKING_OK;
PKCS11 tmpPKCS11;
@@ -1474,7 +1453,7 @@ index cf7cd19b68..69cda46f85 100644
} catch (PKCS11Exception e) {
if (debug != null) {
debug.println("Multi-threaded initialization failed: " + e);
-@@ -336,7 +369,7 @@ public final class SunPKCS11 extends AuthProvider {
+@@ -337,7 +370,7 @@ public final class SunPKCS11 extends AuthProvider {
initArgs.flags = 0;
}
tmpPKCS11 = PKCS11.getInstance(library,
@@ -1483,7 +1462,7 @@ index cf7cd19b68..69cda46f85 100644
}
p11 = tmpPKCS11;
-@@ -376,6 +409,24 @@ public final class SunPKCS11 extends AuthProvider {
+@@ -377,6 +410,24 @@ public final class SunPKCS11 extends AuthProvider {
if (nssModule != null) {
nssModule.setProvider(this);
}
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index 408ebce..849cff2 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -8,7 +8,7 @@
# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
# PROJECT_NAME=openjdk
# REPO_NAME=jdk11u
-# VERSION=jdk-11.0.18+10
+# VERSION=jdk-11.0.21+9
# or to eg prepare systemtap:
# icedtea7's jstack and other tapsets
# VERSION=6327cf1cea9e
@@ -29,8 +29,6 @@ set -e
OPENJDK_URL_DEFAULT=https://github.com
COMPRESSION_DEFAULT=xz
-# Corresponding IcedTea version
-ICEDTEA_VERSION=6.0
if [ "x$1" = "xhelp" ] ; then
echo -e "Behaviour may be specified by setting the following variables:\n"
@@ -41,7 +39,7 @@ if [ "x$1" = "xhelp" ] ; then
echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
echo "REPO_ROOT - the location of the Git repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
- echo "TO_COMPRESS - what part of clone to pack (default is openjdk)"
+ echo "TO_COMPRESS - what part of clone to pack (default is ${VERSION})"
echo "BOOT_JDK - the bootstrap JDK to satisfy the configure run"
exit 1;
fi
@@ -117,8 +115,8 @@ if [ "x$REPO_ROOT" = "x" ] ; then
fi;
if [ "x$TO_COMPRESS" = "x" ] ; then
- TO_COMPRESS="openjdk"
- echo "No targets to be compressed specified, ; default to ${TO_COMPRESS}"
+ TO_COMPRESS="${VERSION}"
+ echo "No targets to be compressed specified ; default to ${TO_COMPRESS}"
fi;
echo -e "Settings:"
@@ -140,41 +138,41 @@ else
mkdir "${FILE_NAME_ROOT}"
pushd "${FILE_NAME_ROOT}"
echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
- git clone -b ${VERSION} ${REPO_ROOT} openjdk
+ git clone -b ${VERSION} ${REPO_ROOT} ${VERSION}
popd
fi
pushd "${FILE_NAME_ROOT}"
# UnderlineTaglet.java has a BSD license with a field-of-use restriction, making it non-Free
- if [ -d openjdk/test ] ; then
+ if [ -d ${VERSION}/test ] ; then
echo "Removing langtools test case with non-Free license"
- rm -vf openjdk/test/langtools/tools/javadoc/api/basic/taglets/UnderlineTaglet.java
+ rm -vf ${VERSION}/test/langtools/tools/javadoc/api/basic/taglets/UnderlineTaglet.java
fi
# Generate .src-rev so build has knowledge of the revision the tarball was created from
mkdir build
pushd build
- sh ${PWD}/../openjdk/configure --with-boot-jdk=${BOOT_JDK}
+ sh ${PWD}/../${VERSION}/configure --with-boot-jdk=${BOOT_JDK}
make store-source-revision
popd
rm -rf build
# Remove commit checks
- echo "Removing $(find openjdk -name '.jcheck' -print)"
- find openjdk -name '.jcheck' -print0 | xargs -0 rm -rf
+ echo "Removing $(find ${VERSION} -name '.jcheck' -print)"
+ find ${VERSION} -name '.jcheck' -print0 | xargs -0 rm -rf
# Remove history and GHA
- echo "find openjdk -name '.hgtags'"
- find openjdk -name '.hgtags' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.hgignore'"
- find openjdk -name '.hgignore' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.gitattributes'"
- find openjdk -name '.gitattributes' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.gitignore'"
- find openjdk -name '.gitignore' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.git'"
- find openjdk -name '.git' -exec rm -rfv '{}' '+'
- echo "find openjdk -name '.github'"
- find openjdk -name '.github' -exec rm -rfv '{}' '+'
+ echo "find ${VERSION} -name '.hgtags'"
+ find ${VERSION} -name '.hgtags' -exec rm -fv '{}' '+'
+ echo "find ${VERSION} -name '.hgignore'"
+ find ${VERSION} -name '.hgignore' -exec rm -fv '{}' '+'
+ echo "find ${VERSION} -name '.gitattributes'"
+ find ${VERSION} -name '.gitattributes' -exec rm -fv '{}' '+'
+ echo "find ${VERSION} -name '.gitignore'"
+ find ${VERSION} -name '.gitignore' -exec rm -fv '{}' '+'
+ echo "find ${VERSION} -name '.git'"
+ find ${VERSION} -name '.git' -exec rm -rfv '{}' '+'
+ echo "find ${VERSION} -name '.github'"
+ find ${VERSION} -name '.github' -exec rm -rfv '{}' '+'
echo "Compressing remaining forest"
if [ "X$COMPRESSION" = "Xxz" ] ; then
diff --git a/icedtea_sync.sh b/icedtea_sync.sh
index e5c54f3..09d9504 100755
--- a/icedtea_sync.sh
+++ b/icedtea_sync.sh
@@ -1,192 +1 @@
-#!/bin/bash
-
-# Copyright (C) 2019 Red Hat, Inc.
-# Written by Andrew John Hughes <gnu.andrew(a)redhat.com>.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-ICEDTEA_USE_VCS=true
-
-ICEDTEA_VERSION=3.15.0
-ICEDTEA_URL=https://icedtea.classpath.org/download/source
-ICEDTEA_SIGNING_KEY=CFDA0F9B35964222
-
-ICEDTEA_HG_URL=https://icedtea.classpath.org/hg/icedtea11
-
-set -e
-
-RPM_DIR=${PWD}
-if [ ! -f ${RPM_DIR}/jconsole.desktop.in ] ; then
- echo "Not in RPM source tree.";
- exit 1;
-fi
-
-if test "x${TMPDIR}" = "x"; then
- TMPDIR=/tmp;
-fi
-WORKDIR=${TMPDIR}/it.sync
-
-echo "Using working directory ${WORKDIR}"
-mkdir ${WORKDIR}
-pushd ${WORKDIR}
-
-if test "x${WGET}" = "x"; then
- WGET=$(which wget);
- if test "x${WGET}" = "x"; then
- echo "wget not found";
- exit 1;
- fi
-fi
-
-if test "x${TAR}" = "x"; then
- TAR=$(which tar)
- if test "x${TAR}" = "x"; then
- echo "tar not found";
- exit 2;
- fi
-fi
-
-echo "Dependencies:";
-echo -e "\tWGET: ${WGET}";
-echo -e "\tTAR: ${TAR}\n";
-
-if test "x${ICEDTEA_USE_VCS}" = "xtrue"; then
- echo "Mode: Using VCS";
-
- if test "x${GREP}" = "x"; then
- GREP=$(which grep);
- if test "x${GREP}" = "x"; then
- echo "grep not found";
- exit 3;
- fi
- fi
-
- if test "x${CUT}" = "x"; then
- CUT=$(which cut);
- if test "x${CUT}" = "x"; then
- echo "cut not found";
- exit 4;
- fi
- fi
-
- if test "x${TR}" = "x"; then
- TR=$(which tr);
- if test "x${TR}" = "x"; then
- echo "tr not found";
- exit 5;
- fi
- fi
-
- if test "x${HG}" = "x"; then
- HG=$(which hg);
- if test "x${HG}" = "x"; then
- echo "hg not found";
- exit 6;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tGREP: ${GREP}";
- echo -e "\tCUT: ${CUT}";
- echo -e "\tTR: ${TR}";
- echo -e "\tHG: ${HG}";
-
- echo "Checking out repository from VCS...";
- ${HG} clone ${ICEDTEA_HG_URL} icedtea
-
- echo "Obtaining version from configure.ac...";
- ROOT_VER=$(${GREP} '^AC_INIT' icedtea/configure.ac|${CUT} -d ',' -f 2|${TR} -d '[][:space:]')
- echo "Root version from configure: ${ROOT_VER}";
-
- VCS_REV=$(${HG} log -R icedtea --template '{node|short}' -r tip)
- echo "VCS revision: ${VCS_REV}";
-
- ICEDTEA_VERSION="${ROOT_VER}-${VCS_REV}"
- echo "Creating icedtea-${ICEDTEA_VERSION}";
- mkdir icedtea-${ICEDTEA_VERSION}
- echo "Copying required files from checkout to icedtea-${ICEDTEA_VERSION}";
- # Commented out for now as IcedTea 6's jconsole.desktop.in is outdated
- #cp -a icedtea/jconsole.desktop.in ../icedtea-${ICEDTEA_VERSION}
- cp -a ${RPM_DIR}/jconsole.desktop.in icedtea-${ICEDTEA_VERSION}
- cp -a icedtea/tapset icedtea-${ICEDTEA_VERSION}
-
- rm -rf icedtea
-else
- echo "Mode: Using tarball";
-
- if test "x${ICEDTEA_VERSION}" = "x"; then
- echo "No IcedTea version specified for tarball download.";
- exit 3;
- fi
-
- if test "x${CHECKSUM}" = "x"; then
- CHECKSUM=$(which sha256sum)
- if test "x${CHECKSUM}" = "x"; then
- echo "sha256sum not found";
- exit 4;
- fi
- fi
-
- if test "x${PGP}" = "x"; then
- PGP=$(which gpg)
- if test "x${PGP}" = "x"; then
- echo "gpg not found";
- exit 5;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tCHECKSUM: ${CHECKSUM}";
- echo -e "\tPGP: ${PGP}\n";
-
- echo "Checking for IcedTea signing key ${ICEDTEA_SIGNING_KEY}...";
- if ! gpg --list-keys ${ICEDTEA_SIGNING_KEY}; then
- echo "IcedTea signing key ${ICEDTEA_SIGNING_KEY} not installed.";
- exit 6;
- fi
-
- echo "Downloading IcedTea release tarball...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz
- echo "Downloading IcedTea tarball signature...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- echo "Downloading IcedTea tarball checksums...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Verifying checksums...";
- ${CHECKSUM} --check --ignore-missing icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Checking signature...";
- ${PGP} --verify icedtea-${ICEDTEA_VERSION}.tar.xz.sig
-
- echo "Extracting files...";
- ${TAR} xJf icedtea-${ICEDTEA_VERSION}.tar.xz \
- icedtea-${ICEDTEA_VERSION}/tapset \
- icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in
-
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- rm -vf icedtea-${ICEDTEA_VERSION}.sha256
-fi
-
-echo "Replacing desktop files...";
-mv -v icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in ${RPM_DIR}
-
-echo "Creating new tapset tarball...";
-mv -v icedtea-${ICEDTEA_VERSION} openjdk
-${TAR} cJf ${RPM_DIR}/tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz openjdk
-
-rm -rvf openjdk
-
-popd
-rm -rf ${WORKDIR}
+# this file is intentionally not use din portables, use tarball from main rpms
diff --git a/java-11-openjdk-portable.spec b/java-11-openjdk-portable.spec
index eba37b7..986cd5f 100644
--- a/java-11-openjdk-portable.spec
+++ b/java-11-openjdk-portable.spec
@@ -29,6 +29,8 @@
%bcond_without release
# Enable static library builds by default.
%bcond_without staticlibs
+# Remove build artifacts by default
+%bcond_with artifacts
# Build a fresh libjvm.so for use in a copy of the bootstrap JDK
%bcond_without fresh_libjvm
# Build with system libraries
@@ -41,8 +43,6 @@
%define __os_install_post %{nil}
%endif
-%global unpacked_licenses %{_datarootdir}/licenses
-
# Workaround for stripping of debug symbols from static libraries
%if %{with staticlibs}
%define __brp_strip_static_archive %{nil}
@@ -66,10 +66,6 @@
# See: https://bugzilla.redhat.com/show_bug.cgi?id=1520879
%global _find_debuginfo_opts -g
-# With LTO flags enabled, debuginfo checks fail for some reason. Disable
-# LTO for a passing build. This really needs to be looked at.
-%define _lto_cflags %{nil}
-
# note: parametrized macros are order-sensitive (unlike not-parametrized) even with normal macros
# also necessary when passing it as parameter to other macros. If not macro, then it is considered a switch
# see the difference between global and define:
@@ -157,9 +153,14 @@
# Set of architectures for which alt-java has SSB mitigation
%global ssbd_arches x86_64
# Set of architectures where we verify backtraces with gdb
+# s390x fails on RHEL 7 so we exclude it there
+%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
+%global gdb_arches %{arm} %{aarch64} %{ix86} %{power64} sparcv9 sparc64 x86_64 %{zero_arches}
+%else
%global gdb_arches %{jit_arches} %{zero_arches}
+%endif
-# By default, we build a debug build during main build on JIT architectures
+# By default, we build a slowdebug build during main build on JIT architectures
%if %{with slowdebug}
%ifarch %{debug_arches}
%global include_debug_build 1
@@ -241,10 +242,10 @@
%global static_libs_target %{nil}
%endif
-# RPM JDK builds keep the debug symbols internal, to be later stripped by RPM
-%global debug_symbols internal
-
-# unlike portables,the rpms have to use static_libs_target very dynamically
+# The static libraries are produced under the same configuration as the main
+# build for portables, as we expect in-tree libraries to be used throughout.
+# If system libraries are enabled, the static libraries will also use them
+# which may cause issues.
%global bootstrap_targets images %{static_libs_target} legacy-jre-image
%global release_targets images docs-zip %{static_libs_target} legacy-jre-image
# No docs nor bootcycle for debug builds
@@ -252,14 +253,18 @@
# Target to use to just build HotSpot
%global hotspot_target hotspot
+
+# Disable LTO as this causes build failures at the moment.
+# See RHBZ#1861401
+%define _lto_cflags %{nil}
+
# Filter out flags from the optflags macro that cause problems with the OpenJDK build
# We filter out -O flags so that the optimization of HotSpot is not lowered from O3 to O2
# We filter out -Wall which will otherwise cause HotSpot to produce hundreds of thousands of warnings (100+mb logs)
# We replace it with -Wformat (required by -Werror=format-security) and -Wno-cpp to avoid FORTIFY_SOURCE warnings
# We filter out -fexceptions as the HotSpot build explicitly does -fno-exceptions and it's otherwise the default for C++
-# removal of -g is portable build specific to achieve no debug for release
-%global ourflags %(echo %optflags | sed -e 's|-Wall|-Wformat -Wno-cpp|' | sed -r -e 's|-O[0-9]*||' | sed -e 's|-g ||')
-%global ourcppflags %(echo %ourflags | sed -e 's|-fexceptions||' | sed -e 's|-g ||')
+%global ourflags %(echo %optflags | sed -e 's|-Wall|-Wformat -Wno-cpp|' | sed -r -e 's|-O[0-9]*||')
+%global ourcppflags %(echo %ourflags | sed -e 's|-fexceptions||')
%global ourldflags %{__global_ldflags}
# With disabled nss is NSS deactivated, so NSS_LIBDIR can contain the wrong path
@@ -338,20 +343,19 @@
# New Version-String scheme-style defines
%global featurever 11
%global interimver 0
-%global updatever 20
+%global updatever 21
%global patchver 0
# buildjdkver is usually same as %%{featurever},
# but in time of bootstrap of next jdk, it is featurever-1,
# and this it is better to change it here, on single place
%global buildjdkver %{featurever}
-# We don't add any LTS designator for STS packages (Fedora and EPEL).
-# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
-%if 0%{?rhel} && !0%{?epel}
+# Add LTS designator for RHEL builds
+%if 0%{?rhel}
%global lts_designator "LTS"
%global lts_designator_zip -%{lts_designator}
%else
- %global lts_designator ""
- %global lts_designator_zip ""
+ %global lts_designator ""
+ %global lts_designator_zip ""
%endif
# JDK to use for bootstrapping
%global bootjdk /usr/lib/jvm/java-%{buildjdkver}-openjdk
@@ -370,32 +374,39 @@
# Define what url should JVM offer in case of a crash report
# order may be important, epel may have rhel declared
%if 0%{?epel}
-%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora%20EPEL&component=%…
+%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora%20EPEL&component=%…
%else
%if 0%{?fedora}
# Does not work for rawhide, keeps the version field empty
-%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{name}&…
+%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{compon…
%else
%if 0%{?rhel}
-%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20…
+%global oj_vendor_bug_url https://access.redhat.com/support/cases/
%else
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi
%endif
%endif
%endif
-%global oj_vendor_version (Red_Hat-%{version}-%{release})
+%global oj_vendor_version (Red_Hat-%{version}-%{rpmrelease})
# Define IcedTea version used for SystemTap tapsets and desktop file
%global icedteaver 6.0.0pre00-c848b93a8598
# Define current Git revision for the FIPS support patches
-%global fipsver b34fb09a5c
+%global fipsver f93a863b56
+# Define JDK versions
+%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
+%global javaver %{featurever}
+# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
+%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
+# The tag used to create the OpenJDK tarball
+%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Standard JPackage naming and versioning defines
%global origin openjdk
%global origin_nice OpenJDK
-%global top_level_dir_name %{origin}
+%global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
-%global buildver 8
+%global buildver 9
%global rpmrelease 1
#%%global tagsuffix %%{nil}
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
@@ -410,14 +421,6 @@
# for techpreview, using 1, so slowdebugs can have 0
%global priority %( printf '%08d' 1 )
%endif
-%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
-%global javaver %{featurever}
-
-# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
-%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
-
-# The tag used to create the OpenJDK tarball
-%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Define milestone (EA for pre-releases, GA for releases)
# Release will be (where N is usually a number starting at 1):
@@ -445,6 +448,7 @@
# output dir stub
%define buildoutputdir() %{expand:build/jdk%{featurever}.build%{?1}}
%define installoutputdir() %{expand:install/jdk%{featurever}.install%{?1}}
+%define packageoutputdir() %{expand:packages/jdk%{featurever}.packages%{?1}}
# we can copy the javadoc to not arched dir, or make it not noarch
%define uniquejavadocdir() %{expand:%{fullversion}.%{_arch}%{?1}}
# main id and dir of this jdk
@@ -465,6 +469,11 @@
# Intentionally use jdkportablenameimpl here since we want to have static-libs files overlayed on
# top of the JDK archive
%define staticlibsportablename() %{expand:%{jdkportablenameimpl -- %%{1}}}
+%define docportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable.docs;g")
+%define docportablearchive() %{docportablename}.tar.xz
+%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable.misc;g")
+%define miscportablearchive() %{miscportablename}.tar.xz
+
# RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1}
# so we have to pass in "" but evaluate it, otherwise files record will include it
@@ -478,7 +487,7 @@
# fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349
# https://bugzilla.redhat.com/show_bug.cgi?id=1590796#c14
# https://bugzilla.redhat.com/show_bug.cgi?id=1655938
-%global _privatelibs libsplashscreen[.]so.*|libawt_xawt[.]so.*|libjli[.]so.*|libattach[.]so.*|libawt[.]so.*|libextnet[.]so.*|libawt_headless[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjimage[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmanagement_agent[.]so.*|libmanagement_ext[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libprefs[.]so.*|librmi[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsystemconf[.]so.*|libzip[.]so.*%{freetype_lib}
+%global _privatelibs libsplashscreen[.]so.*|libawt_xawt[.]so.*|libjli[.]so.*|libattach[.]so.*|libawt[.]so.*|libextnet[.]so.*|libawt_headless[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjimage[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmanagement_agent[.]so.*|libmanagement_ext[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libprefs[.]so.*|librmi[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsunec[.]so.*|libsystemconf[.]so.*|libunpack[.]so.*|libzip[.]so.*%{freetype_lib}
%global _publiclibs libjawt[.]so.*|libjava[.]so.*|libjvm[.]so.*|libverify[.]so.*|libjsig[.]so.*
%if %is_system_jdk
%global __provides_exclude ^(%{_privatelibs})$
@@ -494,6 +503,12 @@
%global __requires_exclude ^(%{_privatelibs}|%{_publiclibs})$
%endif
+# VM variant being built
+%ifarch %{zero_arches}
+%global vm_variant zero
+%else
+%global vm_variant server
+%endif
%global etcjavasubdir %{_sysconfdir}/java/java-%{javaver}-%{origin}
%define etcjavadir() %{expand:%{etcjavasubdir}/%{uniquesuffix -- %{?1}}}
@@ -516,20 +531,6 @@
%global alternatives_requires %{_sbindir}/alternatives
%endif
-%if %{with_systemtap}
-# Where to install systemtap tapset (links)
-# We would like these to be in a package specific sub-dir,
-# but currently systemtap doesn't support that, so we have to
-# use the root tapset dir for now. To distinguish between 64
-# and 32 bit architectures we place the tapsets under the arch
-# specific dir (note that systemtap will only pickup the tapset
-# for the primary arch for now). Systemtap uses the machine name
-# aka target_cpu as architecture specific directory name.
-%global tapsetroot /usr/share/systemtap
-%global tapsetdirttapset %{tapsetroot}/tapset/
-%global tapsetdir %{tapsetdirttapset}/%{stapinstall}
-%endif
-
# x86 is no longer supported
%if 0%{?java_arches:1}
ExclusiveArch: %{java_arches}
@@ -537,8 +538,8 @@ ExclusiveArch: %{java_arches}
ExcludeArch: %{ix86}
%endif
-# Portables have no rpo (requires/provides), but thsoe are awesome for orientation in spec
-# also scriptlets are hapily missing and files are handled old fashion
+# Portables have no repo (requires/provides), but these are awesome for orientation in spec
+# Also scriptlets are happily missing and files are handled old fashion
# not-duplicated requires/provides/obsoletes for normal/debug packages
%define java_rpo() %{expand:
}
@@ -549,6 +550,14 @@ ExcludeArch: %{ix86}
%define java_static_libs_rpo() %{expand:
}
+%define java_unstripped_rpo() %{expand:
+}
+
+%define java_docs_rpo() %{expand:
+}
+
+%define java_misc_rpo() %{expand:
+}
# Prevent brp-java-repack-jars from being run
%global __jar_repack 0
@@ -594,7 +603,6 @@ Group: Development/Languages
License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib and ISC and FTL and RSA
URL: http://openjdk.java.net/
-
# The source tarball, generated using generate_source_tarball.sh
Source0: openjdk-jdk%{featurever}u-%{vcstag}.tar.xz
@@ -615,8 +623,7 @@ Source10: NEWS
Source11: nss.cfg.in
# Removed libraries that we link instead
-# Disabled in portables
-#Source12: remove-intree-libraries.sh
+Source12: remove-intree-libraries.sh
# Ensure we aren't using the limited crypto policy
Source13: TestCryptoLevel.java
@@ -636,14 +643,6 @@ Source17: nss.fips.cfg.in
# Ensure translations are available for new timezones
Source18: TestTranslations.java
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-# boot jdk for portable build root on
-Source1001: ojdk17-aarch64-17.35.tar.gz
-Source1002: ojdk17-ppc64le-17.35.tar.gz
-Source1003: ojdk17-x86_64-17.35.tar.gz
-Source1004: ojdk17-s390x-17.35.tar.gz
-%endif
-
############################################
#
# RPM/distribution specific patches
@@ -652,8 +651,6 @@ Source1004: ojdk17-s390x-17.35.tar.gz
# Ignore AWTError when assistive technologies are loaded
Patch1: rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
-# Restrict access to java-atk-wrapper classes
-Patch2: rh1648644-java_access_bridge_privileged_security.patch
# NSS via SunPKCS11 Provider (disabled due to memory leak).
Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
# RH1750419: enable build of speculative store bypass hardened alt-java (CVE-2018-3639)
@@ -694,10 +691,12 @@ Patch1001: fips-11u-%{fipsver}.patch
#############################################
#
-# OpenJDK patches in need of upstreaming
+# Upstreamable patches
#
+# This section includes patches which need to
+# be reviewed & pushed to the current development
+# tree of OpenJDK.
#############################################
-
Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch
#############################################
@@ -709,10 +708,35 @@ Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk1
# need to be reviewed & pushed to the appropriate
# updates tree of OpenJDK.
#############################################
-Patch2001: jdk8242332-rh2108712-sha3-sunpkcs11.patch
+Patch2002: jdk8242332-rh2108712-sha3-sunpkcs11.patch
-# JDK-8271148: static-libs-image target --with-native-debug-symbols=external doesn't produce debug info
-Patch7777: jdk8271148-external_doesnt_produce_debuginfo.patch
+#############################################
+#
+# Patches appearing in 11.0.21
+#
+# This section includes patches which are present
+# in the listed OpenJDK 11u release and should be
+# able to be removed once that release is out
+# and used by this RPM.
+#############################################
+
+#############################################
+#
+# Patches appearing in 11.0.22
+#
+# This section includes patches which are present
+# in the listed OpenJDK 8u release and should be
+# able to be removed once that release is out
+# and used by this RPM.
+#############################################
+# JDK-8312489, OJ2095: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar
+Patch2000: jdk8312489-max_sig_default_increase.patch
+
+#############################################
+#
+# Portable build specific patches
+#
+#############################################
BuildRequires: autoconf
BuildRequires: automake
@@ -722,6 +746,7 @@ BuildRequires: cups-devel
BuildRequires: desktop-file-utils
# elfutils only are OK for build without AOT
BuildRequires: elfutils-devel
+BuildRequires: file
BuildRequires: fontconfig-devel
BuildRequires: freetype-devel
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
@@ -749,28 +774,24 @@ BuildRequires: libXtst-devel
# Requirement for setting up nss.cfg and nss.fips.cfg
BuildRequires: nss-devel
# Requirement for system security property test
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-BuildRequires: crypto-policies
-%endif
+# N/A for portable. RHEL7 doesn't provide them
+# and policy support is turned off
+#BuildRequires: crypto-policies
BuildRequires: pkgconfig
BuildRequires: xorg-x11-proto-devel
BuildRequires: zip
# to pack portable tarballs
BuildRequires: tar
BuildRequires: unzip
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
# No javapackages-filesystem on el7,nor is needed for portables
-%else
-BuildRequires: javapackages-filesystem
+# BuildRequires: javapackages-filesystem
BuildRequires: java-%{buildjdkver}-openjdk-devel
-%endif
# Zero-assembler build requirement
%ifarch %{zero_arches}
BuildRequires: libffi-devel
%endif
# 2023c required as of JDK-8305113
BuildRequires: tzdata-java >= 2023c
-
# cacerts build requirement in portable mode
BuildRequires: ca-certificates
# Earlier versions have a bug in tree vectorization on PPC
@@ -789,18 +810,18 @@ BuildRequires: lcms2-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
%else
-# Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h
-Provides: bundled(freetype) = 2.12.1
+# Version in src/java.desktop/share/legal/freetype.md
+Provides: bundled(freetype) = 2.13.0
# Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
Provides: bundled(giflib) = 5.2.1
# Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
-Provides: bundled(harfbuzz) = 4.4.1
+Provides: bundled(harfbuzz) = 7.2.0
# Version in src/java.desktop/share/native/liblcms/lcms2.h
-Provides: bundled(lcms2) = 2.12.0
+Provides: bundled(lcms2) = 2.15.0
# Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
Provides: bundled(libjpeg) = 6b
# Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h
-Provides: bundled(libpng) = 1.6.37
+Provides: bundled(libpng) = 1.6.39
# We link statically against libstdc++ to increase portability
BuildRequires: libstdc++-static
%endif
@@ -875,7 +896,7 @@ Group: Development/Tools
%{java_devel_rpo -- %{fastdebug_suffix_unquoted}}
%description devel-fastdebug
-The %{origin_nice} %{featurever} development tools - portable edition.
+The %{origin_nice} %{featurever} runtime environment and development tools - portable edition
%{fastdebug_warning}
%endif
@@ -883,7 +904,7 @@ The %{origin_nice} %{featurever} development tools - portable edition.
%if %{include_normal_build}
%package static-libs
-Summary: %{origin_nice} %{featurever} libraries for static linking - portable edition.
+Summary: %{origin_nice} %{featurever} libraries for static linking - portable edition
%{java_static_libs_rpo %{nil}}
@@ -898,7 +919,7 @@ Summary: %{origin_nice} %{featurever} libraries for static linking - portable ed
%{java_static_libs_rpo -- %{debug_suffix_unquoted}}
%description static-libs-slowdebug
-The %{origin_nice} %{featurever} libraries for static linking - portable edition.
+The %{origin_nice} %{featurever} libraries for static linking - portable edition
%{debug_warning}
%endif
@@ -909,13 +930,42 @@ Summary: %{origin_nice} %{featurever} libraries for static linking - portable ed
%{java_static_libs_rpo -- %{fastdebug_suffix_unquoted}}
%description static-libs-fastdebug
-The %{origin_nice} %{featurever} libraries for static linking - portable edition.
+The %{origin_nice} %{featurever} libraries for static linking - portable edition
%{fastdebug_warning}
%endif
# staticlibs
%endif
+%if %{include_normal_build}
+%package unstripped
+Summary: The %{origin_nice} %{featurever} runtime environment.
+
+%{java_unstripped_rpo %{nil}}
+
+%description unstripped
+The %{origin_nice} %{featurever} runtime environment.
+
+%endif
+
+%if %{include_normal_build}
+%package docs
+Summary: %{origin_nice} %{featurever} API documentation
+
+%{java_docs_rpo %{nil}}
+
+%description docs
+The %{origin_nice} %{featurever} API documentation.
+
+%package misc
+Summary: %{origin_nice} %{featurever} miscellany
+
+%{java_misc_rpo %{nil}}
+
+%description misc
+The %{origin_nice} %{featurever} miscellany.
+%endif
+
%package sources
Summary: %{origin_nice} %{featurever} full patched sources of portable JDK
@@ -927,10 +977,10 @@ The %{origin_nice} %{featurever} full patched sources of portable JDK to build,
echo "Preparing %{oj_vendor_version}"
# Using the echo macro breaks rpmdev-bumpspec, as it parses the first line of stdout :-(
-%if 0%{?stapinstall:1}
- echo "CPU: %{_target_cpu}, arch install directory: %{archinstall}, SystemTap install directory: %{stapinstall}"
+%if 0%{?_build_cpu:1}
+ echo "CPU: %{_target_cpu}, arch install directory: %{archinstall}, SystemTap install directory: %{_build_cpu}"
%else
- %{error:Unrecognised architecture %{_target_cpu}}
+ %{error:Unrecognised architecture %{_build_cpu}}
%endif
if [ %{include_normal_build} -eq 0 -o %{include_normal_build} -eq 1 ] ; then
@@ -951,7 +1001,6 @@ else
echo "include_fastdebug_build is %{include_fastdebug_build}, that is invalid. Use 1 for yes or 0 for no"
exit 13
fi
-
if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 -a %{include_fastdebug_build} -eq 0 ] ; then
echo "You have disabled all builds (normal,fastdebug,slowdebug). That is a no go."
exit 14
@@ -971,7 +1020,6 @@ if [ $prioritylength -ne 8 ] ; then
fi
# OpenJDK patches
-
%if %{system_libs}
# Remove libraries that are linked by both static and dynamic builds
sh %{SOURCE12} %{top_level_dir_name}
@@ -980,49 +1028,23 @@ sh %{SOURCE12} %{top_level_dir_name}
# Patch the JDK
pushd %{top_level_dir_name}
%patch1 -p1
-%patch2 -p1
%patch3 -p1
# Add crypto policy and FIPS support
%patch1001 -p1
# nss.cfg PKCS11 support; must come last as it also alters java.security
%patch1000 -p1
+# JDK-8312489 backport, coming in 11.0.22
+%patch2000 -p1
# PKCS11 SHA3 backport
-%patch2001 -p1
-# debuginfo fix
-%patch7777 -p1
+%patch2002 -p1
+# alt-java
+%patch600 -p1
+# RSA default
+%patch1003 -p1
popd # openjdk
-%patch600
-%patch1003
-# Extract systemtap tapsets
-%if %{with_systemtap}
-tar --strip-components=1 -x -I xz -f %{SOURCE8}
-%if %{include_debug_build}
-cp -r tapset tapset%{debug_suffix}
-%endif
-%if %{include_fastdebug_build}
-cp -r tapset tapset%{fastdebug_suffix}
-%endif
-
-for suffix in %{build_loop} ; do
- for file in "tapset"$suffix/*.in; do
- OUTPUT_FILE=`echo $file | sed -e "s:\.stp\.in$:-%{version}-%{release}.%{_arch}.stp:g"`
- sed -e "s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/server/libjvm.so:g" $file > $file.1
- sed -e "s:@JAVA_SPEC_VER@:%{javaver}:g" $file.1 > $file.2
-# TODO find out which architectures other than i686 have a client vm
-%ifarch %{ix86}
- sed -e "s:@ABS_CLIENT_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/client/libjvm.so:g" $file.2 > $OUTPUT_FILE
-%else
- sed -e "/@ABS_CLIENT_LIBJVM_SO@/d" $file.2 > $OUTPUT_FILE
-%endif
- sed -i -e "s:@ABS_JAVA_HOME_DIR@:%{_jvmdir}/%{sdkdir -- $suffix}:g" $OUTPUT_FILE
- sed -i -e "s:@INSTALL_ARCH_DIR@:%{archinstall}:g" $OUTPUT_FILE
- sed -i -e "s:@prefix@:%{_jvmdir}/%{sdkdir -- $suffix}/:g" $OUTPUT_FILE
- done
-done
-# systemtap tapsets ends
-%endif
+# Systemtap is processed in rpms
# Prepare desktop files
# Portables do not have desktop integration
@@ -1034,27 +1056,6 @@ sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE11} > nss.cfg
sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE17} > nss.fips.cfg
%build
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-mkdir bootjdk
-pushd bootjdk
-%ifarch %{aarch64}
-tar --strip-components=1 -xf %{SOURCE1001}
-%endif
-%ifarch %{ppc64le}
-tar --strip-components=1 -xf %{SOURCE1002}
-%endif
-%ifarch x86_64
-tar --strip-components=1 -xf %{SOURCE1003}
-%endif
-%ifarch s390x
-tar --strip-components=1 -xf %{SOURCE1004}
-%endif
-BOOT_JDK=$PWD
-popd
-%else
-BOOT_JDK=%{bootjdk}
-%endif
-
# How many CPU's do we have?
export NUM_PROC=%(/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :)
export NUM_PROC=${NUM_PROC:-1}
@@ -1136,7 +1137,7 @@ function buildjdk() {
%endif
--with-version-build=%{buildver} \
--with-version-pre="%{ea_designator}" \
- --with-version-opt=%{lts_designator} \
+ --with-version-opt="%{lts_designator}" \
--with-vendor-version-string="%{oj_vendor_version}" \
--with-vendor-name="%{oj_vendor}" \
--with-vendor-url="%{oj_vendor_url}" \
@@ -1144,7 +1145,7 @@ function buildjdk() {
--with-vendor-vm-bug-url="%{oj_vendor_bug_url}" \
--with-boot-jdk=${buildjdk} \
--with-debug-level=${debuglevel} \
- --with-native-debug-symbols="%{debug_symbols}" \
+ --with-native-debug-symbols="${debug_symbols}" \
--disable-sysconf-nss \
--enable-unlimited-crypto \
--with-zlib=%{link_type} \
@@ -1165,330 +1166,309 @@ function buildjdk() {
--disable-warnings-as-errors
cat spec.gmk
+
make \
+ JAVAC_FLAGS=-g \
LOG=trace \
WARNINGS_ARE_ERRORS="-Wno-error" \
CFLAGS_WARNINGS_ARE_ERRORS="-Wno-error" \
$maketargets || ( pwd; find ${top_dir_abs_src_path} ${top_dir_abs_build_path} -name "hs_err_pid*.log" | xargs cat && false )
-
popd
}
+function stripjdk() {
+ local outputdir=${1}
+ local jdkimagepath=${outputdir}/images/%{jdkimage}
+ local jreimagepath=${outputdir}/images/%{jreimage}
+ local jmodimagepath=${outputdir}/images/jmods
+ local supportdir=${outputdir}/support
+
+ if [ "x$suffix" = "x" ] ; then
+ # Keep the unstripped version for consumption by RHEL RPMs
+ cp -a ${jdkimagepath}{,.unstripped}
+
+ # Strip the files
+ for file in $(find ${jdkimagepath} ${jreimagepath} ${supportdir} -type f) ; do
+ if file ${file} | grep -q 'ELF'; then
+ noextfile=${file/.so/};
+ objcopy --only-keep-debug ${file} ${noextfile}.debuginfo;
+ objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file};
+ strip -g ${file};
+ fi
+ done
+
+ # Rebuild jmod files against the stripped binaries
+ if [ ! -d ${supportdir} ] ; then
+ echo "Support directory missing.";
+ exit 15
+ fi
+ for cmd in $(find ${supportdir} -name '*.jmod.cmdline') ; do
+ jmod=$(cat ${cmd} | sed -r 's|.*support/(.*$)|\1|');
+ echo "Rebuilding ${jmod} against stripped binaries...";
+ echo "Removing old jmod ${jmod}...";
+ rm -vf ${jmod}
+ rm -vf ${jdkimagepath}/jmods/$(basename ${jmod});
+ echo "Executing $(cat ${cmd})...";
+ cat ${cmd} | sh -s ;
+ echo "Moving jmod to image...";
+ mv -v ${supportdir}/${jmod} ${jdkimagepath}/jmods;
+ done
+ fi
+}
+
function installjdk() {
- local imagepath=${1}
+ local outputdir=${1}
+ local installdir=${2}
+ local jdkimagepath=${installdir}/images/%{jdkimage}
+ local jreimagepath=${installdir}/images/%{jreimage}
+ local unstripped=${jdkimagepath}.unstripped
+
+ echo "Installing build from ${outputdir} to ${installdir}..."
+ mkdir -p ${installdir}
+ echo "Installing images..."
+ mv ${outputdir}/images ${installdir}
+ if [ -d ${outputdir}/bundles ] ; then
+ echo "Installing bundles...";
+ mv ${outputdir}/bundles ${installdir} ;
+ fi
+
+%if !%{with artifacts}
+ echo "Removing output directory...";
+ rm -rf ${outputdir}
+%endif
- if [ -d ${imagepath} ] ; then
- # the build (erroneously) removes read permissions from some jars
- # this is a regression in OpenJDK 7 (our compiler):
- # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
- find ${imagepath} -iname '*.jar' -exec chmod ugo+r {} \;
+ for imagepath in ${jdkimagepath} ${jreimagepath} ${unstripped}; do
- # Build screws up permissions on binaries
- # https://bugs.openjdk.java.net/browse/JDK-8173610
- find ${imagepath} -iname '*.so' -exec chmod +x {} \;
- find ${imagepath}/bin/ -exec chmod +x {} \;
+ if [ -d ${imagepath} ] ; then
+ # the build (erroneously) removes read permissions from some jars
+ # this is a regression in OpenJDK 7 (our compiler):
+ # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
+ find ${imagepath} -iname '*.jar' -exec chmod ugo+r {} \;
- # Install nss.cfg right away as we will be using the JRE above
- install -m 644 nss.cfg ${imagepath}/conf/security/
+ # Build screws up permissions on binaries
+ # https://bugs.openjdk.java.net/browse/JDK-8173610
+ find ${imagepath} -iname '*.so' -exec chmod +x {} \;
+ find ${imagepath}/bin/ -exec chmod +x {} \;
- # Install nss.fips.cfg: NSS configuration for global FIPS mode (crypto-policies)
- install -m 644 nss.fips.cfg ${imagepath}/conf/security/
+ # Install local files which are distributed with the JDK
+ install -m 644 %{SOURCE10} ${imagepath}
+ install -m 644 nss.cfg ${imagepath}/conf/security/
+ install -m 644 nss.fips.cfg ${imagepath}/conf/security/
- # Create fake alt-java as a placeholder for future alt-java
- if [ -d man/man1 ] ; then
- pushd ${imagepath}
+ # Create fake alt-java as a placeholder for future alt-java
+ pushd ${imagepath}
# add alt-java man page
echo "Hardened java binary recommended for launching untrusted code from the Web e.g. javaws" > man/man1/%{alt_java_name}.1
cat man/man1/java.1 >> man/man1/%{alt_java_name}.1
- popd
- fi
- fi
+ popd
+
+ # Print release information
+ cat ${imagepath}/release
+ fi
+ done
}
-# Checks on debuginfo must be performed before the files are stripped
-# by the RPM installation stage
-function debugcheckjdk() {
- local imagepath=${1}
-
- if [ -d ${imagepath} ] ; then
-
- so_suffix="so"
- # Check debug symbols are present and can identify code
- find "${imagepath}" -iname "*.$so_suffix" -print0 | while read -d $'\0' lib
- do
- if [ -f "$lib" ] ; then
- echo "Testing $lib for debug symbols"
- # All these tests rely on RPM failing the build if the exit code of any set
- # of piped commands is non-zero.
-
- # Test for .debug_* sections in the shared object. This is the main test
- # Stripped objects will not contain these
- eu-readelf -S "$lib" | grep "] .debug_"
- test $(eu-readelf -S "$lib" | grep -E "\]\ .debug_(info|abbrev)" | wc --lines) == 2
-
- # Test FILE symbols. These will most likely be removed by anything that
- # manipulates symbol tables because it's generally useless. So a nice test
- # that nothing has messed with symbols
- old_IFS="$IFS"
- IFS=$'\n'
- for line in $(eu-readelf -s "$lib" | grep "00000000 0 FILE LOCAL DEFAULT")
- do
- # We expect to see .cpp and .S files, except for architectures like aarch64 and
- # s390 where we expect .o and .oS files
- echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|S|oS))?$"
- done
- IFS="$old_IFS"
-
- # If this is the JVM, look for javaCalls.(cpp|o) in FILEs, for extra sanity checking
- if [ "`basename $lib`" = "libjvm.so" ]; then
- eu-readelf -s "$lib" | \
- grep -E "00000000 0 FILE LOCAL DEFAULT ABS javaCalls.(cpp|o)$"
- fi
-
- # Test that there are no .gnu_debuglink sections pointing to another
- # debuginfo file. There shouldn't be any debuginfo files, so the link makes
- # no sense either
- eu-readelf -S "$lib" | grep 'gnu'
- if eu-readelf -S "$lib" | grep "\] .gnu_debuglink" | grep PROGBITS; then
- echo "bad .gnu_debuglink section."
- eu-readelf -x .gnu_debuglink "$lib"
- false
- fi
- fi
- done
+function genchecksum() {
+ local checkedfile=${1}
- # Make sure gdb can do a backtrace based on line numbers on libjvm.so
- # javaCalls.cpp:58 should map to:
- # http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/…
- # Using line number 1 might cause build problems. See:
- # https://bugzilla.redhat.com/show_bug.cgi?id=1539664
- # https://bugzilla.redhat.com/show_bug.cgi?id=1538767
- gdb -q "${imagepath}/bin/java" <<EOF | tee gdb.out
-handle SIGSEGV pass nostop noprint
-handle SIGILL pass nostop noprint
-set breakpoint pending on
-break javaCalls.cpp:58
-commands 1
-backtrace
-quit
-end
-run -version
-EOF
-%ifarch %{gdb_arches}
- grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
-%endif
+ checkdir=$(dirname ${1})
+ checkfile=$(basename ${1})
- fi
+ echo "Generating checksum for ${checkfile} in ${checkdir}..."
+ pushd ${checkdir}
+ sha256sum ${checkfile} > ${checkfile}.sha256sum
+ sha256sum --check ${checkfile}.sha256sum
+ popd
}
-pwd
-ls -l
-tar -cJf ../%{jdkportablesourcesarchive -- ""} --transform "s|^|%{jdkportablesourcesname -- ""}/|" openjdk nss*
-sha256sum ../%{jdkportablesourcesarchive -- ""} > ../%{jdkportablesourcesarchive -- ""}.sha256sum
+function packFullPatchedSources() {
+ srcpackagesdir=`pwd`
+ tar -cJf ${srcpackagesdir}/%{jdkportablesourcesarchive -- ""} --transform "s|^|%{jdkportablesourcesname -- ""}/|" %{top_level_dir_name} nss*
+ genchecksum ${srcpackagesdir}/%{jdkportablesourcesarchive -- ""}
+}
-%if %{build_hotspot_first}
- # Build a fresh libjvm.so first and use it to bootstrap
- cp -LR --preserve=mode,timestamps $BOOT_JDK newboot
- systemjdk=$(pwd)/newboot
- buildjdk build/newboot ${systemjdk} %{hotspot_target} "release" "bundled" "internal"
- mv build/newboot/jdk/lib/server/libjvm.so newboot/lib/server
-%else
- systemjdk=$BOOT_JDK
-%endif
+function packagejdk() {
+ local imagesdir=$(pwd)/${1}/images
+ local docdir=$(pwd)/${1}/images/docs
+ local bundledir=$(pwd)/${1}/bundles
+ local packagesdir=$(pwd)/${2}
+ local srcdir=$(pwd)/%{top_level_dir_name}
+ local tapsetdir=$(pwd)/tapset
-for suffix in %{build_loop} ; do
- if [ "x$suffix" = "x" ] ; then
- debugbuild=release
- debug_symbols=external # portables specific
- else
- # change --something to something
- debugbuild=`echo $suffix | sed "s/-//g"`
- debug_symbols=internal
- fi
-
-builddir=%{buildoutputdir -- ${suffix}}
-bootbuilddir=boot${builddir}
-installdir=%{installoutputdir -- ${suffix}}
-bootinstalldir=boot${installdir}
+ echo "Packaging build from ${imagesdir} to ${packagesdir}..."
+ mkdir -p ${packagesdir}
+ pushd ${imagesdir}
-link_opt="bundled"
+ echo "Packaging build from ${imagesdir} to ${packagesdir}..."
- for loop in %{main_suffix} %{staticlibs_loop} ; do
- builddir=%{buildoutputdir -- ${suffix}${loop}}
- bootbuilddir=boot${builddir}
- if test "x${loop}" = "x%{main_suffix}" ; then
- link_opt="%{link_type}"
-%if %{system_libs}
- # Copy the source tree so we can remove all in-tree libraries
- cp -a %{top_level_dir_name} %{top_level_dir_name_backup}
- # Remove all libraries that are linked
- sh %{SOURCE12} %{top_level_dir_name} full
-%endif
- # Debug builds don't need same targets as release for
- # build speed-up. We also avoid bootstrapping these
- # slower builds.
- if echo $debugbuild | grep -q "debug" ; then
- maketargets="%{debug_targets}"
- run_bootstrap=false
- else
- maketargets="%{release_targets}"
- run_bootstrap=%{bootstrap_build}
- fi
- if ${run_bootstrap} ; then
- buildjdk ${bootbuilddir} ${systemjdk} "%{bootstrap_targets}" ${debugbuild} ${link_opt}
- buildjdk ${builddir} $(pwd)/${bootbuilddir}/images/%{jdkimage} "${maketargets}" ${debugbuild} ${link_opt}
- rm -rf ${bootbuilddir}
- else
- buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt}
- fi
-%if %{system_libs}
- # Restore original source tree we modified by removing full in-tree sources
- rm -rf %{top_level_dir_name}
- mv %{top_level_dir_name_backup} %{top_level_dir_name}
-%endif
+ if [ "x$suffix" = "x" ] ; then
+ nameSuffix=""
else
- # Use bundled libraries for building statically
- link_opt="bundled"
- # Static library cycle only builds the static libraries
- maketargets="%{static_libs_target}"
- # Always just do the one build for the static libraries
- buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt}
+ nameSuffix=`echo "$suffix"| sed s/-/./`
fi
- done # end of main / staticlibs loop
+ jdkname=%{jdkportablename -- "$nameSuffix"}
+ jdkarchive=${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
+ jrename=%{jreportablename -- "$nameSuffix"}
+ jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
+ staticname=%{staticlibsportablename -- "$nameSuffix"}
+ staticarchive=${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
+ debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
+ unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
+ if [ "x$suffix" = "x" ] ; then
+ docname=%{docportablename}
+ docarchive=${packagesdir}/%{docportablearchive}
+ built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
+ fi
+ # These are from the source tree so no debug variants
+ miscname=%{miscportablename}
+ miscarchive=${packagesdir}/%{miscportablearchive}
+
+ if [ "x$suffix" = "x" ] ; then
+ # Keep the unstripped version for consumption by RHEL RPMs
+ mv %{jdkimage}.unstripped ${jdkname}
+ tar -cJf ${unstrippedarchive} ${jdkname}
+ genchecksum ${unstrippedarchive}
+ mv ${jdkname} %{jdkimage}.unstripped
+ fi
- # Final setup on the main image
- top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
- for image in %{jdkimage} %{jreimage} ; do
- imagePath=${top_dir_abs_main_build_path}/images/${image}
- installjdk ${imagePath}
- done
- # Check debug symbols were built into the dynamic libraries; todo, why it passes in JDK only?
- debugcheckjdk ${top_dir_abs_main_build_path}/images/%{jdkimage}
+ # Rename directories for packaging
+ mv %{jdkimage} ${jdkname}
+ mv %{jreimage} ${jrename}
- # Print release information
- cat ${top_dir_abs_main_build_path}/images/%{jdkimage}/release
+ # Release images have external debug symbols
+ if [ "x$suffix" = "x" ] ; then
+ tar -cJf ${debugarchive} $(find ${jdkname} -name \*.debuginfo)
+ genchecksum ${debugarchive}
-################################################################################
- pushd ${top_dir_abs_main_build_path}/images
- if [ "x$suffix" == "x" ] ; then
- nameSuffix=""
- else
- nameSuffix=`echo "$suffix"| sed s/-/./`
- fi
- # additional steps needed for fluent repack; most of them done twice, as images are already populated
- # maybe most of them should be done in upstream build?
- for imagedir in %{jdkimage} %{jreimage} ; do
- pushd $imagedir
- # Convert man pages to UTF8 encoding
- if [ -d man/man1 ] ; then # jre do not have man pages...
- for manpage in man/man1/* ; do
- iconv -f ISO_8859-1 -t UTF8 $manpage -o $manpage.tmp
- mv -f $manpage.tmp $manpage
- done
- fi
- # Install release notes
- cp -a %{SOURCE10} `pwd`
- cp -a %{SOURCE10} `pwd`/legal
- # stabilize permissions; aprtially duplicated in instalojdk
- find `pwd` -name "*.so" -exec chmod 755 {} \; -exec echo "set 755 to so {}" \; ;
- find `pwd` -type d -exec chmod 755 {} \; -exec echo "set 755 to dir {}" \; ;
- find `pwd`/legal -type f -exec chmod 644 {} \; -exec echo "set 644 to licences {}" \; ;
- popd # jdkimage/jreimage
- done # jre/sdk work in loop
- # javadoc is done only for release sdkimage
- if ! echo $suffix | grep -q "debug" ; then
- # Install Javadoc documentation
- #cp -a docs %{jdkimage} # not sure if the plaintext javadoc is for some use
- built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
- cp -a `pwd`/../bundles/${built_doc_archive} `pwd`/%{jdkimage}/javadocs.zip || ls -l `pwd`/../bundles
+ mkdir ${docname}
+ mv ${docdir} ${docname}
+ mv ${bundledir}/${built_doc_archive} ${docname}
+ tar -cJf ${docarchive} ${docname}
+ genchecksum ${docarchive}
+
+ mkdir ${miscname}
+ for s in 16 24 32 48 ; do
+ cp -av ${srcdir}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png ${miscname}
+ done
+ cp -a ${srcdir}/src/sample ${miscname}
+%if %{with_systemtap}
+ cp -a ${tapsetdir}* ${miscname}
+%endif
+ tar -cJf ${miscarchive} ${miscname}
+ genchecksum ${miscarchive}
fi
- # end of additional steps
-
- mv %{jdkimage} %{jdkportablename -- "$nameSuffix"}
- mv %{jreimage} %{jreportablename -- "$nameSuffix"}
- tar -cJf ../../../../%{jdkportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jdkportablename -- "$nameSuffix"}
- sha256sum ../../../../%{jdkportablearchive -- "$nameSuffix"} > ../../../../%{jdkportablearchive -- "$nameSuffix"}.sha256sum
- tar -cJf ../../../../%{jreportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jreportablename -- "$nameSuffix"}
- sha256sum ../../../../%{jreportablearchive -- "$nameSuffix"} > ../../../../%{jreportablearchive -- "$nameSuffix"}.sha256sum
- # copy licenses so they are avialable out of tarball
- cp -rf %{jdkportablename -- "$nameSuffix"}/legal ../../../../%{jdkportablearchive -- "%{normal_suffix}"}-legal
- mv %{jdkportablename -- "$nameSuffix"} %{jdkimage}
- mv %{jreportablename -- "$nameSuffix"} %{jreimage}
- popd #images
+
+ tar -cJf ${jdkarchive} --exclude='**.debuginfo' ${jdkname}
+ genchecksum ${jdkarchive}
+
+ tar -cJf ${jrearchive} --exclude='**.debuginfo' ${jrename}
+ genchecksum ${jrearchive}
+
%if %{include_staticlibs}
- top_dir_abs_staticlibs_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{staticlibs_suffix}}
- pushd ${top_dir_abs_staticlibs_build_path}/images
# Static libraries (needed for building graal vm with native image)
# Tar as overlay. Transform to the JDK name, since we just want to "add"
# static libraries to that folder
- portableJDKname=%{staticlibsportablename -- "$nameSuffix"}
- tar -cJf ../../../../%{staticlibsportablearchive -- "$nameSuffix"} --transform "s|^%{static_libs_image}/lib/*|$portableJDKname/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib"
- sha256sum ../../../../%{staticlibsportablearchive -- "$nameSuffix"} > ../../../../%{staticlibsportablearchive -- "$nameSuffix"}.sha256sum
- popd #staticlibs-images
+ tar -cJf ${staticarchive} \
+ --transform "s|^%{static_libs_image}/lib/*|${staticname}/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib"
+ genchecksum ${staticarchive}
%endif
-################################################################################
-# note, currently no debuginfo, consult portbale spec for external (zipped) debuginfo, being tarred alone
-################################################################################
-# build cycles
-done # end of release / debug cycle loop
+ # Revert directory renaming so testing will run
+ # TODO: testing should run on the packaged JDK
+ mv ${jdkname} %{jdkimage}
+ mv ${jrename} %{jreimage}
-%install
-STRIP_KEEP_SYMTAB=libjvm*
+ popd #images
-mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
-mv ../%{jdkportablesourcesarchive -- ""} $RPM_BUILD_ROOT%{_jvmdir}/
-mv ../%{jdkportablesourcesarchive -- ""}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+}
-for suffix in %{build_loop} ; do
-top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
+packFullPatchedSources
-################################################################################
- if [ "x$suffix" == "x" ] ; then
- nameSuffix=""
+%if %{build_hotspot_first}
+ # Build a fresh libjvm.so first and use it to bootstrap
+ cp -LR --preserve=mode,timestamps %{bootjdk} newboot
+ systemjdk=$(pwd)/newboot
+ buildjdk build/newboot ${systemjdk} %{hotspot_target} "release" "bundled" "internal"
+ mv build/newboot/jdk/lib/%{vm_variant}/libjvm.so newboot/lib/%{vm_variant}
+%else
+ systemjdk=%{bootjdk}
+%endif
+
+for suffix in %{build_loop} ; do
+ if [ "x$suffix" = "x" ] ; then
+ debugbuild=release
+ else
+ # change --something to something
+ debugbuild=`echo $suffix | sed "s/-//g"`
+ fi
+ # We build with internal debug symbols and do
+ # our own stripping for one version of the
+ # release build
+ debug_symbols=internal
+
+ builddir=%{buildoutputdir -- ${suffix}}
+ bootbuilddir=boot${builddir}
+ installdir=%{installoutputdir -- ${suffix}}
+ bootinstalldir=boot${installdir}
+ packagesdir=%{packageoutputdir -- ${suffix}}
+
+ link_opt="%{link_type}"
+%if %{system_libs}
+ # Copy the source tree so we can remove all in-tree libraries
+ cp -a %{top_level_dir_name} %{top_level_dir_name_backup}
+ # Remove all libraries that are linked
+ sh %{SOURCE12} %{top_level_dir_name} full
+%endif
+ # Debug builds don't need same targets as release for
+ # build speed-up. We also avoid bootstrapping these
+ # slower builds.
+ if echo $debugbuild | grep -q "debug" ; then
+ maketargets="%{debug_targets}"
+ run_bootstrap=false
else
- nameSuffix=`echo "$suffix"| sed s/-/./`
+ maketargets="%{release_targets}"
+ run_bootstrap=%{bootstrap_build}
fi
- mv ../%{jdkportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{jdkportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{jreportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{jreportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
-%if %{include_staticlibs}
- mv ../%{staticlibsportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{staticlibsportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
-%endif
- if [ "x$suffix" == "x" ] ; then
- dnameSuffix="$nameSuffix".debuginfo
-# todo handle debuginfo, see note at build (we will need to pack one stripped and one unstripped release build)
-# mv ../%{jdkportablearchive -- "$dnameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
-# mv ../%{jdkportablearchive -- "$dnameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ if ${run_bootstrap} ; then
+ buildjdk ${bootbuilddir} ${systemjdk} "%{bootstrap_targets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ installjdk ${bootbuilddir} ${bootinstalldir}
+ buildjdk ${builddir} $(pwd)/${bootinstalldir}/images/%{jdkimage} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ stripjdk ${builddir}
+ installjdk ${builddir} ${installdir}
+ %{!?with_artifacts:rm -rf ${bootinstalldir}}
+ else
+ buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ stripjdk ${builddir}
+ installjdk ${builddir} ${installdir}
fi
-################################################################################
-# end, dual install
-done
-################################################################################
-# the licenses are packed onloy once and shared
-mkdir -p $RPM_BUILD_ROOT%{unpacked_licenses}
-mv ../%{jdkportablearchive -- "%{normal_suffix}"}-legal $RPM_BUILD_ROOT%{unpacked_licenses}/%{jdkportablesourcesarchive -- "%{normal_suffix}"}
-# To show sha in the build log
-for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do ls -l $file ; cat $file ; done
-################################################################################
+ packagejdk ${installdir} ${packagesdir}
+
+%if %{system_libs}
+ # Restore original source tree we modified by removing full in-tree sources
+ rm -rf %{top_level_dir_name}
+ mv %{top_level_dir_name_backup} %{top_level_dir_name}
+%endif
+
+# build cycles
+done # end of release / debug cycle loop
%check
# We test debug first as it will give better diagnostics on a crash
for suffix in %{build_loop} ; do
-# Tests in the check stage are performed on the installed image
-# rpmbuild operates as follows: build -> install -> test
-# however in portbales, we test built image instead of installed one
-top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
+# portable builds have static_libs embedded, thus top_dir_abs_main_build_path is same as top_dir_abs_staticlibs_build_path
+top_dir_abs_main_build_path=$(pwd)/%{installoutputdir -- ${suffix}}
+%if %{include_staticlibs}
+top_dir_abs_staticlibs_build_path=${top_dir_abs_main_build_path}
+%endif
+
export JAVA_HOME=${top_dir_abs_main_build_path}/images/%{jdkimage}
-#check Shenandoah is enabled
+# Check Shenandoah is enabled
%if %{use_shenandoah_hotspot}
-$JAVA_HOME/bin/java -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -version
+$JAVA_HOME/bin/java -XX:+UseShenandoahGC -version
%endif
# Check unlimited policy has been used
@@ -1499,14 +1479,19 @@ $JAVA_HOME/bin/java --add-opens java.base/javax.crypto=ALL-UNNAMED TestCryptoLev
$JAVA_HOME/bin/javac -d . %{SOURCE14}
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||")
-# Check system crypto (policy) is deactive and can not be enabled
+# Check system crypto (policy) is active and can be disabled
# Test takes a single argument - true or false - to state whether system
# security properties are enabled or not.
$JAVA_HOME/bin/javac -d . %{SOURCE15}
export PROG=$(echo $(basename %{SOURCE15})|sed "s|\.java||")
export SEC_DEBUG="-Djava.security.debug=properties"
+#Portable specific: set false whereas its true for upstream
$JAVA_HOME/bin/java ${SEC_DEBUG} ${PROG} false
-$JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=false ${PROG} false
+$JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=true ${PROG} false
+
+# Check correct vendor values have been set
+$JAVA_HOME/bin/javac -d . %{SOURCE16}
+$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
# Check java launcher has no SSB mitigation
if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
@@ -1518,24 +1503,89 @@ nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation
if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi
%endif
-# Check correct vendor values have been set
-$JAVA_HOME/bin/javac -d . %{SOURCE16}
-$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
-
-%if ! 0%{?flatpak}
-# Check translations are available for new timezones (during flatpak builds, the
-# tzdb.dat used by this test is not where the test expects it, so this is
-# disabled for flatpak builds)
+# Check translations are available for new timezones
$JAVA_HOME/bin/javac -d . %{SOURCE18}
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE
$JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR
-%endif
%if %{include_staticlibs}
# Check debug symbols in static libraries (smoke test)
-export STATIC_LIBS_HOME=${top_dir_abs_main_build_path}/../../%{buildoutputdir -- ${suffix}%{staticlibs_suffix}}/images/static-libs/lib/
-readelf --debug-dump $STATIC_LIBS_HOME/libfdlibm.a | grep w_remainder.c
-readelf --debug-dump $STATIC_LIBS_HOME/libfdlibm.a | grep e_remainder.c
+export STATIC_LIBS_HOME=${top_dir_abs_staticlibs_build_path}/images/%{static_libs_image}
+ls -l $STATIC_LIBS_HOME
+ls -l $STATIC_LIBS_HOME/lib
+readelf --debug-dump $STATIC_LIBS_HOME/lib/libfdlibm.a | grep w_remainder.c
+readelf --debug-dump $STATIC_LIBS_HOME/lib/libfdlibm.a | grep e_remainder.c
+%endif
+
+# Release builds strip the debug symbols into external .debuginfo files
+if [ "x$suffix" = "x" ] ; then
+ so_suffix="debuginfo"
+else
+ so_suffix="so"
+fi
+# Check debug symbols are present and can identify code
+find "$JAVA_HOME" -iname "*.$so_suffix" -print0 | while read -d $'\0' lib
+do
+ if [ -f "$lib" ] ; then
+ echo "Testing $lib for debug symbols"
+ # All these tests rely on RPM failing the build if the exit code of any set
+ # of piped commands is non-zero.
+
+ # Test for .debug_* sections in the shared object. This is the main test
+ # Stripped objects will not contain these
+ eu-readelf -S "$lib" | grep "] .debug_"
+ test $(eu-readelf -S "$lib" | grep -E "\]\ .debug_(info|abbrev)" | wc --lines) == 2
+
+ # Test FILE symbols. These will most likely be removed by anything that
+ # manipulates symbol tables because it's generally useless. So a nice test
+ # that nothing has messed with symbols
+ old_IFS="$IFS"
+ IFS=$'\n'
+ for line in $(eu-readelf -s "$lib" | grep "00000000 0 FILE LOCAL DEFAULT")
+ do
+ # We expect to see .cpp and .S files, except for architectures like aarch64 and
+ # s390 where we expect .o and .oS files
+ echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|S|oS))?$"
+ done
+ IFS="$old_IFS"
+
+ # If this is the JVM, look for javaCalls.(cpp|o) in FILEs, for extra sanity checking
+ if [ "`basename $lib`" = "libjvm.so" ]; then
+ eu-readelf -s "$lib" | \
+ grep -E "00000000 0 FILE LOCAL DEFAULT ABS javaCalls.(cpp|o)$"
+ fi
+
+ # Test that there are no .gnu_debuglink sections pointing to another
+ # debuginfo file. There shouldn't be any debuginfo files, so the link makes
+ # no sense either
+ eu-readelf -S "$lib" | grep 'gnu'
+ if eu-readelf -S "$lib" | grep '] .gnu_debuglink' | grep PROGBITS; then
+ echo "bad .gnu_debuglink section."
+ eu-readelf -x .gnu_debuglink "$lib"
+ false
+ fi
+ fi
+done
+
+# Make sure gdb can do a backtrace based on line numbers on libjvm.so
+# javaCalls.cpp:58 should map to:
+# http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/…
+# Using line number 1 might cause build problems. See:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1539664
+# https://bugzilla.redhat.com/show_bug.cgi?id=1538767
+gdb -q "$JAVA_HOME/bin/java" <<EOF | tee gdb.out
+handle SIGSEGV pass nostop noprint
+handle SIGILL pass nostop noprint
+set breakpoint pending on
+break javaCalls.cpp:58
+commands 1
+backtrace
+quit
+end
+run -version
+EOF
+%ifarch %{gdb_arches}
+grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
%endif
# Check src.zip has all sources. See RHBZ#1130490
@@ -1554,12 +1604,69 @@ $JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LocalVariableTable
# build cycles check
done
+%install
+
+ mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
+ mv %{jdkportablesourcesarchive -- ""} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv %{jdkportablesourcesarchive -- ""}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+
+for suffix in %{build_loop} ; do
+
+ packagesdir=%{packageoutputdir -- ${suffix}}
+
+ if [ "x$suffix" == "x" ] ; then
+ nameSuffix=""
+ else
+ nameSuffix=`echo "$suffix"| sed s/-/./`
+ fi
+
+ # These definitions should match those in installjdk
+ jdkarchive=${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
+ jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
+ staticarchive=${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
+ debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
+ unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
+
+ mv ${jdkarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jdkarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jrearchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jrearchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+
+%if %{include_staticlibs}
+ mv ${staticarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${staticarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+%endif
+
+ if [ "x$suffix" = "x" ] ; then
+ mv ${debugarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${debugarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${unstrippedarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${unstrippedarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ fi
+done
+
+ if [ "x$suffix" = "x" ] ; then
+ # These definitions should match those in installjdk
+ # Install outside the loop as there are no debug variants
+ docarchive=${packagesdir}/%{docportablearchive}
+ miscarchive=${packagesdir}/%{miscportablearchive}
+ mv ${docarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${docarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${miscarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${miscarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ fi
+
+# To show sha in the build log
+for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do
+ ls -l $file ;
+ cat $file ;
+done
+
%if %{include_normal_build}
%files
# main package builds always
%{_jvmdir}/%{jreportablearchiveForFiles}
%{_jvmdir}/%{jreportablearchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%else
%files
# placeholder
@@ -1568,10 +1675,9 @@ done
%if %{include_normal_build}
%files devel
%{_jvmdir}/%{jdkportablearchiveForFiles}
-#%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
+%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
%{_jvmdir}/%{jdkportablearchiveForFiles}.sha256sum
-#%{_jvmdir}/%{jdkportablearchive -- .debuginfo}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
+%{_jvmdir}/%{jdkportablearchive -- .debuginfo}.sha256sum
%endif
%if %{include_normal_build}
@@ -1579,26 +1685,26 @@ done
%files static-libs
%{_jvmdir}/%{staticlibsportablearchiveForFiles}
%{_jvmdir}/%{staticlibsportablearchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
+
+%files unstripped
+%{_jvmdir}/%{jdkportablearchive -- .unstripped}
+%{_jvmdir}/%{jdkportablearchive -- .unstripped}.sha256sum
%endif
%if %{include_debug_build}
%files slowdebug
%{_jvmdir}/%{jreportablearchive -- .slowdebug}
%{_jvmdir}/%{jreportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%files devel-slowdebug
%{_jvmdir}/%{jdkportablearchive -- .slowdebug}
%{_jvmdir}/%{jdkportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%if %{include_staticlibs}
%files static-libs-slowdebug
%{_jvmdir}/%{staticlibsportablearchive -- .slowdebug}
%{_jvmdir}/%{staticlibsportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
%endif
@@ -1606,27 +1712,46 @@ done
%files fastdebug
%{_jvmdir}/%{jreportablearchive -- .fastdebug}
%{_jvmdir}/%{jreportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%files devel-fastdebug
%{_jvmdir}/%{jdkportablearchive -- .fastdebug}
%{_jvmdir}/%{jdkportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%if %{include_staticlibs}
%files static-libs-fastdebug
%{_jvmdir}/%{staticlibsportablearchive -- .fastdebug}
%{_jvmdir}/%{staticlibsportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
%endif
%files sources
%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}
%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
+
+%if %{include_normal_build}
+%files docs
+%{_jvmdir}/%{docportablearchive}
+%{_jvmdir}/%{docportablearchive}.sha256sum
+
+%files misc
+%{_jvmdir}/%{miscportablearchive}
+%{_jvmdir}/%{miscportablearchive}.sha256sum
+%endif
%changelog
+* Wed Nov 22 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:11.0.21.0.9-1
+- Updated to OpenJDK 11.0.21+9 (GA)
+- adjsuted generate_source_tarball
+- removed icedtea_sync
+- dropped standalone licenses
+- added usntripped subpkg
+- added docs subpkg
+- adjsuted versions of bundled libraries
+- build refactored to several solid methods following gnu_andrew
+- Drop local backport of JDK-8243210 which is upstream from 11.0.21+2
+- Bump freetype version to 2.13.0 following JDK-8306881
+- fixed '--without release' build-ability by moving docs and misc to if-release only
+
* Thu Aug 03 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:11.0.20.0.8-1
- Update to jdk-11.0.20.0+8
- Update release notes to 11.0.20.0+8
diff --git a/jconsole.desktop.in b/jconsole.desktop.in
index 8a3b04d..c1b8f6a 100644
--- a/jconsole.desktop.in
+++ b/jconsole.desktop.in
@@ -1,10 +1 @@
-[Desktop Entry]
-Name=OpenJDK @JAVA_VER@ for @target_cpu@ Monitoring & Management Console (@OPENJDK_VER@)
-Comment=Monitor and manage OpenJDK applications
-Exec=_SDKBINDIR_/jconsole
-Icon=java-@JAVA_VER@-@JAVA_VENDOR@
-Terminal=false
-Type=Application
-StartupWMClass=sun-tools-jconsole-JConsole
-Categories=Development;Profiling;Java;
-Version=1.0
+# this file is intentionally not here, as portable builds do not have desktop integration
diff --git a/jdk8242332-rh2108712-sha3-sunpkcs11.patch b/jdk8242332-rh2108712-sha3-sunpkcs11.patch
index a6192a4..cc28540 100644
--- a/jdk8242332-rh2108712-sha3-sunpkcs11.patch
+++ b/jdk8242332-rh2108712-sha3-sunpkcs11.patch
@@ -1,11 +1,11 @@
-commit 81c2107a9188680f7c35ebc7697b292d5972436e
+commit b8711800e3cd9132ad2b195c82cf816210feb77d
Author: Andrew Hughes <gnu.andrew(a)redhat.com>
-Date: Mon Feb 27 13:22:43 2023 +0000
+Date: Thu Oct 5 03:13:01 2023 +0100
Backport 78be334c3817a1b5840922a9bf1339a40dcc5185
diff --git a/src/java.base/share/classes/sun/security/util/KnownOIDs.java b/src/java.base/share/classes/sun/security/util/KnownOIDs.java
-index 92ecb9adc0c..a5848c96aad 100644
+index b5cc3b05f1..7e235c90dd 100644
--- a/src/java.base/share/classes/sun/security/util/KnownOIDs.java
+++ b/src/java.base/share/classes/sun/security/util/KnownOIDs.java
@@ -155,6 +155,14 @@ public enum KnownOIDs {
@@ -24,7 +24,7 @@ index 92ecb9adc0c..a5848c96aad 100644
SHA3_256withRSA("2.16.840.1.101.3.4.3.14", "SHA3-256withRSA"),
SHA3_384withRSA("2.16.840.1.101.3.4.3.15", "SHA3-384withRSA"),
diff --git a/src/java.base/share/classes/sun/security/util/SignatureUtil.java b/src/java.base/share/classes/sun/security/util/SignatureUtil.java
-index 32c089fd96d..7d5c0c7e299 100644
+index 32c089fd96..7d5c0c7e29 100644
--- a/src/java.base/share/classes/sun/security/util/SignatureUtil.java
+++ b/src/java.base/share/classes/sun/security/util/SignatureUtil.java
@@ -168,4 +168,22 @@ public class SignatureUtil {
@@ -51,7 +51,7 @@ index 32c089fd96d..7d5c0c7e299 100644
+ }
}
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Digest.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Digest.java
-index 41fe61b8a16..daf0bc9f69c 100644
+index 41fe61b8a1..daf0bc9f69 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Digest.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Digest.java
@@ -1,5 +1,5 @@
@@ -93,7 +93,7 @@ index 41fe61b8a16..daf0bc9f69c 100644
break;
default:
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java
-index 926414608cb..f343e6025e1 100644
+index 926414608c..f343e6025e 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java
@@ -36,7 +36,9 @@ import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
@@ -428,7 +428,7 @@ index 926414608cb..f343e6025e1 100644
-
}
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Mac.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Mac.java
-index c88e4a6ace5..29b26651c39 100644
+index c88e4a6ace..29b26651c3 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Mac.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Mac.java
@@ -39,8 +39,9 @@ import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
@@ -465,7 +465,7 @@ index c88e4a6ace5..29b26651c39 100644
break;
case (int)CKM_SSL3_MD5_MAC:
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11PSSSignature.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11PSSSignature.java
-index 26eaa4735f1..905b6ea9562 100644
+index 1419be3754..18e00a544b 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11PSSSignature.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11PSSSignature.java
@@ -38,6 +38,7 @@ import java.security.spec.MGF1ParameterSpec;
@@ -738,7 +738,7 @@ index 26eaa4735f1..905b6ea9562 100644
// see JCA spec
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java
-index e3af106d05a..e49edf32c29 100644
+index e3af106d05..e49edf32c2 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java
@@ -51,8 +51,15 @@ import sun.security.util.KeyUtil;
@@ -970,111 +970,88 @@ index e3af106d05a..e49edf32c29 100644
// return RSASignature.decodeSignature(digestOID, signature);
// }
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
-index cf7cd19b689..7a8bcffb92c 100644
+index ffbd671246..d191831dab 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
-@@ -550,6 +550,18 @@ public final class SunPKCS11 extends AuthProvider {
- d(MD, "SHA-512/256", P11Digest,
- s("2.16.840.1.101.3.4.2.6", "OID.2.16.840.1.101.3.4.2.6"),
+@@ -546,6 +546,14 @@ public final class SunPKCS11 extends AuthProvider {
+ m(CKM_SHA512_224));
+ dA(MD, "SHA-512/256", P11Digest,
m(CKM_SHA512_256));
-+ d(MD, "SHA3-224", P11Digest,
-+ s("2.16.840.1.101.3.4.2.7", "OID.2.16.840.1.101.3.4.2.7"),
++ dA(MD, "SHA3-224", P11Digest,
+ m(CKM_SHA3_224));
-+ d(MD, "SHA3-256", P11Digest,
-+ s("2.16.840.1.101.3.4.2.8", "OID.2.16.840.1.101.3.4.2.8"),
++ dA(MD, "SHA3-256", P11Digest,
+ m(CKM_SHA3_256));
-+ d(MD, "SHA3-384", P11Digest,
-+ s("2.16.840.1.101.3.4.2.9", "OID.2.16.840.1.101.3.4.2.9"),
++ dA(MD, "SHA3-384", P11Digest,
+ m(CKM_SHA3_384));
-+ d(MD, "SHA3-512", P11Digest,
-+ s("2.16.840.1.101.3.4.2.10", "OID.2.16.840.1.101.3.4.2.10"),
++ dA(MD, "SHA3-512", P11Digest,
+ m(CKM_SHA3_512));
d(MAC, "HmacMD5", P11MAC,
m(CKM_MD5_HMAC));
-@@ -574,7 +586,18 @@ public final class SunPKCS11 extends AuthProvider {
- d(MAC, "HmacSHA512/256", P11MAC,
- s("1.2.840.113549.2.13", "OID.1.2.840.113549.2.13"),
+@@ -563,7 +571,14 @@ public final class SunPKCS11 extends AuthProvider {
+ m(CKM_SHA512_224_HMAC));
+ dA(MAC, "HmacSHA512/256", P11MAC,
m(CKM_SHA512_256_HMAC));
-
-+ d(MAC, "HmacSHA3-224", P11MAC,
-+ s("2.16.840.1.101.3.4.2.13", "OID.2.16.840.1.101.3.4.2.13"),
++ dA(MAC, "HmacSHA3-224", P11MAC,
+ m(CKM_SHA3_224_HMAC));
-+ d(MAC, "HmacSHA3-256", P11MAC,
-+ s("2.16.840.1.101.3.4.2.14", "OID.2.16.840.1.101.3.4.2.14"),
++ dA(MAC, "HmacSHA3-256", P11MAC,
+ m(CKM_SHA3_256_HMAC));
-+ d(MAC, "HmacSHA3-384", P11MAC,
-+ s("2.16.840.1.101.3.4.2.15", "OID.2.16.840.1.101.3.4.2.15"),
++ dA(MAC, "HmacSHA3-384", P11MAC,
+ m(CKM_SHA3_384_HMAC));
-+ d(MAC, "HmacSHA3-512", P11MAC,
-+ s("2.16.840.1.101.3.4.2.16", "OID.2.16.840.1.101.3.4.2.16"),
++ dA(MAC, "HmacSHA3-512", P11MAC,
+ m(CKM_SHA3_512_HMAC));
d(MAC, "SslMacMD5", P11MAC,
m(CKM_SSL3_MD5_MAC));
d(MAC, "SslMacSHA1", P11MAC,
-@@ -604,6 +627,41 @@ public final class SunPKCS11 extends AuthProvider {
+@@ -595,6 +610,30 @@ public final class SunPKCS11 extends AuthProvider {
m(CKM_BLOWFISH_KEY_GEN));
d(KG, "ChaCha20", P11KeyGenerator,
m(CKM_CHACHA20_KEY_GEN));
+ d(KG, "HmacMD5", P11KeyGenerator, // 1.3.6.1.5.5.8.1.1
+ m(CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA1", P11KeyGenerator,
-+ s("1.2.840.113549.2.7", "OID.1.2.840.113549.2.7"),
++ dA(KG, "HmacSHA1", P11KeyGenerator,
+ m(CKM_SHA_1_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA224", P11KeyGenerator,
-+ s("1.2.840.113549.2.8", "OID.1.2.840.113549.2.8"),
++ dA(KG, "HmacSHA224", P11KeyGenerator,
+ m(CKM_SHA224_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA256", P11KeyGenerator,
-+ s("1.2.840.113549.2.9", "OID.1.2.840.113549.2.9"),
++ dA(KG, "HmacSHA256", P11KeyGenerator,
+ m(CKM_SHA256_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA384", P11KeyGenerator,
-+ s("1.2.840.113549.2.10", "OID.1.2.840.113549.2.10"),
++ dA(KG, "HmacSHA384", P11KeyGenerator,
+ m(CKM_SHA384_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA512", P11KeyGenerator,
-+ s("1.2.840.113549.2.11", "OID.1.2.840.113549.2.11"),
++ dA(KG, "HmacSHA512", P11KeyGenerator,
+ m(CKM_SHA512_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA512/224", P11KeyGenerator,
-+ s("1.2.840.113549.2.12", "OID.1.2.840.113549.2.12"),
++ dA(KG, "HmacSHA512/224", P11KeyGenerator,
+ m(CKM_SHA512_224_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA512/256", P11KeyGenerator,
-+ s("1.2.840.113549.2.13", "OID.1.2.840.113549.2.13"),
++ dA(KG, "HmacSHA512/256", P11KeyGenerator,
+ m(CKM_SHA512_256_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA3-224", P11KeyGenerator,
-+ s("2.16.840.1.101.3.4.2.13", "OID.2.16.840.1.101.3.4.2.13"),
++ dA(KG, "HmacSHA3-224", P11KeyGenerator,
+ m(CKM_SHA3_224_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA3-256", P11KeyGenerator,
-+ s("2.16.840.1.101.3.4.2.14", "OID.2.16.840.1.101.3.4.2.14"),
++ dA(KG, "HmacSHA3-256", P11KeyGenerator,
+ m(CKM_SHA3_256_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA3-384", P11KeyGenerator,
-+ s("2.16.840.1.101.3.4.2.15", "OID.2.16.840.1.101.3.4.2.15"),
++ dA(KG, "HmacSHA3-384", P11KeyGenerator,
+ m(CKM_SHA3_384_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA3-512", P11KeyGenerator,
-+ s("2.16.840.1.101.3.4.2.16", "OID.2.16.840.1.101.3.4.2.16"),
++ dA(KG, "HmacSHA3-512", P11KeyGenerator,
+ m(CKM_SHA3_512_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
// register (Secret)KeyFactories if there are any mechanisms
// for a particular algorithm that we support
-@@ -747,13 +805,40 @@ public final class SunPKCS11 extends AuthProvider {
- d(SIG, "SHA512withDSA", P11Signature,
- s("2.16.840.1.101.3.4.3.4", "OID.2.16.840.1.101.3.4.3.4"),
+@@ -725,37 +764,77 @@ public final class SunPKCS11 extends AuthProvider {
+ m(CKM_DSA_SHA384));
+ dA(SIG, "SHA512withDSA", P11Signature,
m(CKM_DSA_SHA512));
-+ d(SIG, "SHA3-224withDSA", P11Signature,
-+ s("2.16.840.1.101.3.4.3.5", "OID.2.16.840.1.101.3.4.3.5"),
++ dA(SIG, "SHA3-224withDSA", P11Signature,
+ m(CKM_DSA_SHA3_224));
-+ d(SIG, "SHA3-256withDSA", P11Signature,
-+ s("2.16.840.1.101.3.4.3.6", "OID.2.16.840.1.101.3.4.3.6"),
++ dA(SIG, "SHA3-256withDSA", P11Signature,
+ m(CKM_DSA_SHA3_256));
-+ d(SIG, "SHA3-384withDSA", P11Signature,
-+ s("2.16.840.1.101.3.4.3.7", "OID.2.16.840.1.101.3.4.3.7"),
++ dA(SIG, "SHA3-384withDSA", P11Signature,
+ m(CKM_DSA_SHA3_384));
-+ d(SIG, "SHA3-512withDSA", P11Signature,
-+ s("2.16.840.1.101.3.4.3.8", "OID.2.16.840.1.101.3.4.3.8"),
++ dA(SIG, "SHA3-512withDSA", P11Signature,
+ m(CKM_DSA_SHA3_512));
d(SIG, "RawDSAinP1363Format", P11Signature,
- s("NONEwithDSAinP1363Format"),
+ List.of("NONEwithDSAinP1363Format"),
m(CKM_DSA));
d(SIG, "DSAinP1363Format", P11Signature,
- s("SHA1withDSAinP1363Format"),
+ List.of("SHA1withDSAinP1363Format"),
m(CKM_DSA_SHA1, CKM_DSA));
-
+ d(SIG, "SHA224withDSAinP1363Format", P11Signature,
@@ -1095,36 +1072,27 @@ index cf7cd19b689..7a8bcffb92c 100644
+ m(CKM_DSA_SHA3_512));
d(SIG, "NONEwithECDSA", P11Signature,
m(CKM_ECDSA));
- d(SIG, "SHA1withECDSA", P11Signature,
-@@ -761,28 +846,49 @@ public final class SunPKCS11 extends AuthProvider {
+ dA(SIG, "SHA1withECDSA", P11Signature,
m(CKM_ECDSA_SHA1, CKM_ECDSA));
- d(SIG, "SHA224withECDSA", P11Signature,
- s("1.2.840.10045.4.3.1", "OID.1.2.840.10045.4.3.1"),
+ dA(SIG, "SHA224withECDSA", P11Signature,
- m(CKM_ECDSA));
+ m(CKM_ECDSA_SHA224, CKM_ECDSA));
- d(SIG, "SHA256withECDSA", P11Signature,
- s("1.2.840.10045.4.3.2", "OID.1.2.840.10045.4.3.2"),
+ dA(SIG, "SHA256withECDSA", P11Signature,
- m(CKM_ECDSA));
+ m(CKM_ECDSA_SHA256, CKM_ECDSA));
- d(SIG, "SHA384withECDSA", P11Signature,
- s("1.2.840.10045.4.3.3", "OID.1.2.840.10045.4.3.3"),
+ dA(SIG, "SHA384withECDSA", P11Signature,
- m(CKM_ECDSA));
+ m(CKM_ECDSA_SHA384, CKM_ECDSA));
- d(SIG, "SHA512withECDSA", P11Signature,
- s("1.2.840.10045.4.3.4", "OID.1.2.840.10045.4.3.4"),
+ dA(SIG, "SHA512withECDSA", P11Signature,
- m(CKM_ECDSA));
+ m(CKM_ECDSA_SHA512, CKM_ECDSA));
-+ d(SIG, "SHA3-224withECDSA", P11Signature,
-+ s("1.2.840.10045.4.3.9", "OID.1.2.840.10045.4.3.9"),
++ dA(SIG, "SHA3-224withECDSA", P11Signature,
+ m(CKM_ECDSA_SHA3_224, CKM_ECDSA));
-+ d(SIG, "SHA3-256withECDSA", P11Signature,
-+ s("1.2.840.10045.4.3.10", "OID.1.2.840.10045.4.3.10"),
++ dA(SIG, "SHA3-256withECDSA", P11Signature,
+ m(CKM_ECDSA_SHA3_256, CKM_ECDSA));
-+ d(SIG, "SHA3-384withECDSA", P11Signature,
-+ s("1.2.840.10045.4.3.11", "OID.1.2.840.10045.4.3.11"),
++ dA(SIG, "SHA3-384withECDSA", P11Signature,
+ m(CKM_ECDSA_SHA3_384, CKM_ECDSA));
-+ d(SIG, "SHA3-512withECDSA", P11Signature,
-+ s("1.2.840.10045.4.3.12", "OID.1.2.840.10045.4.3.12"),
++ dA(SIG, "SHA3-512withECDSA", P11Signature,
+ m(CKM_ECDSA_SHA3_512, CKM_ECDSA));
d(SIG, "NONEwithECDSAinP1363Format", P11Signature,
m(CKM_ECDSA));
@@ -1151,29 +1119,25 @@ index cf7cd19b689..7a8bcffb92c 100644
+ d(SIG, "SHA3-512withECDSAinP1363Format", P11Signature,
+ m(CKM_ECDSA_SHA3_512, CKM_ECDSA));
+
- d(SIG, "MD2withRSA", P11Signature,
- s("1.2.840.113549.1.1.2", "OID.1.2.840.113549.1.1.2"),
+ dA(SIG, "MD2withRSA", P11Signature,
m(CKM_MD2_RSA_PKCS, CKM_RSA_PKCS, CKM_RSA_X_509));
-@@ -805,6 +911,18 @@ public final class SunPKCS11 extends AuthProvider {
- d(SIG, "SHA512withRSA", P11Signature,
- s("1.2.840.113549.1.1.13", "OID.1.2.840.113549.1.1.13"),
+ dA(SIG, "MD5withRSA", P11Signature,
+@@ -770,6 +849,14 @@ public final class SunPKCS11 extends AuthProvider {
+ m(CKM_SHA384_RSA_PKCS, CKM_RSA_PKCS, CKM_RSA_X_509));
+ dA(SIG, "SHA512withRSA", P11Signature,
m(CKM_SHA512_RSA_PKCS, CKM_RSA_PKCS, CKM_RSA_X_509));
-+ d(SIG, "SHA3-224withRSA", P11Signature,
-+ s("2.16.840.1.101.3.4.3.13", "OID.2.16.840.1.101.3.4.3.13"),
++ dA(SIG, "SHA3-224withRSA", P11Signature,
+ m(CKM_SHA3_224_RSA_PKCS, CKM_RSA_PKCS, CKM_RSA_X_509));
-+ d(SIG, "SHA3-256withRSA", P11Signature,
-+ s("2.16.840.1.101.3.4.3.14", "OID.2.16.840.1.101.3.4.3.14"),
++ dA(SIG, "SHA3-256withRSA", P11Signature,
+ m(CKM_SHA3_256_RSA_PKCS, CKM_RSA_PKCS, CKM_RSA_X_509));
-+ d(SIG, "SHA3-384withRSA", P11Signature,
-+ s("2.16.840.1.101.3.4.3.15", "OID.2.16.840.1.101.3.4.3.15"),
++ dA(SIG, "SHA3-384withRSA", P11Signature,
+ m(CKM_SHA3_384_RSA_PKCS, CKM_RSA_PKCS, CKM_RSA_X_509));
-+ d(SIG, "SHA3-512withRSA", P11Signature,
-+ s("2.16.840.1.101.3.4.3.16", "OID.2.16.840.1.101.3.4.3.16"),
++ dA(SIG, "SHA3-512withRSA", P11Signature,
+ m(CKM_SHA3_512_RSA_PKCS, CKM_RSA_PKCS, CKM_RSA_X_509));
- d(SIG, "RSASSA-PSS", P11PSSSignature,
- s("1.2.840.113549.1.1.10", "OID.1.2.840.113549.1.1.10"),
+ dA(SIG, "RSASSA-PSS", P11PSSSignature,
m(CKM_RSA_PKCS_PSS));
-@@ -818,6 +936,14 @@ public final class SunPKCS11 extends AuthProvider {
+ d(SIG, "SHA1withRSASSA-PSS", P11PSSSignature,
+@@ -782,6 +869,14 @@ public final class SunPKCS11 extends AuthProvider {
m(CKM_SHA384_RSA_PKCS_PSS));
d(SIG, "SHA512withRSASSA-PSS", P11PSSSignature,
m(CKM_SHA512_RSA_PKCS_PSS));
@@ -1189,7 +1153,7 @@ index cf7cd19b689..7a8bcffb92c 100644
d(KG, "SunTlsRsaPremasterSecret",
"sun.security.pkcs11.P11TlsRsaPremasterSecretGenerator",
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java
-index e077943bbc2..cb04b95304d 100644
+index e077943bbc..cb04b95304 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java
@@ -1,5 +1,5 @@
@@ -1215,7 +1179,7 @@ index e077943bbc2..cb04b95304d 100644
diff --git a/test/jdk/sun/security/pkcs11/KeyGenerator/HmacDefKeySizeTest.java b/test/jdk/sun/security/pkcs11/KeyGenerator/HmacDefKeySizeTest.java
new file mode 100644
-index 00000000000..d6707028d96
+index 0000000000..d6707028d9
--- /dev/null
+++ b/test/jdk/sun/security/pkcs11/KeyGenerator/HmacDefKeySizeTest.java
@@ -0,0 +1,84 @@
@@ -1304,7 +1268,7 @@ index 00000000000..d6707028d96
+ }
+}
diff --git a/test/jdk/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java b/test/jdk/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java
-index b61d10beece..78b7d857e8e 100644
+index b61d10beec..78b7d857e8 100644
--- a/test/jdk/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java
+++ b/test/jdk/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java
@@ -23,7 +23,7 @@
@@ -1336,7 +1300,7 @@ index b61d10beece..78b7d857e8e 100644
test("ARCFOUR", 1024, p, TestResult.TBD);
} else if (p.getName().equals("SunPKCS11-NSS")) {
diff --git a/test/jdk/sun/security/pkcs11/Mac/MacSameTest.java b/test/jdk/sun/security/pkcs11/Mac/MacSameTest.java
-index 59af327c1f2..64c42a6dd06 100644
+index 59af327c1f..64c42a6dd0 100644
--- a/test/jdk/sun/security/pkcs11/Mac/MacSameTest.java
+++ b/test/jdk/sun/security/pkcs11/Mac/MacSameTest.java
@@ -23,7 +23,7 @@
@@ -1421,7 +1385,7 @@ index 59af327c1f2..64c42a6dd06 100644
mac.reset();
diff --git a/test/jdk/sun/security/pkcs11/Mac/ReinitMac.java b/test/jdk/sun/security/pkcs11/Mac/ReinitMac.java
-index 5cad8859840..7e045232e3a 100644
+index 5cad885984..7e045232e3 100644
--- a/test/jdk/sun/security/pkcs11/Mac/ReinitMac.java
+++ b/test/jdk/sun/security/pkcs11/Mac/ReinitMac.java
@@ -1,5 +1,5 @@
@@ -1514,7 +1478,7 @@ index 5cad8859840..7e045232e3a 100644
}
}
diff --git a/test/jdk/sun/security/pkcs11/MessageDigest/ByteBuffers.java b/test/jdk/sun/security/pkcs11/MessageDigest/ByteBuffers.java
-index 7ced00630cc..a7a72e8ea3d 100644
+index 7ced00630c..a7a72e8ea3 100644
--- a/test/jdk/sun/security/pkcs11/MessageDigest/ByteBuffers.java
+++ b/test/jdk/sun/security/pkcs11/MessageDigest/ByteBuffers.java
@@ -1,5 +1,5 @@
@@ -1574,7 +1538,7 @@ index 7ced00630cc..a7a72e8ea3d 100644
byte[] d1 = md.digest(data);
diff --git a/test/jdk/sun/security/pkcs11/MessageDigest/ReinitDigest.java b/test/jdk/sun/security/pkcs11/MessageDigest/ReinitDigest.java
-index ea7909bc397..268f698276b 100644
+index ea7909bc39..268f698276 100644
--- a/test/jdk/sun/security/pkcs11/MessageDigest/ReinitDigest.java
+++ b/test/jdk/sun/security/pkcs11/MessageDigest/ReinitDigest.java
@@ -1,5 +1,5 @@
@@ -1655,7 +1619,7 @@ index ea7909bc397..268f698276b 100644
private static void check(byte[] d1, byte[] d2) throws Exception {
diff --git a/test/jdk/sun/security/pkcs11/MessageDigest/TestCloning.java b/test/jdk/sun/security/pkcs11/MessageDigest/TestCloning.java
-index b931c8564b2..ace601c7233 100644
+index b931c8564b..ace601c723 100644
--- a/test/jdk/sun/security/pkcs11/MessageDigest/TestCloning.java
+++ b/test/jdk/sun/security/pkcs11/MessageDigest/TestCloning.java
@@ -1,5 +1,5 @@
@@ -1744,7 +1708,7 @@ index b931c8564b2..ace601c7233 100644
MessageDigest mdCopy0 = (MessageDigest) mdObj.clone();
diff --git a/test/jdk/sun/security/pkcs11/Signature/ByteBuffers.java b/test/jdk/sun/security/pkcs11/Signature/ByteBuffers.java
-index 26eeacffed9..f5de994779c 100644
+index 26eeacffed..f5de994779 100644
--- a/test/jdk/sun/security/pkcs11/Signature/ByteBuffers.java
+++ b/test/jdk/sun/security/pkcs11/Signature/ByteBuffers.java
@@ -23,7 +23,7 @@
@@ -1770,7 +1734,7 @@ index 26eeacffed9..f5de994779c 100644
sig.update(t);
byte[] signature = sig.sign();
diff --git a/test/jdk/sun/security/pkcs11/Signature/InitAgainPSS.java b/test/jdk/sun/security/pkcs11/Signature/InitAgainPSS.java
-index ccd66599fb0..a2fa7294977 100644
+index ccd66599fb..a2fa729497 100644
--- a/test/jdk/sun/security/pkcs11/Signature/InitAgainPSS.java
+++ b/test/jdk/sun/security/pkcs11/Signature/InitAgainPSS.java
@@ -1,5 +1,5 @@
@@ -1816,7 +1780,7 @@ index ccd66599fb0..a2fa7294977 100644
PSSParameterSpec params = new PSSParameterSpec("SHA-256", "MGF1",
new MGF1ParameterSpec("SHA-256"), 32,
diff --git a/test/jdk/sun/security/pkcs11/Signature/KeyAndParamCheckForPSS.java b/test/jdk/sun/security/pkcs11/Signature/KeyAndParamCheckForPSS.java
-index 2e4fedbf1d5..f1c0492b5fc 100644
+index 2e4fedbf1d..f1c0492b5f 100644
--- a/test/jdk/sun/security/pkcs11/Signature/KeyAndParamCheckForPSS.java
+++ b/test/jdk/sun/security/pkcs11/Signature/KeyAndParamCheckForPSS.java
@@ -1,5 +1,5 @@
@@ -1910,7 +1874,7 @@ index 2e4fedbf1d5..f1c0492b5fc 100644
System.out.println("test#4: pass");
}
diff --git a/test/jdk/sun/security/pkcs11/Signature/ReinitSignature.java b/test/jdk/sun/security/pkcs11/Signature/ReinitSignature.java
-index 42ca7fa203d..8c132ca7e4f 100644
+index 42ca7fa203..8c132ca7e4 100644
--- a/test/jdk/sun/security/pkcs11/Signature/ReinitSignature.java
+++ b/test/jdk/sun/security/pkcs11/Signature/ReinitSignature.java
@@ -23,312 +23,13 @@
@@ -2242,7 +2206,7 @@ index 42ca7fa203d..8c132ca7e4f 100644
new Random().nextBytes(data);
sig.initSign(privateKey);
diff --git a/test/jdk/sun/security/pkcs11/Signature/SigInteropPSS.java b/test/jdk/sun/security/pkcs11/Signature/SigInteropPSS.java
-index 3c3edb5aa6a..11147022771 100644
+index 3c3edb5aa6..1114702277 100644
--- a/test/jdk/sun/security/pkcs11/Signature/SigInteropPSS.java
+++ b/test/jdk/sun/security/pkcs11/Signature/SigInteropPSS.java
@@ -1,5 +1,5 @@
@@ -2263,7 +2227,7 @@ index 3c3edb5aa6a..11147022771 100644
* @library /test/lib ..
diff --git a/test/jdk/sun/security/pkcs11/Signature/SigInteropPSS2.java b/test/jdk/sun/security/pkcs11/Signature/SigInteropPSS2.java
new file mode 100644
-index 00000000000..b8ea9863327
+index 0000000000..b8ea986332
--- /dev/null
+++ b/test/jdk/sun/security/pkcs11/Signature/SigInteropPSS2.java
@@ -0,0 +1,98 @@
@@ -2366,7 +2330,7 @@ index 00000000000..b8ea9863327
+ }
+}
diff --git a/test/jdk/sun/security/pkcs11/Signature/SignatureTestPSS.java b/test/jdk/sun/security/pkcs11/Signature/SignatureTestPSS.java
-index 3a6dbe345e9..4c1f7284bbc 100644
+index 3a6dbe345e..4c1f7284bb 100644
--- a/test/jdk/sun/security/pkcs11/Signature/SignatureTestPSS.java
+++ b/test/jdk/sun/security/pkcs11/Signature/SignatureTestPSS.java
@@ -1,5 +1,5 @@
@@ -2424,7 +2388,7 @@ index 3a6dbe345e9..4c1f7284bbc 100644
hash, "MGF1", new MGF1ParameterSpec(mgfHash), 0, 1);
diff --git a/test/jdk/sun/security/pkcs11/Signature/SignatureTestPSS2.java b/test/jdk/sun/security/pkcs11/Signature/SignatureTestPSS2.java
new file mode 100644
-index 00000000000..516b17972e5
+index 0000000000..516b17972e
--- /dev/null
+++ b/test/jdk/sun/security/pkcs11/Signature/SignatureTestPSS2.java
@@ -0,0 +1,140 @@
@@ -2569,7 +2533,7 @@ index 00000000000..516b17972e5
+ }
+}
diff --git a/test/jdk/sun/security/pkcs11/Signature/TestDSA2.java b/test/jdk/sun/security/pkcs11/Signature/TestDSA2.java
-index 222f8a2a5ed..3161de6fc50 100644
+index 222f8a2a5e..3161de6fc5 100644
--- a/test/jdk/sun/security/pkcs11/Signature/TestDSA2.java
+++ b/test/jdk/sun/security/pkcs11/Signature/TestDSA2.java
@@ -1,5 +1,5 @@
@@ -2664,7 +2628,7 @@ index 222f8a2a5ed..3161de6fc50 100644
}
}
diff --git a/test/jdk/sun/security/pkcs11/Signature/TestRSAKeyLength.java b/test/jdk/sun/security/pkcs11/Signature/TestRSAKeyLength.java
-index f469ca17b65..7e5a012a5ec 100644
+index f469ca17b6..7e5a012a5e 100644
--- a/test/jdk/sun/security/pkcs11/Signature/TestRSAKeyLength.java
+++ b/test/jdk/sun/security/pkcs11/Signature/TestRSAKeyLength.java
@@ -22,8 +22,8 @@
@@ -2697,7 +2661,7 @@ index f469ca17b65..7e5a012a5ec 100644
kpg.initialize(512);
KeyPair kp = kpg.generateKeyPair();
diff --git a/test/jdk/sun/security/pkcs11/nss/p11-nss.txt b/test/jdk/sun/security/pkcs11/nss/p11-nss.txt
-index 49778ea954c..576b1dc4d69 100644
+index 49778ea954..576b1dc4d6 100644
--- a/test/jdk/sun/security/pkcs11/nss/p11-nss.txt
+++ b/test/jdk/sun/security/pkcs11/nss/p11-nss.txt
@@ -11,12 +11,23 @@ library = ${pkcs11test.nss.lib}
diff --git a/jdk8271148-external_doesnt_produce_debuginfo.patch b/jdk8271148-external_doesnt_produce_debuginfo.patch
deleted file mode 100644
index 7eed447..0000000
--- a/jdk8271148-external_doesnt_produce_debuginfo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e2d6aaa1a809c0d49d599812440777549fc36ea4 Mon Sep 17 00:00:00 2001
-From: Severin Gehwolf <sgehwolf(a)redhat.com>
-Date: Thu, 22 Jul 2021 18:30:22 +0200
-Subject: [PATCH] Backport JDK-8271148
-
----
- make/common/NativeCompilation.gmk | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
-index 490a7f4c7fb..2e3b5dd5eca 100644
---- a/make/common/NativeCompilation.gmk
-+++ b/make/common/NativeCompilation.gmk
-@@ -544,15 +544,6 @@ define SetupNativeCompilationBody
- # jmods.
- $1_OBJECT_DIR := $$($1_OBJECT_DIR)/static
- $1_OUTPUT_DIR := $$($1_OBJECT_DIR)
-- # For release builds where debug symbols are configured to be moved to
-- # separate debuginfo files, disable debug symbols for static libs instead.
-- # We don't currently support this configuration and we don't want symbol
-- # information in release builds unless explicitly asked to provide it.
-- ifeq ($(DEBUG_LEVEL), release)
-- ifeq ($(COPY_DEBUG_SYMBOLS), true)
-- $1_COMPILE_WITH_DEBUG_SYMBOLS := false
-- endif
-- endif
- endif
-
- ifeq ($$($1_TYPE), EXECUTABLE)
---
-2.31.1
-
diff --git a/jdk8312489-max_sig_default_increase.patch b/jdk8312489-max_sig_default_increase.patch
new file mode 100644
index 0000000..e0c4eeb
--- /dev/null
+++ b/jdk8312489-max_sig_default_increase.patch
@@ -0,0 +1,50 @@
+commit 50074a04e62f91faa080b831d9ce343396ead252
+Author: Andrew John Hughes <andrew(a)openjdk.org>
+Date: Tue Sep 5 20:48:42 2023 +0000
+
+ 8312489: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar
+
+ Backport-of: e47a84f23dd2608c6f5748093eefe301fb5bf750
+
+diff --git a/src/java.base/share/classes/java/util/jar/JarFile.java b/src/java.base/share/classes/java/util/jar/JarFile.java
+index cb7e308e0d..cce897c0d3 100644
+--- a/src/java.base/share/classes/java/util/jar/JarFile.java
++++ b/src/java.base/share/classes/java/util/jar/JarFile.java
+@@ -809,7 +809,9 @@ class JarFile extends ZipFile {
+ throw new IOException("Unsupported size: " + uncompressedSize +
+ " for JarEntry " + ze.getName() +
+ ". Allowed max size: " +
+- SignatureFileVerifier.MAX_SIG_FILE_SIZE + " bytes");
++ SignatureFileVerifier.MAX_SIG_FILE_SIZE + " bytes. " +
++ "You can use the jdk.jar.maxSignatureFileSize " +
++ "system property to increase the default value.");
+ }
+ int len = (int)uncompressedSize;
+ int bytesRead;
+diff --git a/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
+index cb477fc134..a766b8249f 100644
+--- a/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
++++ b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
+@@ -852,16 +852,16 @@ public class SignatureFileVerifier {
+ * the maximum allowed number of bytes for the signature-related files
+ * in a JAR file.
+ */
+- Integer tmp = GetIntegerAction.privilegedGetProperty(
+- "jdk.jar.maxSignatureFileSize", 8000000);
++ int tmp = GetIntegerAction.privilegedGetProperty(
++ "jdk.jar.maxSignatureFileSize", 16000000);
+ if (tmp < 0 || tmp > MAX_ARRAY_SIZE) {
+ if (debug != null) {
+- debug.println("Default signature file size 8000000 bytes " +
+- "is used as the specified size for the " +
+- "jdk.jar.maxSignatureFileSize system property " +
++ debug.println("The default signature file size of 16000000 bytes " +
++ "will be used for the jdk.jar.maxSignatureFileSize " +
++ "system property since the specified value " +
+ "is out of range: " + tmp);
+ }
+- tmp = 8000000;
++ tmp = 16000000;
+ }
+ return tmp;
+ }
diff --git a/openjdk_news.sh b/openjdk_news.sh
index 560b356..386aa53 100755
--- a/openjdk_news.sh
+++ b/openjdk_news.sh
@@ -18,8 +18,8 @@
OLD_RELEASE=$1
NEW_RELEASE=$2
-SUBDIR=$3
-REPO=$4
+REPO=$3
+SUBDIR=$4
SCRIPT_DIR=$(dirname ${0})
if test "x${SUBDIR}" = "x"; then
diff --git a/remove-intree-libraries.sh b/remove-intree-libraries.sh
index ee02f60..25c2fc8 100644
--- a/remove-intree-libraries.sh
+++ b/remove-intree-libraries.sh
@@ -162,5 +162,3 @@ rm -vf ${LCMS_SRC}/cmsxform.c
rm -vf ${LCMS_SRC}/lcms2.h
rm -vf ${LCMS_SRC}/lcms2_internal.h
rm -vf ${LCMS_SRC}/lcms2_plugin.h
-
-
diff --git a/sources b/sources
index b289e5b..7c58d0e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openjdk-jdk11u-jdk-11.0.20+8.tar.xz) = c518d6c58d2644a34406d7867befe05457b81841e1ff376eb5f80e6b92f9799f921668b133c59008cbb6aa47f7ec9618de14f6848f827c3cbe1b630e000f9105
+SHA512 (openjdk-jdk11u-jdk-11.0.21+9.tar.xz) = 7435bd1b6196f965985fee1aed06eebb97e89fe90d3bd846ffe9cf8451e1d0c7bdedcba373e0d128f9c74fcaf111ddab030efcb032e88f9306a81569aba29ace
diff --git a/update_package.sh b/update_package.sh
index 9831993..09d9504 100644
--- a/update_package.sh
+++ b/update_package.sh
@@ -1,42 +1 @@
-#!/bin/bash -x
-# this file contains defaults for currently generated source tarballs
-
-set -e
-
-# OpenJDK from Shenandoah project
-export PROJECT_NAME="shenandoah"
-export REPO_NAME="jdk11"
-# warning, clonning without shenadnaoh prefix, you will clone pure jdk - thus without shenandaoh GC
-export VERSION="shenandoah-jdk-11.0.3+7"
-export COMPRESSION=xz
-# unset tapsets overrides
-export OPENJDK_URL=""
-export TO_COMPRESS=""
-# warning, filename and filenameroot creation is duplicated here from generate_source_tarball.sh
-export FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
-FILENAME=${FILE_NAME_ROOT}.tar.${COMPRESSION}
-
-if [ ! -f ${FILENAME} ] ; then
-echo "Generating ${FILENAME}"
- sh ./generate_source_tarball.sh
-else
- echo "exists exists exists exists exists exists exists "
- echo "reusing reusing reusing reusing reusing reusing "
- echo ${FILENAME}
-fi
-
-set +e
-
-major=`echo $REPO_NAME | sed 's/[a-zA-Z]*//g'`
-build=`echo $VERSION | sed 's/.*+//g'`
-name_helper=`echo $FILENAME | sed s/$major/'%{majorver}'/g `
-name_helper=`echo $name_helper | sed s/$build/'%{buildver}'/g `
-echo "align specfile acordingly:"
-echo " sed 's/^Source0:.*/Source0: $name_helper/' -i *.spec"
-echo " sed 's/^Source8:.*/Source8: $TAPSET/' -i *.spec"
-echo " sed 's/^%global buildver.*/%global buildver $build/' -i *.spec"
-echo " sed 's/Release:.*/Release: 1%{?dist}/' -i *.spec"
-echo "and maybe others...."
-echo "you should fedpkg/rhpkg new-sources $TAPSET $FILENAME"
-echo "you should fedpkg/rhpkg prep --arch XXXX on all architectures: x86_64 i386 i586 i686 ppc ppc64 ppc64le s390 s390x aarch64 armv7hl"
-
+# this file is intentionally not use din portables, use tarball from main rpms
1
0
Architecture specific change in rpms/java-11-openjdk-portable.git
by githook-noreply＠fedoraproject.org 30 Nov '23
by githook-noreply＠fedoraproject.org 30 Nov '23
30 Nov '23
The package rpms/java-11-openjdk-portable.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-11-openjdk-portable.git/commit….
Change:
+%ifarch %{gdb_arches}
Thanks.
Full change:
============
commit dd97e2b708b53c8ad9011ad0172daeddc37f6066
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Wed Nov 29 18:06:03 2023 +0100
Fixed doc and misc name macro
diff --git a/java-11-openjdk-portable.spec b/java-11-openjdk-portable.spec
index 986cd5f..88ec160 100644
--- a/java-11-openjdk-portable.spec
+++ b/java-11-openjdk-portable.spec
@@ -469,12 +469,11 @@
# Intentionally use jdkportablenameimpl here since we want to have static-libs files overlayed on
# top of the JDK archive
%define staticlibsportablename() %{expand:%{jdkportablenameimpl -- %%{1}}}
-%define docportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable.docs;g")
+%define docportablename() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable.docs;g" | sed "s;openjdkportable;el;g")
%define docportablearchive() %{docportablename}.tar.xz
-%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable.misc;g")
+%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable.misc;g" | sed "s;openjdkportable;el;g")
%define miscportablearchive() %{miscportablename}.tar.xz
-
# RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1}
# so we have to pass in "" but evaluate it, otherwise files record will include it
%define jreportablearchiveForFiles() %(echo %{jreportablearchive -- ""})
@@ -1299,8 +1298,6 @@ function packagejdk() {
mkdir -p ${packagesdir}
pushd ${imagesdir}
- echo "Packaging build from ${imagesdir} to ${packagesdir}..."
-
if [ "x$suffix" = "x" ] ; then
nameSuffix=""
else
commit 138da70acb492bff9e4f0777f4216c3f93b0603f
Author: Jiri <jvanek(a)redhat.com>
Date: Wed Nov 29 11:08:00 2023 +0100
Updated to OpenJDK 11.0.21+9 (GA)
- adjsuted generate_source_tarball
- removed icedtea_sync
- dropped standalone licenses
- added usntripped subpkg
- added docs subpkg
- adjsuted versions of bundled libraries
- build refactored to several solid methods following gnu_andrew
- Drop local backport of JDK-8243210 which is upstream from 11.0.21+2
- Bump freetype version to 2.13.0 following JDK-8306881
- fixed '--without release' build-ability by moving docs and misc to if-release only
diff --git a/.gitignore b/.gitignore
index 0a19a08..1aa9a04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -114,3 +114,4 @@
/openjdk-jdk11u-jdk-11.0.19+7-4curve.tar.xz
/openjdk-jdk11u-jdk-11.0.19+7.tar.xz
/openjdk-jdk11u-jdk-11.0.20+8.tar.xz
+/openjdk-jdk11u-jdk-11.0.21+9.tar.xz
diff --git a/NEWS b/NEWS
index 04b170f..b99b7c6 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,308 @@ Key:
JDK-X - https://bugs.openjdk.java.net/browse/JDK-X
CVE-XXXX-YYYY: https://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
+New in release OpenJDK 11.0.21 (2023-10-17):
+============================================
+Live versions of these release notes can be found at:
+ * https://bit.ly/openjdk11021
+
+* CVEs
+ - CVE-2023-22081
+* Security fixes
+ - JDK-8286503, JDK-8312367: Enhance security classes
+ - JDK-8296581: Better system proxy support
+ - JDK-8297856: Improve handling of Bidi characters
+ - JDK-8305815, JDK-8307278: Update Libpng to 1.6.39
+ - JDK-8306881, JDK-8307286: Update FreeType to 2.13.0
+ - JDK-8309966: Enhanced TLS connections
+* Other changes
+ - JDK-6176679: Application freezes when copying an animated gif image to the system clipboard
+ - JDK-8023980: JCE doesn't provide any class to handle RSA private key in PKCS#1
+ - JDK-8155246: Throw error if default java.security file is missing
+ - JDK-8158880: test/java/time/tck/java/time/format/TCKDateTimeFormatterBuilder.java fail with zh_CN locale
+ - JDK-8168261: Use server cipher suites preference by default
+ - JDK-8181383: com/sun/jdi/OptionTest.java fails intermittently with bind failed: Address already in use
+ - JDK-8201516: DebugNonSafepoints generates incorrect information
+ - JDK-8209398: sun/security/pkcs11/KeyStore/SecretKeysBasic.sh failed with "PKCS11Exception: CKR_ATTRIBUTE_SENSITIVE"
+ - JDK-8211343: nsk_jvmti_parseoptions should handle multiple suboptions
+ - JDK-8212045: Add back the tests that were removed from HashesTest.java and AddExportsTest.java
+ - JDK-8216059: nsk_jvmti_parseoptions still has dependency on tilde separator
+ - JDK-8217237: HttpClient does not deal well with multi-valued WWW-Authenticate challenge headers
+ - JDK-8217395: Update langtools shell tests to use ${EXE_SUFFIX}
+ - JDK-8217612: (CL)HSDB cannot show some JVM flags
+ - JDK-8217850: CompressedClassSpaceSizeInJmapHeap fails after JDK-8217612
+ - JDK-8218471: generate-unsafe-access-tests.sh does not correctly invoke build.tools.spp.Spp
+ - JDK-8219628: [TESTBUG] javadoc/doclet/InheritDocForUserTags fails with -othervm
+ - JDK-8220410: sun/security/tools/jarsigner/warnings/NoTimestampTest.java failed with missing expected output
+ - JDK-8221372: Test vmTestbase/nsk/jvmti/GetThreadState/thrstat001/TestDescription.java times out
+ - JDK-8222323: ChildAlwaysOnTopTest.java fails with "RuntimeException: Failed to unset alwaysOnTop"
+ - JDK-8223573: Replace wildcard address with loopback or local host in tests - part 4
+ - JDK-8223714: HTTPSetAuthenticatorTest could be made more resilient
+ - JDK-8223783: sun/net/www/http/HttpClient/MultiThreadTest.java sometimes detect threads+1 connections
+ - JDK-8223856: Replace wildcard address with loopback or local host in tests - part 8
+ - JDK-8224617: (fs) java/nio/file/FileStore/Basic.java found filesystem twice
+ - JDK-8224729: Cleanups in sun/security/provider/certpath/ldap/LDAPCertStoreImpl.java
+ - JDK-8224768: Test ActalisCA.java fails
+ - JDK-8225012: sanity/client/SwingSet/src/ToolTipDemoTest.java fails on Windows
+ - JDK-8226221: Update PKCS11 tests to use NSS 3.46 libs
+ - JDK-8228341: SignTwice.java fails intermittently on Windows
+ - JDK-8228403: SignTwice.java failed with java.io.FileNotFoundException: File name too long
+ - JDK-8229147: Linux os::create_thread() overcounts guardpage size with newer glibc (>=2.27)
+ - JDK-8229333: java/io/File/SetLastModified.java timed out
+ - JDK-8229338: clean up test/jdk/java/util/RandomAccess/Basic.java
+ - JDK-8229348: java/net/DatagramSocket/UnreferencedDatagramSockets.java fails intermittently
+ - JDK-8229481: sun/net/www/protocol/https/ChunkedOutputStream.java failed with a SSLException
+ - JDK-8229912: [TESTBUG] java/net/Socks/SocksIPv6Test fails without IPv6
+ - JDK-8230132: java/net/NetworkInterface/NetworkInterfaceRetrievalTests.java to skip Teredo Tunneling Pseudo-Interface
+ - JDK-8231037: java/net/InetAddress/ptr/Lookup.java fails intermittently due to reverse lookup failed
+ - JDK-8231357: sun/security/pkcs11/Cipher/TestKATForGCM.java fails on SLES11 using mozilla-nss-3.14
+ - JDK-8231516: network QuickAckTest.java failed due to "SocketException: maximum number of DatagramSockets reached"
+ - JDK-8232101: (sctp) Add minimal sanity tests for SCTP
+ - JDK-8232195: Enable BigInteger tests: DivisionOverflow, SymmetricRangeTests and StringConstructorOverflow
+ - JDK-8232840: java/math/BigInteger/largeMemory/SymmetricRangeTests.java fails due to "OutOfMemoryError: Requested array size exceeds VM limit"
+ - JDK-8232922: Add java/math/BigInteger/largeMemory/SymmetricRangeTests.java to ProblemList-Xcomp
+ - JDK-8234808: jdb quoted option parsing broken
+ - JDK-8236045: [TESTBUG] MismatchedWhiteBox test fails with missing WhiteBox$WhiteBoxPermission.class
+ - JDK-8237183: Bug ID missing for test in patch which fixed JDK-8230665
+ - JDK-8238157: security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java test failures because of revocation date
+ - JDK-8239007: java/math/BigInteger/largeMemory/ tests should be disabled on 32-bit platforms
+ - JDK-8239264: Clearup the legacy ObjectIdentifier constructor from int array
+ - JDK-8239333: Mark test AmazonCA.java with intermittent key
+ - JDK-8239537: cgroup MetricsTester testMemorySubsystem fails sometimes when testing memory.kmem.tcp.usage_in_bytes
+ - JDK-8240193: loadLibrary("osxsecurity") should not be removed
+ - JDK-8241097: java/math/BigInteger/largeMemory/SymmetricRangeTests.java requires -XX:+CompactStrings
+ - JDK-8242151: Improve OID mapping and reuse among JDK security providers for aliases registration
+ - JDK-8242330: Arrays should be cloned in several JAAS Callback classes
+ - JDK-8242897: KeyFactory.generatePublic( x509Spec ) failed with java.security.InvalidKeyException
+ - JDK-8243210: ClhsdbScanOops fails with NullPointerException in FileMapHeader.inCopiedVtableSpace
+ - JDK-8244078: ProcessTools executeTestJvm and createJavaProcessBuilder have inconsistent handling of test.*.opts
+ - JDK-8247895: SHA1PRNGReseed.java is calling setSeed(0)
+ - JDK-8247968: test/jdk/javax/crypto/SecretKeyFactory/security.properties has wrong header
+ - JDK-8248001: javadoc generates invalid HTML pages whose ftp:// links are broken
+ - JDK-8249699: java/io/ByteArrayOutputStream/MaxCapacity.java should use @requires instead of @ignore
+ - JDK-8251517: [TESTBUG] com/sun/net/httpserver/bugs/B6393710.java does not scale socket timeout
+ - JDK-8252530: Fix inconsistencies in hotspot whitebox
+ - JDK-8254350: CompletableFuture.get may swallow InterruptedException
+ - JDK-8255348: NPE in PKIXCertPathValidator event logging code
+ - JDK-8257993: vmTestbase/nsk/jvmti/RedefineClasses/StressRedefine/TestDescription.java crash intermittently
+ - JDK-8259796: timed CompletableFuture.get may swallow InterruptedException
+ - JDK-8260274: Cipher.init(int, key) does not use highest priority provider for random bytes
+ - JDK-8260878: com/sun/jdi/JdbOptions.java fails without jfr
+ - JDK-8260934: java/lang/StringBuilder/HugeCapacity.java fails without Compact Strings
+ - JDK-8263970: Manual test javax/swing/JTextField/JapaneseReadingAttributes/JapaneseReadingAttributes.java failed
+ - JDK-8265980: Fix systemDictionary and loaderConstraints printing
+ - JDK-8268457: XML Transformer outputs Unicode supplementary character incorrectly to HTML
+ - JDK-8268464: Remove dependancy of TestHttpsServer, HttpTransaction, HttpCallback from open/test/jdk/sun/net/www/protocol/https/ tests
+ - JDK-8269091: javax/sound/sampled/Clip/SetPositionHang.java failed with ArrayIndexOutOfBoundsException: Array index out of range: -4
+ - JDK-8270331: [TESTBUG] Error: Not a test or directory containing tests: java/awt/print/PrinterJob/InitToBlack.java
+ - JDK-8271838: AmazonCA.java interop test fails
+ - JDK-8273807: Zero: Drop incorrect test block from compiler/startup/NumCompilerThreadsCheck.java
+ - JDK-8274205: Handle KDC_ERR_SVC_UNAVAILABLE error code from KDC
+ - JDK-8274606: Fix jaxp/javax/xml/jaxp/unittest/transform/SurrogateTest.java test
+ - JDK-8275234: java/awt/GraphicsDevice/DisplayModes/CycleDMImage.java is entered twice in ProblemList
+ - JDK-8275303: sun/java2d/pipe/InterpolationQualityTest.java fails with D3D basic render driver
+ - JDK-8276651: java/lang/ProcessHandle tests fail with "RuntimeException: Input/output error" in java.lang.ProcessHandleImpl$Info.info0
+ - JDK-8277353: java/security/MessageDigest/ThreadSafetyTest.java test times out
+ - JDK-8279536: jdk/nio/zipfs/ZipFSOutputStreamTest.java timed out
+ - JDK-8283756: (zipfs) ZipFSOutputStreamTest.testOutputStream should only check inflated bytes
+ - JDK-8284524: Create an automated test for JDK-4422362
+ - JDK-8284767: Create an automated test for JDK-4422535
+ - JDK-8284772: GHA: Use GCC Major Version Dependencies Only
+ - JDK-8284910: Buffer clean in PasswordCallback
+ - JDK-8285635: javax/swing/JRootPane/DefaultButtonTest.java failed with Default Button not pressed for L&F: com.sun.java.swing.plaf.motif.MotifLookAndFeel
+ - JDK-8286172: Create an automated test for JDK-4516019
+ - JDK-8286481: Exception printed to stdout on Windows when storing transparent image in clipboard
+ - JDK-8286620: Create regression test for verifying setMargin() of JRadioButton
+ - JDK-8289508: Improve test coverage for XPath Axes: ancestor, ancestor-or-self, preceding, and preceding-sibling
+ - JDK-8289748: C2 compiled code crashes with SIGFPE with -XX:+StressLCM and -XX:+StressGCM
+ - JDK-8291444: GHA builds/tests won't run manually if disabled from automatic running
+ - JDK-8291830: jvmti/RedefineClasses/StressRedefine failed: assert(!is_null(v)) failed: narrow klass value can never be zero
+ - JDK-8292033: Move jdk.X509Certificate event logic to JCA layer
+ - JDK-8292297: Fix up loading of override java.security properties file
+ - JDK-8292443: Weak CAS VarHandle/Unsafe tests should test always-failing cases
+ - JDK-8293180: JQuery UI license file not updated
+ - JDK-8293562: KeepAliveCache Blocks Threads while Closing Connections
+ - JDK-8293657: sun/management/jmxremote/bootstrap/RmiBootstrapTest.java#id1 failed with "SSLHandshakeException: Remote host terminated the handshake"
+ - JDK-8293858: Change PKCS7 code to use default SecureRandom impl instead of SHA1PRNG
+ - JDK-8295737: macOS: Print content cut off when width > height with portrait orientation
+ - JDK-8295894: Remove SECOM certificate that is expiring in September 2023
+ - JDK-8296084: javax/swing/JSpinner/4788637/bug4788637.java fails intermittently on a VM
+ - JDK-8297437: javadoc cannot link to old docs (with old style anchors)
+ - JDK-8297523: Various GetPrimitiveArrayCritical miss result - NULL check
+ - JDK-8297587: Upgrade JLine to 3.22.0
+ - JDK-8297681: Unnecessary color conversion during 4BYTE_ABGR_PRE to INT_ARGB_PRE blit
+ - JDK-8297730: C2: Arraycopy intrinsic throws incorrect exception
+ - JDK-8297887: Update Siphash
+ - JDK-8297923: java.awt.ScrollPane broken after multiple scroll up/down
+ - JDK-8297955: LDAP CertStore should use LdapName and not String for DNs
+ - JDK-8298921: Create a regression test for JDK-8139581
+ - JDK-8298974: Add ftcolor.c to imported freetype sources
+ - JDK-8299424: containers/docker/TestMemoryWithCgroupV1.java fails on SLES12 ppc64le when testing Memory and Swap Limit
+ - JDK-8299658: C1 compilation crashes in LinearScan::resolve_exception_edge
+ - JDK-8299713: Test javax/swing/JTableHeader/6889007/bug6889007.java failed: Wrong type of cursor
+ - JDK-8300098: java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java fails with internal timeout when executed with TieredCompilation1/3
+ - JDK-8300659: Refactor TestMemoryAwareness to use WhiteBox api for host values
+ - JDK-8300751: [17u] Remove duplicate entry in javac.properties
+ - JDK-8301269: Update Commons BCEL to Version 6.7.0
+ - JDK-8301491: C2: java.lang.StringUTF16::indexOfChar intrinsic called with negative character argument
+ - JDK-8301700: Increase the default TLS Diffie-Hellman group size from 1024-bit to 2048-bit
+ - JDK-8301959: Compile command in compiler.loopopts.TestRemoveEmptyCountedLoop does not work
+ - JDK-8302161: Upgrade jQuery UI to version 1.13.2
+ - JDK-8302182: Update Public Suffix List to 88467c9
+ - JDK-8303511: C2: assert(get_ctrl(n) == cle_out) during unrolling
+ - JDK-8303809: Dispose context in SPNEGO NegotiatorImpl
+ - JDK-8304054: Linux: NullPointerException from FontConfiguration.getVersion in case no fonts are installed
+ - JDK-8304498: JShell does not switch to raw mode when there is no /bin/test
+ - JDK-8304867: Explicitly disable dtrace for ppc builds
+ - JDK-8305074: ProblemList javax/net/ssl/DTLS/RespondToRetransmit.java
+ - JDK-8305421: Work around JDK-8305420 in CDSJDITest.java
+ - JDK-8305763: Parsing a URI with an underscore goes through a silent exception, negatively impacting performance
+ - JDK-8305766: ProblemList runtime/CompressedOops/CompressedClassPointers.java
+ - JDK-8305950: Have -XshowSettings option display tzdata version
+ - JDK-8306133: Open source few AWT Drag & Drop related tests
+ - JDK-8306137: Open source several AWT ScrollPane related tests
+ - JDK-8306484: Open source several AWT Choice jtreg tests
+ - JDK-8306636: Disable compiler/c2/Test6905845.java with -XX:TieredStopAtLevel=3
+ - JDK-8306638: Open source some AWT tests related to datatransfer and Toolkit
+ - JDK-8306682: Open source a few more AWT Choice tests
+ - JDK-8306718: Optimize and opensource some old AWT tests
+ - JDK-8306954: Open source five Focus related tests
+ - JDK-8306955: Open source several JComboBox jtreg tests
+ - JDK-8307078: Opensource and clean up five more AWT Focus related tests
+ - JDK-8307080: Open source some more JComboBox jtreg tests
+ - JDK-8307128: Open source some drag and drop tests 4
+ - JDK-8307133: Open source some JTable jtreg tests
+ - JDK-8307135: java/awt/dnd/NotReallySerializableTest/NotReallySerializableTest.java failed
+ - JDK-8307301: Update HarfBuzz to 7.2.0
+ - JDK-8307569: Build with gcc8 is broken after JDK-8307301
+ - JDK-8307572: AArch64: Vector registers are clobbered by some macroassemblers
+ - JDK-8307603: [AIX] Broken build after JDK-8307301
+ - JDK-8307604: gcc12 based Alpine build broken build after JDK-8307301
+ - JDK-8307799: Newly added java/awt/dnd/MozillaDnDTest.java has invalid jtreg `@requires` clause
+ - JDK-8308156: VerifyCACerts.java misses blank in error output
+ - JDK-8309088: security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java fails
+ - JDK-8309108: Bump update version for OpenJDK: jdk-11.0.21
+ - JDK-8309138: Fix container tests for jdks with symlinked conf dir
+ - JDK-8310054: ScrollPane insets are incorrect
+ - JDK-8310176: JDK 11 G1 crash during full GC with +UseStringDeduplication
+ - JDK-8310620: [11u] Problemlist failing aot tests on macos x64
+ - JDK-8311033: [macos] PrinterJob does not take into account Sides attribute
+ - JDK-8311689: Wrong visible amount in Adjustable of ScrollPane
+ - JDK-8312138: jcmd VM.metaspace vslist has no newline character before the Class: label.
+ - JDK-8312555: Ideographic characters aren't stretched by AffineTransform.scale(2, 1)
+ - JDK-8313159: [11u] Fix test SSLEngineKeyLimit.java after Merge error
+ - JDK-8313765: Invalid CEN header (invalid zip64 extra data field size)
+ - JDK-8313796: AsyncGetCallTrace crash on unreadable interpreter method pointer
+ - JDK-8313803: [11u] Exclude jdk/jfr/event/sampling/TestStackFrameLineNumbers.java
+ - JDK-8313878: Exclude two compiler/rtm/locking tests on ppc64le
+ - JDK-8314086: [11u] A typo in the fix for JDK-8312462 is causing test failure in ChildAlwaysOnTopTest.java
+ - JDK-8314950: CMS may miss NMT tag after mark stack expansion
+ - JDK-8314960: Add Certigna Root CA - 2
+ - JDK-8315135: Memory leak in the native implementation of Pack200.Unpacker.unpack()
+ - JDK-8315529: [11u] Exclude some failing Z-GC tests
+ - JDK-8317040: Exclude cleaner test failing on older releases
+ - JDK-8317644: [11u] Remove designator DEFAULT_PROMOTED_VERSION_PRE=ea for release 11.0.21
+
+Notes on individual issues:
+===========================
+
+security-libs/javax.net.ssl:
+
+JDK-8301700: The Default TLS Diffie-Hellman Group Size Has Been Increased from 1024-bit to 2048-bit
+===================================================================================================
+The JDK implementation of TLS 1.2 now uses a default Diffie Hellman
+keysize of 2048 bits when a TLS_DHE cipher suite is negotiated and
+either the client or server does not support FFDHE.
+
+The JDK TLS implementation supports FFDHE, which can negotiate a
+stronger keysize, and this is enabled by default.
+
+As a workaround, users can revert to the previous key size by setting
+the `jdk.tls.ephemeralDHKeySize` system property to 1024 (at their own
+risk).
+
+This change does not affect TLS 1.3 as the minimum DH group size is
+already 2048 bits.
+
+JDK-8168261: Use Server Cipher Suites Preference by Default
+===========================================================
+The SunJSSE provider has been updated to use the local server-side
+cipher suite preferences by default. Previously, the server would use
+the preferences specified by the connecting client. To revert to the
+previous behaviour, use `SSLParameters.setUseCipherSuitesOrder(false)`
+on the server side.
+
+security-libs/javax.crypto:
+
+JDK-8023980: JDK Now Accepts RSA Keys in PKCS#1 Format
+======================================================
+RSA private and public keys in PKCS#1 format can now be accepted by
+JDK providers, such as the RSA `KeyFactory.impl` from the SunRsaSign
+provider. The RSA private or public key object should have the PKCS#1
+format and an encoding matching the ASN.1 syntax for a PKCS#1 RSA
+private key and public key.
+
+security-libs/javax.security:
+
+JDK-8242330: Arrays should be cloned in several JAAS Callback classes
+=====================================================================
+In the JAAS classes, ChoiceCallback and ConfirmationCallback, arrays
+were not cloned when passed into a constructor or returned. This
+allowed an external program to get access to the internal fields of
+these classes. The classes have been updated to return cloned arrays.
+
+tools/launcher:
+
+JDK-8305950: `-XshowSettings:locale` Output Now Includes Tzdata Version
+=======================================================================
+The `-XshowSettings` launcher option has been enhanced to print the
+tzdata version used by the JDK. The tzdata version is displayed as
+part of the `locale` showSettings option.
+
+Example output using `-X:showSettings:locale`:
+
+Locale settings:
+ default locale = English
+ default display locale = English
+ default format locale = English
+ tzdata version = 2023c
+
+security-libs/java.security:
+
+JDK-8295894: Removed SECOM Trust System's RootCA1 Root Certificate
+==================================================================
+The following root certificate from SECOM Trust System has been
+removed from the `cacerts` keystore:
+
+Alias Name: secomscrootca1 [jdk]
+Distinguished Name: OU=Security Communication RootCA1, O=SECOM Trust.net, C=JP
+
+JDK-8314960: Added Certigna Root CA Certificate
+===============================================
+The following root certificate has been added to the cacerts
+truststore:
+
+Name: Certigna (Dhimyotis)
+Alias Name: certignarootca
+Distinguished Name: CN=Certigna Root CA, OU=0002 48146308100036, O=Dhimyotis, C=FR
+
+JDK-8155246: Throw Error If Default java.security File Fails to Load
+====================================================================
+A hardcoded set of security properties was used in previous releases
+when the `java.security` file could not be loaded. This set of
+properties were poorly maintained and it was not obvious to the user
+that they were being utilised. This release instead throws an
+`InternalError` if the `java.security` file can not be loaded.
+
+New in release OpenJDK 11.0.20.1 (2023-08-24):
+==============================================
+Live versions of these release notes can be found at:
+ * https://bit.ly/openjdk110201
+
+* Other changes
+ - JDK-8313765: Invalid CEN header (invalid zip64 extra data field size)
+ - JDK-8314678: Bump update version for OpenJDK: jdk-11.0.20.1
+
New in release OpenJDK 11.0.20 (2023-07-18):
=============================================
Live versions of these release notes can be found at:
@@ -4842,4 +5144,3 @@ This new system property sets the pool size of the internal
function is equivalent to the
`org.apache.xml.security.parser.pool-size` system property used in
Apache Santuario and has the same default value of 20.
-
diff --git a/discover_trees.sh b/discover_trees.sh
new file mode 100755
index 0000000..8c31278
--- /dev/null
+++ b/discover_trees.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# Copyright (C) 2020 Red Hat, Inc.
+# Written by Andrew John Hughes <gnu.andrew(a)redhat.com>.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+TREE=${1}
+
+if test "x${TREE}" = "x"; then
+ TREE=${PWD}
+fi
+
+if [ -e ${TREE}/nashorn/.hg -o -e ${TREE}/nashorn/merge.changeset ] ; then
+ NASHORN="nashorn" ;
+fi
+
+if [ -e ${TREE}/corba/.hg -o -e ${TREE}/corba/merge.changeset ] ; then
+ CORBA="corba";
+fi
+
+if [ -e ${TREE}/jaxp/.hg -o -e ${TREE}/jaxp/merge.changeset ] ; then
+ JAXP="jaxp";
+fi
+
+if [ -e ${TREE}/jaxws/.hg -o -e ${TREE}/jaxws/merge.changeset ] ; then
+ JAXWS="jaxws";
+fi
+
+if [ -e ${TREE}/langtools/.hg -o -e ${TREE}/langtools/merge.changeset ] ; then
+ LANGTOOLS="langtools";
+fi
+
+if [ -e ${TREE}/jdk/.hg -o -e ${TREE}/jdk/merge.changeset ] ; then
+ JDK="jdk";
+fi
+
+if [ -e ${TREE}/hotspot/.hg -o -e ${TREE}/hotspot/merge.changeset ] ; then
+ HOTSPOT="hotspot";
+fi
+
+SUBTREES="${CORBA} ${JAXP} ${JAXWS} ${LANGTOOLS} ${NASHORN} ${JDK} ${HOTSPOT}";
+echo ${SUBTREES}
diff --git a/fips-11u-b34fb09a5c.patch b/fips-11u-f93a863b56.patch
similarity index 96%
rename from fips-11u-b34fb09a5c.patch
rename to fips-11u-f93a863b56.patch
index 02ce6df..3690cb8 100644
--- a/fips-11u-b34fb09a5c.patch
+++ b/fips-11u-f93a863b56.patch
@@ -89,7 +89,7 @@ index 3787b12600..dab108a82b 100644
LCMS_CFLAGS:=@LCMS_CFLAGS@
LCMS_LIBS:=@LCMS_LIBS@
diff --git a/make/lib/Lib-java.base.gmk b/make/lib/Lib-java.base.gmk
-index 4cd656a086..e1fc94b5b4 100644
+index b40d3114b9..0d1d83cf3e 100644
--- a/make/lib/Lib-java.base.gmk
+++ b/make/lib/Lib-java.base.gmk
@@ -178,6 +178,31 @@ ifeq ($(call isTargetOsType, unix), true)
@@ -401,7 +401,7 @@ index 0000000000..8dcb7d9073
+ }
+}
diff --git a/src/java.base/share/classes/java/security/Security.java b/src/java.base/share/classes/java/security/Security.java
-index b36510a376..ad5182e1e7 100644
+index 5b9552058b..b46de49211 100644
--- a/src/java.base/share/classes/java/security/Security.java
+++ b/src/java.base/share/classes/java/security/Security.java
@@ -32,6 +32,7 @@ import java.net.URL;
@@ -412,16 +412,17 @@ index b36510a376..ad5182e1e7 100644
import jdk.internal.misc.SharedSecrets;
import jdk.internal.util.StaticProperty;
import sun.security.util.Debug;
-@@ -47,12 +48,20 @@ import sun.security.jca.*;
+@@ -47,6 +48,9 @@ import sun.security.jca.*;
* implementation-specific location, which is typically the properties file
* {@code conf/security/java.security} in the Java installation directory.
*
+ * <p>Additional default values of security properties are read from a
+ * system-specific location, if available.</p>
+ *
- * @author Benjamin Renaud
- * @since 1.1
- */
+ * @implNote If the properties file fails to load, the JDK implementation will
+ * throw an unspecified error when initializing the {@code Security} class.
+ *
+@@ -56,6 +60,11 @@ import sun.security.jca.*;
public final class Security {
@@ -433,7 +434,7 @@ index b36510a376..ad5182e1e7 100644
/* Are we debugging? -- for developers */
private static final Debug sdebug =
Debug.getInstance("properties");
-@@ -67,6 +76,19 @@ public final class Security {
+@@ -70,6 +79,19 @@ public final class Security {
}
static {
@@ -453,26 +454,19 @@ index b36510a376..ad5182e1e7 100644
// doPrivileged here because there are multiple
// things in initialize that might require privs.
// (the FileInputStream call and the File.exists call,
-@@ -83,6 +105,7 @@ public final class Security {
+@@ -85,6 +107,7 @@ public final class Security {
+ private static void initialize() {
props = new Properties();
- boolean loadedProps = false;
boolean overrideAll = false;
+ boolean systemSecPropsEnabled = false;
// first load the system properties file
// to determine the value of security.overridePropertiesFile
-@@ -98,6 +121,7 @@ public final class Security {
- if (sdebug != null) {
- sdebug.println("reading security properties file: " +
- propFile);
-+ sdebug.println(props.toString());
- }
- } catch (IOException e) {
- if (sdebug != null) {
-@@ -192,6 +216,61 @@ public final class Security {
+@@ -105,9 +128,63 @@ public final class Security {
}
+ loadProps(null, extraPropFile, overrideAll);
}
-
++
+ boolean sysUseProps = Boolean.valueOf(System.getProperty(SYS_PROP_SWITCH, "false"));
+ boolean secUseProps = Boolean.valueOf(props.getProperty(SEC_PROP_SWITCH));
+ if (sdebug != null) {
@@ -492,9 +486,7 @@ index b36510a376..ad5182e1e7 100644
+ }
+ }
+
-+ // FIPS support depends on the contents of java.security so
-+ // ensure it has loaded first
-+ if (loadedProps && systemSecPropsEnabled) {
++ if (systemSecPropsEnabled) {
+ boolean shouldEnable;
+ String sysProp = System.getProperty("com.redhat.fips");
+ if (sysProp == null) {
@@ -530,15 +522,19 @@ index b36510a376..ad5182e1e7 100644
+ }
}
- /*
+- private static boolean loadProps(File masterFile, String extraPropFile, boolean overrideAll) {
++ static boolean loadProps(File masterFile, String extraPropFile, boolean overrideAll) {
+ InputStream is = null;
+ try {
+ if (masterFile != null && masterFile.exists()) {
diff --git a/src/java.base/share/classes/java/security/SystemConfigurator.java b/src/java.base/share/classes/java/security/SystemConfigurator.java
new file mode 100644
-index 0000000000..90f6dd2ebc
+index 0000000000..49bf17ea17
--- /dev/null
+++ b/src/java.base/share/classes/java/security/SystemConfigurator.java
-@@ -0,0 +1,248 @@
+@@ -0,0 +1,231 @@
+/*
-+ * Copyright (c) 2019, 2021, Red Hat, Inc.
++ * Copyright (c) 2019, 2023, Red Hat, Inc.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
@@ -616,26 +612,9 @@ index 0000000000..90f6dd2ebc
+ * security.useSystemPropertiesFile is true.
+ */
+ static boolean configureSysProps(Properties props) {
-+ boolean systemSecPropsLoaded = false;
-+
-+ try (BufferedInputStream bis =
-+ new BufferedInputStream(
-+ new FileInputStream(CRYPTO_POLICIES_JAVA_CONFIG))) {
-+ props.load(bis);
-+ systemSecPropsLoaded = true;
-+ if (sdebug != null) {
-+ sdebug.println("reading system security properties file " +
-+ CRYPTO_POLICIES_JAVA_CONFIG);
-+ sdebug.println(props.toString());
-+ }
-+ } catch (IOException e) {
-+ if (sdebug != null) {
-+ sdebug.println("unable to load security properties from " +
-+ CRYPTO_POLICIES_JAVA_CONFIG);
-+ e.printStackTrace();
-+ }
-+ }
-+ return systemSecPropsLoaded;
++ // now load the system file, if it exists, so its values
++ // will win if they conflict with the earlier values
++ return Security.loadProps(null, CRYPTO_POLICIES_JAVA_CONFIG, false);
+ }
+
+ /*
@@ -1035,7 +1014,7 @@ index e06b2a588c..315a2ce370 100644
candidates = new ProtocolVersion[] {
ProtocolVersion.TLS13,
diff --git a/src/java.base/share/classes/sun/security/ssl/SunJSSE.java b/src/java.base/share/classes/sun/security/ssl/SunJSSE.java
-index c50ba93ecf..de2a91a478 100644
+index 2a2b5d7568..891796f19b 100644
--- a/src/java.base/share/classes/sun/security/ssl/SunJSSE.java
+++ b/src/java.base/share/classes/sun/security/ssl/SunJSSE.java
@@ -27,6 +27,8 @@ package sun.security.ssl;
@@ -1046,7 +1025,7 @@ index c50ba93ecf..de2a91a478 100644
+import jdk.internal.misc.SharedSecrets;
import sun.security.rsa.SunRsaSignEntries;
import static sun.security.util.SecurityConstants.PROVIDER_VER;
- import static sun.security.provider.SunEntries.createAliases;
+ import static sun.security.util.SecurityProviderConstants.*;
@@ -195,8 +197,13 @@ public abstract class SunJSSE extends java.security.Provider {
"sun.security.ssl.SSLContextImpl$TLS11Context", null, null);
ps("SSLContext", "TLSv1.2",
@@ -1062,12 +1041,12 @@ index c50ba93ecf..de2a91a478 100644
+ }
ps("SSLContext", "TLS",
"sun.security.ssl.SSLContextImpl$TLSContext",
- (isfips? null : createAliases("SSL")), null);
+ (isfips? null : List.of("SSL")), null);
diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
-index 9af64321c4..957cd78a55 100644
+index c0eed3f884..b03bd9f896 100644
--- a/src/java.base/share/conf/security/java.security
+++ b/src/java.base/share/conf/security/java.security
-@@ -85,6 +85,14 @@ security.provider.tbd=Apple
+@@ -88,6 +88,14 @@ security.provider.tbd=Apple
security.provider.tbd=SunPKCS11
#endif
@@ -1082,7 +1061,7 @@ index 9af64321c4..957cd78a55 100644
#
# A list of preferred providers for specific algorithms. These providers will
# be searched for matching algorithms before the list of registered providers.
-@@ -298,6 +306,11 @@ policy.ignoreIdentityScope=false
+@@ -301,6 +309,11 @@ policy.ignoreIdentityScope=false
#
keystore.type=pkcs12
@@ -1094,7 +1073,7 @@ index 9af64321c4..957cd78a55 100644
#
# Controls compatibility mode for JKS and PKCS12 keystore types.
#
-@@ -335,6 +348,13 @@ package.definition=sun.misc.,\
+@@ -338,6 +351,13 @@ package.definition=sun.misc.,\
#
security.overridePropertiesFile=true
@@ -1405,7 +1384,7 @@ index 0000000000..b848a1fd78
+ }
+}
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
-index cf7cd19b68..69cda46f85 100644
+index ffbd671246..bdaad67e06 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
@@ -26,6 +26,9 @@
@@ -1427,7 +1406,7 @@ index cf7cd19b68..69cda46f85 100644
import sun.security.util.Debug;
import sun.security.util.ResourcesMgr;
import static sun.security.util.SecurityConstants.PROVIDER_VER;
-@@ -60,6 +65,29 @@ import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
+@@ -61,6 +66,29 @@ import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
*/
public final class SunPKCS11 extends AuthProvider {
@@ -1457,7 +1436,7 @@ index cf7cd19b68..69cda46f85 100644
private static final long serialVersionUID = -1354835039035306505L;
static final Debug debug = Debug.getInstance("sunpkcs11");
-@@ -317,10 +345,15 @@ public final class SunPKCS11 extends AuthProvider {
+@@ -318,10 +346,15 @@ public final class SunPKCS11 extends AuthProvider {
// request multithreaded access first
initArgs.flags = CKF_OS_LOCKING_OK;
PKCS11 tmpPKCS11;
@@ -1474,7 +1453,7 @@ index cf7cd19b68..69cda46f85 100644
} catch (PKCS11Exception e) {
if (debug != null) {
debug.println("Multi-threaded initialization failed: " + e);
-@@ -336,7 +369,7 @@ public final class SunPKCS11 extends AuthProvider {
+@@ -337,7 +370,7 @@ public final class SunPKCS11 extends AuthProvider {
initArgs.flags = 0;
}
tmpPKCS11 = PKCS11.getInstance(library,
@@ -1483,7 +1462,7 @@ index cf7cd19b68..69cda46f85 100644
}
p11 = tmpPKCS11;
-@@ -376,6 +409,24 @@ public final class SunPKCS11 extends AuthProvider {
+@@ -377,6 +410,24 @@ public final class SunPKCS11 extends AuthProvider {
if (nssModule != null) {
nssModule.setProvider(this);
}
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index 408ebce..849cff2 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -8,7 +8,7 @@
# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
# PROJECT_NAME=openjdk
# REPO_NAME=jdk11u
-# VERSION=jdk-11.0.18+10
+# VERSION=jdk-11.0.21+9
# or to eg prepare systemtap:
# icedtea7's jstack and other tapsets
# VERSION=6327cf1cea9e
@@ -29,8 +29,6 @@ set -e
OPENJDK_URL_DEFAULT=https://github.com
COMPRESSION_DEFAULT=xz
-# Corresponding IcedTea version
-ICEDTEA_VERSION=6.0
if [ "x$1" = "xhelp" ] ; then
echo -e "Behaviour may be specified by setting the following variables:\n"
@@ -41,7 +39,7 @@ if [ "x$1" = "xhelp" ] ; then
echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
echo "REPO_ROOT - the location of the Git repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
- echo "TO_COMPRESS - what part of clone to pack (default is openjdk)"
+ echo "TO_COMPRESS - what part of clone to pack (default is ${VERSION})"
echo "BOOT_JDK - the bootstrap JDK to satisfy the configure run"
exit 1;
fi
@@ -117,8 +115,8 @@ if [ "x$REPO_ROOT" = "x" ] ; then
fi;
if [ "x$TO_COMPRESS" = "x" ] ; then
- TO_COMPRESS="openjdk"
- echo "No targets to be compressed specified, ; default to ${TO_COMPRESS}"
+ TO_COMPRESS="${VERSION}"
+ echo "No targets to be compressed specified ; default to ${TO_COMPRESS}"
fi;
echo -e "Settings:"
@@ -140,41 +138,41 @@ else
mkdir "${FILE_NAME_ROOT}"
pushd "${FILE_NAME_ROOT}"
echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
- git clone -b ${VERSION} ${REPO_ROOT} openjdk
+ git clone -b ${VERSION} ${REPO_ROOT} ${VERSION}
popd
fi
pushd "${FILE_NAME_ROOT}"
# UnderlineTaglet.java has a BSD license with a field-of-use restriction, making it non-Free
- if [ -d openjdk/test ] ; then
+ if [ -d ${VERSION}/test ] ; then
echo "Removing langtools test case with non-Free license"
- rm -vf openjdk/test/langtools/tools/javadoc/api/basic/taglets/UnderlineTaglet.java
+ rm -vf ${VERSION}/test/langtools/tools/javadoc/api/basic/taglets/UnderlineTaglet.java
fi
# Generate .src-rev so build has knowledge of the revision the tarball was created from
mkdir build
pushd build
- sh ${PWD}/../openjdk/configure --with-boot-jdk=${BOOT_JDK}
+ sh ${PWD}/../${VERSION}/configure --with-boot-jdk=${BOOT_JDK}
make store-source-revision
popd
rm -rf build
# Remove commit checks
- echo "Removing $(find openjdk -name '.jcheck' -print)"
- find openjdk -name '.jcheck' -print0 | xargs -0 rm -rf
+ echo "Removing $(find ${VERSION} -name '.jcheck' -print)"
+ find ${VERSION} -name '.jcheck' -print0 | xargs -0 rm -rf
# Remove history and GHA
- echo "find openjdk -name '.hgtags'"
- find openjdk -name '.hgtags' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.hgignore'"
- find openjdk -name '.hgignore' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.gitattributes'"
- find openjdk -name '.gitattributes' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.gitignore'"
- find openjdk -name '.gitignore' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.git'"
- find openjdk -name '.git' -exec rm -rfv '{}' '+'
- echo "find openjdk -name '.github'"
- find openjdk -name '.github' -exec rm -rfv '{}' '+'
+ echo "find ${VERSION} -name '.hgtags'"
+ find ${VERSION} -name '.hgtags' -exec rm -fv '{}' '+'
+ echo "find ${VERSION} -name '.hgignore'"
+ find ${VERSION} -name '.hgignore' -exec rm -fv '{}' '+'
+ echo "find ${VERSION} -name '.gitattributes'"
+ find ${VERSION} -name '.gitattributes' -exec rm -fv '{}' '+'
+ echo "find ${VERSION} -name '.gitignore'"
+ find ${VERSION} -name '.gitignore' -exec rm -fv '{}' '+'
+ echo "find ${VERSION} -name '.git'"
+ find ${VERSION} -name '.git' -exec rm -rfv '{}' '+'
+ echo "find ${VERSION} -name '.github'"
+ find ${VERSION} -name '.github' -exec rm -rfv '{}' '+'
echo "Compressing remaining forest"
if [ "X$COMPRESSION" = "Xxz" ] ; then
diff --git a/icedtea_sync.sh b/icedtea_sync.sh
index e5c54f3..09d9504 100755
--- a/icedtea_sync.sh
+++ b/icedtea_sync.sh
@@ -1,192 +1 @@
-#!/bin/bash
-
-# Copyright (C) 2019 Red Hat, Inc.
-# Written by Andrew John Hughes <gnu.andrew(a)redhat.com>.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-ICEDTEA_USE_VCS=true
-
-ICEDTEA_VERSION=3.15.0
-ICEDTEA_URL=https://icedtea.classpath.org/download/source
-ICEDTEA_SIGNING_KEY=CFDA0F9B35964222
-
-ICEDTEA_HG_URL=https://icedtea.classpath.org/hg/icedtea11
-
-set -e
-
-RPM_DIR=${PWD}
-if [ ! -f ${RPM_DIR}/jconsole.desktop.in ] ; then
- echo "Not in RPM source tree.";
- exit 1;
-fi
-
-if test "x${TMPDIR}" = "x"; then
- TMPDIR=/tmp;
-fi
-WORKDIR=${TMPDIR}/it.sync
-
-echo "Using working directory ${WORKDIR}"
-mkdir ${WORKDIR}
-pushd ${WORKDIR}
-
-if test "x${WGET}" = "x"; then
- WGET=$(which wget);
- if test "x${WGET}" = "x"; then
- echo "wget not found";
- exit 1;
- fi
-fi
-
-if test "x${TAR}" = "x"; then
- TAR=$(which tar)
- if test "x${TAR}" = "x"; then
- echo "tar not found";
- exit 2;
- fi
-fi
-
-echo "Dependencies:";
-echo -e "\tWGET: ${WGET}";
-echo -e "\tTAR: ${TAR}\n";
-
-if test "x${ICEDTEA_USE_VCS}" = "xtrue"; then
- echo "Mode: Using VCS";
-
- if test "x${GREP}" = "x"; then
- GREP=$(which grep);
- if test "x${GREP}" = "x"; then
- echo "grep not found";
- exit 3;
- fi
- fi
-
- if test "x${CUT}" = "x"; then
- CUT=$(which cut);
- if test "x${CUT}" = "x"; then
- echo "cut not found";
- exit 4;
- fi
- fi
-
- if test "x${TR}" = "x"; then
- TR=$(which tr);
- if test "x${TR}" = "x"; then
- echo "tr not found";
- exit 5;
- fi
- fi
-
- if test "x${HG}" = "x"; then
- HG=$(which hg);
- if test "x${HG}" = "x"; then
- echo "hg not found";
- exit 6;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tGREP: ${GREP}";
- echo -e "\tCUT: ${CUT}";
- echo -e "\tTR: ${TR}";
- echo -e "\tHG: ${HG}";
-
- echo "Checking out repository from VCS...";
- ${HG} clone ${ICEDTEA_HG_URL} icedtea
-
- echo "Obtaining version from configure.ac...";
- ROOT_VER=$(${GREP} '^AC_INIT' icedtea/configure.ac|${CUT} -d ',' -f 2|${TR} -d '[][:space:]')
- echo "Root version from configure: ${ROOT_VER}";
-
- VCS_REV=$(${HG} log -R icedtea --template '{node|short}' -r tip)
- echo "VCS revision: ${VCS_REV}";
-
- ICEDTEA_VERSION="${ROOT_VER}-${VCS_REV}"
- echo "Creating icedtea-${ICEDTEA_VERSION}";
- mkdir icedtea-${ICEDTEA_VERSION}
- echo "Copying required files from checkout to icedtea-${ICEDTEA_VERSION}";
- # Commented out for now as IcedTea 6's jconsole.desktop.in is outdated
- #cp -a icedtea/jconsole.desktop.in ../icedtea-${ICEDTEA_VERSION}
- cp -a ${RPM_DIR}/jconsole.desktop.in icedtea-${ICEDTEA_VERSION}
- cp -a icedtea/tapset icedtea-${ICEDTEA_VERSION}
-
- rm -rf icedtea
-else
- echo "Mode: Using tarball";
-
- if test "x${ICEDTEA_VERSION}" = "x"; then
- echo "No IcedTea version specified for tarball download.";
- exit 3;
- fi
-
- if test "x${CHECKSUM}" = "x"; then
- CHECKSUM=$(which sha256sum)
- if test "x${CHECKSUM}" = "x"; then
- echo "sha256sum not found";
- exit 4;
- fi
- fi
-
- if test "x${PGP}" = "x"; then
- PGP=$(which gpg)
- if test "x${PGP}" = "x"; then
- echo "gpg not found";
- exit 5;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tCHECKSUM: ${CHECKSUM}";
- echo -e "\tPGP: ${PGP}\n";
-
- echo "Checking for IcedTea signing key ${ICEDTEA_SIGNING_KEY}...";
- if ! gpg --list-keys ${ICEDTEA_SIGNING_KEY}; then
- echo "IcedTea signing key ${ICEDTEA_SIGNING_KEY} not installed.";
- exit 6;
- fi
-
- echo "Downloading IcedTea release tarball...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz
- echo "Downloading IcedTea tarball signature...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- echo "Downloading IcedTea tarball checksums...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Verifying checksums...";
- ${CHECKSUM} --check --ignore-missing icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Checking signature...";
- ${PGP} --verify icedtea-${ICEDTEA_VERSION}.tar.xz.sig
-
- echo "Extracting files...";
- ${TAR} xJf icedtea-${ICEDTEA_VERSION}.tar.xz \
- icedtea-${ICEDTEA_VERSION}/tapset \
- icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in
-
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- rm -vf icedtea-${ICEDTEA_VERSION}.sha256
-fi
-
-echo "Replacing desktop files...";
-mv -v icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in ${RPM_DIR}
-
-echo "Creating new tapset tarball...";
-mv -v icedtea-${ICEDTEA_VERSION} openjdk
-${TAR} cJf ${RPM_DIR}/tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz openjdk
-
-rm -rvf openjdk
-
-popd
-rm -rf ${WORKDIR}
+# this file is intentionally not use din portables, use tarball from main rpms
diff --git a/java-11-openjdk-portable.spec b/java-11-openjdk-portable.spec
index eba37b7..986cd5f 100644
--- a/java-11-openjdk-portable.spec
+++ b/java-11-openjdk-portable.spec
@@ -29,6 +29,8 @@
%bcond_without release
# Enable static library builds by default.
%bcond_without staticlibs
+# Remove build artifacts by default
+%bcond_with artifacts
# Build a fresh libjvm.so for use in a copy of the bootstrap JDK
%bcond_without fresh_libjvm
# Build with system libraries
@@ -41,8 +43,6 @@
%define __os_install_post %{nil}
%endif
-%global unpacked_licenses %{_datarootdir}/licenses
-
# Workaround for stripping of debug symbols from static libraries
%if %{with staticlibs}
%define __brp_strip_static_archive %{nil}
@@ -66,10 +66,6 @@
# See: https://bugzilla.redhat.com/show_bug.cgi?id=1520879
%global _find_debuginfo_opts -g
-# With LTO flags enabled, debuginfo checks fail for some reason. Disable
-# LTO for a passing build. This really needs to be looked at.
-%define _lto_cflags %{nil}
-
# note: parametrized macros are order-sensitive (unlike not-parametrized) even with normal macros
# also necessary when passing it as parameter to other macros. If not macro, then it is considered a switch
# see the difference between global and define:
@@ -157,9 +153,14 @@
# Set of architectures for which alt-java has SSB mitigation
%global ssbd_arches x86_64
# Set of architectures where we verify backtraces with gdb
+# s390x fails on RHEL 7 so we exclude it there
+%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
+%global gdb_arches %{arm} %{aarch64} %{ix86} %{power64} sparcv9 sparc64 x86_64 %{zero_arches}
+%else
%global gdb_arches %{jit_arches} %{zero_arches}
+%endif
-# By default, we build a debug build during main build on JIT architectures
+# By default, we build a slowdebug build during main build on JIT architectures
%if %{with slowdebug}
%ifarch %{debug_arches}
%global include_debug_build 1
@@ -241,10 +242,10 @@
%global static_libs_target %{nil}
%endif
-# RPM JDK builds keep the debug symbols internal, to be later stripped by RPM
-%global debug_symbols internal
-
-# unlike portables,the rpms have to use static_libs_target very dynamically
+# The static libraries are produced under the same configuration as the main
+# build for portables, as we expect in-tree libraries to be used throughout.
+# If system libraries are enabled, the static libraries will also use them
+# which may cause issues.
%global bootstrap_targets images %{static_libs_target} legacy-jre-image
%global release_targets images docs-zip %{static_libs_target} legacy-jre-image
# No docs nor bootcycle for debug builds
@@ -252,14 +253,18 @@
# Target to use to just build HotSpot
%global hotspot_target hotspot
+
+# Disable LTO as this causes build failures at the moment.
+# See RHBZ#1861401
+%define _lto_cflags %{nil}
+
# Filter out flags from the optflags macro that cause problems with the OpenJDK build
# We filter out -O flags so that the optimization of HotSpot is not lowered from O3 to O2
# We filter out -Wall which will otherwise cause HotSpot to produce hundreds of thousands of warnings (100+mb logs)
# We replace it with -Wformat (required by -Werror=format-security) and -Wno-cpp to avoid FORTIFY_SOURCE warnings
# We filter out -fexceptions as the HotSpot build explicitly does -fno-exceptions and it's otherwise the default for C++
-# removal of -g is portable build specific to achieve no debug for release
-%global ourflags %(echo %optflags | sed -e 's|-Wall|-Wformat -Wno-cpp|' | sed -r -e 's|-O[0-9]*||' | sed -e 's|-g ||')
-%global ourcppflags %(echo %ourflags | sed -e 's|-fexceptions||' | sed -e 's|-g ||')
+%global ourflags %(echo %optflags | sed -e 's|-Wall|-Wformat -Wno-cpp|' | sed -r -e 's|-O[0-9]*||')
+%global ourcppflags %(echo %ourflags | sed -e 's|-fexceptions||')
%global ourldflags %{__global_ldflags}
# With disabled nss is NSS deactivated, so NSS_LIBDIR can contain the wrong path
@@ -338,20 +343,19 @@
# New Version-String scheme-style defines
%global featurever 11
%global interimver 0
-%global updatever 20
+%global updatever 21
%global patchver 0
# buildjdkver is usually same as %%{featurever},
# but in time of bootstrap of next jdk, it is featurever-1,
# and this it is better to change it here, on single place
%global buildjdkver %{featurever}
-# We don't add any LTS designator for STS packages (Fedora and EPEL).
-# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
-%if 0%{?rhel} && !0%{?epel}
+# Add LTS designator for RHEL builds
+%if 0%{?rhel}
%global lts_designator "LTS"
%global lts_designator_zip -%{lts_designator}
%else
- %global lts_designator ""
- %global lts_designator_zip ""
+ %global lts_designator ""
+ %global lts_designator_zip ""
%endif
# JDK to use for bootstrapping
%global bootjdk /usr/lib/jvm/java-%{buildjdkver}-openjdk
@@ -370,32 +374,39 @@
# Define what url should JVM offer in case of a crash report
# order may be important, epel may have rhel declared
%if 0%{?epel}
-%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora%20EPEL&component=%…
+%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora%20EPEL&component=%…
%else
%if 0%{?fedora}
# Does not work for rawhide, keeps the version field empty
-%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{name}&…
+%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{compon…
%else
%if 0%{?rhel}
-%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20…
+%global oj_vendor_bug_url https://access.redhat.com/support/cases/
%else
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi
%endif
%endif
%endif
-%global oj_vendor_version (Red_Hat-%{version}-%{release})
+%global oj_vendor_version (Red_Hat-%{version}-%{rpmrelease})
# Define IcedTea version used for SystemTap tapsets and desktop file
%global icedteaver 6.0.0pre00-c848b93a8598
# Define current Git revision for the FIPS support patches
-%global fipsver b34fb09a5c
+%global fipsver f93a863b56
+# Define JDK versions
+%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
+%global javaver %{featurever}
+# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
+%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
+# The tag used to create the OpenJDK tarball
+%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Standard JPackage naming and versioning defines
%global origin openjdk
%global origin_nice OpenJDK
-%global top_level_dir_name %{origin}
+%global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
-%global buildver 8
+%global buildver 9
%global rpmrelease 1
#%%global tagsuffix %%{nil}
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
@@ -410,14 +421,6 @@
# for techpreview, using 1, so slowdebugs can have 0
%global priority %( printf '%08d' 1 )
%endif
-%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
-%global javaver %{featurever}
-
-# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
-%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
-
-# The tag used to create the OpenJDK tarball
-%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Define milestone (EA for pre-releases, GA for releases)
# Release will be (where N is usually a number starting at 1):
@@ -445,6 +448,7 @@
# output dir stub
%define buildoutputdir() %{expand:build/jdk%{featurever}.build%{?1}}
%define installoutputdir() %{expand:install/jdk%{featurever}.install%{?1}}
+%define packageoutputdir() %{expand:packages/jdk%{featurever}.packages%{?1}}
# we can copy the javadoc to not arched dir, or make it not noarch
%define uniquejavadocdir() %{expand:%{fullversion}.%{_arch}%{?1}}
# main id and dir of this jdk
@@ -465,6 +469,11 @@
# Intentionally use jdkportablenameimpl here since we want to have static-libs files overlayed on
# top of the JDK archive
%define staticlibsportablename() %{expand:%{jdkportablenameimpl -- %%{1}}}
+%define docportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable.docs;g")
+%define docportablearchive() %{docportablename}.tar.xz
+%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable.misc;g")
+%define miscportablearchive() %{miscportablename}.tar.xz
+
# RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1}
# so we have to pass in "" but evaluate it, otherwise files record will include it
@@ -478,7 +487,7 @@
# fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349
# https://bugzilla.redhat.com/show_bug.cgi?id=1590796#c14
# https://bugzilla.redhat.com/show_bug.cgi?id=1655938
-%global _privatelibs libsplashscreen[.]so.*|libawt_xawt[.]so.*|libjli[.]so.*|libattach[.]so.*|libawt[.]so.*|libextnet[.]so.*|libawt_headless[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjimage[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmanagement_agent[.]so.*|libmanagement_ext[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libprefs[.]so.*|librmi[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsystemconf[.]so.*|libzip[.]so.*%{freetype_lib}
+%global _privatelibs libsplashscreen[.]so.*|libawt_xawt[.]so.*|libjli[.]so.*|libattach[.]so.*|libawt[.]so.*|libextnet[.]so.*|libawt_headless[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjimage[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmanagement_agent[.]so.*|libmanagement_ext[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libprefs[.]so.*|librmi[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsunec[.]so.*|libsystemconf[.]so.*|libunpack[.]so.*|libzip[.]so.*%{freetype_lib}
%global _publiclibs libjawt[.]so.*|libjava[.]so.*|libjvm[.]so.*|libverify[.]so.*|libjsig[.]so.*
%if %is_system_jdk
%global __provides_exclude ^(%{_privatelibs})$
@@ -494,6 +503,12 @@
%global __requires_exclude ^(%{_privatelibs}|%{_publiclibs})$
%endif
+# VM variant being built
+%ifarch %{zero_arches}
+%global vm_variant zero
+%else
+%global vm_variant server
+%endif
%global etcjavasubdir %{_sysconfdir}/java/java-%{javaver}-%{origin}
%define etcjavadir() %{expand:%{etcjavasubdir}/%{uniquesuffix -- %{?1}}}
@@ -516,20 +531,6 @@
%global alternatives_requires %{_sbindir}/alternatives
%endif
-%if %{with_systemtap}
-# Where to install systemtap tapset (links)
-# We would like these to be in a package specific sub-dir,
-# but currently systemtap doesn't support that, so we have to
-# use the root tapset dir for now. To distinguish between 64
-# and 32 bit architectures we place the tapsets under the arch
-# specific dir (note that systemtap will only pickup the tapset
-# for the primary arch for now). Systemtap uses the machine name
-# aka target_cpu as architecture specific directory name.
-%global tapsetroot /usr/share/systemtap
-%global tapsetdirttapset %{tapsetroot}/tapset/
-%global tapsetdir %{tapsetdirttapset}/%{stapinstall}
-%endif
-
# x86 is no longer supported
%if 0%{?java_arches:1}
ExclusiveArch: %{java_arches}
@@ -537,8 +538,8 @@ ExclusiveArch: %{java_arches}
ExcludeArch: %{ix86}
%endif
-# Portables have no rpo (requires/provides), but thsoe are awesome for orientation in spec
-# also scriptlets are hapily missing and files are handled old fashion
+# Portables have no repo (requires/provides), but these are awesome for orientation in spec
+# Also scriptlets are happily missing and files are handled old fashion
# not-duplicated requires/provides/obsoletes for normal/debug packages
%define java_rpo() %{expand:
}
@@ -549,6 +550,14 @@ ExcludeArch: %{ix86}
%define java_static_libs_rpo() %{expand:
}
+%define java_unstripped_rpo() %{expand:
+}
+
+%define java_docs_rpo() %{expand:
+}
+
+%define java_misc_rpo() %{expand:
+}
# Prevent brp-java-repack-jars from being run
%global __jar_repack 0
@@ -594,7 +603,6 @@ Group: Development/Languages
License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib and ISC and FTL and RSA
URL: http://openjdk.java.net/
-
# The source tarball, generated using generate_source_tarball.sh
Source0: openjdk-jdk%{featurever}u-%{vcstag}.tar.xz
@@ -615,8 +623,7 @@ Source10: NEWS
Source11: nss.cfg.in
# Removed libraries that we link instead
-# Disabled in portables
-#Source12: remove-intree-libraries.sh
+Source12: remove-intree-libraries.sh
# Ensure we aren't using the limited crypto policy
Source13: TestCryptoLevel.java
@@ -636,14 +643,6 @@ Source17: nss.fips.cfg.in
# Ensure translations are available for new timezones
Source18: TestTranslations.java
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-# boot jdk for portable build root on
-Source1001: ojdk17-aarch64-17.35.tar.gz
-Source1002: ojdk17-ppc64le-17.35.tar.gz
-Source1003: ojdk17-x86_64-17.35.tar.gz
-Source1004: ojdk17-s390x-17.35.tar.gz
-%endif
-
############################################
#
# RPM/distribution specific patches
@@ -652,8 +651,6 @@ Source1004: ojdk17-s390x-17.35.tar.gz
# Ignore AWTError when assistive technologies are loaded
Patch1: rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
-# Restrict access to java-atk-wrapper classes
-Patch2: rh1648644-java_access_bridge_privileged_security.patch
# NSS via SunPKCS11 Provider (disabled due to memory leak).
Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
# RH1750419: enable build of speculative store bypass hardened alt-java (CVE-2018-3639)
@@ -694,10 +691,12 @@ Patch1001: fips-11u-%{fipsver}.patch
#############################################
#
-# OpenJDK patches in need of upstreaming
+# Upstreamable patches
#
+# This section includes patches which need to
+# be reviewed & pushed to the current development
+# tree of OpenJDK.
#############################################
-
Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch
#############################################
@@ -709,10 +708,35 @@ Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk1
# need to be reviewed & pushed to the appropriate
# updates tree of OpenJDK.
#############################################
-Patch2001: jdk8242332-rh2108712-sha3-sunpkcs11.patch
+Patch2002: jdk8242332-rh2108712-sha3-sunpkcs11.patch
-# JDK-8271148: static-libs-image target --with-native-debug-symbols=external doesn't produce debug info
-Patch7777: jdk8271148-external_doesnt_produce_debuginfo.patch
+#############################################
+#
+# Patches appearing in 11.0.21
+#
+# This section includes patches which are present
+# in the listed OpenJDK 11u release and should be
+# able to be removed once that release is out
+# and used by this RPM.
+#############################################
+
+#############################################
+#
+# Patches appearing in 11.0.22
+#
+# This section includes patches which are present
+# in the listed OpenJDK 8u release and should be
+# able to be removed once that release is out
+# and used by this RPM.
+#############################################
+# JDK-8312489, OJ2095: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar
+Patch2000: jdk8312489-max_sig_default_increase.patch
+
+#############################################
+#
+# Portable build specific patches
+#
+#############################################
BuildRequires: autoconf
BuildRequires: automake
@@ -722,6 +746,7 @@ BuildRequires: cups-devel
BuildRequires: desktop-file-utils
# elfutils only are OK for build without AOT
BuildRequires: elfutils-devel
+BuildRequires: file
BuildRequires: fontconfig-devel
BuildRequires: freetype-devel
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
@@ -749,28 +774,24 @@ BuildRequires: libXtst-devel
# Requirement for setting up nss.cfg and nss.fips.cfg
BuildRequires: nss-devel
# Requirement for system security property test
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-BuildRequires: crypto-policies
-%endif
+# N/A for portable. RHEL7 doesn't provide them
+# and policy support is turned off
+#BuildRequires: crypto-policies
BuildRequires: pkgconfig
BuildRequires: xorg-x11-proto-devel
BuildRequires: zip
# to pack portable tarballs
BuildRequires: tar
BuildRequires: unzip
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
# No javapackages-filesystem on el7,nor is needed for portables
-%else
-BuildRequires: javapackages-filesystem
+# BuildRequires: javapackages-filesystem
BuildRequires: java-%{buildjdkver}-openjdk-devel
-%endif
# Zero-assembler build requirement
%ifarch %{zero_arches}
BuildRequires: libffi-devel
%endif
# 2023c required as of JDK-8305113
BuildRequires: tzdata-java >= 2023c
-
# cacerts build requirement in portable mode
BuildRequires: ca-certificates
# Earlier versions have a bug in tree vectorization on PPC
@@ -789,18 +810,18 @@ BuildRequires: lcms2-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
%else
-# Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h
-Provides: bundled(freetype) = 2.12.1
+# Version in src/java.desktop/share/legal/freetype.md
+Provides: bundled(freetype) = 2.13.0
# Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
Provides: bundled(giflib) = 5.2.1
# Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
-Provides: bundled(harfbuzz) = 4.4.1
+Provides: bundled(harfbuzz) = 7.2.0
# Version in src/java.desktop/share/native/liblcms/lcms2.h
-Provides: bundled(lcms2) = 2.12.0
+Provides: bundled(lcms2) = 2.15.0
# Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
Provides: bundled(libjpeg) = 6b
# Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h
-Provides: bundled(libpng) = 1.6.37
+Provides: bundled(libpng) = 1.6.39
# We link statically against libstdc++ to increase portability
BuildRequires: libstdc++-static
%endif
@@ -875,7 +896,7 @@ Group: Development/Tools
%{java_devel_rpo -- %{fastdebug_suffix_unquoted}}
%description devel-fastdebug
-The %{origin_nice} %{featurever} development tools - portable edition.
+The %{origin_nice} %{featurever} runtime environment and development tools - portable edition
%{fastdebug_warning}
%endif
@@ -883,7 +904,7 @@ The %{origin_nice} %{featurever} development tools - portable edition.
%if %{include_normal_build}
%package static-libs
-Summary: %{origin_nice} %{featurever} libraries for static linking - portable edition.
+Summary: %{origin_nice} %{featurever} libraries for static linking - portable edition
%{java_static_libs_rpo %{nil}}
@@ -898,7 +919,7 @@ Summary: %{origin_nice} %{featurever} libraries for static linking - portable ed
%{java_static_libs_rpo -- %{debug_suffix_unquoted}}
%description static-libs-slowdebug
-The %{origin_nice} %{featurever} libraries for static linking - portable edition.
+The %{origin_nice} %{featurever} libraries for static linking - portable edition
%{debug_warning}
%endif
@@ -909,13 +930,42 @@ Summary: %{origin_nice} %{featurever} libraries for static linking - portable ed
%{java_static_libs_rpo -- %{fastdebug_suffix_unquoted}}
%description static-libs-fastdebug
-The %{origin_nice} %{featurever} libraries for static linking - portable edition.
+The %{origin_nice} %{featurever} libraries for static linking - portable edition
%{fastdebug_warning}
%endif
# staticlibs
%endif
+%if %{include_normal_build}
+%package unstripped
+Summary: The %{origin_nice} %{featurever} runtime environment.
+
+%{java_unstripped_rpo %{nil}}
+
+%description unstripped
+The %{origin_nice} %{featurever} runtime environment.
+
+%endif
+
+%if %{include_normal_build}
+%package docs
+Summary: %{origin_nice} %{featurever} API documentation
+
+%{java_docs_rpo %{nil}}
+
+%description docs
+The %{origin_nice} %{featurever} API documentation.
+
+%package misc
+Summary: %{origin_nice} %{featurever} miscellany
+
+%{java_misc_rpo %{nil}}
+
+%description misc
+The %{origin_nice} %{featurever} miscellany.
+%endif
+
%package sources
Summary: %{origin_nice} %{featurever} full patched sources of portable JDK
@@ -927,10 +977,10 @@ The %{origin_nice} %{featurever} full patched sources of portable JDK to build,
echo "Preparing %{oj_vendor_version}"
# Using the echo macro breaks rpmdev-bumpspec, as it parses the first line of stdout :-(
-%if 0%{?stapinstall:1}
- echo "CPU: %{_target_cpu}, arch install directory: %{archinstall}, SystemTap install directory: %{stapinstall}"
+%if 0%{?_build_cpu:1}
+ echo "CPU: %{_target_cpu}, arch install directory: %{archinstall}, SystemTap install directory: %{_build_cpu}"
%else
- %{error:Unrecognised architecture %{_target_cpu}}
+ %{error:Unrecognised architecture %{_build_cpu}}
%endif
if [ %{include_normal_build} -eq 0 -o %{include_normal_build} -eq 1 ] ; then
@@ -951,7 +1001,6 @@ else
echo "include_fastdebug_build is %{include_fastdebug_build}, that is invalid. Use 1 for yes or 0 for no"
exit 13
fi
-
if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 -a %{include_fastdebug_build} -eq 0 ] ; then
echo "You have disabled all builds (normal,fastdebug,slowdebug). That is a no go."
exit 14
@@ -971,7 +1020,6 @@ if [ $prioritylength -ne 8 ] ; then
fi
# OpenJDK patches
-
%if %{system_libs}
# Remove libraries that are linked by both static and dynamic builds
sh %{SOURCE12} %{top_level_dir_name}
@@ -980,49 +1028,23 @@ sh %{SOURCE12} %{top_level_dir_name}
# Patch the JDK
pushd %{top_level_dir_name}
%patch1 -p1
-%patch2 -p1
%patch3 -p1
# Add crypto policy and FIPS support
%patch1001 -p1
# nss.cfg PKCS11 support; must come last as it also alters java.security
%patch1000 -p1
+# JDK-8312489 backport, coming in 11.0.22
+%patch2000 -p1
# PKCS11 SHA3 backport
-%patch2001 -p1
-# debuginfo fix
-%patch7777 -p1
+%patch2002 -p1
+# alt-java
+%patch600 -p1
+# RSA default
+%patch1003 -p1
popd # openjdk
-%patch600
-%patch1003
-# Extract systemtap tapsets
-%if %{with_systemtap}
-tar --strip-components=1 -x -I xz -f %{SOURCE8}
-%if %{include_debug_build}
-cp -r tapset tapset%{debug_suffix}
-%endif
-%if %{include_fastdebug_build}
-cp -r tapset tapset%{fastdebug_suffix}
-%endif
-
-for suffix in %{build_loop} ; do
- for file in "tapset"$suffix/*.in; do
- OUTPUT_FILE=`echo $file | sed -e "s:\.stp\.in$:-%{version}-%{release}.%{_arch}.stp:g"`
- sed -e "s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/server/libjvm.so:g" $file > $file.1
- sed -e "s:@JAVA_SPEC_VER@:%{javaver}:g" $file.1 > $file.2
-# TODO find out which architectures other than i686 have a client vm
-%ifarch %{ix86}
- sed -e "s:@ABS_CLIENT_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/client/libjvm.so:g" $file.2 > $OUTPUT_FILE
-%else
- sed -e "/@ABS_CLIENT_LIBJVM_SO@/d" $file.2 > $OUTPUT_FILE
-%endif
- sed -i -e "s:@ABS_JAVA_HOME_DIR@:%{_jvmdir}/%{sdkdir -- $suffix}:g" $OUTPUT_FILE
- sed -i -e "s:@INSTALL_ARCH_DIR@:%{archinstall}:g" $OUTPUT_FILE
- sed -i -e "s:@prefix@:%{_jvmdir}/%{sdkdir -- $suffix}/:g" $OUTPUT_FILE
- done
-done
-# systemtap tapsets ends
-%endif
+# Systemtap is processed in rpms
# Prepare desktop files
# Portables do not have desktop integration
@@ -1034,27 +1056,6 @@ sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE11} > nss.cfg
sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE17} > nss.fips.cfg
%build
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-mkdir bootjdk
-pushd bootjdk
-%ifarch %{aarch64}
-tar --strip-components=1 -xf %{SOURCE1001}
-%endif
-%ifarch %{ppc64le}
-tar --strip-components=1 -xf %{SOURCE1002}
-%endif
-%ifarch x86_64
-tar --strip-components=1 -xf %{SOURCE1003}
-%endif
-%ifarch s390x
-tar --strip-components=1 -xf %{SOURCE1004}
-%endif
-BOOT_JDK=$PWD
-popd
-%else
-BOOT_JDK=%{bootjdk}
-%endif
-
# How many CPU's do we have?
export NUM_PROC=%(/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :)
export NUM_PROC=${NUM_PROC:-1}
@@ -1136,7 +1137,7 @@ function buildjdk() {
%endif
--with-version-build=%{buildver} \
--with-version-pre="%{ea_designator}" \
- --with-version-opt=%{lts_designator} \
+ --with-version-opt="%{lts_designator}" \
--with-vendor-version-string="%{oj_vendor_version}" \
--with-vendor-name="%{oj_vendor}" \
--with-vendor-url="%{oj_vendor_url}" \
@@ -1144,7 +1145,7 @@ function buildjdk() {
--with-vendor-vm-bug-url="%{oj_vendor_bug_url}" \
--with-boot-jdk=${buildjdk} \
--with-debug-level=${debuglevel} \
- --with-native-debug-symbols="%{debug_symbols}" \
+ --with-native-debug-symbols="${debug_symbols}" \
--disable-sysconf-nss \
--enable-unlimited-crypto \
--with-zlib=%{link_type} \
@@ -1165,330 +1166,309 @@ function buildjdk() {
--disable-warnings-as-errors
cat spec.gmk
+
make \
+ JAVAC_FLAGS=-g \
LOG=trace \
WARNINGS_ARE_ERRORS="-Wno-error" \
CFLAGS_WARNINGS_ARE_ERRORS="-Wno-error" \
$maketargets || ( pwd; find ${top_dir_abs_src_path} ${top_dir_abs_build_path} -name "hs_err_pid*.log" | xargs cat && false )
-
popd
}
+function stripjdk() {
+ local outputdir=${1}
+ local jdkimagepath=${outputdir}/images/%{jdkimage}
+ local jreimagepath=${outputdir}/images/%{jreimage}
+ local jmodimagepath=${outputdir}/images/jmods
+ local supportdir=${outputdir}/support
+
+ if [ "x$suffix" = "x" ] ; then
+ # Keep the unstripped version for consumption by RHEL RPMs
+ cp -a ${jdkimagepath}{,.unstripped}
+
+ # Strip the files
+ for file in $(find ${jdkimagepath} ${jreimagepath} ${supportdir} -type f) ; do
+ if file ${file} | grep -q 'ELF'; then
+ noextfile=${file/.so/};
+ objcopy --only-keep-debug ${file} ${noextfile}.debuginfo;
+ objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file};
+ strip -g ${file};
+ fi
+ done
+
+ # Rebuild jmod files against the stripped binaries
+ if [ ! -d ${supportdir} ] ; then
+ echo "Support directory missing.";
+ exit 15
+ fi
+ for cmd in $(find ${supportdir} -name '*.jmod.cmdline') ; do
+ jmod=$(cat ${cmd} | sed -r 's|.*support/(.*$)|\1|');
+ echo "Rebuilding ${jmod} against stripped binaries...";
+ echo "Removing old jmod ${jmod}...";
+ rm -vf ${jmod}
+ rm -vf ${jdkimagepath}/jmods/$(basename ${jmod});
+ echo "Executing $(cat ${cmd})...";
+ cat ${cmd} | sh -s ;
+ echo "Moving jmod to image...";
+ mv -v ${supportdir}/${jmod} ${jdkimagepath}/jmods;
+ done
+ fi
+}
+
function installjdk() {
- local imagepath=${1}
+ local outputdir=${1}
+ local installdir=${2}
+ local jdkimagepath=${installdir}/images/%{jdkimage}
+ local jreimagepath=${installdir}/images/%{jreimage}
+ local unstripped=${jdkimagepath}.unstripped
+
+ echo "Installing build from ${outputdir} to ${installdir}..."
+ mkdir -p ${installdir}
+ echo "Installing images..."
+ mv ${outputdir}/images ${installdir}
+ if [ -d ${outputdir}/bundles ] ; then
+ echo "Installing bundles...";
+ mv ${outputdir}/bundles ${installdir} ;
+ fi
+
+%if !%{with artifacts}
+ echo "Removing output directory...";
+ rm -rf ${outputdir}
+%endif
- if [ -d ${imagepath} ] ; then
- # the build (erroneously) removes read permissions from some jars
- # this is a regression in OpenJDK 7 (our compiler):
- # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
- find ${imagepath} -iname '*.jar' -exec chmod ugo+r {} \;
+ for imagepath in ${jdkimagepath} ${jreimagepath} ${unstripped}; do
- # Build screws up permissions on binaries
- # https://bugs.openjdk.java.net/browse/JDK-8173610
- find ${imagepath} -iname '*.so' -exec chmod +x {} \;
- find ${imagepath}/bin/ -exec chmod +x {} \;
+ if [ -d ${imagepath} ] ; then
+ # the build (erroneously) removes read permissions from some jars
+ # this is a regression in OpenJDK 7 (our compiler):
+ # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
+ find ${imagepath} -iname '*.jar' -exec chmod ugo+r {} \;
- # Install nss.cfg right away as we will be using the JRE above
- install -m 644 nss.cfg ${imagepath}/conf/security/
+ # Build screws up permissions on binaries
+ # https://bugs.openjdk.java.net/browse/JDK-8173610
+ find ${imagepath} -iname '*.so' -exec chmod +x {} \;
+ find ${imagepath}/bin/ -exec chmod +x {} \;
- # Install nss.fips.cfg: NSS configuration for global FIPS mode (crypto-policies)
- install -m 644 nss.fips.cfg ${imagepath}/conf/security/
+ # Install local files which are distributed with the JDK
+ install -m 644 %{SOURCE10} ${imagepath}
+ install -m 644 nss.cfg ${imagepath}/conf/security/
+ install -m 644 nss.fips.cfg ${imagepath}/conf/security/
- # Create fake alt-java as a placeholder for future alt-java
- if [ -d man/man1 ] ; then
- pushd ${imagepath}
+ # Create fake alt-java as a placeholder for future alt-java
+ pushd ${imagepath}
# add alt-java man page
echo "Hardened java binary recommended for launching untrusted code from the Web e.g. javaws" > man/man1/%{alt_java_name}.1
cat man/man1/java.1 >> man/man1/%{alt_java_name}.1
- popd
- fi
- fi
+ popd
+
+ # Print release information
+ cat ${imagepath}/release
+ fi
+ done
}
-# Checks on debuginfo must be performed before the files are stripped
-# by the RPM installation stage
-function debugcheckjdk() {
- local imagepath=${1}
-
- if [ -d ${imagepath} ] ; then
-
- so_suffix="so"
- # Check debug symbols are present and can identify code
- find "${imagepath}" -iname "*.$so_suffix" -print0 | while read -d $'\0' lib
- do
- if [ -f "$lib" ] ; then
- echo "Testing $lib for debug symbols"
- # All these tests rely on RPM failing the build if the exit code of any set
- # of piped commands is non-zero.
-
- # Test for .debug_* sections in the shared object. This is the main test
- # Stripped objects will not contain these
- eu-readelf -S "$lib" | grep "] .debug_"
- test $(eu-readelf -S "$lib" | grep -E "\]\ .debug_(info|abbrev)" | wc --lines) == 2
-
- # Test FILE symbols. These will most likely be removed by anything that
- # manipulates symbol tables because it's generally useless. So a nice test
- # that nothing has messed with symbols
- old_IFS="$IFS"
- IFS=$'\n'
- for line in $(eu-readelf -s "$lib" | grep "00000000 0 FILE LOCAL DEFAULT")
- do
- # We expect to see .cpp and .S files, except for architectures like aarch64 and
- # s390 where we expect .o and .oS files
- echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|S|oS))?$"
- done
- IFS="$old_IFS"
-
- # If this is the JVM, look for javaCalls.(cpp|o) in FILEs, for extra sanity checking
- if [ "`basename $lib`" = "libjvm.so" ]; then
- eu-readelf -s "$lib" | \
- grep -E "00000000 0 FILE LOCAL DEFAULT ABS javaCalls.(cpp|o)$"
- fi
-
- # Test that there are no .gnu_debuglink sections pointing to another
- # debuginfo file. There shouldn't be any debuginfo files, so the link makes
- # no sense either
- eu-readelf -S "$lib" | grep 'gnu'
- if eu-readelf -S "$lib" | grep "\] .gnu_debuglink" | grep PROGBITS; then
- echo "bad .gnu_debuglink section."
- eu-readelf -x .gnu_debuglink "$lib"
- false
- fi
- fi
- done
+function genchecksum() {
+ local checkedfile=${1}
- # Make sure gdb can do a backtrace based on line numbers on libjvm.so
- # javaCalls.cpp:58 should map to:
- # http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/…
- # Using line number 1 might cause build problems. See:
- # https://bugzilla.redhat.com/show_bug.cgi?id=1539664
- # https://bugzilla.redhat.com/show_bug.cgi?id=1538767
- gdb -q "${imagepath}/bin/java" <<EOF | tee gdb.out
-handle SIGSEGV pass nostop noprint
-handle SIGILL pass nostop noprint
-set breakpoint pending on
-break javaCalls.cpp:58
-commands 1
-backtrace
-quit
-end
-run -version
-EOF
-%ifarch %{gdb_arches}
- grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
-%endif
+ checkdir=$(dirname ${1})
+ checkfile=$(basename ${1})
- fi
+ echo "Generating checksum for ${checkfile} in ${checkdir}..."
+ pushd ${checkdir}
+ sha256sum ${checkfile} > ${checkfile}.sha256sum
+ sha256sum --check ${checkfile}.sha256sum
+ popd
}
-pwd
-ls -l
-tar -cJf ../%{jdkportablesourcesarchive -- ""} --transform "s|^|%{jdkportablesourcesname -- ""}/|" openjdk nss*
-sha256sum ../%{jdkportablesourcesarchive -- ""} > ../%{jdkportablesourcesarchive -- ""}.sha256sum
+function packFullPatchedSources() {
+ srcpackagesdir=`pwd`
+ tar -cJf ${srcpackagesdir}/%{jdkportablesourcesarchive -- ""} --transform "s|^|%{jdkportablesourcesname -- ""}/|" %{top_level_dir_name} nss*
+ genchecksum ${srcpackagesdir}/%{jdkportablesourcesarchive -- ""}
+}
-%if %{build_hotspot_first}
- # Build a fresh libjvm.so first and use it to bootstrap
- cp -LR --preserve=mode,timestamps $BOOT_JDK newboot
- systemjdk=$(pwd)/newboot
- buildjdk build/newboot ${systemjdk} %{hotspot_target} "release" "bundled" "internal"
- mv build/newboot/jdk/lib/server/libjvm.so newboot/lib/server
-%else
- systemjdk=$BOOT_JDK
-%endif
+function packagejdk() {
+ local imagesdir=$(pwd)/${1}/images
+ local docdir=$(pwd)/${1}/images/docs
+ local bundledir=$(pwd)/${1}/bundles
+ local packagesdir=$(pwd)/${2}
+ local srcdir=$(pwd)/%{top_level_dir_name}
+ local tapsetdir=$(pwd)/tapset
-for suffix in %{build_loop} ; do
- if [ "x$suffix" = "x" ] ; then
- debugbuild=release
- debug_symbols=external # portables specific
- else
- # change --something to something
- debugbuild=`echo $suffix | sed "s/-//g"`
- debug_symbols=internal
- fi
-
-builddir=%{buildoutputdir -- ${suffix}}
-bootbuilddir=boot${builddir}
-installdir=%{installoutputdir -- ${suffix}}
-bootinstalldir=boot${installdir}
+ echo "Packaging build from ${imagesdir} to ${packagesdir}..."
+ mkdir -p ${packagesdir}
+ pushd ${imagesdir}
-link_opt="bundled"
+ echo "Packaging build from ${imagesdir} to ${packagesdir}..."
- for loop in %{main_suffix} %{staticlibs_loop} ; do
- builddir=%{buildoutputdir -- ${suffix}${loop}}
- bootbuilddir=boot${builddir}
- if test "x${loop}" = "x%{main_suffix}" ; then
- link_opt="%{link_type}"
-%if %{system_libs}
- # Copy the source tree so we can remove all in-tree libraries
- cp -a %{top_level_dir_name} %{top_level_dir_name_backup}
- # Remove all libraries that are linked
- sh %{SOURCE12} %{top_level_dir_name} full
-%endif
- # Debug builds don't need same targets as release for
- # build speed-up. We also avoid bootstrapping these
- # slower builds.
- if echo $debugbuild | grep -q "debug" ; then
- maketargets="%{debug_targets}"
- run_bootstrap=false
- else
- maketargets="%{release_targets}"
- run_bootstrap=%{bootstrap_build}
- fi
- if ${run_bootstrap} ; then
- buildjdk ${bootbuilddir} ${systemjdk} "%{bootstrap_targets}" ${debugbuild} ${link_opt}
- buildjdk ${builddir} $(pwd)/${bootbuilddir}/images/%{jdkimage} "${maketargets}" ${debugbuild} ${link_opt}
- rm -rf ${bootbuilddir}
- else
- buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt}
- fi
-%if %{system_libs}
- # Restore original source tree we modified by removing full in-tree sources
- rm -rf %{top_level_dir_name}
- mv %{top_level_dir_name_backup} %{top_level_dir_name}
-%endif
+ if [ "x$suffix" = "x" ] ; then
+ nameSuffix=""
else
- # Use bundled libraries for building statically
- link_opt="bundled"
- # Static library cycle only builds the static libraries
- maketargets="%{static_libs_target}"
- # Always just do the one build for the static libraries
- buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt}
+ nameSuffix=`echo "$suffix"| sed s/-/./`
fi
- done # end of main / staticlibs loop
+ jdkname=%{jdkportablename -- "$nameSuffix"}
+ jdkarchive=${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
+ jrename=%{jreportablename -- "$nameSuffix"}
+ jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
+ staticname=%{staticlibsportablename -- "$nameSuffix"}
+ staticarchive=${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
+ debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
+ unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
+ if [ "x$suffix" = "x" ] ; then
+ docname=%{docportablename}
+ docarchive=${packagesdir}/%{docportablearchive}
+ built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
+ fi
+ # These are from the source tree so no debug variants
+ miscname=%{miscportablename}
+ miscarchive=${packagesdir}/%{miscportablearchive}
+
+ if [ "x$suffix" = "x" ] ; then
+ # Keep the unstripped version for consumption by RHEL RPMs
+ mv %{jdkimage}.unstripped ${jdkname}
+ tar -cJf ${unstrippedarchive} ${jdkname}
+ genchecksum ${unstrippedarchive}
+ mv ${jdkname} %{jdkimage}.unstripped
+ fi
- # Final setup on the main image
- top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
- for image in %{jdkimage} %{jreimage} ; do
- imagePath=${top_dir_abs_main_build_path}/images/${image}
- installjdk ${imagePath}
- done
- # Check debug symbols were built into the dynamic libraries; todo, why it passes in JDK only?
- debugcheckjdk ${top_dir_abs_main_build_path}/images/%{jdkimage}
+ # Rename directories for packaging
+ mv %{jdkimage} ${jdkname}
+ mv %{jreimage} ${jrename}
- # Print release information
- cat ${top_dir_abs_main_build_path}/images/%{jdkimage}/release
+ # Release images have external debug symbols
+ if [ "x$suffix" = "x" ] ; then
+ tar -cJf ${debugarchive} $(find ${jdkname} -name \*.debuginfo)
+ genchecksum ${debugarchive}
-################################################################################
- pushd ${top_dir_abs_main_build_path}/images
- if [ "x$suffix" == "x" ] ; then
- nameSuffix=""
- else
- nameSuffix=`echo "$suffix"| sed s/-/./`
- fi
- # additional steps needed for fluent repack; most of them done twice, as images are already populated
- # maybe most of them should be done in upstream build?
- for imagedir in %{jdkimage} %{jreimage} ; do
- pushd $imagedir
- # Convert man pages to UTF8 encoding
- if [ -d man/man1 ] ; then # jre do not have man pages...
- for manpage in man/man1/* ; do
- iconv -f ISO_8859-1 -t UTF8 $manpage -o $manpage.tmp
- mv -f $manpage.tmp $manpage
- done
- fi
- # Install release notes
- cp -a %{SOURCE10} `pwd`
- cp -a %{SOURCE10} `pwd`/legal
- # stabilize permissions; aprtially duplicated in instalojdk
- find `pwd` -name "*.so" -exec chmod 755 {} \; -exec echo "set 755 to so {}" \; ;
- find `pwd` -type d -exec chmod 755 {} \; -exec echo "set 755 to dir {}" \; ;
- find `pwd`/legal -type f -exec chmod 644 {} \; -exec echo "set 644 to licences {}" \; ;
- popd # jdkimage/jreimage
- done # jre/sdk work in loop
- # javadoc is done only for release sdkimage
- if ! echo $suffix | grep -q "debug" ; then
- # Install Javadoc documentation
- #cp -a docs %{jdkimage} # not sure if the plaintext javadoc is for some use
- built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
- cp -a `pwd`/../bundles/${built_doc_archive} `pwd`/%{jdkimage}/javadocs.zip || ls -l `pwd`/../bundles
+ mkdir ${docname}
+ mv ${docdir} ${docname}
+ mv ${bundledir}/${built_doc_archive} ${docname}
+ tar -cJf ${docarchive} ${docname}
+ genchecksum ${docarchive}
+
+ mkdir ${miscname}
+ for s in 16 24 32 48 ; do
+ cp -av ${srcdir}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png ${miscname}
+ done
+ cp -a ${srcdir}/src/sample ${miscname}
+%if %{with_systemtap}
+ cp -a ${tapsetdir}* ${miscname}
+%endif
+ tar -cJf ${miscarchive} ${miscname}
+ genchecksum ${miscarchive}
fi
- # end of additional steps
-
- mv %{jdkimage} %{jdkportablename -- "$nameSuffix"}
- mv %{jreimage} %{jreportablename -- "$nameSuffix"}
- tar -cJf ../../../../%{jdkportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jdkportablename -- "$nameSuffix"}
- sha256sum ../../../../%{jdkportablearchive -- "$nameSuffix"} > ../../../../%{jdkportablearchive -- "$nameSuffix"}.sha256sum
- tar -cJf ../../../../%{jreportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jreportablename -- "$nameSuffix"}
- sha256sum ../../../../%{jreportablearchive -- "$nameSuffix"} > ../../../../%{jreportablearchive -- "$nameSuffix"}.sha256sum
- # copy licenses so they are avialable out of tarball
- cp -rf %{jdkportablename -- "$nameSuffix"}/legal ../../../../%{jdkportablearchive -- "%{normal_suffix}"}-legal
- mv %{jdkportablename -- "$nameSuffix"} %{jdkimage}
- mv %{jreportablename -- "$nameSuffix"} %{jreimage}
- popd #images
+
+ tar -cJf ${jdkarchive} --exclude='**.debuginfo' ${jdkname}
+ genchecksum ${jdkarchive}
+
+ tar -cJf ${jrearchive} --exclude='**.debuginfo' ${jrename}
+ genchecksum ${jrearchive}
+
%if %{include_staticlibs}
- top_dir_abs_staticlibs_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{staticlibs_suffix}}
- pushd ${top_dir_abs_staticlibs_build_path}/images
# Static libraries (needed for building graal vm with native image)
# Tar as overlay. Transform to the JDK name, since we just want to "add"
# static libraries to that folder
- portableJDKname=%{staticlibsportablename -- "$nameSuffix"}
- tar -cJf ../../../../%{staticlibsportablearchive -- "$nameSuffix"} --transform "s|^%{static_libs_image}/lib/*|$portableJDKname/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib"
- sha256sum ../../../../%{staticlibsportablearchive -- "$nameSuffix"} > ../../../../%{staticlibsportablearchive -- "$nameSuffix"}.sha256sum
- popd #staticlibs-images
+ tar -cJf ${staticarchive} \
+ --transform "s|^%{static_libs_image}/lib/*|${staticname}/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib"
+ genchecksum ${staticarchive}
%endif
-################################################################################
-# note, currently no debuginfo, consult portbale spec for external (zipped) debuginfo, being tarred alone
-################################################################################
-# build cycles
-done # end of release / debug cycle loop
+ # Revert directory renaming so testing will run
+ # TODO: testing should run on the packaged JDK
+ mv ${jdkname} %{jdkimage}
+ mv ${jrename} %{jreimage}
-%install
-STRIP_KEEP_SYMTAB=libjvm*
+ popd #images
-mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
-mv ../%{jdkportablesourcesarchive -- ""} $RPM_BUILD_ROOT%{_jvmdir}/
-mv ../%{jdkportablesourcesarchive -- ""}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+}
-for suffix in %{build_loop} ; do
-top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
+packFullPatchedSources
-################################################################################
- if [ "x$suffix" == "x" ] ; then
- nameSuffix=""
+%if %{build_hotspot_first}
+ # Build a fresh libjvm.so first and use it to bootstrap
+ cp -LR --preserve=mode,timestamps %{bootjdk} newboot
+ systemjdk=$(pwd)/newboot
+ buildjdk build/newboot ${systemjdk} %{hotspot_target} "release" "bundled" "internal"
+ mv build/newboot/jdk/lib/%{vm_variant}/libjvm.so newboot/lib/%{vm_variant}
+%else
+ systemjdk=%{bootjdk}
+%endif
+
+for suffix in %{build_loop} ; do
+ if [ "x$suffix" = "x" ] ; then
+ debugbuild=release
+ else
+ # change --something to something
+ debugbuild=`echo $suffix | sed "s/-//g"`
+ fi
+ # We build with internal debug symbols and do
+ # our own stripping for one version of the
+ # release build
+ debug_symbols=internal
+
+ builddir=%{buildoutputdir -- ${suffix}}
+ bootbuilddir=boot${builddir}
+ installdir=%{installoutputdir -- ${suffix}}
+ bootinstalldir=boot${installdir}
+ packagesdir=%{packageoutputdir -- ${suffix}}
+
+ link_opt="%{link_type}"
+%if %{system_libs}
+ # Copy the source tree so we can remove all in-tree libraries
+ cp -a %{top_level_dir_name} %{top_level_dir_name_backup}
+ # Remove all libraries that are linked
+ sh %{SOURCE12} %{top_level_dir_name} full
+%endif
+ # Debug builds don't need same targets as release for
+ # build speed-up. We also avoid bootstrapping these
+ # slower builds.
+ if echo $debugbuild | grep -q "debug" ; then
+ maketargets="%{debug_targets}"
+ run_bootstrap=false
else
- nameSuffix=`echo "$suffix"| sed s/-/./`
+ maketargets="%{release_targets}"
+ run_bootstrap=%{bootstrap_build}
fi
- mv ../%{jdkportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{jdkportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{jreportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{jreportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
-%if %{include_staticlibs}
- mv ../%{staticlibsportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{staticlibsportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
-%endif
- if [ "x$suffix" == "x" ] ; then
- dnameSuffix="$nameSuffix".debuginfo
-# todo handle debuginfo, see note at build (we will need to pack one stripped and one unstripped release build)
-# mv ../%{jdkportablearchive -- "$dnameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
-# mv ../%{jdkportablearchive -- "$dnameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ if ${run_bootstrap} ; then
+ buildjdk ${bootbuilddir} ${systemjdk} "%{bootstrap_targets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ installjdk ${bootbuilddir} ${bootinstalldir}
+ buildjdk ${builddir} $(pwd)/${bootinstalldir}/images/%{jdkimage} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ stripjdk ${builddir}
+ installjdk ${builddir} ${installdir}
+ %{!?with_artifacts:rm -rf ${bootinstalldir}}
+ else
+ buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ stripjdk ${builddir}
+ installjdk ${builddir} ${installdir}
fi
-################################################################################
-# end, dual install
-done
-################################################################################
-# the licenses are packed onloy once and shared
-mkdir -p $RPM_BUILD_ROOT%{unpacked_licenses}
-mv ../%{jdkportablearchive -- "%{normal_suffix}"}-legal $RPM_BUILD_ROOT%{unpacked_licenses}/%{jdkportablesourcesarchive -- "%{normal_suffix}"}
-# To show sha in the build log
-for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do ls -l $file ; cat $file ; done
-################################################################################
+ packagejdk ${installdir} ${packagesdir}
+
+%if %{system_libs}
+ # Restore original source tree we modified by removing full in-tree sources
+ rm -rf %{top_level_dir_name}
+ mv %{top_level_dir_name_backup} %{top_level_dir_name}
+%endif
+
+# build cycles
+done # end of release / debug cycle loop
%check
# We test debug first as it will give better diagnostics on a crash
for suffix in %{build_loop} ; do
-# Tests in the check stage are performed on the installed image
-# rpmbuild operates as follows: build -> install -> test
-# however in portbales, we test built image instead of installed one
-top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
+# portable builds have static_libs embedded, thus top_dir_abs_main_build_path is same as top_dir_abs_staticlibs_build_path
+top_dir_abs_main_build_path=$(pwd)/%{installoutputdir -- ${suffix}}
+%if %{include_staticlibs}
+top_dir_abs_staticlibs_build_path=${top_dir_abs_main_build_path}
+%endif
+
export JAVA_HOME=${top_dir_abs_main_build_path}/images/%{jdkimage}
-#check Shenandoah is enabled
+# Check Shenandoah is enabled
%if %{use_shenandoah_hotspot}
-$JAVA_HOME/bin/java -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -version
+$JAVA_HOME/bin/java -XX:+UseShenandoahGC -version
%endif
# Check unlimited policy has been used
@@ -1499,14 +1479,19 @@ $JAVA_HOME/bin/java --add-opens java.base/javax.crypto=ALL-UNNAMED TestCryptoLev
$JAVA_HOME/bin/javac -d . %{SOURCE14}
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||")
-# Check system crypto (policy) is deactive and can not be enabled
+# Check system crypto (policy) is active and can be disabled
# Test takes a single argument - true or false - to state whether system
# security properties are enabled or not.
$JAVA_HOME/bin/javac -d . %{SOURCE15}
export PROG=$(echo $(basename %{SOURCE15})|sed "s|\.java||")
export SEC_DEBUG="-Djava.security.debug=properties"
+#Portable specific: set false whereas its true for upstream
$JAVA_HOME/bin/java ${SEC_DEBUG} ${PROG} false
-$JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=false ${PROG} false
+$JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=true ${PROG} false
+
+# Check correct vendor values have been set
+$JAVA_HOME/bin/javac -d . %{SOURCE16}
+$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
# Check java launcher has no SSB mitigation
if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
@@ -1518,24 +1503,89 @@ nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation
if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi
%endif
-# Check correct vendor values have been set
-$JAVA_HOME/bin/javac -d . %{SOURCE16}
-$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
-
-%if ! 0%{?flatpak}
-# Check translations are available for new timezones (during flatpak builds, the
-# tzdb.dat used by this test is not where the test expects it, so this is
-# disabled for flatpak builds)
+# Check translations are available for new timezones
$JAVA_HOME/bin/javac -d . %{SOURCE18}
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE
$JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR
-%endif
%if %{include_staticlibs}
# Check debug symbols in static libraries (smoke test)
-export STATIC_LIBS_HOME=${top_dir_abs_main_build_path}/../../%{buildoutputdir -- ${suffix}%{staticlibs_suffix}}/images/static-libs/lib/
-readelf --debug-dump $STATIC_LIBS_HOME/libfdlibm.a | grep w_remainder.c
-readelf --debug-dump $STATIC_LIBS_HOME/libfdlibm.a | grep e_remainder.c
+export STATIC_LIBS_HOME=${top_dir_abs_staticlibs_build_path}/images/%{static_libs_image}
+ls -l $STATIC_LIBS_HOME
+ls -l $STATIC_LIBS_HOME/lib
+readelf --debug-dump $STATIC_LIBS_HOME/lib/libfdlibm.a | grep w_remainder.c
+readelf --debug-dump $STATIC_LIBS_HOME/lib/libfdlibm.a | grep e_remainder.c
+%endif
+
+# Release builds strip the debug symbols into external .debuginfo files
+if [ "x$suffix" = "x" ] ; then
+ so_suffix="debuginfo"
+else
+ so_suffix="so"
+fi
+# Check debug symbols are present and can identify code
+find "$JAVA_HOME" -iname "*.$so_suffix" -print0 | while read -d $'\0' lib
+do
+ if [ -f "$lib" ] ; then
+ echo "Testing $lib for debug symbols"
+ # All these tests rely on RPM failing the build if the exit code of any set
+ # of piped commands is non-zero.
+
+ # Test for .debug_* sections in the shared object. This is the main test
+ # Stripped objects will not contain these
+ eu-readelf -S "$lib" | grep "] .debug_"
+ test $(eu-readelf -S "$lib" | grep -E "\]\ .debug_(info|abbrev)" | wc --lines) == 2
+
+ # Test FILE symbols. These will most likely be removed by anything that
+ # manipulates symbol tables because it's generally useless. So a nice test
+ # that nothing has messed with symbols
+ old_IFS="$IFS"
+ IFS=$'\n'
+ for line in $(eu-readelf -s "$lib" | grep "00000000 0 FILE LOCAL DEFAULT")
+ do
+ # We expect to see .cpp and .S files, except for architectures like aarch64 and
+ # s390 where we expect .o and .oS files
+ echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|S|oS))?$"
+ done
+ IFS="$old_IFS"
+
+ # If this is the JVM, look for javaCalls.(cpp|o) in FILEs, for extra sanity checking
+ if [ "`basename $lib`" = "libjvm.so" ]; then
+ eu-readelf -s "$lib" | \
+ grep -E "00000000 0 FILE LOCAL DEFAULT ABS javaCalls.(cpp|o)$"
+ fi
+
+ # Test that there are no .gnu_debuglink sections pointing to another
+ # debuginfo file. There shouldn't be any debuginfo files, so the link makes
+ # no sense either
+ eu-readelf -S "$lib" | grep 'gnu'
+ if eu-readelf -S "$lib" | grep '] .gnu_debuglink' | grep PROGBITS; then
+ echo "bad .gnu_debuglink section."
+ eu-readelf -x .gnu_debuglink "$lib"
+ false
+ fi
+ fi
+done
+
+# Make sure gdb can do a backtrace based on line numbers on libjvm.so
+# javaCalls.cpp:58 should map to:
+# http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/…
+# Using line number 1 might cause build problems. See:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1539664
+# https://bugzilla.redhat.com/show_bug.cgi?id=1538767
+gdb -q "$JAVA_HOME/bin/java" <<EOF | tee gdb.out
+handle SIGSEGV pass nostop noprint
+handle SIGILL pass nostop noprint
+set breakpoint pending on
+break javaCalls.cpp:58
+commands 1
+backtrace
+quit
+end
+run -version
+EOF
+%ifarch %{gdb_arches}
+grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
%endif
# Check src.zip has all sources. See RHBZ#1130490
@@ -1554,12 +1604,69 @@ $JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LocalVariableTable
# build cycles check
done
+%install
+
+ mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
+ mv %{jdkportablesourcesarchive -- ""} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv %{jdkportablesourcesarchive -- ""}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+
+for suffix in %{build_loop} ; do
+
+ packagesdir=%{packageoutputdir -- ${suffix}}
+
+ if [ "x$suffix" == "x" ] ; then
+ nameSuffix=""
+ else
+ nameSuffix=`echo "$suffix"| sed s/-/./`
+ fi
+
+ # These definitions should match those in installjdk
+ jdkarchive=${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
+ jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
+ staticarchive=${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
+ debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
+ unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
+
+ mv ${jdkarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jdkarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jrearchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jrearchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+
+%if %{include_staticlibs}
+ mv ${staticarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${staticarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+%endif
+
+ if [ "x$suffix" = "x" ] ; then
+ mv ${debugarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${debugarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${unstrippedarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${unstrippedarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ fi
+done
+
+ if [ "x$suffix" = "x" ] ; then
+ # These definitions should match those in installjdk
+ # Install outside the loop as there are no debug variants
+ docarchive=${packagesdir}/%{docportablearchive}
+ miscarchive=${packagesdir}/%{miscportablearchive}
+ mv ${docarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${docarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${miscarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${miscarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ fi
+
+# To show sha in the build log
+for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do
+ ls -l $file ;
+ cat $file ;
+done
+
%if %{include_normal_build}
%files
# main package builds always
%{_jvmdir}/%{jreportablearchiveForFiles}
%{_jvmdir}/%{jreportablearchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%else
%files
# placeholder
@@ -1568,10 +1675,9 @@ done
%if %{include_normal_build}
%files devel
%{_jvmdir}/%{jdkportablearchiveForFiles}
-#%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
+%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
%{_jvmdir}/%{jdkportablearchiveForFiles}.sha256sum
-#%{_jvmdir}/%{jdkportablearchive -- .debuginfo}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
+%{_jvmdir}/%{jdkportablearchive -- .debuginfo}.sha256sum
%endif
%if %{include_normal_build}
@@ -1579,26 +1685,26 @@ done
%files static-libs
%{_jvmdir}/%{staticlibsportablearchiveForFiles}
%{_jvmdir}/%{staticlibsportablearchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
+
+%files unstripped
+%{_jvmdir}/%{jdkportablearchive -- .unstripped}
+%{_jvmdir}/%{jdkportablearchive -- .unstripped}.sha256sum
%endif
%if %{include_debug_build}
%files slowdebug
%{_jvmdir}/%{jreportablearchive -- .slowdebug}
%{_jvmdir}/%{jreportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%files devel-slowdebug
%{_jvmdir}/%{jdkportablearchive -- .slowdebug}
%{_jvmdir}/%{jdkportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%if %{include_staticlibs}
%files static-libs-slowdebug
%{_jvmdir}/%{staticlibsportablearchive -- .slowdebug}
%{_jvmdir}/%{staticlibsportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
%endif
@@ -1606,27 +1712,46 @@ done
%files fastdebug
%{_jvmdir}/%{jreportablearchive -- .fastdebug}
%{_jvmdir}/%{jreportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%files devel-fastdebug
%{_jvmdir}/%{jdkportablearchive -- .fastdebug}
%{_jvmdir}/%{jdkportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%if %{include_staticlibs}
%files static-libs-fastdebug
%{_jvmdir}/%{staticlibsportablearchive -- .fastdebug}
%{_jvmdir}/%{staticlibsportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
%endif
%files sources
%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}
%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
+
+%if %{include_normal_build}
+%files docs
+%{_jvmdir}/%{docportablearchive}
+%{_jvmdir}/%{docportablearchive}.sha256sum
+
+%files misc
+%{_jvmdir}/%{miscportablearchive}
+%{_jvmdir}/%{miscportablearchive}.sha256sum
+%endif
%changelog
+* Wed Nov 22 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:11.0.21.0.9-1
+- Updated to OpenJDK 11.0.21+9 (GA)
+- adjsuted generate_source_tarball
+- removed icedtea_sync
+- dropped standalone licenses
+- added usntripped subpkg
+- added docs subpkg
+- adjsuted versions of bundled libraries
+- build refactored to several solid methods following gnu_andrew
+- Drop local backport of JDK-8243210 which is upstream from 11.0.21+2
+- Bump freetype version to 2.13.0 following JDK-8306881
+- fixed '--without release' build-ability by moving docs and misc to if-release only
+
* Thu Aug 03 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:11.0.20.0.8-1
- Update to jdk-11.0.20.0+8
- Update release notes to 11.0.20.0+8
diff --git a/jconsole.desktop.in b/jconsole.desktop.in
index 8a3b04d..c1b8f6a 100644
--- a/jconsole.desktop.in
+++ b/jconsole.desktop.in
@@ -1,10 +1 @@
-[Desktop Entry]
-Name=OpenJDK @JAVA_VER@ for @target_cpu@ Monitoring & Management Console (@OPENJDK_VER@)
-Comment=Monitor and manage OpenJDK applications
-Exec=_SDKBINDIR_/jconsole
-Icon=java-@JAVA_VER@-@JAVA_VENDOR@
-Terminal=false
-Type=Application
-StartupWMClass=sun-tools-jconsole-JConsole
-Categories=Development;Profiling;Java;
-Version=1.0
+# this file is intentionally not here, as portable builds do not have desktop integration
diff --git a/jdk8242332-rh2108712-sha3-sunpkcs11.patch b/jdk8242332-rh2108712-sha3-sunpkcs11.patch
index a6192a4..cc28540 100644
--- a/jdk8242332-rh2108712-sha3-sunpkcs11.patch
+++ b/jdk8242332-rh2108712-sha3-sunpkcs11.patch
@@ -1,11 +1,11 @@
-commit 81c2107a9188680f7c35ebc7697b292d5972436e
+commit b8711800e3cd9132ad2b195c82cf816210feb77d
Author: Andrew Hughes <gnu.andrew(a)redhat.com>
-Date: Mon Feb 27 13:22:43 2023 +0000
+Date: Thu Oct 5 03:13:01 2023 +0100
Backport 78be334c3817a1b5840922a9bf1339a40dcc5185
diff --git a/src/java.base/share/classes/sun/security/util/KnownOIDs.java b/src/java.base/share/classes/sun/security/util/KnownOIDs.java
-index 92ecb9adc0c..a5848c96aad 100644
+index b5cc3b05f1..7e235c90dd 100644
--- a/src/java.base/share/classes/sun/security/util/KnownOIDs.java
+++ b/src/java.base/share/classes/sun/security/util/KnownOIDs.java
@@ -155,6 +155,14 @@ public enum KnownOIDs {
@@ -24,7 +24,7 @@ index 92ecb9adc0c..a5848c96aad 100644
SHA3_256withRSA("2.16.840.1.101.3.4.3.14", "SHA3-256withRSA"),
SHA3_384withRSA("2.16.840.1.101.3.4.3.15", "SHA3-384withRSA"),
diff --git a/src/java.base/share/classes/sun/security/util/SignatureUtil.java b/src/java.base/share/classes/sun/security/util/SignatureUtil.java
-index 32c089fd96d..7d5c0c7e299 100644
+index 32c089fd96..7d5c0c7e29 100644
--- a/src/java.base/share/classes/sun/security/util/SignatureUtil.java
+++ b/src/java.base/share/classes/sun/security/util/SignatureUtil.java
@@ -168,4 +168,22 @@ public class SignatureUtil {
@@ -51,7 +51,7 @@ index 32c089fd96d..7d5c0c7e299 100644
+ }
}
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Digest.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Digest.java
-index 41fe61b8a16..daf0bc9f69c 100644
+index 41fe61b8a1..daf0bc9f69 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Digest.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Digest.java
@@ -1,5 +1,5 @@
@@ -93,7 +93,7 @@ index 41fe61b8a16..daf0bc9f69c 100644
break;
default:
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java
-index 926414608cb..f343e6025e1 100644
+index 926414608c..f343e6025e 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java
@@ -36,7 +36,9 @@ import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
@@ -428,7 +428,7 @@ index 926414608cb..f343e6025e1 100644
-
}
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Mac.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Mac.java
-index c88e4a6ace5..29b26651c39 100644
+index c88e4a6ace..29b26651c3 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Mac.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Mac.java
@@ -39,8 +39,9 @@ import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
@@ -465,7 +465,7 @@ index c88e4a6ace5..29b26651c39 100644
break;
case (int)CKM_SSL3_MD5_MAC:
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11PSSSignature.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11PSSSignature.java
-index 26eaa4735f1..905b6ea9562 100644
+index 1419be3754..18e00a544b 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11PSSSignature.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11PSSSignature.java
@@ -38,6 +38,7 @@ import java.security.spec.MGF1ParameterSpec;
@@ -738,7 +738,7 @@ index 26eaa4735f1..905b6ea9562 100644
// see JCA spec
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java
-index e3af106d05a..e49edf32c29 100644
+index e3af106d05..e49edf32c2 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java
@@ -51,8 +51,15 @@ import sun.security.util.KeyUtil;
@@ -970,111 +970,88 @@ index e3af106d05a..e49edf32c29 100644
// return RSASignature.decodeSignature(digestOID, signature);
// }
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
-index cf7cd19b689..7a8bcffb92c 100644
+index ffbd671246..d191831dab 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
-@@ -550,6 +550,18 @@ public final class SunPKCS11 extends AuthProvider {
- d(MD, "SHA-512/256", P11Digest,
- s("2.16.840.1.101.3.4.2.6", "OID.2.16.840.1.101.3.4.2.6"),
+@@ -546,6 +546,14 @@ public final class SunPKCS11 extends AuthProvider {
+ m(CKM_SHA512_224));
+ dA(MD, "SHA-512/256", P11Digest,
m(CKM_SHA512_256));
-+ d(MD, "SHA3-224", P11Digest,
-+ s("2.16.840.1.101.3.4.2.7", "OID.2.16.840.1.101.3.4.2.7"),
++ dA(MD, "SHA3-224", P11Digest,
+ m(CKM_SHA3_224));
-+ d(MD, "SHA3-256", P11Digest,
-+ s("2.16.840.1.101.3.4.2.8", "OID.2.16.840.1.101.3.4.2.8"),
++ dA(MD, "SHA3-256", P11Digest,
+ m(CKM_SHA3_256));
-+ d(MD, "SHA3-384", P11Digest,
-+ s("2.16.840.1.101.3.4.2.9", "OID.2.16.840.1.101.3.4.2.9"),
++ dA(MD, "SHA3-384", P11Digest,
+ m(CKM_SHA3_384));
-+ d(MD, "SHA3-512", P11Digest,
-+ s("2.16.840.1.101.3.4.2.10", "OID.2.16.840.1.101.3.4.2.10"),
++ dA(MD, "SHA3-512", P11Digest,
+ m(CKM_SHA3_512));
d(MAC, "HmacMD5", P11MAC,
m(CKM_MD5_HMAC));
-@@ -574,7 +586,18 @@ public final class SunPKCS11 extends AuthProvider {
- d(MAC, "HmacSHA512/256", P11MAC,
- s("1.2.840.113549.2.13", "OID.1.2.840.113549.2.13"),
+@@ -563,7 +571,14 @@ public final class SunPKCS11 extends AuthProvider {
+ m(CKM_SHA512_224_HMAC));
+ dA(MAC, "HmacSHA512/256", P11MAC,
m(CKM_SHA512_256_HMAC));
-
-+ d(MAC, "HmacSHA3-224", P11MAC,
-+ s("2.16.840.1.101.3.4.2.13", "OID.2.16.840.1.101.3.4.2.13"),
++ dA(MAC, "HmacSHA3-224", P11MAC,
+ m(CKM_SHA3_224_HMAC));
-+ d(MAC, "HmacSHA3-256", P11MAC,
-+ s("2.16.840.1.101.3.4.2.14", "OID.2.16.840.1.101.3.4.2.14"),
++ dA(MAC, "HmacSHA3-256", P11MAC,
+ m(CKM_SHA3_256_HMAC));
-+ d(MAC, "HmacSHA3-384", P11MAC,
-+ s("2.16.840.1.101.3.4.2.15", "OID.2.16.840.1.101.3.4.2.15"),
++ dA(MAC, "HmacSHA3-384", P11MAC,
+ m(CKM_SHA3_384_HMAC));
-+ d(MAC, "HmacSHA3-512", P11MAC,
-+ s("2.16.840.1.101.3.4.2.16", "OID.2.16.840.1.101.3.4.2.16"),
++ dA(MAC, "HmacSHA3-512", P11MAC,
+ m(CKM_SHA3_512_HMAC));
d(MAC, "SslMacMD5", P11MAC,
m(CKM_SSL3_MD5_MAC));
d(MAC, "SslMacSHA1", P11MAC,
-@@ -604,6 +627,41 @@ public final class SunPKCS11 extends AuthProvider {
+@@ -595,6 +610,30 @@ public final class SunPKCS11 extends AuthProvider {
m(CKM_BLOWFISH_KEY_GEN));
d(KG, "ChaCha20", P11KeyGenerator,
m(CKM_CHACHA20_KEY_GEN));
+ d(KG, "HmacMD5", P11KeyGenerator, // 1.3.6.1.5.5.8.1.1
+ m(CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA1", P11KeyGenerator,
-+ s("1.2.840.113549.2.7", "OID.1.2.840.113549.2.7"),
++ dA(KG, "HmacSHA1", P11KeyGenerator,
+ m(CKM_SHA_1_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA224", P11KeyGenerator,
-+ s("1.2.840.113549.2.8", "OID.1.2.840.113549.2.8"),
++ dA(KG, "HmacSHA224", P11KeyGenerator,
+ m(CKM_SHA224_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA256", P11KeyGenerator,
-+ s("1.2.840.113549.2.9", "OID.1.2.840.113549.2.9"),
++ dA(KG, "HmacSHA256", P11KeyGenerator,
+ m(CKM_SHA256_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA384", P11KeyGenerator,
-+ s("1.2.840.113549.2.10", "OID.1.2.840.113549.2.10"),
++ dA(KG, "HmacSHA384", P11KeyGenerator,
+ m(CKM_SHA384_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA512", P11KeyGenerator,
-+ s("1.2.840.113549.2.11", "OID.1.2.840.113549.2.11"),
++ dA(KG, "HmacSHA512", P11KeyGenerator,
+ m(CKM_SHA512_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA512/224", P11KeyGenerator,
-+ s("1.2.840.113549.2.12", "OID.1.2.840.113549.2.12"),
++ dA(KG, "HmacSHA512/224", P11KeyGenerator,
+ m(CKM_SHA512_224_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA512/256", P11KeyGenerator,
-+ s("1.2.840.113549.2.13", "OID.1.2.840.113549.2.13"),
++ dA(KG, "HmacSHA512/256", P11KeyGenerator,
+ m(CKM_SHA512_256_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA3-224", P11KeyGenerator,
-+ s("2.16.840.1.101.3.4.2.13", "OID.2.16.840.1.101.3.4.2.13"),
++ dA(KG, "HmacSHA3-224", P11KeyGenerator,
+ m(CKM_SHA3_224_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA3-256", P11KeyGenerator,
-+ s("2.16.840.1.101.3.4.2.14", "OID.2.16.840.1.101.3.4.2.14"),
++ dA(KG, "HmacSHA3-256", P11KeyGenerator,
+ m(CKM_SHA3_256_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA3-384", P11KeyGenerator,
-+ s("2.16.840.1.101.3.4.2.15", "OID.2.16.840.1.101.3.4.2.15"),
++ dA(KG, "HmacSHA3-384", P11KeyGenerator,
+ m(CKM_SHA3_384_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA3-512", P11KeyGenerator,
-+ s("2.16.840.1.101.3.4.2.16", "OID.2.16.840.1.101.3.4.2.16"),
++ dA(KG, "HmacSHA3-512", P11KeyGenerator,
+ m(CKM_SHA3_512_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
// register (Secret)KeyFactories if there are any mechanisms
// for a particular algorithm that we support
-@@ -747,13 +805,40 @@ public final class SunPKCS11 extends AuthProvider {
- d(SIG, "SHA512withDSA", P11Signature,
- s("2.16.840.1.101.3.4.3.4", "OID.2.16.840.1.101.3.4.3.4"),
+@@ -725,37 +764,77 @@ public final class SunPKCS11 extends AuthProvider {
+ m(CKM_DSA_SHA384));
+ dA(SIG, "SHA512withDSA", P11Signature,
m(CKM_DSA_SHA512));
-+ d(SIG, "SHA3-224withDSA", P11Signature,
-+ s("2.16.840.1.101.3.4.3.5", "OID.2.16.840.1.101.3.4.3.5"),
++ dA(SIG, "SHA3-224withDSA", P11Signature,
+ m(CKM_DSA_SHA3_224));
-+ d(SIG, "SHA3-256withDSA", P11Signature,
-+ s("2.16.840.1.101.3.4.3.6", "OID.2.16.840.1.101.3.4.3.6"),
++ dA(SIG, "SHA3-256withDSA", P11Signature,
+ m(CKM_DSA_SHA3_256));
-+ d(SIG, "SHA3-384withDSA", P11Signature,
-+ s("2.16.840.1.101.3.4.3.7", "OID.2.16.840.1.101.3.4.3.7"),
++ dA(SIG, "SHA3-384withDSA", P11Signature,
+ m(CKM_DSA_SHA3_384));
-+ d(SIG, "SHA3-512withDSA", P11Signature,
-+ s("2.16.840.1.101.3.4.3.8", "OID.2.16.840.1.101.3.4.3.8"),
++ dA(SIG, "SHA3-512withDSA", P11Signature,
+ m(CKM_DSA_SHA3_512));
d(SIG, "RawDSAinP1363Format", P11Signature,
- s("NONEwithDSAinP1363Format"),
+ List.of("NONEwithDSAinP1363Format"),
m(CKM_DSA));
d(SIG, "DSAinP1363Format", P11Signature,
- s("SHA1withDSAinP1363Format"),
+ List.of("SHA1withDSAinP1363Format"),
m(CKM_DSA_SHA1, CKM_DSA));
-
+ d(SIG, "SHA224withDSAinP1363Format", P11Signature,
@@ -1095,36 +1072,27 @@ index cf7cd19b689..7a8bcffb92c 100644
+ m(CKM_DSA_SHA3_512));
d(SIG, "NONEwithECDSA", P11Signature,
m(CKM_ECDSA));
- d(SIG, "SHA1withECDSA", P11Signature,
-@@ -761,28 +846,49 @@ public final class SunPKCS11 extends AuthProvider {
+ dA(SIG, "SHA1withECDSA", P11Signature,
m(CKM_ECDSA_SHA1, CKM_ECDSA));
- d(SIG, "SHA224withECDSA", P11Signature,
- s("1.2.840.10045.4.3.1", "OID.1.2.840.10045.4.3.1"),
+ dA(SIG, "SHA224withECDSA", P11Signature,
- m(CKM_ECDSA));
+ m(CKM_ECDSA_SHA224, CKM_ECDSA));
- d(SIG, "SHA256withECDSA", P11Signature,
- s("1.2.840.10045.4.3.2", "OID.1.2.840.10045.4.3.2"),
+ dA(SIG, "SHA256withECDSA", P11Signature,
- m(CKM_ECDSA));
+ m(CKM_ECDSA_SHA256, CKM_ECDSA));
- d(SIG, "SHA384withECDSA", P11Signature,
- s("1.2.840.10045.4.3.3", "OID.1.2.840.10045.4.3.3"),
+ dA(SIG, "SHA384withECDSA", P11Signature,
- m(CKM_ECDSA));
+ m(CKM_ECDSA_SHA384, CKM_ECDSA));
- d(SIG, "SHA512withECDSA", P11Signature,
- s("1.2.840.10045.4.3.4", "OID.1.2.840.10045.4.3.4"),
+ dA(SIG, "SHA512withECDSA", P11Signature,
- m(CKM_ECDSA));
+ m(CKM_ECDSA_SHA512, CKM_ECDSA));
-+ d(SIG, "SHA3-224withECDSA", P11Signature,
-+ s("1.2.840.10045.4.3.9", "OID.1.2.840.10045.4.3.9"),
++ dA(SIG, "SHA3-224withECDSA", P11Signature,
+ m(CKM_ECDSA_SHA3_224, CKM_ECDSA));
-+ d(SIG, "SHA3-256withECDSA", P11Signature,
-+ s("1.2.840.10045.4.3.10", "OID.1.2.840.10045.4.3.10"),
++ dA(SIG, "SHA3-256withECDSA", P11Signature,
+ m(CKM_ECDSA_SHA3_256, CKM_ECDSA));
-+ d(SIG, "SHA3-384withECDSA", P11Signature,
-+ s("1.2.840.10045.4.3.11", "OID.1.2.840.10045.4.3.11"),
++ dA(SIG, "SHA3-384withECDSA", P11Signature,
+ m(CKM_ECDSA_SHA3_384, CKM_ECDSA));
-+ d(SIG, "SHA3-512withECDSA", P11Signature,
-+ s("1.2.840.10045.4.3.12", "OID.1.2.840.10045.4.3.12"),
++ dA(SIG, "SHA3-512withECDSA", P11Signature,
+ m(CKM_ECDSA_SHA3_512, CKM_ECDSA));
d(SIG, "NONEwithECDSAinP1363Format", P11Signature,
m(CKM_ECDSA));
@@ -1151,29 +1119,25 @@ index cf7cd19b689..7a8bcffb92c 100644
+ d(SIG, "SHA3-512withECDSAinP1363Format", P11Signature,
+ m(CKM_ECDSA_SHA3_512, CKM_ECDSA));
+
- d(SIG, "MD2withRSA", P11Signature,
- s("1.2.840.113549.1.1.2", "OID.1.2.840.113549.1.1.2"),
+ dA(SIG, "MD2withRSA", P11Signature,
m(CKM_MD2_RSA_PKCS, CKM_RSA_PKCS, CKM_RSA_X_509));
-@@ -805,6 +911,18 @@ public final class SunPKCS11 extends AuthProvider {
- d(SIG, "SHA512withRSA", P11Signature,
- s("1.2.840.113549.1.1.13", "OID.1.2.840.113549.1.1.13"),
+ dA(SIG, "MD5withRSA", P11Signature,
+@@ -770,6 +849,14 @@ public final class SunPKCS11 extends AuthProvider {
+ m(CKM_SHA384_RSA_PKCS, CKM_RSA_PKCS, CKM_RSA_X_509));
+ dA(SIG, "SHA512withRSA", P11Signature,
m(CKM_SHA512_RSA_PKCS, CKM_RSA_PKCS, CKM_RSA_X_509));
-+ d(SIG, "SHA3-224withRSA", P11Signature,
-+ s("2.16.840.1.101.3.4.3.13", "OID.2.16.840.1.101.3.4.3.13"),
++ dA(SIG, "SHA3-224withRSA", P11Signature,
+ m(CKM_SHA3_224_RSA_PKCS, CKM_RSA_PKCS, CKM_RSA_X_509));
-+ d(SIG, "SHA3-256withRSA", P11Signature,
-+ s("2.16.840.1.101.3.4.3.14", "OID.2.16.840.1.101.3.4.3.14"),
++ dA(SIG, "SHA3-256withRSA", P11Signature,
+ m(CKM_SHA3_256_RSA_PKCS, CKM_RSA_PKCS, CKM_RSA_X_509));
-+ d(SIG, "SHA3-384withRSA", P11Signature,
-+ s("2.16.840.1.101.3.4.3.15", "OID.2.16.840.1.101.3.4.3.15"),
++ dA(SIG, "SHA3-384withRSA", P11Signature,
+ m(CKM_SHA3_384_RSA_PKCS, CKM_RSA_PKCS, CKM_RSA_X_509));
-+ d(SIG, "SHA3-512withRSA", P11Signature,
-+ s("2.16.840.1.101.3.4.3.16", "OID.2.16.840.1.101.3.4.3.16"),
++ dA(SIG, "SHA3-512withRSA", P11Signature,
+ m(CKM_SHA3_512_RSA_PKCS, CKM_RSA_PKCS, CKM_RSA_X_509));
- d(SIG, "RSASSA-PSS", P11PSSSignature,
- s("1.2.840.113549.1.1.10", "OID.1.2.840.113549.1.1.10"),
+ dA(SIG, "RSASSA-PSS", P11PSSSignature,
m(CKM_RSA_PKCS_PSS));
-@@ -818,6 +936,14 @@ public final class SunPKCS11 extends AuthProvider {
+ d(SIG, "SHA1withRSASSA-PSS", P11PSSSignature,
+@@ -782,6 +869,14 @@ public final class SunPKCS11 extends AuthProvider {
m(CKM_SHA384_RSA_PKCS_PSS));
d(SIG, "SHA512withRSASSA-PSS", P11PSSSignature,
m(CKM_SHA512_RSA_PKCS_PSS));
@@ -1189,7 +1153,7 @@ index cf7cd19b689..7a8bcffb92c 100644
d(KG, "SunTlsRsaPremasterSecret",
"sun.security.pkcs11.P11TlsRsaPremasterSecretGenerator",
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java
-index e077943bbc2..cb04b95304d 100644
+index e077943bbc..cb04b95304 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java
@@ -1,5 +1,5 @@
@@ -1215,7 +1179,7 @@ index e077943bbc2..cb04b95304d 100644
diff --git a/test/jdk/sun/security/pkcs11/KeyGenerator/HmacDefKeySizeTest.java b/test/jdk/sun/security/pkcs11/KeyGenerator/HmacDefKeySizeTest.java
new file mode 100644
-index 00000000000..d6707028d96
+index 0000000000..d6707028d9
--- /dev/null
+++ b/test/jdk/sun/security/pkcs11/KeyGenerator/HmacDefKeySizeTest.java
@@ -0,0 +1,84 @@
@@ -1304,7 +1268,7 @@ index 00000000000..d6707028d96
+ }
+}
diff --git a/test/jdk/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java b/test/jdk/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java
-index b61d10beece..78b7d857e8e 100644
+index b61d10beec..78b7d857e8 100644
--- a/test/jdk/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java
+++ b/test/jdk/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java
@@ -23,7 +23,7 @@
@@ -1336,7 +1300,7 @@ index b61d10beece..78b7d857e8e 100644
test("ARCFOUR", 1024, p, TestResult.TBD);
} else if (p.getName().equals("SunPKCS11-NSS")) {
diff --git a/test/jdk/sun/security/pkcs11/Mac/MacSameTest.java b/test/jdk/sun/security/pkcs11/Mac/MacSameTest.java
-index 59af327c1f2..64c42a6dd06 100644
+index 59af327c1f..64c42a6dd0 100644
--- a/test/jdk/sun/security/pkcs11/Mac/MacSameTest.java
+++ b/test/jdk/sun/security/pkcs11/Mac/MacSameTest.java
@@ -23,7 +23,7 @@
@@ -1421,7 +1385,7 @@ index 59af327c1f2..64c42a6dd06 100644
mac.reset();
diff --git a/test/jdk/sun/security/pkcs11/Mac/ReinitMac.java b/test/jdk/sun/security/pkcs11/Mac/ReinitMac.java
-index 5cad8859840..7e045232e3a 100644
+index 5cad885984..7e045232e3 100644
--- a/test/jdk/sun/security/pkcs11/Mac/ReinitMac.java
+++ b/test/jdk/sun/security/pkcs11/Mac/ReinitMac.java
@@ -1,5 +1,5 @@
@@ -1514,7 +1478,7 @@ index 5cad8859840..7e045232e3a 100644
}
}
diff --git a/test/jdk/sun/security/pkcs11/MessageDigest/ByteBuffers.java b/test/jdk/sun/security/pkcs11/MessageDigest/ByteBuffers.java
-index 7ced00630cc..a7a72e8ea3d 100644
+index 7ced00630c..a7a72e8ea3 100644
--- a/test/jdk/sun/security/pkcs11/MessageDigest/ByteBuffers.java
+++ b/test/jdk/sun/security/pkcs11/MessageDigest/ByteBuffers.java
@@ -1,5 +1,5 @@
@@ -1574,7 +1538,7 @@ index 7ced00630cc..a7a72e8ea3d 100644
byte[] d1 = md.digest(data);
diff --git a/test/jdk/sun/security/pkcs11/MessageDigest/ReinitDigest.java b/test/jdk/sun/security/pkcs11/MessageDigest/ReinitDigest.java
-index ea7909bc397..268f698276b 100644
+index ea7909bc39..268f698276 100644
--- a/test/jdk/sun/security/pkcs11/MessageDigest/ReinitDigest.java
+++ b/test/jdk/sun/security/pkcs11/MessageDigest/ReinitDigest.java
@@ -1,5 +1,5 @@
@@ -1655,7 +1619,7 @@ index ea7909bc397..268f698276b 100644
private static void check(byte[] d1, byte[] d2) throws Exception {
diff --git a/test/jdk/sun/security/pkcs11/MessageDigest/TestCloning.java b/test/jdk/sun/security/pkcs11/MessageDigest/TestCloning.java
-index b931c8564b2..ace601c7233 100644
+index b931c8564b..ace601c723 100644
--- a/test/jdk/sun/security/pkcs11/MessageDigest/TestCloning.java
+++ b/test/jdk/sun/security/pkcs11/MessageDigest/TestCloning.java
@@ -1,5 +1,5 @@
@@ -1744,7 +1708,7 @@ index b931c8564b2..ace601c7233 100644
MessageDigest mdCopy0 = (MessageDigest) mdObj.clone();
diff --git a/test/jdk/sun/security/pkcs11/Signature/ByteBuffers.java b/test/jdk/sun/security/pkcs11/Signature/ByteBuffers.java
-index 26eeacffed9..f5de994779c 100644
+index 26eeacffed..f5de994779 100644
--- a/test/jdk/sun/security/pkcs11/Signature/ByteBuffers.java
+++ b/test/jdk/sun/security/pkcs11/Signature/ByteBuffers.java
@@ -23,7 +23,7 @@
@@ -1770,7 +1734,7 @@ index 26eeacffed9..f5de994779c 100644
sig.update(t);
byte[] signature = sig.sign();
diff --git a/test/jdk/sun/security/pkcs11/Signature/InitAgainPSS.java b/test/jdk/sun/security/pkcs11/Signature/InitAgainPSS.java
-index ccd66599fb0..a2fa7294977 100644
+index ccd66599fb..a2fa729497 100644
--- a/test/jdk/sun/security/pkcs11/Signature/InitAgainPSS.java
+++ b/test/jdk/sun/security/pkcs11/Signature/InitAgainPSS.java
@@ -1,5 +1,5 @@
@@ -1816,7 +1780,7 @@ index ccd66599fb0..a2fa7294977 100644
PSSParameterSpec params = new PSSParameterSpec("SHA-256", "MGF1",
new MGF1ParameterSpec("SHA-256"), 32,
diff --git a/test/jdk/sun/security/pkcs11/Signature/KeyAndParamCheckForPSS.java b/test/jdk/sun/security/pkcs11/Signature/KeyAndParamCheckForPSS.java
-index 2e4fedbf1d5..f1c0492b5fc 100644
+index 2e4fedbf1d..f1c0492b5f 100644
--- a/test/jdk/sun/security/pkcs11/Signature/KeyAndParamCheckForPSS.java
+++ b/test/jdk/sun/security/pkcs11/Signature/KeyAndParamCheckForPSS.java
@@ -1,5 +1,5 @@
@@ -1910,7 +1874,7 @@ index 2e4fedbf1d5..f1c0492b5fc 100644
System.out.println("test#4: pass");
}
diff --git a/test/jdk/sun/security/pkcs11/Signature/ReinitSignature.java b/test/jdk/sun/security/pkcs11/Signature/ReinitSignature.java
-index 42ca7fa203d..8c132ca7e4f 100644
+index 42ca7fa203..8c132ca7e4 100644
--- a/test/jdk/sun/security/pkcs11/Signature/ReinitSignature.java
+++ b/test/jdk/sun/security/pkcs11/Signature/ReinitSignature.java
@@ -23,312 +23,13 @@
@@ -2242,7 +2206,7 @@ index 42ca7fa203d..8c132ca7e4f 100644
new Random().nextBytes(data);
sig.initSign(privateKey);
diff --git a/test/jdk/sun/security/pkcs11/Signature/SigInteropPSS.java b/test/jdk/sun/security/pkcs11/Signature/SigInteropPSS.java
-index 3c3edb5aa6a..11147022771 100644
+index 3c3edb5aa6..1114702277 100644
--- a/test/jdk/sun/security/pkcs11/Signature/SigInteropPSS.java
+++ b/test/jdk/sun/security/pkcs11/Signature/SigInteropPSS.java
@@ -1,5 +1,5 @@
@@ -2263,7 +2227,7 @@ index 3c3edb5aa6a..11147022771 100644
* @library /test/lib ..
diff --git a/test/jdk/sun/security/pkcs11/Signature/SigInteropPSS2.java b/test/jdk/sun/security/pkcs11/Signature/SigInteropPSS2.java
new file mode 100644
-index 00000000000..b8ea9863327
+index 0000000000..b8ea986332
--- /dev/null
+++ b/test/jdk/sun/security/pkcs11/Signature/SigInteropPSS2.java
@@ -0,0 +1,98 @@
@@ -2366,7 +2330,7 @@ index 00000000000..b8ea9863327
+ }
+}
diff --git a/test/jdk/sun/security/pkcs11/Signature/SignatureTestPSS.java b/test/jdk/sun/security/pkcs11/Signature/SignatureTestPSS.java
-index 3a6dbe345e9..4c1f7284bbc 100644
+index 3a6dbe345e..4c1f7284bb 100644
--- a/test/jdk/sun/security/pkcs11/Signature/SignatureTestPSS.java
+++ b/test/jdk/sun/security/pkcs11/Signature/SignatureTestPSS.java
@@ -1,5 +1,5 @@
@@ -2424,7 +2388,7 @@ index 3a6dbe345e9..4c1f7284bbc 100644
hash, "MGF1", new MGF1ParameterSpec(mgfHash), 0, 1);
diff --git a/test/jdk/sun/security/pkcs11/Signature/SignatureTestPSS2.java b/test/jdk/sun/security/pkcs11/Signature/SignatureTestPSS2.java
new file mode 100644
-index 00000000000..516b17972e5
+index 0000000000..516b17972e
--- /dev/null
+++ b/test/jdk/sun/security/pkcs11/Signature/SignatureTestPSS2.java
@@ -0,0 +1,140 @@
@@ -2569,7 +2533,7 @@ index 00000000000..516b17972e5
+ }
+}
diff --git a/test/jdk/sun/security/pkcs11/Signature/TestDSA2.java b/test/jdk/sun/security/pkcs11/Signature/TestDSA2.java
-index 222f8a2a5ed..3161de6fc50 100644
+index 222f8a2a5e..3161de6fc5 100644
--- a/test/jdk/sun/security/pkcs11/Signature/TestDSA2.java
+++ b/test/jdk/sun/security/pkcs11/Signature/TestDSA2.java
@@ -1,5 +1,5 @@
@@ -2664,7 +2628,7 @@ index 222f8a2a5ed..3161de6fc50 100644
}
}
diff --git a/test/jdk/sun/security/pkcs11/Signature/TestRSAKeyLength.java b/test/jdk/sun/security/pkcs11/Signature/TestRSAKeyLength.java
-index f469ca17b65..7e5a012a5ec 100644
+index f469ca17b6..7e5a012a5e 100644
--- a/test/jdk/sun/security/pkcs11/Signature/TestRSAKeyLength.java
+++ b/test/jdk/sun/security/pkcs11/Signature/TestRSAKeyLength.java
@@ -22,8 +22,8 @@
@@ -2697,7 +2661,7 @@ index f469ca17b65..7e5a012a5ec 100644
kpg.initialize(512);
KeyPair kp = kpg.generateKeyPair();
diff --git a/test/jdk/sun/security/pkcs11/nss/p11-nss.txt b/test/jdk/sun/security/pkcs11/nss/p11-nss.txt
-index 49778ea954c..576b1dc4d69 100644
+index 49778ea954..576b1dc4d6 100644
--- a/test/jdk/sun/security/pkcs11/nss/p11-nss.txt
+++ b/test/jdk/sun/security/pkcs11/nss/p11-nss.txt
@@ -11,12 +11,23 @@ library = ${pkcs11test.nss.lib}
diff --git a/jdk8271148-external_doesnt_produce_debuginfo.patch b/jdk8271148-external_doesnt_produce_debuginfo.patch
deleted file mode 100644
index 7eed447..0000000
--- a/jdk8271148-external_doesnt_produce_debuginfo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e2d6aaa1a809c0d49d599812440777549fc36ea4 Mon Sep 17 00:00:00 2001
-From: Severin Gehwolf <sgehwolf(a)redhat.com>
-Date: Thu, 22 Jul 2021 18:30:22 +0200
-Subject: [PATCH] Backport JDK-8271148
-
----
- make/common/NativeCompilation.gmk | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
-index 490a7f4c7fb..2e3b5dd5eca 100644
---- a/make/common/NativeCompilation.gmk
-+++ b/make/common/NativeCompilation.gmk
-@@ -544,15 +544,6 @@ define SetupNativeCompilationBody
- # jmods.
- $1_OBJECT_DIR := $$($1_OBJECT_DIR)/static
- $1_OUTPUT_DIR := $$($1_OBJECT_DIR)
-- # For release builds where debug symbols are configured to be moved to
-- # separate debuginfo files, disable debug symbols for static libs instead.
-- # We don't currently support this configuration and we don't want symbol
-- # information in release builds unless explicitly asked to provide it.
-- ifeq ($(DEBUG_LEVEL), release)
-- ifeq ($(COPY_DEBUG_SYMBOLS), true)
-- $1_COMPILE_WITH_DEBUG_SYMBOLS := false
-- endif
-- endif
- endif
-
- ifeq ($$($1_TYPE), EXECUTABLE)
---
-2.31.1
-
diff --git a/jdk8312489-max_sig_default_increase.patch b/jdk8312489-max_sig_default_increase.patch
new file mode 100644
index 0000000..e0c4eeb
--- /dev/null
+++ b/jdk8312489-max_sig_default_increase.patch
@@ -0,0 +1,50 @@
+commit 50074a04e62f91faa080b831d9ce343396ead252
+Author: Andrew John Hughes <andrew(a)openjdk.org>
+Date: Tue Sep 5 20:48:42 2023 +0000
+
+ 8312489: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar
+
+ Backport-of: e47a84f23dd2608c6f5748093eefe301fb5bf750
+
+diff --git a/src/java.base/share/classes/java/util/jar/JarFile.java b/src/java.base/share/classes/java/util/jar/JarFile.java
+index cb7e308e0d..cce897c0d3 100644
+--- a/src/java.base/share/classes/java/util/jar/JarFile.java
++++ b/src/java.base/share/classes/java/util/jar/JarFile.java
+@@ -809,7 +809,9 @@ class JarFile extends ZipFile {
+ throw new IOException("Unsupported size: " + uncompressedSize +
+ " for JarEntry " + ze.getName() +
+ ". Allowed max size: " +
+- SignatureFileVerifier.MAX_SIG_FILE_SIZE + " bytes");
++ SignatureFileVerifier.MAX_SIG_FILE_SIZE + " bytes. " +
++ "You can use the jdk.jar.maxSignatureFileSize " +
++ "system property to increase the default value.");
+ }
+ int len = (int)uncompressedSize;
+ int bytesRead;
+diff --git a/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
+index cb477fc134..a766b8249f 100644
+--- a/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
++++ b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
+@@ -852,16 +852,16 @@ public class SignatureFileVerifier {
+ * the maximum allowed number of bytes for the signature-related files
+ * in a JAR file.
+ */
+- Integer tmp = GetIntegerAction.privilegedGetProperty(
+- "jdk.jar.maxSignatureFileSize", 8000000);
++ int tmp = GetIntegerAction.privilegedGetProperty(
++ "jdk.jar.maxSignatureFileSize", 16000000);
+ if (tmp < 0 || tmp > MAX_ARRAY_SIZE) {
+ if (debug != null) {
+- debug.println("Default signature file size 8000000 bytes " +
+- "is used as the specified size for the " +
+- "jdk.jar.maxSignatureFileSize system property " +
++ debug.println("The default signature file size of 16000000 bytes " +
++ "will be used for the jdk.jar.maxSignatureFileSize " +
++ "system property since the specified value " +
+ "is out of range: " + tmp);
+ }
+- tmp = 8000000;
++ tmp = 16000000;
+ }
+ return tmp;
+ }
diff --git a/openjdk_news.sh b/openjdk_news.sh
index 560b356..386aa53 100755
--- a/openjdk_news.sh
+++ b/openjdk_news.sh
@@ -18,8 +18,8 @@
OLD_RELEASE=$1
NEW_RELEASE=$2
-SUBDIR=$3
-REPO=$4
+REPO=$3
+SUBDIR=$4
SCRIPT_DIR=$(dirname ${0})
if test "x${SUBDIR}" = "x"; then
diff --git a/remove-intree-libraries.sh b/remove-intree-libraries.sh
index ee02f60..25c2fc8 100644
--- a/remove-intree-libraries.sh
+++ b/remove-intree-libraries.sh
@@ -162,5 +162,3 @@ rm -vf ${LCMS_SRC}/cmsxform.c
rm -vf ${LCMS_SRC}/lcms2.h
rm -vf ${LCMS_SRC}/lcms2_internal.h
rm -vf ${LCMS_SRC}/lcms2_plugin.h
-
-
diff --git a/sources b/sources
index b289e5b..7c58d0e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openjdk-jdk11u-jdk-11.0.20+8.tar.xz) = c518d6c58d2644a34406d7867befe05457b81841e1ff376eb5f80e6b92f9799f921668b133c59008cbb6aa47f7ec9618de14f6848f827c3cbe1b630e000f9105
+SHA512 (openjdk-jdk11u-jdk-11.0.21+9.tar.xz) = 7435bd1b6196f965985fee1aed06eebb97e89fe90d3bd846ffe9cf8451e1d0c7bdedcba373e0d128f9c74fcaf111ddab030efcb032e88f9306a81569aba29ace
diff --git a/update_package.sh b/update_package.sh
index 9831993..09d9504 100644
--- a/update_package.sh
+++ b/update_package.sh
@@ -1,42 +1 @@
-#!/bin/bash -x
-# this file contains defaults for currently generated source tarballs
-
-set -e
-
-# OpenJDK from Shenandoah project
-export PROJECT_NAME="shenandoah"
-export REPO_NAME="jdk11"
-# warning, clonning without shenadnaoh prefix, you will clone pure jdk - thus without shenandaoh GC
-export VERSION="shenandoah-jdk-11.0.3+7"
-export COMPRESSION=xz
-# unset tapsets overrides
-export OPENJDK_URL=""
-export TO_COMPRESS=""
-# warning, filename and filenameroot creation is duplicated here from generate_source_tarball.sh
-export FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
-FILENAME=${FILE_NAME_ROOT}.tar.${COMPRESSION}
-
-if [ ! -f ${FILENAME} ] ; then
-echo "Generating ${FILENAME}"
- sh ./generate_source_tarball.sh
-else
- echo "exists exists exists exists exists exists exists "
- echo "reusing reusing reusing reusing reusing reusing "
- echo ${FILENAME}
-fi
-
-set +e
-
-major=`echo $REPO_NAME | sed 's/[a-zA-Z]*//g'`
-build=`echo $VERSION | sed 's/.*+//g'`
-name_helper=`echo $FILENAME | sed s/$major/'%{majorver}'/g `
-name_helper=`echo $name_helper | sed s/$build/'%{buildver}'/g `
-echo "align specfile acordingly:"
-echo " sed 's/^Source0:.*/Source0: $name_helper/' -i *.spec"
-echo " sed 's/^Source8:.*/Source8: $TAPSET/' -i *.spec"
-echo " sed 's/^%global buildver.*/%global buildver $build/' -i *.spec"
-echo " sed 's/Release:.*/Release: 1%{?dist}/' -i *.spec"
-echo "and maybe others...."
-echo "you should fedpkg/rhpkg new-sources $TAPSET $FILENAME"
-echo "you should fedpkg/rhpkg prep --arch XXXX on all architectures: x86_64 i386 i586 i686 ppc ppc64 ppc64le s390 s390x aarch64 armv7hl"
-
+# this file is intentionally not use din portables, use tarball from main rpms
1
0
Architecture specific change in rpms/java-11-openjdk-portable.git
by githook-noreply＠fedoraproject.org 30 Nov '23
by githook-noreply＠fedoraproject.org 30 Nov '23
30 Nov '23
The package rpms/java-11-openjdk-portable.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-11-openjdk-portable.git/commit….
Change:
+%ifarch %{gdb_arches}
Thanks.
Full change:
============
commit dd97e2b708b53c8ad9011ad0172daeddc37f6066
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Wed Nov 29 18:06:03 2023 +0100
Fixed doc and misc name macro
diff --git a/java-11-openjdk-portable.spec b/java-11-openjdk-portable.spec
index 986cd5f..88ec160 100644
--- a/java-11-openjdk-portable.spec
+++ b/java-11-openjdk-portable.spec
@@ -469,12 +469,11 @@
# Intentionally use jdkportablenameimpl here since we want to have static-libs files overlayed on
# top of the JDK archive
%define staticlibsportablename() %{expand:%{jdkportablenameimpl -- %%{1}}}
-%define docportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable.docs;g")
+%define docportablename() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable.docs;g" | sed "s;openjdkportable;el;g")
%define docportablearchive() %{docportablename}.tar.xz
-%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable.misc;g")
+%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable.misc;g" | sed "s;openjdkportable;el;g")
%define miscportablearchive() %{miscportablename}.tar.xz
-
# RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1}
# so we have to pass in "" but evaluate it, otherwise files record will include it
%define jreportablearchiveForFiles() %(echo %{jreportablearchive -- ""})
@@ -1299,8 +1298,6 @@ function packagejdk() {
mkdir -p ${packagesdir}
pushd ${imagesdir}
- echo "Packaging build from ${imagesdir} to ${packagesdir}..."
-
if [ "x$suffix" = "x" ] ; then
nameSuffix=""
else
commit 138da70acb492bff9e4f0777f4216c3f93b0603f
Author: Jiri <jvanek(a)redhat.com>
Date: Wed Nov 29 11:08:00 2023 +0100
Updated to OpenJDK 11.0.21+9 (GA)
- adjsuted generate_source_tarball
- removed icedtea_sync
- dropped standalone licenses
- added usntripped subpkg
- added docs subpkg
- adjsuted versions of bundled libraries
- build refactored to several solid methods following gnu_andrew
- Drop local backport of JDK-8243210 which is upstream from 11.0.21+2
- Bump freetype version to 2.13.0 following JDK-8306881
- fixed '--without release' build-ability by moving docs and misc to if-release only
diff --git a/.gitignore b/.gitignore
index 0a19a08..1aa9a04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -114,3 +114,4 @@
/openjdk-jdk11u-jdk-11.0.19+7-4curve.tar.xz
/openjdk-jdk11u-jdk-11.0.19+7.tar.xz
/openjdk-jdk11u-jdk-11.0.20+8.tar.xz
+/openjdk-jdk11u-jdk-11.0.21+9.tar.xz
diff --git a/NEWS b/NEWS
index 04b170f..b99b7c6 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,308 @@ Key:
JDK-X - https://bugs.openjdk.java.net/browse/JDK-X
CVE-XXXX-YYYY: https://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
+New in release OpenJDK 11.0.21 (2023-10-17):
+============================================
+Live versions of these release notes can be found at:
+ * https://bit.ly/openjdk11021
+
+* CVEs
+ - CVE-2023-22081
+* Security fixes
+ - JDK-8286503, JDK-8312367: Enhance security classes
+ - JDK-8296581: Better system proxy support
+ - JDK-8297856: Improve handling of Bidi characters
+ - JDK-8305815, JDK-8307278: Update Libpng to 1.6.39
+ - JDK-8306881, JDK-8307286: Update FreeType to 2.13.0
+ - JDK-8309966: Enhanced TLS connections
+* Other changes
+ - JDK-6176679: Application freezes when copying an animated gif image to the system clipboard
+ - JDK-8023980: JCE doesn't provide any class to handle RSA private key in PKCS#1
+ - JDK-8155246: Throw error if default java.security file is missing
+ - JDK-8158880: test/java/time/tck/java/time/format/TCKDateTimeFormatterBuilder.java fail with zh_CN locale
+ - JDK-8168261: Use server cipher suites preference by default
+ - JDK-8181383: com/sun/jdi/OptionTest.java fails intermittently with bind failed: Address already in use
+ - JDK-8201516: DebugNonSafepoints generates incorrect information
+ - JDK-8209398: sun/security/pkcs11/KeyStore/SecretKeysBasic.sh failed with "PKCS11Exception: CKR_ATTRIBUTE_SENSITIVE"
+ - JDK-8211343: nsk_jvmti_parseoptions should handle multiple suboptions
+ - JDK-8212045: Add back the tests that were removed from HashesTest.java and AddExportsTest.java
+ - JDK-8216059: nsk_jvmti_parseoptions still has dependency on tilde separator
+ - JDK-8217237: HttpClient does not deal well with multi-valued WWW-Authenticate challenge headers
+ - JDK-8217395: Update langtools shell tests to use ${EXE_SUFFIX}
+ - JDK-8217612: (CL)HSDB cannot show some JVM flags
+ - JDK-8217850: CompressedClassSpaceSizeInJmapHeap fails after JDK-8217612
+ - JDK-8218471: generate-unsafe-access-tests.sh does not correctly invoke build.tools.spp.Spp
+ - JDK-8219628: [TESTBUG] javadoc/doclet/InheritDocForUserTags fails with -othervm
+ - JDK-8220410: sun/security/tools/jarsigner/warnings/NoTimestampTest.java failed with missing expected output
+ - JDK-8221372: Test vmTestbase/nsk/jvmti/GetThreadState/thrstat001/TestDescription.java times out
+ - JDK-8222323: ChildAlwaysOnTopTest.java fails with "RuntimeException: Failed to unset alwaysOnTop"
+ - JDK-8223573: Replace wildcard address with loopback or local host in tests - part 4
+ - JDK-8223714: HTTPSetAuthenticatorTest could be made more resilient
+ - JDK-8223783: sun/net/www/http/HttpClient/MultiThreadTest.java sometimes detect threads+1 connections
+ - JDK-8223856: Replace wildcard address with loopback or local host in tests - part 8
+ - JDK-8224617: (fs) java/nio/file/FileStore/Basic.java found filesystem twice
+ - JDK-8224729: Cleanups in sun/security/provider/certpath/ldap/LDAPCertStoreImpl.java
+ - JDK-8224768: Test ActalisCA.java fails
+ - JDK-8225012: sanity/client/SwingSet/src/ToolTipDemoTest.java fails on Windows
+ - JDK-8226221: Update PKCS11 tests to use NSS 3.46 libs
+ - JDK-8228341: SignTwice.java fails intermittently on Windows
+ - JDK-8228403: SignTwice.java failed with java.io.FileNotFoundException: File name too long
+ - JDK-8229147: Linux os::create_thread() overcounts guardpage size with newer glibc (>=2.27)
+ - JDK-8229333: java/io/File/SetLastModified.java timed out
+ - JDK-8229338: clean up test/jdk/java/util/RandomAccess/Basic.java
+ - JDK-8229348: java/net/DatagramSocket/UnreferencedDatagramSockets.java fails intermittently
+ - JDK-8229481: sun/net/www/protocol/https/ChunkedOutputStream.java failed with a SSLException
+ - JDK-8229912: [TESTBUG] java/net/Socks/SocksIPv6Test fails without IPv6
+ - JDK-8230132: java/net/NetworkInterface/NetworkInterfaceRetrievalTests.java to skip Teredo Tunneling Pseudo-Interface
+ - JDK-8231037: java/net/InetAddress/ptr/Lookup.java fails intermittently due to reverse lookup failed
+ - JDK-8231357: sun/security/pkcs11/Cipher/TestKATForGCM.java fails on SLES11 using mozilla-nss-3.14
+ - JDK-8231516: network QuickAckTest.java failed due to "SocketException: maximum number of DatagramSockets reached"
+ - JDK-8232101: (sctp) Add minimal sanity tests for SCTP
+ - JDK-8232195: Enable BigInteger tests: DivisionOverflow, SymmetricRangeTests and StringConstructorOverflow
+ - JDK-8232840: java/math/BigInteger/largeMemory/SymmetricRangeTests.java fails due to "OutOfMemoryError: Requested array size exceeds VM limit"
+ - JDK-8232922: Add java/math/BigInteger/largeMemory/SymmetricRangeTests.java to ProblemList-Xcomp
+ - JDK-8234808: jdb quoted option parsing broken
+ - JDK-8236045: [TESTBUG] MismatchedWhiteBox test fails with missing WhiteBox$WhiteBoxPermission.class
+ - JDK-8237183: Bug ID missing for test in patch which fixed JDK-8230665
+ - JDK-8238157: security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java test failures because of revocation date
+ - JDK-8239007: java/math/BigInteger/largeMemory/ tests should be disabled on 32-bit platforms
+ - JDK-8239264: Clearup the legacy ObjectIdentifier constructor from int array
+ - JDK-8239333: Mark test AmazonCA.java with intermittent key
+ - JDK-8239537: cgroup MetricsTester testMemorySubsystem fails sometimes when testing memory.kmem.tcp.usage_in_bytes
+ - JDK-8240193: loadLibrary("osxsecurity") should not be removed
+ - JDK-8241097: java/math/BigInteger/largeMemory/SymmetricRangeTests.java requires -XX:+CompactStrings
+ - JDK-8242151: Improve OID mapping and reuse among JDK security providers for aliases registration
+ - JDK-8242330: Arrays should be cloned in several JAAS Callback classes
+ - JDK-8242897: KeyFactory.generatePublic( x509Spec ) failed with java.security.InvalidKeyException
+ - JDK-8243210: ClhsdbScanOops fails with NullPointerException in FileMapHeader.inCopiedVtableSpace
+ - JDK-8244078: ProcessTools executeTestJvm and createJavaProcessBuilder have inconsistent handling of test.*.opts
+ - JDK-8247895: SHA1PRNGReseed.java is calling setSeed(0)
+ - JDK-8247968: test/jdk/javax/crypto/SecretKeyFactory/security.properties has wrong header
+ - JDK-8248001: javadoc generates invalid HTML pages whose ftp:// links are broken
+ - JDK-8249699: java/io/ByteArrayOutputStream/MaxCapacity.java should use @requires instead of @ignore
+ - JDK-8251517: [TESTBUG] com/sun/net/httpserver/bugs/B6393710.java does not scale socket timeout
+ - JDK-8252530: Fix inconsistencies in hotspot whitebox
+ - JDK-8254350: CompletableFuture.get may swallow InterruptedException
+ - JDK-8255348: NPE in PKIXCertPathValidator event logging code
+ - JDK-8257993: vmTestbase/nsk/jvmti/RedefineClasses/StressRedefine/TestDescription.java crash intermittently
+ - JDK-8259796: timed CompletableFuture.get may swallow InterruptedException
+ - JDK-8260274: Cipher.init(int, key) does not use highest priority provider for random bytes
+ - JDK-8260878: com/sun/jdi/JdbOptions.java fails without jfr
+ - JDK-8260934: java/lang/StringBuilder/HugeCapacity.java fails without Compact Strings
+ - JDK-8263970: Manual test javax/swing/JTextField/JapaneseReadingAttributes/JapaneseReadingAttributes.java failed
+ - JDK-8265980: Fix systemDictionary and loaderConstraints printing
+ - JDK-8268457: XML Transformer outputs Unicode supplementary character incorrectly to HTML
+ - JDK-8268464: Remove dependancy of TestHttpsServer, HttpTransaction, HttpCallback from open/test/jdk/sun/net/www/protocol/https/ tests
+ - JDK-8269091: javax/sound/sampled/Clip/SetPositionHang.java failed with ArrayIndexOutOfBoundsException: Array index out of range: -4
+ - JDK-8270331: [TESTBUG] Error: Not a test or directory containing tests: java/awt/print/PrinterJob/InitToBlack.java
+ - JDK-8271838: AmazonCA.java interop test fails
+ - JDK-8273807: Zero: Drop incorrect test block from compiler/startup/NumCompilerThreadsCheck.java
+ - JDK-8274205: Handle KDC_ERR_SVC_UNAVAILABLE error code from KDC
+ - JDK-8274606: Fix jaxp/javax/xml/jaxp/unittest/transform/SurrogateTest.java test
+ - JDK-8275234: java/awt/GraphicsDevice/DisplayModes/CycleDMImage.java is entered twice in ProblemList
+ - JDK-8275303: sun/java2d/pipe/InterpolationQualityTest.java fails with D3D basic render driver
+ - JDK-8276651: java/lang/ProcessHandle tests fail with "RuntimeException: Input/output error" in java.lang.ProcessHandleImpl$Info.info0
+ - JDK-8277353: java/security/MessageDigest/ThreadSafetyTest.java test times out
+ - JDK-8279536: jdk/nio/zipfs/ZipFSOutputStreamTest.java timed out
+ - JDK-8283756: (zipfs) ZipFSOutputStreamTest.testOutputStream should only check inflated bytes
+ - JDK-8284524: Create an automated test for JDK-4422362
+ - JDK-8284767: Create an automated test for JDK-4422535
+ - JDK-8284772: GHA: Use GCC Major Version Dependencies Only
+ - JDK-8284910: Buffer clean in PasswordCallback
+ - JDK-8285635: javax/swing/JRootPane/DefaultButtonTest.java failed with Default Button not pressed for L&F: com.sun.java.swing.plaf.motif.MotifLookAndFeel
+ - JDK-8286172: Create an automated test for JDK-4516019
+ - JDK-8286481: Exception printed to stdout on Windows when storing transparent image in clipboard
+ - JDK-8286620: Create regression test for verifying setMargin() of JRadioButton
+ - JDK-8289508: Improve test coverage for XPath Axes: ancestor, ancestor-or-self, preceding, and preceding-sibling
+ - JDK-8289748: C2 compiled code crashes with SIGFPE with -XX:+StressLCM and -XX:+StressGCM
+ - JDK-8291444: GHA builds/tests won't run manually if disabled from automatic running
+ - JDK-8291830: jvmti/RedefineClasses/StressRedefine failed: assert(!is_null(v)) failed: narrow klass value can never be zero
+ - JDK-8292033: Move jdk.X509Certificate event logic to JCA layer
+ - JDK-8292297: Fix up loading of override java.security properties file
+ - JDK-8292443: Weak CAS VarHandle/Unsafe tests should test always-failing cases
+ - JDK-8293180: JQuery UI license file not updated
+ - JDK-8293562: KeepAliveCache Blocks Threads while Closing Connections
+ - JDK-8293657: sun/management/jmxremote/bootstrap/RmiBootstrapTest.java#id1 failed with "SSLHandshakeException: Remote host terminated the handshake"
+ - JDK-8293858: Change PKCS7 code to use default SecureRandom impl instead of SHA1PRNG
+ - JDK-8295737: macOS: Print content cut off when width > height with portrait orientation
+ - JDK-8295894: Remove SECOM certificate that is expiring in September 2023
+ - JDK-8296084: javax/swing/JSpinner/4788637/bug4788637.java fails intermittently on a VM
+ - JDK-8297437: javadoc cannot link to old docs (with old style anchors)
+ - JDK-8297523: Various GetPrimitiveArrayCritical miss result - NULL check
+ - JDK-8297587: Upgrade JLine to 3.22.0
+ - JDK-8297681: Unnecessary color conversion during 4BYTE_ABGR_PRE to INT_ARGB_PRE blit
+ - JDK-8297730: C2: Arraycopy intrinsic throws incorrect exception
+ - JDK-8297887: Update Siphash
+ - JDK-8297923: java.awt.ScrollPane broken after multiple scroll up/down
+ - JDK-8297955: LDAP CertStore should use LdapName and not String for DNs
+ - JDK-8298921: Create a regression test for JDK-8139581
+ - JDK-8298974: Add ftcolor.c to imported freetype sources
+ - JDK-8299424: containers/docker/TestMemoryWithCgroupV1.java fails on SLES12 ppc64le when testing Memory and Swap Limit
+ - JDK-8299658: C1 compilation crashes in LinearScan::resolve_exception_edge
+ - JDK-8299713: Test javax/swing/JTableHeader/6889007/bug6889007.java failed: Wrong type of cursor
+ - JDK-8300098: java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java fails with internal timeout when executed with TieredCompilation1/3
+ - JDK-8300659: Refactor TestMemoryAwareness to use WhiteBox api for host values
+ - JDK-8300751: [17u] Remove duplicate entry in javac.properties
+ - JDK-8301269: Update Commons BCEL to Version 6.7.0
+ - JDK-8301491: C2: java.lang.StringUTF16::indexOfChar intrinsic called with negative character argument
+ - JDK-8301700: Increase the default TLS Diffie-Hellman group size from 1024-bit to 2048-bit
+ - JDK-8301959: Compile command in compiler.loopopts.TestRemoveEmptyCountedLoop does not work
+ - JDK-8302161: Upgrade jQuery UI to version 1.13.2
+ - JDK-8302182: Update Public Suffix List to 88467c9
+ - JDK-8303511: C2: assert(get_ctrl(n) == cle_out) during unrolling
+ - JDK-8303809: Dispose context in SPNEGO NegotiatorImpl
+ - JDK-8304054: Linux: NullPointerException from FontConfiguration.getVersion in case no fonts are installed
+ - JDK-8304498: JShell does not switch to raw mode when there is no /bin/test
+ - JDK-8304867: Explicitly disable dtrace for ppc builds
+ - JDK-8305074: ProblemList javax/net/ssl/DTLS/RespondToRetransmit.java
+ - JDK-8305421: Work around JDK-8305420 in CDSJDITest.java
+ - JDK-8305763: Parsing a URI with an underscore goes through a silent exception, negatively impacting performance
+ - JDK-8305766: ProblemList runtime/CompressedOops/CompressedClassPointers.java
+ - JDK-8305950: Have -XshowSettings option display tzdata version
+ - JDK-8306133: Open source few AWT Drag & Drop related tests
+ - JDK-8306137: Open source several AWT ScrollPane related tests
+ - JDK-8306484: Open source several AWT Choice jtreg tests
+ - JDK-8306636: Disable compiler/c2/Test6905845.java with -XX:TieredStopAtLevel=3
+ - JDK-8306638: Open source some AWT tests related to datatransfer and Toolkit
+ - JDK-8306682: Open source a few more AWT Choice tests
+ - JDK-8306718: Optimize and opensource some old AWT tests
+ - JDK-8306954: Open source five Focus related tests
+ - JDK-8306955: Open source several JComboBox jtreg tests
+ - JDK-8307078: Opensource and clean up five more AWT Focus related tests
+ - JDK-8307080: Open source some more JComboBox jtreg tests
+ - JDK-8307128: Open source some drag and drop tests 4
+ - JDK-8307133: Open source some JTable jtreg tests
+ - JDK-8307135: java/awt/dnd/NotReallySerializableTest/NotReallySerializableTest.java failed
+ - JDK-8307301: Update HarfBuzz to 7.2.0
+ - JDK-8307569: Build with gcc8 is broken after JDK-8307301
+ - JDK-8307572: AArch64: Vector registers are clobbered by some macroassemblers
+ - JDK-8307603: [AIX] Broken build after JDK-8307301
+ - JDK-8307604: gcc12 based Alpine build broken build after JDK-8307301
+ - JDK-8307799: Newly added java/awt/dnd/MozillaDnDTest.java has invalid jtreg `@requires` clause
+ - JDK-8308156: VerifyCACerts.java misses blank in error output
+ - JDK-8309088: security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java fails
+ - JDK-8309108: Bump update version for OpenJDK: jdk-11.0.21
+ - JDK-8309138: Fix container tests for jdks with symlinked conf dir
+ - JDK-8310054: ScrollPane insets are incorrect
+ - JDK-8310176: JDK 11 G1 crash during full GC with +UseStringDeduplication
+ - JDK-8310620: [11u] Problemlist failing aot tests on macos x64
+ - JDK-8311033: [macos] PrinterJob does not take into account Sides attribute
+ - JDK-8311689: Wrong visible amount in Adjustable of ScrollPane
+ - JDK-8312138: jcmd VM.metaspace vslist has no newline character before the Class: label.
+ - JDK-8312555: Ideographic characters aren't stretched by AffineTransform.scale(2, 1)
+ - JDK-8313159: [11u] Fix test SSLEngineKeyLimit.java after Merge error
+ - JDK-8313765: Invalid CEN header (invalid zip64 extra data field size)
+ - JDK-8313796: AsyncGetCallTrace crash on unreadable interpreter method pointer
+ - JDK-8313803: [11u] Exclude jdk/jfr/event/sampling/TestStackFrameLineNumbers.java
+ - JDK-8313878: Exclude two compiler/rtm/locking tests on ppc64le
+ - JDK-8314086: [11u] A typo in the fix for JDK-8312462 is causing test failure in ChildAlwaysOnTopTest.java
+ - JDK-8314950: CMS may miss NMT tag after mark stack expansion
+ - JDK-8314960: Add Certigna Root CA - 2
+ - JDK-8315135: Memory leak in the native implementation of Pack200.Unpacker.unpack()
+ - JDK-8315529: [11u] Exclude some failing Z-GC tests
+ - JDK-8317040: Exclude cleaner test failing on older releases
+ - JDK-8317644: [11u] Remove designator DEFAULT_PROMOTED_VERSION_PRE=ea for release 11.0.21
+
+Notes on individual issues:
+===========================
+
+security-libs/javax.net.ssl:
+
+JDK-8301700: The Default TLS Diffie-Hellman Group Size Has Been Increased from 1024-bit to 2048-bit
+===================================================================================================
+The JDK implementation of TLS 1.2 now uses a default Diffie Hellman
+keysize of 2048 bits when a TLS_DHE cipher suite is negotiated and
+either the client or server does not support FFDHE.
+
+The JDK TLS implementation supports FFDHE, which can negotiate a
+stronger keysize, and this is enabled by default.
+
+As a workaround, users can revert to the previous key size by setting
+the `jdk.tls.ephemeralDHKeySize` system property to 1024 (at their own
+risk).
+
+This change does not affect TLS 1.3 as the minimum DH group size is
+already 2048 bits.
+
+JDK-8168261: Use Server Cipher Suites Preference by Default
+===========================================================
+The SunJSSE provider has been updated to use the local server-side
+cipher suite preferences by default. Previously, the server would use
+the preferences specified by the connecting client. To revert to the
+previous behaviour, use `SSLParameters.setUseCipherSuitesOrder(false)`
+on the server side.
+
+security-libs/javax.crypto:
+
+JDK-8023980: JDK Now Accepts RSA Keys in PKCS#1 Format
+======================================================
+RSA private and public keys in PKCS#1 format can now be accepted by
+JDK providers, such as the RSA `KeyFactory.impl` from the SunRsaSign
+provider. The RSA private or public key object should have the PKCS#1
+format and an encoding matching the ASN.1 syntax for a PKCS#1 RSA
+private key and public key.
+
+security-libs/javax.security:
+
+JDK-8242330: Arrays should be cloned in several JAAS Callback classes
+=====================================================================
+In the JAAS classes, ChoiceCallback and ConfirmationCallback, arrays
+were not cloned when passed into a constructor or returned. This
+allowed an external program to get access to the internal fields of
+these classes. The classes have been updated to return cloned arrays.
+
+tools/launcher:
+
+JDK-8305950: `-XshowSettings:locale` Output Now Includes Tzdata Version
+=======================================================================
+The `-XshowSettings` launcher option has been enhanced to print the
+tzdata version used by the JDK. The tzdata version is displayed as
+part of the `locale` showSettings option.
+
+Example output using `-X:showSettings:locale`:
+
+Locale settings:
+ default locale = English
+ default display locale = English
+ default format locale = English
+ tzdata version = 2023c
+
+security-libs/java.security:
+
+JDK-8295894: Removed SECOM Trust System's RootCA1 Root Certificate
+==================================================================
+The following root certificate from SECOM Trust System has been
+removed from the `cacerts` keystore:
+
+Alias Name: secomscrootca1 [jdk]
+Distinguished Name: OU=Security Communication RootCA1, O=SECOM Trust.net, C=JP
+
+JDK-8314960: Added Certigna Root CA Certificate
+===============================================
+The following root certificate has been added to the cacerts
+truststore:
+
+Name: Certigna (Dhimyotis)
+Alias Name: certignarootca
+Distinguished Name: CN=Certigna Root CA, OU=0002 48146308100036, O=Dhimyotis, C=FR
+
+JDK-8155246: Throw Error If Default java.security File Fails to Load
+====================================================================
+A hardcoded set of security properties was used in previous releases
+when the `java.security` file could not be loaded. This set of
+properties were poorly maintained and it was not obvious to the user
+that they were being utilised. This release instead throws an
+`InternalError` if the `java.security` file can not be loaded.
+
+New in release OpenJDK 11.0.20.1 (2023-08-24):
+==============================================
+Live versions of these release notes can be found at:
+ * https://bit.ly/openjdk110201
+
+* Other changes
+ - JDK-8313765: Invalid CEN header (invalid zip64 extra data field size)
+ - JDK-8314678: Bump update version for OpenJDK: jdk-11.0.20.1
+
New in release OpenJDK 11.0.20 (2023-07-18):
=============================================
Live versions of these release notes can be found at:
@@ -4842,4 +5144,3 @@ This new system property sets the pool size of the internal
function is equivalent to the
`org.apache.xml.security.parser.pool-size` system property used in
Apache Santuario and has the same default value of 20.
-
diff --git a/discover_trees.sh b/discover_trees.sh
new file mode 100755
index 0000000..8c31278
--- /dev/null
+++ b/discover_trees.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# Copyright (C) 2020 Red Hat, Inc.
+# Written by Andrew John Hughes <gnu.andrew(a)redhat.com>.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+TREE=${1}
+
+if test "x${TREE}" = "x"; then
+ TREE=${PWD}
+fi
+
+if [ -e ${TREE}/nashorn/.hg -o -e ${TREE}/nashorn/merge.changeset ] ; then
+ NASHORN="nashorn" ;
+fi
+
+if [ -e ${TREE}/corba/.hg -o -e ${TREE}/corba/merge.changeset ] ; then
+ CORBA="corba";
+fi
+
+if [ -e ${TREE}/jaxp/.hg -o -e ${TREE}/jaxp/merge.changeset ] ; then
+ JAXP="jaxp";
+fi
+
+if [ -e ${TREE}/jaxws/.hg -o -e ${TREE}/jaxws/merge.changeset ] ; then
+ JAXWS="jaxws";
+fi
+
+if [ -e ${TREE}/langtools/.hg -o -e ${TREE}/langtools/merge.changeset ] ; then
+ LANGTOOLS="langtools";
+fi
+
+if [ -e ${TREE}/jdk/.hg -o -e ${TREE}/jdk/merge.changeset ] ; then
+ JDK="jdk";
+fi
+
+if [ -e ${TREE}/hotspot/.hg -o -e ${TREE}/hotspot/merge.changeset ] ; then
+ HOTSPOT="hotspot";
+fi
+
+SUBTREES="${CORBA} ${JAXP} ${JAXWS} ${LANGTOOLS} ${NASHORN} ${JDK} ${HOTSPOT}";
+echo ${SUBTREES}
diff --git a/fips-11u-b34fb09a5c.patch b/fips-11u-f93a863b56.patch
similarity index 96%
rename from fips-11u-b34fb09a5c.patch
rename to fips-11u-f93a863b56.patch
index 02ce6df..3690cb8 100644
--- a/fips-11u-b34fb09a5c.patch
+++ b/fips-11u-f93a863b56.patch
@@ -89,7 +89,7 @@ index 3787b12600..dab108a82b 100644
LCMS_CFLAGS:=@LCMS_CFLAGS@
LCMS_LIBS:=@LCMS_LIBS@
diff --git a/make/lib/Lib-java.base.gmk b/make/lib/Lib-java.base.gmk
-index 4cd656a086..e1fc94b5b4 100644
+index b40d3114b9..0d1d83cf3e 100644
--- a/make/lib/Lib-java.base.gmk
+++ b/make/lib/Lib-java.base.gmk
@@ -178,6 +178,31 @@ ifeq ($(call isTargetOsType, unix), true)
@@ -401,7 +401,7 @@ index 0000000000..8dcb7d9073
+ }
+}
diff --git a/src/java.base/share/classes/java/security/Security.java b/src/java.base/share/classes/java/security/Security.java
-index b36510a376..ad5182e1e7 100644
+index 5b9552058b..b46de49211 100644
--- a/src/java.base/share/classes/java/security/Security.java
+++ b/src/java.base/share/classes/java/security/Security.java
@@ -32,6 +32,7 @@ import java.net.URL;
@@ -412,16 +412,17 @@ index b36510a376..ad5182e1e7 100644
import jdk.internal.misc.SharedSecrets;
import jdk.internal.util.StaticProperty;
import sun.security.util.Debug;
-@@ -47,12 +48,20 @@ import sun.security.jca.*;
+@@ -47,6 +48,9 @@ import sun.security.jca.*;
* implementation-specific location, which is typically the properties file
* {@code conf/security/java.security} in the Java installation directory.
*
+ * <p>Additional default values of security properties are read from a
+ * system-specific location, if available.</p>
+ *
- * @author Benjamin Renaud
- * @since 1.1
- */
+ * @implNote If the properties file fails to load, the JDK implementation will
+ * throw an unspecified error when initializing the {@code Security} class.
+ *
+@@ -56,6 +60,11 @@ import sun.security.jca.*;
public final class Security {
@@ -433,7 +434,7 @@ index b36510a376..ad5182e1e7 100644
/* Are we debugging? -- for developers */
private static final Debug sdebug =
Debug.getInstance("properties");
-@@ -67,6 +76,19 @@ public final class Security {
+@@ -70,6 +79,19 @@ public final class Security {
}
static {
@@ -453,26 +454,19 @@ index b36510a376..ad5182e1e7 100644
// doPrivileged here because there are multiple
// things in initialize that might require privs.
// (the FileInputStream call and the File.exists call,
-@@ -83,6 +105,7 @@ public final class Security {
+@@ -85,6 +107,7 @@ public final class Security {
+ private static void initialize() {
props = new Properties();
- boolean loadedProps = false;
boolean overrideAll = false;
+ boolean systemSecPropsEnabled = false;
// first load the system properties file
// to determine the value of security.overridePropertiesFile
-@@ -98,6 +121,7 @@ public final class Security {
- if (sdebug != null) {
- sdebug.println("reading security properties file: " +
- propFile);
-+ sdebug.println(props.toString());
- }
- } catch (IOException e) {
- if (sdebug != null) {
-@@ -192,6 +216,61 @@ public final class Security {
+@@ -105,9 +128,63 @@ public final class Security {
}
+ loadProps(null, extraPropFile, overrideAll);
}
-
++
+ boolean sysUseProps = Boolean.valueOf(System.getProperty(SYS_PROP_SWITCH, "false"));
+ boolean secUseProps = Boolean.valueOf(props.getProperty(SEC_PROP_SWITCH));
+ if (sdebug != null) {
@@ -492,9 +486,7 @@ index b36510a376..ad5182e1e7 100644
+ }
+ }
+
-+ // FIPS support depends on the contents of java.security so
-+ // ensure it has loaded first
-+ if (loadedProps && systemSecPropsEnabled) {
++ if (systemSecPropsEnabled) {
+ boolean shouldEnable;
+ String sysProp = System.getProperty("com.redhat.fips");
+ if (sysProp == null) {
@@ -530,15 +522,19 @@ index b36510a376..ad5182e1e7 100644
+ }
}
- /*
+- private static boolean loadProps(File masterFile, String extraPropFile, boolean overrideAll) {
++ static boolean loadProps(File masterFile, String extraPropFile, boolean overrideAll) {
+ InputStream is = null;
+ try {
+ if (masterFile != null && masterFile.exists()) {
diff --git a/src/java.base/share/classes/java/security/SystemConfigurator.java b/src/java.base/share/classes/java/security/SystemConfigurator.java
new file mode 100644
-index 0000000000..90f6dd2ebc
+index 0000000000..49bf17ea17
--- /dev/null
+++ b/src/java.base/share/classes/java/security/SystemConfigurator.java
-@@ -0,0 +1,248 @@
+@@ -0,0 +1,231 @@
+/*
-+ * Copyright (c) 2019, 2021, Red Hat, Inc.
++ * Copyright (c) 2019, 2023, Red Hat, Inc.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
@@ -616,26 +612,9 @@ index 0000000000..90f6dd2ebc
+ * security.useSystemPropertiesFile is true.
+ */
+ static boolean configureSysProps(Properties props) {
-+ boolean systemSecPropsLoaded = false;
-+
-+ try (BufferedInputStream bis =
-+ new BufferedInputStream(
-+ new FileInputStream(CRYPTO_POLICIES_JAVA_CONFIG))) {
-+ props.load(bis);
-+ systemSecPropsLoaded = true;
-+ if (sdebug != null) {
-+ sdebug.println("reading system security properties file " +
-+ CRYPTO_POLICIES_JAVA_CONFIG);
-+ sdebug.println(props.toString());
-+ }
-+ } catch (IOException e) {
-+ if (sdebug != null) {
-+ sdebug.println("unable to load security properties from " +
-+ CRYPTO_POLICIES_JAVA_CONFIG);
-+ e.printStackTrace();
-+ }
-+ }
-+ return systemSecPropsLoaded;
++ // now load the system file, if it exists, so its values
++ // will win if they conflict with the earlier values
++ return Security.loadProps(null, CRYPTO_POLICIES_JAVA_CONFIG, false);
+ }
+
+ /*
@@ -1035,7 +1014,7 @@ index e06b2a588c..315a2ce370 100644
candidates = new ProtocolVersion[] {
ProtocolVersion.TLS13,
diff --git a/src/java.base/share/classes/sun/security/ssl/SunJSSE.java b/src/java.base/share/classes/sun/security/ssl/SunJSSE.java
-index c50ba93ecf..de2a91a478 100644
+index 2a2b5d7568..891796f19b 100644
--- a/src/java.base/share/classes/sun/security/ssl/SunJSSE.java
+++ b/src/java.base/share/classes/sun/security/ssl/SunJSSE.java
@@ -27,6 +27,8 @@ package sun.security.ssl;
@@ -1046,7 +1025,7 @@ index c50ba93ecf..de2a91a478 100644
+import jdk.internal.misc.SharedSecrets;
import sun.security.rsa.SunRsaSignEntries;
import static sun.security.util.SecurityConstants.PROVIDER_VER;
- import static sun.security.provider.SunEntries.createAliases;
+ import static sun.security.util.SecurityProviderConstants.*;
@@ -195,8 +197,13 @@ public abstract class SunJSSE extends java.security.Provider {
"sun.security.ssl.SSLContextImpl$TLS11Context", null, null);
ps("SSLContext", "TLSv1.2",
@@ -1062,12 +1041,12 @@ index c50ba93ecf..de2a91a478 100644
+ }
ps("SSLContext", "TLS",
"sun.security.ssl.SSLContextImpl$TLSContext",
- (isfips? null : createAliases("SSL")), null);
+ (isfips? null : List.of("SSL")), null);
diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
-index 9af64321c4..957cd78a55 100644
+index c0eed3f884..b03bd9f896 100644
--- a/src/java.base/share/conf/security/java.security
+++ b/src/java.base/share/conf/security/java.security
-@@ -85,6 +85,14 @@ security.provider.tbd=Apple
+@@ -88,6 +88,14 @@ security.provider.tbd=Apple
security.provider.tbd=SunPKCS11
#endif
@@ -1082,7 +1061,7 @@ index 9af64321c4..957cd78a55 100644
#
# A list of preferred providers for specific algorithms. These providers will
# be searched for matching algorithms before the list of registered providers.
-@@ -298,6 +306,11 @@ policy.ignoreIdentityScope=false
+@@ -301,6 +309,11 @@ policy.ignoreIdentityScope=false
#
keystore.type=pkcs12
@@ -1094,7 +1073,7 @@ index 9af64321c4..957cd78a55 100644
#
# Controls compatibility mode for JKS and PKCS12 keystore types.
#
-@@ -335,6 +348,13 @@ package.definition=sun.misc.,\
+@@ -338,6 +351,13 @@ package.definition=sun.misc.,\
#
security.overridePropertiesFile=true
@@ -1405,7 +1384,7 @@ index 0000000000..b848a1fd78
+ }
+}
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
-index cf7cd19b68..69cda46f85 100644
+index ffbd671246..bdaad67e06 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
@@ -26,6 +26,9 @@
@@ -1427,7 +1406,7 @@ index cf7cd19b68..69cda46f85 100644
import sun.security.util.Debug;
import sun.security.util.ResourcesMgr;
import static sun.security.util.SecurityConstants.PROVIDER_VER;
-@@ -60,6 +65,29 @@ import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
+@@ -61,6 +66,29 @@ import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
*/
public final class SunPKCS11 extends AuthProvider {
@@ -1457,7 +1436,7 @@ index cf7cd19b68..69cda46f85 100644
private static final long serialVersionUID = -1354835039035306505L;
static final Debug debug = Debug.getInstance("sunpkcs11");
-@@ -317,10 +345,15 @@ public final class SunPKCS11 extends AuthProvider {
+@@ -318,10 +346,15 @@ public final class SunPKCS11 extends AuthProvider {
// request multithreaded access first
initArgs.flags = CKF_OS_LOCKING_OK;
PKCS11 tmpPKCS11;
@@ -1474,7 +1453,7 @@ index cf7cd19b68..69cda46f85 100644
} catch (PKCS11Exception e) {
if (debug != null) {
debug.println("Multi-threaded initialization failed: " + e);
-@@ -336,7 +369,7 @@ public final class SunPKCS11 extends AuthProvider {
+@@ -337,7 +370,7 @@ public final class SunPKCS11 extends AuthProvider {
initArgs.flags = 0;
}
tmpPKCS11 = PKCS11.getInstance(library,
@@ -1483,7 +1462,7 @@ index cf7cd19b68..69cda46f85 100644
}
p11 = tmpPKCS11;
-@@ -376,6 +409,24 @@ public final class SunPKCS11 extends AuthProvider {
+@@ -377,6 +410,24 @@ public final class SunPKCS11 extends AuthProvider {
if (nssModule != null) {
nssModule.setProvider(this);
}
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index 408ebce..849cff2 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -8,7 +8,7 @@
# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
# PROJECT_NAME=openjdk
# REPO_NAME=jdk11u
-# VERSION=jdk-11.0.18+10
+# VERSION=jdk-11.0.21+9
# or to eg prepare systemtap:
# icedtea7's jstack and other tapsets
# VERSION=6327cf1cea9e
@@ -29,8 +29,6 @@ set -e
OPENJDK_URL_DEFAULT=https://github.com
COMPRESSION_DEFAULT=xz
-# Corresponding IcedTea version
-ICEDTEA_VERSION=6.0
if [ "x$1" = "xhelp" ] ; then
echo -e "Behaviour may be specified by setting the following variables:\n"
@@ -41,7 +39,7 @@ if [ "x$1" = "xhelp" ] ; then
echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
echo "REPO_ROOT - the location of the Git repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
- echo "TO_COMPRESS - what part of clone to pack (default is openjdk)"
+ echo "TO_COMPRESS - what part of clone to pack (default is ${VERSION})"
echo "BOOT_JDK - the bootstrap JDK to satisfy the configure run"
exit 1;
fi
@@ -117,8 +115,8 @@ if [ "x$REPO_ROOT" = "x" ] ; then
fi;
if [ "x$TO_COMPRESS" = "x" ] ; then
- TO_COMPRESS="openjdk"
- echo "No targets to be compressed specified, ; default to ${TO_COMPRESS}"
+ TO_COMPRESS="${VERSION}"
+ echo "No targets to be compressed specified ; default to ${TO_COMPRESS}"
fi;
echo -e "Settings:"
@@ -140,41 +138,41 @@ else
mkdir "${FILE_NAME_ROOT}"
pushd "${FILE_NAME_ROOT}"
echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
- git clone -b ${VERSION} ${REPO_ROOT} openjdk
+ git clone -b ${VERSION} ${REPO_ROOT} ${VERSION}
popd
fi
pushd "${FILE_NAME_ROOT}"
# UnderlineTaglet.java has a BSD license with a field-of-use restriction, making it non-Free
- if [ -d openjdk/test ] ; then
+ if [ -d ${VERSION}/test ] ; then
echo "Removing langtools test case with non-Free license"
- rm -vf openjdk/test/langtools/tools/javadoc/api/basic/taglets/UnderlineTaglet.java
+ rm -vf ${VERSION}/test/langtools/tools/javadoc/api/basic/taglets/UnderlineTaglet.java
fi
# Generate .src-rev so build has knowledge of the revision the tarball was created from
mkdir build
pushd build
- sh ${PWD}/../openjdk/configure --with-boot-jdk=${BOOT_JDK}
+ sh ${PWD}/../${VERSION}/configure --with-boot-jdk=${BOOT_JDK}
make store-source-revision
popd
rm -rf build
# Remove commit checks
- echo "Removing $(find openjdk -name '.jcheck' -print)"
- find openjdk -name '.jcheck' -print0 | xargs -0 rm -rf
+ echo "Removing $(find ${VERSION} -name '.jcheck' -print)"
+ find ${VERSION} -name '.jcheck' -print0 | xargs -0 rm -rf
# Remove history and GHA
- echo "find openjdk -name '.hgtags'"
- find openjdk -name '.hgtags' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.hgignore'"
- find openjdk -name '.hgignore' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.gitattributes'"
- find openjdk -name '.gitattributes' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.gitignore'"
- find openjdk -name '.gitignore' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.git'"
- find openjdk -name '.git' -exec rm -rfv '{}' '+'
- echo "find openjdk -name '.github'"
- find openjdk -name '.github' -exec rm -rfv '{}' '+'
+ echo "find ${VERSION} -name '.hgtags'"
+ find ${VERSION} -name '.hgtags' -exec rm -fv '{}' '+'
+ echo "find ${VERSION} -name '.hgignore'"
+ find ${VERSION} -name '.hgignore' -exec rm -fv '{}' '+'
+ echo "find ${VERSION} -name '.gitattributes'"
+ find ${VERSION} -name '.gitattributes' -exec rm -fv '{}' '+'
+ echo "find ${VERSION} -name '.gitignore'"
+ find ${VERSION} -name '.gitignore' -exec rm -fv '{}' '+'
+ echo "find ${VERSION} -name '.git'"
+ find ${VERSION} -name '.git' -exec rm -rfv '{}' '+'
+ echo "find ${VERSION} -name '.github'"
+ find ${VERSION} -name '.github' -exec rm -rfv '{}' '+'
echo "Compressing remaining forest"
if [ "X$COMPRESSION" = "Xxz" ] ; then
diff --git a/icedtea_sync.sh b/icedtea_sync.sh
index e5c54f3..09d9504 100755
--- a/icedtea_sync.sh
+++ b/icedtea_sync.sh
@@ -1,192 +1 @@
-#!/bin/bash
-
-# Copyright (C) 2019 Red Hat, Inc.
-# Written by Andrew John Hughes <gnu.andrew(a)redhat.com>.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-ICEDTEA_USE_VCS=true
-
-ICEDTEA_VERSION=3.15.0
-ICEDTEA_URL=https://icedtea.classpath.org/download/source
-ICEDTEA_SIGNING_KEY=CFDA0F9B35964222
-
-ICEDTEA_HG_URL=https://icedtea.classpath.org/hg/icedtea11
-
-set -e
-
-RPM_DIR=${PWD}
-if [ ! -f ${RPM_DIR}/jconsole.desktop.in ] ; then
- echo "Not in RPM source tree.";
- exit 1;
-fi
-
-if test "x${TMPDIR}" = "x"; then
- TMPDIR=/tmp;
-fi
-WORKDIR=${TMPDIR}/it.sync
-
-echo "Using working directory ${WORKDIR}"
-mkdir ${WORKDIR}
-pushd ${WORKDIR}
-
-if test "x${WGET}" = "x"; then
- WGET=$(which wget);
- if test "x${WGET}" = "x"; then
- echo "wget not found";
- exit 1;
- fi
-fi
-
-if test "x${TAR}" = "x"; then
- TAR=$(which tar)
- if test "x${TAR}" = "x"; then
- echo "tar not found";
- exit 2;
- fi
-fi
-
-echo "Dependencies:";
-echo -e "\tWGET: ${WGET}";
-echo -e "\tTAR: ${TAR}\n";
-
-if test "x${ICEDTEA_USE_VCS}" = "xtrue"; then
- echo "Mode: Using VCS";
-
- if test "x${GREP}" = "x"; then
- GREP=$(which grep);
- if test "x${GREP}" = "x"; then
- echo "grep not found";
- exit 3;
- fi
- fi
-
- if test "x${CUT}" = "x"; then
- CUT=$(which cut);
- if test "x${CUT}" = "x"; then
- echo "cut not found";
- exit 4;
- fi
- fi
-
- if test "x${TR}" = "x"; then
- TR=$(which tr);
- if test "x${TR}" = "x"; then
- echo "tr not found";
- exit 5;
- fi
- fi
-
- if test "x${HG}" = "x"; then
- HG=$(which hg);
- if test "x${HG}" = "x"; then
- echo "hg not found";
- exit 6;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tGREP: ${GREP}";
- echo -e "\tCUT: ${CUT}";
- echo -e "\tTR: ${TR}";
- echo -e "\tHG: ${HG}";
-
- echo "Checking out repository from VCS...";
- ${HG} clone ${ICEDTEA_HG_URL} icedtea
-
- echo "Obtaining version from configure.ac...";
- ROOT_VER=$(${GREP} '^AC_INIT' icedtea/configure.ac|${CUT} -d ',' -f 2|${TR} -d '[][:space:]')
- echo "Root version from configure: ${ROOT_VER}";
-
- VCS_REV=$(${HG} log -R icedtea --template '{node|short}' -r tip)
- echo "VCS revision: ${VCS_REV}";
-
- ICEDTEA_VERSION="${ROOT_VER}-${VCS_REV}"
- echo "Creating icedtea-${ICEDTEA_VERSION}";
- mkdir icedtea-${ICEDTEA_VERSION}
- echo "Copying required files from checkout to icedtea-${ICEDTEA_VERSION}";
- # Commented out for now as IcedTea 6's jconsole.desktop.in is outdated
- #cp -a icedtea/jconsole.desktop.in ../icedtea-${ICEDTEA_VERSION}
- cp -a ${RPM_DIR}/jconsole.desktop.in icedtea-${ICEDTEA_VERSION}
- cp -a icedtea/tapset icedtea-${ICEDTEA_VERSION}
-
- rm -rf icedtea
-else
- echo "Mode: Using tarball";
-
- if test "x${ICEDTEA_VERSION}" = "x"; then
- echo "No IcedTea version specified for tarball download.";
- exit 3;
- fi
-
- if test "x${CHECKSUM}" = "x"; then
- CHECKSUM=$(which sha256sum)
- if test "x${CHECKSUM}" = "x"; then
- echo "sha256sum not found";
- exit 4;
- fi
- fi
-
- if test "x${PGP}" = "x"; then
- PGP=$(which gpg)
- if test "x${PGP}" = "x"; then
- echo "gpg not found";
- exit 5;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tCHECKSUM: ${CHECKSUM}";
- echo -e "\tPGP: ${PGP}\n";
-
- echo "Checking for IcedTea signing key ${ICEDTEA_SIGNING_KEY}...";
- if ! gpg --list-keys ${ICEDTEA_SIGNING_KEY}; then
- echo "IcedTea signing key ${ICEDTEA_SIGNING_KEY} not installed.";
- exit 6;
- fi
-
- echo "Downloading IcedTea release tarball...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz
- echo "Downloading IcedTea tarball signature...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- echo "Downloading IcedTea tarball checksums...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Verifying checksums...";
- ${CHECKSUM} --check --ignore-missing icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Checking signature...";
- ${PGP} --verify icedtea-${ICEDTEA_VERSION}.tar.xz.sig
-
- echo "Extracting files...";
- ${TAR} xJf icedtea-${ICEDTEA_VERSION}.tar.xz \
- icedtea-${ICEDTEA_VERSION}/tapset \
- icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in
-
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- rm -vf icedtea-${ICEDTEA_VERSION}.sha256
-fi
-
-echo "Replacing desktop files...";
-mv -v icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in ${RPM_DIR}
-
-echo "Creating new tapset tarball...";
-mv -v icedtea-${ICEDTEA_VERSION} openjdk
-${TAR} cJf ${RPM_DIR}/tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz openjdk
-
-rm -rvf openjdk
-
-popd
-rm -rf ${WORKDIR}
+# this file is intentionally not use din portables, use tarball from main rpms
diff --git a/java-11-openjdk-portable.spec b/java-11-openjdk-portable.spec
index eba37b7..986cd5f 100644
--- a/java-11-openjdk-portable.spec
+++ b/java-11-openjdk-portable.spec
@@ -29,6 +29,8 @@
%bcond_without release
# Enable static library builds by default.
%bcond_without staticlibs
+# Remove build artifacts by default
+%bcond_with artifacts
# Build a fresh libjvm.so for use in a copy of the bootstrap JDK
%bcond_without fresh_libjvm
# Build with system libraries
@@ -41,8 +43,6 @@
%define __os_install_post %{nil}
%endif
-%global unpacked_licenses %{_datarootdir}/licenses
-
# Workaround for stripping of debug symbols from static libraries
%if %{with staticlibs}
%define __brp_strip_static_archive %{nil}
@@ -66,10 +66,6 @@
# See: https://bugzilla.redhat.com/show_bug.cgi?id=1520879
%global _find_debuginfo_opts -g
-# With LTO flags enabled, debuginfo checks fail for some reason. Disable
-# LTO for a passing build. This really needs to be looked at.
-%define _lto_cflags %{nil}
-
# note: parametrized macros are order-sensitive (unlike not-parametrized) even with normal macros
# also necessary when passing it as parameter to other macros. If not macro, then it is considered a switch
# see the difference between global and define:
@@ -157,9 +153,14 @@
# Set of architectures for which alt-java has SSB mitigation
%global ssbd_arches x86_64
# Set of architectures where we verify backtraces with gdb
+# s390x fails on RHEL 7 so we exclude it there
+%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
+%global gdb_arches %{arm} %{aarch64} %{ix86} %{power64} sparcv9 sparc64 x86_64 %{zero_arches}
+%else
%global gdb_arches %{jit_arches} %{zero_arches}
+%endif
-# By default, we build a debug build during main build on JIT architectures
+# By default, we build a slowdebug build during main build on JIT architectures
%if %{with slowdebug}
%ifarch %{debug_arches}
%global include_debug_build 1
@@ -241,10 +242,10 @@
%global static_libs_target %{nil}
%endif
-# RPM JDK builds keep the debug symbols internal, to be later stripped by RPM
-%global debug_symbols internal
-
-# unlike portables,the rpms have to use static_libs_target very dynamically
+# The static libraries are produced under the same configuration as the main
+# build for portables, as we expect in-tree libraries to be used throughout.
+# If system libraries are enabled, the static libraries will also use them
+# which may cause issues.
%global bootstrap_targets images %{static_libs_target} legacy-jre-image
%global release_targets images docs-zip %{static_libs_target} legacy-jre-image
# No docs nor bootcycle for debug builds
@@ -252,14 +253,18 @@
# Target to use to just build HotSpot
%global hotspot_target hotspot
+
+# Disable LTO as this causes build failures at the moment.
+# See RHBZ#1861401
+%define _lto_cflags %{nil}
+
# Filter out flags from the optflags macro that cause problems with the OpenJDK build
# We filter out -O flags so that the optimization of HotSpot is not lowered from O3 to O2
# We filter out -Wall which will otherwise cause HotSpot to produce hundreds of thousands of warnings (100+mb logs)
# We replace it with -Wformat (required by -Werror=format-security) and -Wno-cpp to avoid FORTIFY_SOURCE warnings
# We filter out -fexceptions as the HotSpot build explicitly does -fno-exceptions and it's otherwise the default for C++
-# removal of -g is portable build specific to achieve no debug for release
-%global ourflags %(echo %optflags | sed -e 's|-Wall|-Wformat -Wno-cpp|' | sed -r -e 's|-O[0-9]*||' | sed -e 's|-g ||')
-%global ourcppflags %(echo %ourflags | sed -e 's|-fexceptions||' | sed -e 's|-g ||')
+%global ourflags %(echo %optflags | sed -e 's|-Wall|-Wformat -Wno-cpp|' | sed -r -e 's|-O[0-9]*||')
+%global ourcppflags %(echo %ourflags | sed -e 's|-fexceptions||')
%global ourldflags %{__global_ldflags}
# With disabled nss is NSS deactivated, so NSS_LIBDIR can contain the wrong path
@@ -338,20 +343,19 @@
# New Version-String scheme-style defines
%global featurever 11
%global interimver 0
-%global updatever 20
+%global updatever 21
%global patchver 0
# buildjdkver is usually same as %%{featurever},
# but in time of bootstrap of next jdk, it is featurever-1,
# and this it is better to change it here, on single place
%global buildjdkver %{featurever}
-# We don't add any LTS designator for STS packages (Fedora and EPEL).
-# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
-%if 0%{?rhel} && !0%{?epel}
+# Add LTS designator for RHEL builds
+%if 0%{?rhel}
%global lts_designator "LTS"
%global lts_designator_zip -%{lts_designator}
%else
- %global lts_designator ""
- %global lts_designator_zip ""
+ %global lts_designator ""
+ %global lts_designator_zip ""
%endif
# JDK to use for bootstrapping
%global bootjdk /usr/lib/jvm/java-%{buildjdkver}-openjdk
@@ -370,32 +374,39 @@
# Define what url should JVM offer in case of a crash report
# order may be important, epel may have rhel declared
%if 0%{?epel}
-%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora%20EPEL&component=%…
+%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora%20EPEL&component=%…
%else
%if 0%{?fedora}
# Does not work for rawhide, keeps the version field empty
-%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{name}&…
+%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{compon…
%else
%if 0%{?rhel}
-%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20…
+%global oj_vendor_bug_url https://access.redhat.com/support/cases/
%else
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi
%endif
%endif
%endif
-%global oj_vendor_version (Red_Hat-%{version}-%{release})
+%global oj_vendor_version (Red_Hat-%{version}-%{rpmrelease})
# Define IcedTea version used for SystemTap tapsets and desktop file
%global icedteaver 6.0.0pre00-c848b93a8598
# Define current Git revision for the FIPS support patches
-%global fipsver b34fb09a5c
+%global fipsver f93a863b56
+# Define JDK versions
+%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
+%global javaver %{featurever}
+# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
+%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
+# The tag used to create the OpenJDK tarball
+%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Standard JPackage naming and versioning defines
%global origin openjdk
%global origin_nice OpenJDK
-%global top_level_dir_name %{origin}
+%global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
-%global buildver 8
+%global buildver 9
%global rpmrelease 1
#%%global tagsuffix %%{nil}
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
@@ -410,14 +421,6 @@
# for techpreview, using 1, so slowdebugs can have 0
%global priority %( printf '%08d' 1 )
%endif
-%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
-%global javaver %{featurever}
-
-# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
-%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
-
-# The tag used to create the OpenJDK tarball
-%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Define milestone (EA for pre-releases, GA for releases)
# Release will be (where N is usually a number starting at 1):
@@ -445,6 +448,7 @@
# output dir stub
%define buildoutputdir() %{expand:build/jdk%{featurever}.build%{?1}}
%define installoutputdir() %{expand:install/jdk%{featurever}.install%{?1}}
+%define packageoutputdir() %{expand:packages/jdk%{featurever}.packages%{?1}}
# we can copy the javadoc to not arched dir, or make it not noarch
%define uniquejavadocdir() %{expand:%{fullversion}.%{_arch}%{?1}}
# main id and dir of this jdk
@@ -465,6 +469,11 @@
# Intentionally use jdkportablenameimpl here since we want to have static-libs files overlayed on
# top of the JDK archive
%define staticlibsportablename() %{expand:%{jdkportablenameimpl -- %%{1}}}
+%define docportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable.docs;g")
+%define docportablearchive() %{docportablename}.tar.xz
+%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable.misc;g")
+%define miscportablearchive() %{miscportablename}.tar.xz
+
# RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1}
# so we have to pass in "" but evaluate it, otherwise files record will include it
@@ -478,7 +487,7 @@
# fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349
# https://bugzilla.redhat.com/show_bug.cgi?id=1590796#c14
# https://bugzilla.redhat.com/show_bug.cgi?id=1655938
-%global _privatelibs libsplashscreen[.]so.*|libawt_xawt[.]so.*|libjli[.]so.*|libattach[.]so.*|libawt[.]so.*|libextnet[.]so.*|libawt_headless[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjimage[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmanagement_agent[.]so.*|libmanagement_ext[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libprefs[.]so.*|librmi[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsystemconf[.]so.*|libzip[.]so.*%{freetype_lib}
+%global _privatelibs libsplashscreen[.]so.*|libawt_xawt[.]so.*|libjli[.]so.*|libattach[.]so.*|libawt[.]so.*|libextnet[.]so.*|libawt_headless[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjimage[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmanagement_agent[.]so.*|libmanagement_ext[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libprefs[.]so.*|librmi[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsunec[.]so.*|libsystemconf[.]so.*|libunpack[.]so.*|libzip[.]so.*%{freetype_lib}
%global _publiclibs libjawt[.]so.*|libjava[.]so.*|libjvm[.]so.*|libverify[.]so.*|libjsig[.]so.*
%if %is_system_jdk
%global __provides_exclude ^(%{_privatelibs})$
@@ -494,6 +503,12 @@
%global __requires_exclude ^(%{_privatelibs}|%{_publiclibs})$
%endif
+# VM variant being built
+%ifarch %{zero_arches}
+%global vm_variant zero
+%else
+%global vm_variant server
+%endif
%global etcjavasubdir %{_sysconfdir}/java/java-%{javaver}-%{origin}
%define etcjavadir() %{expand:%{etcjavasubdir}/%{uniquesuffix -- %{?1}}}
@@ -516,20 +531,6 @@
%global alternatives_requires %{_sbindir}/alternatives
%endif
-%if %{with_systemtap}
-# Where to install systemtap tapset (links)
-# We would like these to be in a package specific sub-dir,
-# but currently systemtap doesn't support that, so we have to
-# use the root tapset dir for now. To distinguish between 64
-# and 32 bit architectures we place the tapsets under the arch
-# specific dir (note that systemtap will only pickup the tapset
-# for the primary arch for now). Systemtap uses the machine name
-# aka target_cpu as architecture specific directory name.
-%global tapsetroot /usr/share/systemtap
-%global tapsetdirttapset %{tapsetroot}/tapset/
-%global tapsetdir %{tapsetdirttapset}/%{stapinstall}
-%endif
-
# x86 is no longer supported
%if 0%{?java_arches:1}
ExclusiveArch: %{java_arches}
@@ -537,8 +538,8 @@ ExclusiveArch: %{java_arches}
ExcludeArch: %{ix86}
%endif
-# Portables have no rpo (requires/provides), but thsoe are awesome for orientation in spec
-# also scriptlets are hapily missing and files are handled old fashion
+# Portables have no repo (requires/provides), but these are awesome for orientation in spec
+# Also scriptlets are happily missing and files are handled old fashion
# not-duplicated requires/provides/obsoletes for normal/debug packages
%define java_rpo() %{expand:
}
@@ -549,6 +550,14 @@ ExcludeArch: %{ix86}
%define java_static_libs_rpo() %{expand:
}
+%define java_unstripped_rpo() %{expand:
+}
+
+%define java_docs_rpo() %{expand:
+}
+
+%define java_misc_rpo() %{expand:
+}
# Prevent brp-java-repack-jars from being run
%global __jar_repack 0
@@ -594,7 +603,6 @@ Group: Development/Languages
License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib and ISC and FTL and RSA
URL: http://openjdk.java.net/
-
# The source tarball, generated using generate_source_tarball.sh
Source0: openjdk-jdk%{featurever}u-%{vcstag}.tar.xz
@@ -615,8 +623,7 @@ Source10: NEWS
Source11: nss.cfg.in
# Removed libraries that we link instead
-# Disabled in portables
-#Source12: remove-intree-libraries.sh
+Source12: remove-intree-libraries.sh
# Ensure we aren't using the limited crypto policy
Source13: TestCryptoLevel.java
@@ -636,14 +643,6 @@ Source17: nss.fips.cfg.in
# Ensure translations are available for new timezones
Source18: TestTranslations.java
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-# boot jdk for portable build root on
-Source1001: ojdk17-aarch64-17.35.tar.gz
-Source1002: ojdk17-ppc64le-17.35.tar.gz
-Source1003: ojdk17-x86_64-17.35.tar.gz
-Source1004: ojdk17-s390x-17.35.tar.gz
-%endif
-
############################################
#
# RPM/distribution specific patches
@@ -652,8 +651,6 @@ Source1004: ojdk17-s390x-17.35.tar.gz
# Ignore AWTError when assistive technologies are loaded
Patch1: rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
-# Restrict access to java-atk-wrapper classes
-Patch2: rh1648644-java_access_bridge_privileged_security.patch
# NSS via SunPKCS11 Provider (disabled due to memory leak).
Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
# RH1750419: enable build of speculative store bypass hardened alt-java (CVE-2018-3639)
@@ -694,10 +691,12 @@ Patch1001: fips-11u-%{fipsver}.patch
#############################################
#
-# OpenJDK patches in need of upstreaming
+# Upstreamable patches
#
+# This section includes patches which need to
+# be reviewed & pushed to the current development
+# tree of OpenJDK.
#############################################
-
Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch
#############################################
@@ -709,10 +708,35 @@ Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk1
# need to be reviewed & pushed to the appropriate
# updates tree of OpenJDK.
#############################################
-Patch2001: jdk8242332-rh2108712-sha3-sunpkcs11.patch
+Patch2002: jdk8242332-rh2108712-sha3-sunpkcs11.patch
-# JDK-8271148: static-libs-image target --with-native-debug-symbols=external doesn't produce debug info
-Patch7777: jdk8271148-external_doesnt_produce_debuginfo.patch
+#############################################
+#
+# Patches appearing in 11.0.21
+#
+# This section includes patches which are present
+# in the listed OpenJDK 11u release and should be
+# able to be removed once that release is out
+# and used by this RPM.
+#############################################
+
+#############################################
+#
+# Patches appearing in 11.0.22
+#
+# This section includes patches which are present
+# in the listed OpenJDK 8u release and should be
+# able to be removed once that release is out
+# and used by this RPM.
+#############################################
+# JDK-8312489, OJ2095: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar
+Patch2000: jdk8312489-max_sig_default_increase.patch
+
+#############################################
+#
+# Portable build specific patches
+#
+#############################################
BuildRequires: autoconf
BuildRequires: automake
@@ -722,6 +746,7 @@ BuildRequires: cups-devel
BuildRequires: desktop-file-utils
# elfutils only are OK for build without AOT
BuildRequires: elfutils-devel
+BuildRequires: file
BuildRequires: fontconfig-devel
BuildRequires: freetype-devel
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
@@ -749,28 +774,24 @@ BuildRequires: libXtst-devel
# Requirement for setting up nss.cfg and nss.fips.cfg
BuildRequires: nss-devel
# Requirement for system security property test
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-BuildRequires: crypto-policies
-%endif
+# N/A for portable. RHEL7 doesn't provide them
+# and policy support is turned off
+#BuildRequires: crypto-policies
BuildRequires: pkgconfig
BuildRequires: xorg-x11-proto-devel
BuildRequires: zip
# to pack portable tarballs
BuildRequires: tar
BuildRequires: unzip
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
# No javapackages-filesystem on el7,nor is needed for portables
-%else
-BuildRequires: javapackages-filesystem
+# BuildRequires: javapackages-filesystem
BuildRequires: java-%{buildjdkver}-openjdk-devel
-%endif
# Zero-assembler build requirement
%ifarch %{zero_arches}
BuildRequires: libffi-devel
%endif
# 2023c required as of JDK-8305113
BuildRequires: tzdata-java >= 2023c
-
# cacerts build requirement in portable mode
BuildRequires: ca-certificates
# Earlier versions have a bug in tree vectorization on PPC
@@ -789,18 +810,18 @@ BuildRequires: lcms2-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
%else
-# Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h
-Provides: bundled(freetype) = 2.12.1
+# Version in src/java.desktop/share/legal/freetype.md
+Provides: bundled(freetype) = 2.13.0
# Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
Provides: bundled(giflib) = 5.2.1
# Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
-Provides: bundled(harfbuzz) = 4.4.1
+Provides: bundled(harfbuzz) = 7.2.0
# Version in src/java.desktop/share/native/liblcms/lcms2.h
-Provides: bundled(lcms2) = 2.12.0
+Provides: bundled(lcms2) = 2.15.0
# Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
Provides: bundled(libjpeg) = 6b
# Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h
-Provides: bundled(libpng) = 1.6.37
+Provides: bundled(libpng) = 1.6.39
# We link statically against libstdc++ to increase portability
BuildRequires: libstdc++-static
%endif
@@ -875,7 +896,7 @@ Group: Development/Tools
%{java_devel_rpo -- %{fastdebug_suffix_unquoted}}
%description devel-fastdebug
-The %{origin_nice} %{featurever} development tools - portable edition.
+The %{origin_nice} %{featurever} runtime environment and development tools - portable edition
%{fastdebug_warning}
%endif
@@ -883,7 +904,7 @@ The %{origin_nice} %{featurever} development tools - portable edition.
%if %{include_normal_build}
%package static-libs
-Summary: %{origin_nice} %{featurever} libraries for static linking - portable edition.
+Summary: %{origin_nice} %{featurever} libraries for static linking - portable edition
%{java_static_libs_rpo %{nil}}
@@ -898,7 +919,7 @@ Summary: %{origin_nice} %{featurever} libraries for static linking - portable ed
%{java_static_libs_rpo -- %{debug_suffix_unquoted}}
%description static-libs-slowdebug
-The %{origin_nice} %{featurever} libraries for static linking - portable edition.
+The %{origin_nice} %{featurever} libraries for static linking - portable edition
%{debug_warning}
%endif
@@ -909,13 +930,42 @@ Summary: %{origin_nice} %{featurever} libraries for static linking - portable ed
%{java_static_libs_rpo -- %{fastdebug_suffix_unquoted}}
%description static-libs-fastdebug
-The %{origin_nice} %{featurever} libraries for static linking - portable edition.
+The %{origin_nice} %{featurever} libraries for static linking - portable edition
%{fastdebug_warning}
%endif
# staticlibs
%endif
+%if %{include_normal_build}
+%package unstripped
+Summary: The %{origin_nice} %{featurever} runtime environment.
+
+%{java_unstripped_rpo %{nil}}
+
+%description unstripped
+The %{origin_nice} %{featurever} runtime environment.
+
+%endif
+
+%if %{include_normal_build}
+%package docs
+Summary: %{origin_nice} %{featurever} API documentation
+
+%{java_docs_rpo %{nil}}
+
+%description docs
+The %{origin_nice} %{featurever} API documentation.
+
+%package misc
+Summary: %{origin_nice} %{featurever} miscellany
+
+%{java_misc_rpo %{nil}}
+
+%description misc
+The %{origin_nice} %{featurever} miscellany.
+%endif
+
%package sources
Summary: %{origin_nice} %{featurever} full patched sources of portable JDK
@@ -927,10 +977,10 @@ The %{origin_nice} %{featurever} full patched sources of portable JDK to build,
echo "Preparing %{oj_vendor_version}"
# Using the echo macro breaks rpmdev-bumpspec, as it parses the first line of stdout :-(
-%if 0%{?stapinstall:1}
- echo "CPU: %{_target_cpu}, arch install directory: %{archinstall}, SystemTap install directory: %{stapinstall}"
+%if 0%{?_build_cpu:1}
+ echo "CPU: %{_target_cpu}, arch install directory: %{archinstall}, SystemTap install directory: %{_build_cpu}"
%else
- %{error:Unrecognised architecture %{_target_cpu}}
+ %{error:Unrecognised architecture %{_build_cpu}}
%endif
if [ %{include_normal_build} -eq 0 -o %{include_normal_build} -eq 1 ] ; then
@@ -951,7 +1001,6 @@ else
echo "include_fastdebug_build is %{include_fastdebug_build}, that is invalid. Use 1 for yes or 0 for no"
exit 13
fi
-
if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 -a %{include_fastdebug_build} -eq 0 ] ; then
echo "You have disabled all builds (normal,fastdebug,slowdebug). That is a no go."
exit 14
@@ -971,7 +1020,6 @@ if [ $prioritylength -ne 8 ] ; then
fi
# OpenJDK patches
-
%if %{system_libs}
# Remove libraries that are linked by both static and dynamic builds
sh %{SOURCE12} %{top_level_dir_name}
@@ -980,49 +1028,23 @@ sh %{SOURCE12} %{top_level_dir_name}
# Patch the JDK
pushd %{top_level_dir_name}
%patch1 -p1
-%patch2 -p1
%patch3 -p1
# Add crypto policy and FIPS support
%patch1001 -p1
# nss.cfg PKCS11 support; must come last as it also alters java.security
%patch1000 -p1
+# JDK-8312489 backport, coming in 11.0.22
+%patch2000 -p1
# PKCS11 SHA3 backport
-%patch2001 -p1
-# debuginfo fix
-%patch7777 -p1
+%patch2002 -p1
+# alt-java
+%patch600 -p1
+# RSA default
+%patch1003 -p1
popd # openjdk
-%patch600
-%patch1003
-# Extract systemtap tapsets
-%if %{with_systemtap}
-tar --strip-components=1 -x -I xz -f %{SOURCE8}
-%if %{include_debug_build}
-cp -r tapset tapset%{debug_suffix}
-%endif
-%if %{include_fastdebug_build}
-cp -r tapset tapset%{fastdebug_suffix}
-%endif
-
-for suffix in %{build_loop} ; do
- for file in "tapset"$suffix/*.in; do
- OUTPUT_FILE=`echo $file | sed -e "s:\.stp\.in$:-%{version}-%{release}.%{_arch}.stp:g"`
- sed -e "s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/server/libjvm.so:g" $file > $file.1
- sed -e "s:@JAVA_SPEC_VER@:%{javaver}:g" $file.1 > $file.2
-# TODO find out which architectures other than i686 have a client vm
-%ifarch %{ix86}
- sed -e "s:@ABS_CLIENT_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/client/libjvm.so:g" $file.2 > $OUTPUT_FILE
-%else
- sed -e "/@ABS_CLIENT_LIBJVM_SO@/d" $file.2 > $OUTPUT_FILE
-%endif
- sed -i -e "s:@ABS_JAVA_HOME_DIR@:%{_jvmdir}/%{sdkdir -- $suffix}:g" $OUTPUT_FILE
- sed -i -e "s:@INSTALL_ARCH_DIR@:%{archinstall}:g" $OUTPUT_FILE
- sed -i -e "s:@prefix@:%{_jvmdir}/%{sdkdir -- $suffix}/:g" $OUTPUT_FILE
- done
-done
-# systemtap tapsets ends
-%endif
+# Systemtap is processed in rpms
# Prepare desktop files
# Portables do not have desktop integration
@@ -1034,27 +1056,6 @@ sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE11} > nss.cfg
sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE17} > nss.fips.cfg
%build
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-mkdir bootjdk
-pushd bootjdk
-%ifarch %{aarch64}
-tar --strip-components=1 -xf %{SOURCE1001}
-%endif
-%ifarch %{ppc64le}
-tar --strip-components=1 -xf %{SOURCE1002}
-%endif
-%ifarch x86_64
-tar --strip-components=1 -xf %{SOURCE1003}
-%endif
-%ifarch s390x
-tar --strip-components=1 -xf %{SOURCE1004}
-%endif
-BOOT_JDK=$PWD
-popd
-%else
-BOOT_JDK=%{bootjdk}
-%endif
-
# How many CPU's do we have?
export NUM_PROC=%(/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :)
export NUM_PROC=${NUM_PROC:-1}
@@ -1136,7 +1137,7 @@ function buildjdk() {
%endif
--with-version-build=%{buildver} \
--with-version-pre="%{ea_designator}" \
- --with-version-opt=%{lts_designator} \
+ --with-version-opt="%{lts_designator}" \
--with-vendor-version-string="%{oj_vendor_version}" \
--with-vendor-name="%{oj_vendor}" \
--with-vendor-url="%{oj_vendor_url}" \
@@ -1144,7 +1145,7 @@ function buildjdk() {
--with-vendor-vm-bug-url="%{oj_vendor_bug_url}" \
--with-boot-jdk=${buildjdk} \
--with-debug-level=${debuglevel} \
- --with-native-debug-symbols="%{debug_symbols}" \
+ --with-native-debug-symbols="${debug_symbols}" \
--disable-sysconf-nss \
--enable-unlimited-crypto \
--with-zlib=%{link_type} \
@@ -1165,330 +1166,309 @@ function buildjdk() {
--disable-warnings-as-errors
cat spec.gmk
+
make \
+ JAVAC_FLAGS=-g \
LOG=trace \
WARNINGS_ARE_ERRORS="-Wno-error" \
CFLAGS_WARNINGS_ARE_ERRORS="-Wno-error" \
$maketargets || ( pwd; find ${top_dir_abs_src_path} ${top_dir_abs_build_path} -name "hs_err_pid*.log" | xargs cat && false )
-
popd
}
+function stripjdk() {
+ local outputdir=${1}
+ local jdkimagepath=${outputdir}/images/%{jdkimage}
+ local jreimagepath=${outputdir}/images/%{jreimage}
+ local jmodimagepath=${outputdir}/images/jmods
+ local supportdir=${outputdir}/support
+
+ if [ "x$suffix" = "x" ] ; then
+ # Keep the unstripped version for consumption by RHEL RPMs
+ cp -a ${jdkimagepath}{,.unstripped}
+
+ # Strip the files
+ for file in $(find ${jdkimagepath} ${jreimagepath} ${supportdir} -type f) ; do
+ if file ${file} | grep -q 'ELF'; then
+ noextfile=${file/.so/};
+ objcopy --only-keep-debug ${file} ${noextfile}.debuginfo;
+ objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file};
+ strip -g ${file};
+ fi
+ done
+
+ # Rebuild jmod files against the stripped binaries
+ if [ ! -d ${supportdir} ] ; then
+ echo "Support directory missing.";
+ exit 15
+ fi
+ for cmd in $(find ${supportdir} -name '*.jmod.cmdline') ; do
+ jmod=$(cat ${cmd} | sed -r 's|.*support/(.*$)|\1|');
+ echo "Rebuilding ${jmod} against stripped binaries...";
+ echo "Removing old jmod ${jmod}...";
+ rm -vf ${jmod}
+ rm -vf ${jdkimagepath}/jmods/$(basename ${jmod});
+ echo "Executing $(cat ${cmd})...";
+ cat ${cmd} | sh -s ;
+ echo "Moving jmod to image...";
+ mv -v ${supportdir}/${jmod} ${jdkimagepath}/jmods;
+ done
+ fi
+}
+
function installjdk() {
- local imagepath=${1}
+ local outputdir=${1}
+ local installdir=${2}
+ local jdkimagepath=${installdir}/images/%{jdkimage}
+ local jreimagepath=${installdir}/images/%{jreimage}
+ local unstripped=${jdkimagepath}.unstripped
+
+ echo "Installing build from ${outputdir} to ${installdir}..."
+ mkdir -p ${installdir}
+ echo "Installing images..."
+ mv ${outputdir}/images ${installdir}
+ if [ -d ${outputdir}/bundles ] ; then
+ echo "Installing bundles...";
+ mv ${outputdir}/bundles ${installdir} ;
+ fi
+
+%if !%{with artifacts}
+ echo "Removing output directory...";
+ rm -rf ${outputdir}
+%endif
- if [ -d ${imagepath} ] ; then
- # the build (erroneously) removes read permissions from some jars
- # this is a regression in OpenJDK 7 (our compiler):
- # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
- find ${imagepath} -iname '*.jar' -exec chmod ugo+r {} \;
+ for imagepath in ${jdkimagepath} ${jreimagepath} ${unstripped}; do
- # Build screws up permissions on binaries
- # https://bugs.openjdk.java.net/browse/JDK-8173610
- find ${imagepath} -iname '*.so' -exec chmod +x {} \;
- find ${imagepath}/bin/ -exec chmod +x {} \;
+ if [ -d ${imagepath} ] ; then
+ # the build (erroneously) removes read permissions from some jars
+ # this is a regression in OpenJDK 7 (our compiler):
+ # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
+ find ${imagepath} -iname '*.jar' -exec chmod ugo+r {} \;
- # Install nss.cfg right away as we will be using the JRE above
- install -m 644 nss.cfg ${imagepath}/conf/security/
+ # Build screws up permissions on binaries
+ # https://bugs.openjdk.java.net/browse/JDK-8173610
+ find ${imagepath} -iname '*.so' -exec chmod +x {} \;
+ find ${imagepath}/bin/ -exec chmod +x {} \;
- # Install nss.fips.cfg: NSS configuration for global FIPS mode (crypto-policies)
- install -m 644 nss.fips.cfg ${imagepath}/conf/security/
+ # Install local files which are distributed with the JDK
+ install -m 644 %{SOURCE10} ${imagepath}
+ install -m 644 nss.cfg ${imagepath}/conf/security/
+ install -m 644 nss.fips.cfg ${imagepath}/conf/security/
- # Create fake alt-java as a placeholder for future alt-java
- if [ -d man/man1 ] ; then
- pushd ${imagepath}
+ # Create fake alt-java as a placeholder for future alt-java
+ pushd ${imagepath}
# add alt-java man page
echo "Hardened java binary recommended for launching untrusted code from the Web e.g. javaws" > man/man1/%{alt_java_name}.1
cat man/man1/java.1 >> man/man1/%{alt_java_name}.1
- popd
- fi
- fi
+ popd
+
+ # Print release information
+ cat ${imagepath}/release
+ fi
+ done
}
-# Checks on debuginfo must be performed before the files are stripped
-# by the RPM installation stage
-function debugcheckjdk() {
- local imagepath=${1}
-
- if [ -d ${imagepath} ] ; then
-
- so_suffix="so"
- # Check debug symbols are present and can identify code
- find "${imagepath}" -iname "*.$so_suffix" -print0 | while read -d $'\0' lib
- do
- if [ -f "$lib" ] ; then
- echo "Testing $lib for debug symbols"
- # All these tests rely on RPM failing the build if the exit code of any set
- # of piped commands is non-zero.
-
- # Test for .debug_* sections in the shared object. This is the main test
- # Stripped objects will not contain these
- eu-readelf -S "$lib" | grep "] .debug_"
- test $(eu-readelf -S "$lib" | grep -E "\]\ .debug_(info|abbrev)" | wc --lines) == 2
-
- # Test FILE symbols. These will most likely be removed by anything that
- # manipulates symbol tables because it's generally useless. So a nice test
- # that nothing has messed with symbols
- old_IFS="$IFS"
- IFS=$'\n'
- for line in $(eu-readelf -s "$lib" | grep "00000000 0 FILE LOCAL DEFAULT")
- do
- # We expect to see .cpp and .S files, except for architectures like aarch64 and
- # s390 where we expect .o and .oS files
- echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|S|oS))?$"
- done
- IFS="$old_IFS"
-
- # If this is the JVM, look for javaCalls.(cpp|o) in FILEs, for extra sanity checking
- if [ "`basename $lib`" = "libjvm.so" ]; then
- eu-readelf -s "$lib" | \
- grep -E "00000000 0 FILE LOCAL DEFAULT ABS javaCalls.(cpp|o)$"
- fi
-
- # Test that there are no .gnu_debuglink sections pointing to another
- # debuginfo file. There shouldn't be any debuginfo files, so the link makes
- # no sense either
- eu-readelf -S "$lib" | grep 'gnu'
- if eu-readelf -S "$lib" | grep "\] .gnu_debuglink" | grep PROGBITS; then
- echo "bad .gnu_debuglink section."
- eu-readelf -x .gnu_debuglink "$lib"
- false
- fi
- fi
- done
+function genchecksum() {
+ local checkedfile=${1}
- # Make sure gdb can do a backtrace based on line numbers on libjvm.so
- # javaCalls.cpp:58 should map to:
- # http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/…
- # Using line number 1 might cause build problems. See:
- # https://bugzilla.redhat.com/show_bug.cgi?id=1539664
- # https://bugzilla.redhat.com/show_bug.cgi?id=1538767
- gdb -q "${imagepath}/bin/java" <<EOF | tee gdb.out
-handle SIGSEGV pass nostop noprint
-handle SIGILL pass nostop noprint
-set breakpoint pending on
-break javaCalls.cpp:58
-commands 1
-backtrace
-quit
-end
-run -version
-EOF
-%ifarch %{gdb_arches}
- grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
-%endif
+ checkdir=$(dirname ${1})
+ checkfile=$(basename ${1})
- fi
+ echo "Generating checksum for ${checkfile} in ${checkdir}..."
+ pushd ${checkdir}
+ sha256sum ${checkfile} > ${checkfile}.sha256sum
+ sha256sum --check ${checkfile}.sha256sum
+ popd
}
-pwd
-ls -l
-tar -cJf ../%{jdkportablesourcesarchive -- ""} --transform "s|^|%{jdkportablesourcesname -- ""}/|" openjdk nss*
-sha256sum ../%{jdkportablesourcesarchive -- ""} > ../%{jdkportablesourcesarchive -- ""}.sha256sum
+function packFullPatchedSources() {
+ srcpackagesdir=`pwd`
+ tar -cJf ${srcpackagesdir}/%{jdkportablesourcesarchive -- ""} --transform "s|^|%{jdkportablesourcesname -- ""}/|" %{top_level_dir_name} nss*
+ genchecksum ${srcpackagesdir}/%{jdkportablesourcesarchive -- ""}
+}
-%if %{build_hotspot_first}
- # Build a fresh libjvm.so first and use it to bootstrap
- cp -LR --preserve=mode,timestamps $BOOT_JDK newboot
- systemjdk=$(pwd)/newboot
- buildjdk build/newboot ${systemjdk} %{hotspot_target} "release" "bundled" "internal"
- mv build/newboot/jdk/lib/server/libjvm.so newboot/lib/server
-%else
- systemjdk=$BOOT_JDK
-%endif
+function packagejdk() {
+ local imagesdir=$(pwd)/${1}/images
+ local docdir=$(pwd)/${1}/images/docs
+ local bundledir=$(pwd)/${1}/bundles
+ local packagesdir=$(pwd)/${2}
+ local srcdir=$(pwd)/%{top_level_dir_name}
+ local tapsetdir=$(pwd)/tapset
-for suffix in %{build_loop} ; do
- if [ "x$suffix" = "x" ] ; then
- debugbuild=release
- debug_symbols=external # portables specific
- else
- # change --something to something
- debugbuild=`echo $suffix | sed "s/-//g"`
- debug_symbols=internal
- fi
-
-builddir=%{buildoutputdir -- ${suffix}}
-bootbuilddir=boot${builddir}
-installdir=%{installoutputdir -- ${suffix}}
-bootinstalldir=boot${installdir}
+ echo "Packaging build from ${imagesdir} to ${packagesdir}..."
+ mkdir -p ${packagesdir}
+ pushd ${imagesdir}
-link_opt="bundled"
+ echo "Packaging build from ${imagesdir} to ${packagesdir}..."
- for loop in %{main_suffix} %{staticlibs_loop} ; do
- builddir=%{buildoutputdir -- ${suffix}${loop}}
- bootbuilddir=boot${builddir}
- if test "x${loop}" = "x%{main_suffix}" ; then
- link_opt="%{link_type}"
-%if %{system_libs}
- # Copy the source tree so we can remove all in-tree libraries
- cp -a %{top_level_dir_name} %{top_level_dir_name_backup}
- # Remove all libraries that are linked
- sh %{SOURCE12} %{top_level_dir_name} full
-%endif
- # Debug builds don't need same targets as release for
- # build speed-up. We also avoid bootstrapping these
- # slower builds.
- if echo $debugbuild | grep -q "debug" ; then
- maketargets="%{debug_targets}"
- run_bootstrap=false
- else
- maketargets="%{release_targets}"
- run_bootstrap=%{bootstrap_build}
- fi
- if ${run_bootstrap} ; then
- buildjdk ${bootbuilddir} ${systemjdk} "%{bootstrap_targets}" ${debugbuild} ${link_opt}
- buildjdk ${builddir} $(pwd)/${bootbuilddir}/images/%{jdkimage} "${maketargets}" ${debugbuild} ${link_opt}
- rm -rf ${bootbuilddir}
- else
- buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt}
- fi
-%if %{system_libs}
- # Restore original source tree we modified by removing full in-tree sources
- rm -rf %{top_level_dir_name}
- mv %{top_level_dir_name_backup} %{top_level_dir_name}
-%endif
+ if [ "x$suffix" = "x" ] ; then
+ nameSuffix=""
else
- # Use bundled libraries for building statically
- link_opt="bundled"
- # Static library cycle only builds the static libraries
- maketargets="%{static_libs_target}"
- # Always just do the one build for the static libraries
- buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt}
+ nameSuffix=`echo "$suffix"| sed s/-/./`
fi
- done # end of main / staticlibs loop
+ jdkname=%{jdkportablename -- "$nameSuffix"}
+ jdkarchive=${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
+ jrename=%{jreportablename -- "$nameSuffix"}
+ jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
+ staticname=%{staticlibsportablename -- "$nameSuffix"}
+ staticarchive=${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
+ debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
+ unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
+ if [ "x$suffix" = "x" ] ; then
+ docname=%{docportablename}
+ docarchive=${packagesdir}/%{docportablearchive}
+ built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
+ fi
+ # These are from the source tree so no debug variants
+ miscname=%{miscportablename}
+ miscarchive=${packagesdir}/%{miscportablearchive}
+
+ if [ "x$suffix" = "x" ] ; then
+ # Keep the unstripped version for consumption by RHEL RPMs
+ mv %{jdkimage}.unstripped ${jdkname}
+ tar -cJf ${unstrippedarchive} ${jdkname}
+ genchecksum ${unstrippedarchive}
+ mv ${jdkname} %{jdkimage}.unstripped
+ fi
- # Final setup on the main image
- top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
- for image in %{jdkimage} %{jreimage} ; do
- imagePath=${top_dir_abs_main_build_path}/images/${image}
- installjdk ${imagePath}
- done
- # Check debug symbols were built into the dynamic libraries; todo, why it passes in JDK only?
- debugcheckjdk ${top_dir_abs_main_build_path}/images/%{jdkimage}
+ # Rename directories for packaging
+ mv %{jdkimage} ${jdkname}
+ mv %{jreimage} ${jrename}
- # Print release information
- cat ${top_dir_abs_main_build_path}/images/%{jdkimage}/release
+ # Release images have external debug symbols
+ if [ "x$suffix" = "x" ] ; then
+ tar -cJf ${debugarchive} $(find ${jdkname} -name \*.debuginfo)
+ genchecksum ${debugarchive}
-################################################################################
- pushd ${top_dir_abs_main_build_path}/images
- if [ "x$suffix" == "x" ] ; then
- nameSuffix=""
- else
- nameSuffix=`echo "$suffix"| sed s/-/./`
- fi
- # additional steps needed for fluent repack; most of them done twice, as images are already populated
- # maybe most of them should be done in upstream build?
- for imagedir in %{jdkimage} %{jreimage} ; do
- pushd $imagedir
- # Convert man pages to UTF8 encoding
- if [ -d man/man1 ] ; then # jre do not have man pages...
- for manpage in man/man1/* ; do
- iconv -f ISO_8859-1 -t UTF8 $manpage -o $manpage.tmp
- mv -f $manpage.tmp $manpage
- done
- fi
- # Install release notes
- cp -a %{SOURCE10} `pwd`
- cp -a %{SOURCE10} `pwd`/legal
- # stabilize permissions; aprtially duplicated in instalojdk
- find `pwd` -name "*.so" -exec chmod 755 {} \; -exec echo "set 755 to so {}" \; ;
- find `pwd` -type d -exec chmod 755 {} \; -exec echo "set 755 to dir {}" \; ;
- find `pwd`/legal -type f -exec chmod 644 {} \; -exec echo "set 644 to licences {}" \; ;
- popd # jdkimage/jreimage
- done # jre/sdk work in loop
- # javadoc is done only for release sdkimage
- if ! echo $suffix | grep -q "debug" ; then
- # Install Javadoc documentation
- #cp -a docs %{jdkimage} # not sure if the plaintext javadoc is for some use
- built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
- cp -a `pwd`/../bundles/${built_doc_archive} `pwd`/%{jdkimage}/javadocs.zip || ls -l `pwd`/../bundles
+ mkdir ${docname}
+ mv ${docdir} ${docname}
+ mv ${bundledir}/${built_doc_archive} ${docname}
+ tar -cJf ${docarchive} ${docname}
+ genchecksum ${docarchive}
+
+ mkdir ${miscname}
+ for s in 16 24 32 48 ; do
+ cp -av ${srcdir}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png ${miscname}
+ done
+ cp -a ${srcdir}/src/sample ${miscname}
+%if %{with_systemtap}
+ cp -a ${tapsetdir}* ${miscname}
+%endif
+ tar -cJf ${miscarchive} ${miscname}
+ genchecksum ${miscarchive}
fi
- # end of additional steps
-
- mv %{jdkimage} %{jdkportablename -- "$nameSuffix"}
- mv %{jreimage} %{jreportablename -- "$nameSuffix"}
- tar -cJf ../../../../%{jdkportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jdkportablename -- "$nameSuffix"}
- sha256sum ../../../../%{jdkportablearchive -- "$nameSuffix"} > ../../../../%{jdkportablearchive -- "$nameSuffix"}.sha256sum
- tar -cJf ../../../../%{jreportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jreportablename -- "$nameSuffix"}
- sha256sum ../../../../%{jreportablearchive -- "$nameSuffix"} > ../../../../%{jreportablearchive -- "$nameSuffix"}.sha256sum
- # copy licenses so they are avialable out of tarball
- cp -rf %{jdkportablename -- "$nameSuffix"}/legal ../../../../%{jdkportablearchive -- "%{normal_suffix}"}-legal
- mv %{jdkportablename -- "$nameSuffix"} %{jdkimage}
- mv %{jreportablename -- "$nameSuffix"} %{jreimage}
- popd #images
+
+ tar -cJf ${jdkarchive} --exclude='**.debuginfo' ${jdkname}
+ genchecksum ${jdkarchive}
+
+ tar -cJf ${jrearchive} --exclude='**.debuginfo' ${jrename}
+ genchecksum ${jrearchive}
+
%if %{include_staticlibs}
- top_dir_abs_staticlibs_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{staticlibs_suffix}}
- pushd ${top_dir_abs_staticlibs_build_path}/images
# Static libraries (needed for building graal vm with native image)
# Tar as overlay. Transform to the JDK name, since we just want to "add"
# static libraries to that folder
- portableJDKname=%{staticlibsportablename -- "$nameSuffix"}
- tar -cJf ../../../../%{staticlibsportablearchive -- "$nameSuffix"} --transform "s|^%{static_libs_image}/lib/*|$portableJDKname/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib"
- sha256sum ../../../../%{staticlibsportablearchive -- "$nameSuffix"} > ../../../../%{staticlibsportablearchive -- "$nameSuffix"}.sha256sum
- popd #staticlibs-images
+ tar -cJf ${staticarchive} \
+ --transform "s|^%{static_libs_image}/lib/*|${staticname}/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib"
+ genchecksum ${staticarchive}
%endif
-################################################################################
-# note, currently no debuginfo, consult portbale spec for external (zipped) debuginfo, being tarred alone
-################################################################################
-# build cycles
-done # end of release / debug cycle loop
+ # Revert directory renaming so testing will run
+ # TODO: testing should run on the packaged JDK
+ mv ${jdkname} %{jdkimage}
+ mv ${jrename} %{jreimage}
-%install
-STRIP_KEEP_SYMTAB=libjvm*
+ popd #images
-mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
-mv ../%{jdkportablesourcesarchive -- ""} $RPM_BUILD_ROOT%{_jvmdir}/
-mv ../%{jdkportablesourcesarchive -- ""}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+}
-for suffix in %{build_loop} ; do
-top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
+packFullPatchedSources
-################################################################################
- if [ "x$suffix" == "x" ] ; then
- nameSuffix=""
+%if %{build_hotspot_first}
+ # Build a fresh libjvm.so first and use it to bootstrap
+ cp -LR --preserve=mode,timestamps %{bootjdk} newboot
+ systemjdk=$(pwd)/newboot
+ buildjdk build/newboot ${systemjdk} %{hotspot_target} "release" "bundled" "internal"
+ mv build/newboot/jdk/lib/%{vm_variant}/libjvm.so newboot/lib/%{vm_variant}
+%else
+ systemjdk=%{bootjdk}
+%endif
+
+for suffix in %{build_loop} ; do
+ if [ "x$suffix" = "x" ] ; then
+ debugbuild=release
+ else
+ # change --something to something
+ debugbuild=`echo $suffix | sed "s/-//g"`
+ fi
+ # We build with internal debug symbols and do
+ # our own stripping for one version of the
+ # release build
+ debug_symbols=internal
+
+ builddir=%{buildoutputdir -- ${suffix}}
+ bootbuilddir=boot${builddir}
+ installdir=%{installoutputdir -- ${suffix}}
+ bootinstalldir=boot${installdir}
+ packagesdir=%{packageoutputdir -- ${suffix}}
+
+ link_opt="%{link_type}"
+%if %{system_libs}
+ # Copy the source tree so we can remove all in-tree libraries
+ cp -a %{top_level_dir_name} %{top_level_dir_name_backup}
+ # Remove all libraries that are linked
+ sh %{SOURCE12} %{top_level_dir_name} full
+%endif
+ # Debug builds don't need same targets as release for
+ # build speed-up. We also avoid bootstrapping these
+ # slower builds.
+ if echo $debugbuild | grep -q "debug" ; then
+ maketargets="%{debug_targets}"
+ run_bootstrap=false
else
- nameSuffix=`echo "$suffix"| sed s/-/./`
+ maketargets="%{release_targets}"
+ run_bootstrap=%{bootstrap_build}
fi
- mv ../%{jdkportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{jdkportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{jreportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{jreportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
-%if %{include_staticlibs}
- mv ../%{staticlibsportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{staticlibsportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
-%endif
- if [ "x$suffix" == "x" ] ; then
- dnameSuffix="$nameSuffix".debuginfo
-# todo handle debuginfo, see note at build (we will need to pack one stripped and one unstripped release build)
-# mv ../%{jdkportablearchive -- "$dnameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
-# mv ../%{jdkportablearchive -- "$dnameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ if ${run_bootstrap} ; then
+ buildjdk ${bootbuilddir} ${systemjdk} "%{bootstrap_targets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ installjdk ${bootbuilddir} ${bootinstalldir}
+ buildjdk ${builddir} $(pwd)/${bootinstalldir}/images/%{jdkimage} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ stripjdk ${builddir}
+ installjdk ${builddir} ${installdir}
+ %{!?with_artifacts:rm -rf ${bootinstalldir}}
+ else
+ buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ stripjdk ${builddir}
+ installjdk ${builddir} ${installdir}
fi
-################################################################################
-# end, dual install
-done
-################################################################################
-# the licenses are packed onloy once and shared
-mkdir -p $RPM_BUILD_ROOT%{unpacked_licenses}
-mv ../%{jdkportablearchive -- "%{normal_suffix}"}-legal $RPM_BUILD_ROOT%{unpacked_licenses}/%{jdkportablesourcesarchive -- "%{normal_suffix}"}
-# To show sha in the build log
-for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do ls -l $file ; cat $file ; done
-################################################################################
+ packagejdk ${installdir} ${packagesdir}
+
+%if %{system_libs}
+ # Restore original source tree we modified by removing full in-tree sources
+ rm -rf %{top_level_dir_name}
+ mv %{top_level_dir_name_backup} %{top_level_dir_name}
+%endif
+
+# build cycles
+done # end of release / debug cycle loop
%check
# We test debug first as it will give better diagnostics on a crash
for suffix in %{build_loop} ; do
-# Tests in the check stage are performed on the installed image
-# rpmbuild operates as follows: build -> install -> test
-# however in portbales, we test built image instead of installed one
-top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
+# portable builds have static_libs embedded, thus top_dir_abs_main_build_path is same as top_dir_abs_staticlibs_build_path
+top_dir_abs_main_build_path=$(pwd)/%{installoutputdir -- ${suffix}}
+%if %{include_staticlibs}
+top_dir_abs_staticlibs_build_path=${top_dir_abs_main_build_path}
+%endif
+
export JAVA_HOME=${top_dir_abs_main_build_path}/images/%{jdkimage}
-#check Shenandoah is enabled
+# Check Shenandoah is enabled
%if %{use_shenandoah_hotspot}
-$JAVA_HOME/bin/java -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -version
+$JAVA_HOME/bin/java -XX:+UseShenandoahGC -version
%endif
# Check unlimited policy has been used
@@ -1499,14 +1479,19 @@ $JAVA_HOME/bin/java --add-opens java.base/javax.crypto=ALL-UNNAMED TestCryptoLev
$JAVA_HOME/bin/javac -d . %{SOURCE14}
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||")
-# Check system crypto (policy) is deactive and can not be enabled
+# Check system crypto (policy) is active and can be disabled
# Test takes a single argument - true or false - to state whether system
# security properties are enabled or not.
$JAVA_HOME/bin/javac -d . %{SOURCE15}
export PROG=$(echo $(basename %{SOURCE15})|sed "s|\.java||")
export SEC_DEBUG="-Djava.security.debug=properties"
+#Portable specific: set false whereas its true for upstream
$JAVA_HOME/bin/java ${SEC_DEBUG} ${PROG} false
-$JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=false ${PROG} false
+$JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=true ${PROG} false
+
+# Check correct vendor values have been set
+$JAVA_HOME/bin/javac -d . %{SOURCE16}
+$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
# Check java launcher has no SSB mitigation
if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
@@ -1518,24 +1503,89 @@ nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation
if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi
%endif
-# Check correct vendor values have been set
-$JAVA_HOME/bin/javac -d . %{SOURCE16}
-$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
-
-%if ! 0%{?flatpak}
-# Check translations are available for new timezones (during flatpak builds, the
-# tzdb.dat used by this test is not where the test expects it, so this is
-# disabled for flatpak builds)
+# Check translations are available for new timezones
$JAVA_HOME/bin/javac -d . %{SOURCE18}
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE
$JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR
-%endif
%if %{include_staticlibs}
# Check debug symbols in static libraries (smoke test)
-export STATIC_LIBS_HOME=${top_dir_abs_main_build_path}/../../%{buildoutputdir -- ${suffix}%{staticlibs_suffix}}/images/static-libs/lib/
-readelf --debug-dump $STATIC_LIBS_HOME/libfdlibm.a | grep w_remainder.c
-readelf --debug-dump $STATIC_LIBS_HOME/libfdlibm.a | grep e_remainder.c
+export STATIC_LIBS_HOME=${top_dir_abs_staticlibs_build_path}/images/%{static_libs_image}
+ls -l $STATIC_LIBS_HOME
+ls -l $STATIC_LIBS_HOME/lib
+readelf --debug-dump $STATIC_LIBS_HOME/lib/libfdlibm.a | grep w_remainder.c
+readelf --debug-dump $STATIC_LIBS_HOME/lib/libfdlibm.a | grep e_remainder.c
+%endif
+
+# Release builds strip the debug symbols into external .debuginfo files
+if [ "x$suffix" = "x" ] ; then
+ so_suffix="debuginfo"
+else
+ so_suffix="so"
+fi
+# Check debug symbols are present and can identify code
+find "$JAVA_HOME" -iname "*.$so_suffix" -print0 | while read -d $'\0' lib
+do
+ if [ -f "$lib" ] ; then
+ echo "Testing $lib for debug symbols"
+ # All these tests rely on RPM failing the build if the exit code of any set
+ # of piped commands is non-zero.
+
+ # Test for .debug_* sections in the shared object. This is the main test
+ # Stripped objects will not contain these
+ eu-readelf -S "$lib" | grep "] .debug_"
+ test $(eu-readelf -S "$lib" | grep -E "\]\ .debug_(info|abbrev)" | wc --lines) == 2
+
+ # Test FILE symbols. These will most likely be removed by anything that
+ # manipulates symbol tables because it's generally useless. So a nice test
+ # that nothing has messed with symbols
+ old_IFS="$IFS"
+ IFS=$'\n'
+ for line in $(eu-readelf -s "$lib" | grep "00000000 0 FILE LOCAL DEFAULT")
+ do
+ # We expect to see .cpp and .S files, except for architectures like aarch64 and
+ # s390 where we expect .o and .oS files
+ echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|S|oS))?$"
+ done
+ IFS="$old_IFS"
+
+ # If this is the JVM, look for javaCalls.(cpp|o) in FILEs, for extra sanity checking
+ if [ "`basename $lib`" = "libjvm.so" ]; then
+ eu-readelf -s "$lib" | \
+ grep -E "00000000 0 FILE LOCAL DEFAULT ABS javaCalls.(cpp|o)$"
+ fi
+
+ # Test that there are no .gnu_debuglink sections pointing to another
+ # debuginfo file. There shouldn't be any debuginfo files, so the link makes
+ # no sense either
+ eu-readelf -S "$lib" | grep 'gnu'
+ if eu-readelf -S "$lib" | grep '] .gnu_debuglink' | grep PROGBITS; then
+ echo "bad .gnu_debuglink section."
+ eu-readelf -x .gnu_debuglink "$lib"
+ false
+ fi
+ fi
+done
+
+# Make sure gdb can do a backtrace based on line numbers on libjvm.so
+# javaCalls.cpp:58 should map to:
+# http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/…
+# Using line number 1 might cause build problems. See:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1539664
+# https://bugzilla.redhat.com/show_bug.cgi?id=1538767
+gdb -q "$JAVA_HOME/bin/java" <<EOF | tee gdb.out
+handle SIGSEGV pass nostop noprint
+handle SIGILL pass nostop noprint
+set breakpoint pending on
+break javaCalls.cpp:58
+commands 1
+backtrace
+quit
+end
+run -version
+EOF
+%ifarch %{gdb_arches}
+grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
%endif
# Check src.zip has all sources. See RHBZ#1130490
@@ -1554,12 +1604,69 @@ $JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LocalVariableTable
# build cycles check
done
+%install
+
+ mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
+ mv %{jdkportablesourcesarchive -- ""} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv %{jdkportablesourcesarchive -- ""}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+
+for suffix in %{build_loop} ; do
+
+ packagesdir=%{packageoutputdir -- ${suffix}}
+
+ if [ "x$suffix" == "x" ] ; then
+ nameSuffix=""
+ else
+ nameSuffix=`echo "$suffix"| sed s/-/./`
+ fi
+
+ # These definitions should match those in installjdk
+ jdkarchive=${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
+ jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
+ staticarchive=${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
+ debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
+ unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
+
+ mv ${jdkarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jdkarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jrearchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jrearchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+
+%if %{include_staticlibs}
+ mv ${staticarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${staticarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+%endif
+
+ if [ "x$suffix" = "x" ] ; then
+ mv ${debugarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${debugarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${unstrippedarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${unstrippedarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ fi
+done
+
+ if [ "x$suffix" = "x" ] ; then
+ # These definitions should match those in installjdk
+ # Install outside the loop as there are no debug variants
+ docarchive=${packagesdir}/%{docportablearchive}
+ miscarchive=${packagesdir}/%{miscportablearchive}
+ mv ${docarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${docarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${miscarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${miscarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ fi
+
+# To show sha in the build log
+for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do
+ ls -l $file ;
+ cat $file ;
+done
+
%if %{include_normal_build}
%files
# main package builds always
%{_jvmdir}/%{jreportablearchiveForFiles}
%{_jvmdir}/%{jreportablearchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%else
%files
# placeholder
@@ -1568,10 +1675,9 @@ done
%if %{include_normal_build}
%files devel
%{_jvmdir}/%{jdkportablearchiveForFiles}
-#%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
+%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
%{_jvmdir}/%{jdkportablearchiveForFiles}.sha256sum
-#%{_jvmdir}/%{jdkportablearchive -- .debuginfo}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
+%{_jvmdir}/%{jdkportablearchive -- .debuginfo}.sha256sum
%endif
%if %{include_normal_build}
@@ -1579,26 +1685,26 @@ done
%files static-libs
%{_jvmdir}/%{staticlibsportablearchiveForFiles}
%{_jvmdir}/%{staticlibsportablearchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
+
+%files unstripped
+%{_jvmdir}/%{jdkportablearchive -- .unstripped}
+%{_jvmdir}/%{jdkportablearchive -- .unstripped}.sha256sum
%endif
%if %{include_debug_build}
%files slowdebug
%{_jvmdir}/%{jreportablearchive -- .slowdebug}
%{_jvmdir}/%{jreportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%files devel-slowdebug
%{_jvmdir}/%{jdkportablearchive -- .slowdebug}
%{_jvmdir}/%{jdkportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%if %{include_staticlibs}
%files static-libs-slowdebug
%{_jvmdir}/%{staticlibsportablearchive -- .slowdebug}
%{_jvmdir}/%{staticlibsportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
%endif
@@ -1606,27 +1712,46 @@ done
%files fastdebug
%{_jvmdir}/%{jreportablearchive -- .fastdebug}
%{_jvmdir}/%{jreportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%files devel-fastdebug
%{_jvmdir}/%{jdkportablearchive -- .fastdebug}
%{_jvmdir}/%{jdkportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%if %{include_staticlibs}
%files static-libs-fastdebug
%{_jvmdir}/%{staticlibsportablearchive -- .fastdebug}
%{_jvmdir}/%{staticlibsportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
%endif
%files sources
%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}
%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
+
+%if %{include_normal_build}
+%files docs
+%{_jvmdir}/%{docportablearchive}
+%{_jvmdir}/%{docportablearchive}.sha256sum
+
+%files misc
+%{_jvmdir}/%{miscportablearchive}
+%{_jvmdir}/%{miscportablearchive}.sha256sum
+%endif
%changelog
+* Wed Nov 22 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:11.0.21.0.9-1
+- Updated to OpenJDK 11.0.21+9 (GA)
+- adjsuted generate_source_tarball
+- removed icedtea_sync
+- dropped standalone licenses
+- added usntripped subpkg
+- added docs subpkg
+- adjsuted versions of bundled libraries
+- build refactored to several solid methods following gnu_andrew
+- Drop local backport of JDK-8243210 which is upstream from 11.0.21+2
+- Bump freetype version to 2.13.0 following JDK-8306881
+- fixed '--without release' build-ability by moving docs and misc to if-release only
+
* Thu Aug 03 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:11.0.20.0.8-1
- Update to jdk-11.0.20.0+8
- Update release notes to 11.0.20.0+8
diff --git a/jconsole.desktop.in b/jconsole.desktop.in
index 8a3b04d..c1b8f6a 100644
--- a/jconsole.desktop.in
+++ b/jconsole.desktop.in
@@ -1,10 +1 @@
-[Desktop Entry]
-Name=OpenJDK @JAVA_VER@ for @target_cpu@ Monitoring & Management Console (@OPENJDK_VER@)
-Comment=Monitor and manage OpenJDK applications
-Exec=_SDKBINDIR_/jconsole
-Icon=java-@JAVA_VER@-@JAVA_VENDOR@
-Terminal=false
-Type=Application
-StartupWMClass=sun-tools-jconsole-JConsole
-Categories=Development;Profiling;Java;
-Version=1.0
+# this file is intentionally not here, as portable builds do not have desktop integration
diff --git a/jdk8242332-rh2108712-sha3-sunpkcs11.patch b/jdk8242332-rh2108712-sha3-sunpkcs11.patch
index a6192a4..cc28540 100644
--- a/jdk8242332-rh2108712-sha3-sunpkcs11.patch
+++ b/jdk8242332-rh2108712-sha3-sunpkcs11.patch
@@ -1,11 +1,11 @@
-commit 81c2107a9188680f7c35ebc7697b292d5972436e
+commit b8711800e3cd9132ad2b195c82cf816210feb77d
Author: Andrew Hughes <gnu.andrew(a)redhat.com>
-Date: Mon Feb 27 13:22:43 2023 +0000
+Date: Thu Oct 5 03:13:01 2023 +0100
Backport 78be334c3817a1b5840922a9bf1339a40dcc5185
diff --git a/src/java.base/share/classes/sun/security/util/KnownOIDs.java b/src/java.base/share/classes/sun/security/util/KnownOIDs.java
-index 92ecb9adc0c..a5848c96aad 100644
+index b5cc3b05f1..7e235c90dd 100644
--- a/src/java.base/share/classes/sun/security/util/KnownOIDs.java
+++ b/src/java.base/share/classes/sun/security/util/KnownOIDs.java
@@ -155,6 +155,14 @@ public enum KnownOIDs {
@@ -24,7 +24,7 @@ index 92ecb9adc0c..a5848c96aad 100644
SHA3_256withRSA("2.16.840.1.101.3.4.3.14", "SHA3-256withRSA"),
SHA3_384withRSA("2.16.840.1.101.3.4.3.15", "SHA3-384withRSA"),
diff --git a/src/java.base/share/classes/sun/security/util/SignatureUtil.java b/src/java.base/share/classes/sun/security/util/SignatureUtil.java
-index 32c089fd96d..7d5c0c7e299 100644
+index 32c089fd96..7d5c0c7e29 100644
--- a/src/java.base/share/classes/sun/security/util/SignatureUtil.java
+++ b/src/java.base/share/classes/sun/security/util/SignatureUtil.java
@@ -168,4 +168,22 @@ public class SignatureUtil {
@@ -51,7 +51,7 @@ index 32c089fd96d..7d5c0c7e299 100644
+ }
}
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Digest.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Digest.java
-index 41fe61b8a16..daf0bc9f69c 100644
+index 41fe61b8a1..daf0bc9f69 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Digest.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Digest.java
@@ -1,5 +1,5 @@
@@ -93,7 +93,7 @@ index 41fe61b8a16..daf0bc9f69c 100644
break;
default:
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java
-index 926414608cb..f343e6025e1 100644
+index 926414608c..f343e6025e 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java
@@ -36,7 +36,9 @@ import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
@@ -428,7 +428,7 @@ index 926414608cb..f343e6025e1 100644
-
}
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Mac.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Mac.java
-index c88e4a6ace5..29b26651c39 100644
+index c88e4a6ace..29b26651c3 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Mac.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Mac.java
@@ -39,8 +39,9 @@ import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
@@ -465,7 +465,7 @@ index c88e4a6ace5..29b26651c39 100644
break;
case (int)CKM_SSL3_MD5_MAC:
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11PSSSignature.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11PSSSignature.java
-index 26eaa4735f1..905b6ea9562 100644
+index 1419be3754..18e00a544b 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11PSSSignature.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11PSSSignature.java
@@ -38,6 +38,7 @@ import java.security.spec.MGF1ParameterSpec;
@@ -738,7 +738,7 @@ index 26eaa4735f1..905b6ea9562 100644
// see JCA spec
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java
-index e3af106d05a..e49edf32c29 100644
+index e3af106d05..e49edf32c2 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java
@@ -51,8 +51,15 @@ import sun.security.util.KeyUtil;
@@ -970,111 +970,88 @@ index e3af106d05a..e49edf32c29 100644
// return RSASignature.decodeSignature(digestOID, signature);
// }
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
-index cf7cd19b689..7a8bcffb92c 100644
+index ffbd671246..d191831dab 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
-@@ -550,6 +550,18 @@ public final class SunPKCS11 extends AuthProvider {
- d(MD, "SHA-512/256", P11Digest,
- s("2.16.840.1.101.3.4.2.6", "OID.2.16.840.1.101.3.4.2.6"),
+@@ -546,6 +546,14 @@ public final class SunPKCS11 extends AuthProvider {
+ m(CKM_SHA512_224));
+ dA(MD, "SHA-512/256", P11Digest,
m(CKM_SHA512_256));
-+ d(MD, "SHA3-224", P11Digest,
-+ s("2.16.840.1.101.3.4.2.7", "OID.2.16.840.1.101.3.4.2.7"),
++ dA(MD, "SHA3-224", P11Digest,
+ m(CKM_SHA3_224));
-+ d(MD, "SHA3-256", P11Digest,
-+ s("2.16.840.1.101.3.4.2.8", "OID.2.16.840.1.101.3.4.2.8"),
++ dA(MD, "SHA3-256", P11Digest,
+ m(CKM_SHA3_256));
-+ d(MD, "SHA3-384", P11Digest,
-+ s("2.16.840.1.101.3.4.2.9", "OID.2.16.840.1.101.3.4.2.9"),
++ dA(MD, "SHA3-384", P11Digest,
+ m(CKM_SHA3_384));
-+ d(MD, "SHA3-512", P11Digest,
-+ s("2.16.840.1.101.3.4.2.10", "OID.2.16.840.1.101.3.4.2.10"),
++ dA(MD, "SHA3-512", P11Digest,
+ m(CKM_SHA3_512));
d(MAC, "HmacMD5", P11MAC,
m(CKM_MD5_HMAC));
-@@ -574,7 +586,18 @@ public final class SunPKCS11 extends AuthProvider {
- d(MAC, "HmacSHA512/256", P11MAC,
- s("1.2.840.113549.2.13", "OID.1.2.840.113549.2.13"),
+@@ -563,7 +571,14 @@ public final class SunPKCS11 extends AuthProvider {
+ m(CKM_SHA512_224_HMAC));
+ dA(MAC, "HmacSHA512/256", P11MAC,
m(CKM_SHA512_256_HMAC));
-
-+ d(MAC, "HmacSHA3-224", P11MAC,
-+ s("2.16.840.1.101.3.4.2.13", "OID.2.16.840.1.101.3.4.2.13"),
++ dA(MAC, "HmacSHA3-224", P11MAC,
+ m(CKM_SHA3_224_HMAC));
-+ d(MAC, "HmacSHA3-256", P11MAC,
-+ s("2.16.840.1.101.3.4.2.14", "OID.2.16.840.1.101.3.4.2.14"),
++ dA(MAC, "HmacSHA3-256", P11MAC,
+ m(CKM_SHA3_256_HMAC));
-+ d(MAC, "HmacSHA3-384", P11MAC,
-+ s("2.16.840.1.101.3.4.2.15", "OID.2.16.840.1.101.3.4.2.15"),
++ dA(MAC, "HmacSHA3-384", P11MAC,
+ m(CKM_SHA3_384_HMAC));
-+ d(MAC, "HmacSHA3-512", P11MAC,
-+ s("2.16.840.1.101.3.4.2.16", "OID.2.16.840.1.101.3.4.2.16"),
++ dA(MAC, "HmacSHA3-512", P11MAC,
+ m(CKM_SHA3_512_HMAC));
d(MAC, "SslMacMD5", P11MAC,
m(CKM_SSL3_MD5_MAC));
d(MAC, "SslMacSHA1", P11MAC,
-@@ -604,6 +627,41 @@ public final class SunPKCS11 extends AuthProvider {
+@@ -595,6 +610,30 @@ public final class SunPKCS11 extends AuthProvider {
m(CKM_BLOWFISH_KEY_GEN));
d(KG, "ChaCha20", P11KeyGenerator,
m(CKM_CHACHA20_KEY_GEN));
+ d(KG, "HmacMD5", P11KeyGenerator, // 1.3.6.1.5.5.8.1.1
+ m(CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA1", P11KeyGenerator,
-+ s("1.2.840.113549.2.7", "OID.1.2.840.113549.2.7"),
++ dA(KG, "HmacSHA1", P11KeyGenerator,
+ m(CKM_SHA_1_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA224", P11KeyGenerator,
-+ s("1.2.840.113549.2.8", "OID.1.2.840.113549.2.8"),
++ dA(KG, "HmacSHA224", P11KeyGenerator,
+ m(CKM_SHA224_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA256", P11KeyGenerator,
-+ s("1.2.840.113549.2.9", "OID.1.2.840.113549.2.9"),
++ dA(KG, "HmacSHA256", P11KeyGenerator,
+ m(CKM_SHA256_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA384", P11KeyGenerator,
-+ s("1.2.840.113549.2.10", "OID.1.2.840.113549.2.10"),
++ dA(KG, "HmacSHA384", P11KeyGenerator,
+ m(CKM_SHA384_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA512", P11KeyGenerator,
-+ s("1.2.840.113549.2.11", "OID.1.2.840.113549.2.11"),
++ dA(KG, "HmacSHA512", P11KeyGenerator,
+ m(CKM_SHA512_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA512/224", P11KeyGenerator,
-+ s("1.2.840.113549.2.12", "OID.1.2.840.113549.2.12"),
++ dA(KG, "HmacSHA512/224", P11KeyGenerator,
+ m(CKM_SHA512_224_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA512/256", P11KeyGenerator,
-+ s("1.2.840.113549.2.13", "OID.1.2.840.113549.2.13"),
++ dA(KG, "HmacSHA512/256", P11KeyGenerator,
+ m(CKM_SHA512_256_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA3-224", P11KeyGenerator,
-+ s("2.16.840.1.101.3.4.2.13", "OID.2.16.840.1.101.3.4.2.13"),
++ dA(KG, "HmacSHA3-224", P11KeyGenerator,
+ m(CKM_SHA3_224_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA3-256", P11KeyGenerator,
-+ s("2.16.840.1.101.3.4.2.14", "OID.2.16.840.1.101.3.4.2.14"),
++ dA(KG, "HmacSHA3-256", P11KeyGenerator,
+ m(CKM_SHA3_256_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA3-384", P11KeyGenerator,
-+ s("2.16.840.1.101.3.4.2.15", "OID.2.16.840.1.101.3.4.2.15"),
++ dA(KG, "HmacSHA3-384", P11KeyGenerator,
+ m(CKM_SHA3_384_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
-+ d(KG, "HmacSHA3-512", P11KeyGenerator,
-+ s("2.16.840.1.101.3.4.2.16", "OID.2.16.840.1.101.3.4.2.16"),
++ dA(KG, "HmacSHA3-512", P11KeyGenerator,
+ m(CKM_SHA3_512_KEY_GEN, CKM_GENERIC_SECRET_KEY_GEN));
// register (Secret)KeyFactories if there are any mechanisms
// for a particular algorithm that we support
-@@ -747,13 +805,40 @@ public final class SunPKCS11 extends AuthProvider {
- d(SIG, "SHA512withDSA", P11Signature,
- s("2.16.840.1.101.3.4.3.4", "OID.2.16.840.1.101.3.4.3.4"),
+@@ -725,37 +764,77 @@ public final class SunPKCS11 extends AuthProvider {
+ m(CKM_DSA_SHA384));
+ dA(SIG, "SHA512withDSA", P11Signature,
m(CKM_DSA_SHA512));
-+ d(SIG, "SHA3-224withDSA", P11Signature,
-+ s("2.16.840.1.101.3.4.3.5", "OID.2.16.840.1.101.3.4.3.5"),
++ dA(SIG, "SHA3-224withDSA", P11Signature,
+ m(CKM_DSA_SHA3_224));
-+ d(SIG, "SHA3-256withDSA", P11Signature,
-+ s("2.16.840.1.101.3.4.3.6", "OID.2.16.840.1.101.3.4.3.6"),
++ dA(SIG, "SHA3-256withDSA", P11Signature,
+ m(CKM_DSA_SHA3_256));
-+ d(SIG, "SHA3-384withDSA", P11Signature,
-+ s("2.16.840.1.101.3.4.3.7", "OID.2.16.840.1.101.3.4.3.7"),
++ dA(SIG, "SHA3-384withDSA", P11Signature,
+ m(CKM_DSA_SHA3_384));
-+ d(SIG, "SHA3-512withDSA", P11Signature,
-+ s("2.16.840.1.101.3.4.3.8", "OID.2.16.840.1.101.3.4.3.8"),
++ dA(SIG, "SHA3-512withDSA", P11Signature,
+ m(CKM_DSA_SHA3_512));
d(SIG, "RawDSAinP1363Format", P11Signature,
- s("NONEwithDSAinP1363Format"),
+ List.of("NONEwithDSAinP1363Format"),
m(CKM_DSA));
d(SIG, "DSAinP1363Format", P11Signature,
- s("SHA1withDSAinP1363Format"),
+ List.of("SHA1withDSAinP1363Format"),
m(CKM_DSA_SHA1, CKM_DSA));
-
+ d(SIG, "SHA224withDSAinP1363Format", P11Signature,
@@ -1095,36 +1072,27 @@ index cf7cd19b689..7a8bcffb92c 100644
+ m(CKM_DSA_SHA3_512));
d(SIG, "NONEwithECDSA", P11Signature,
m(CKM_ECDSA));
- d(SIG, "SHA1withECDSA", P11Signature,
-@@ -761,28 +846,49 @@ public final class SunPKCS11 extends AuthProvider {
+ dA(SIG, "SHA1withECDSA", P11Signature,
m(CKM_ECDSA_SHA1, CKM_ECDSA));
- d(SIG, "SHA224withECDSA", P11Signature,
- s("1.2.840.10045.4.3.1", "OID.1.2.840.10045.4.3.1"),
+ dA(SIG, "SHA224withECDSA", P11Signature,
- m(CKM_ECDSA));
+ m(CKM_ECDSA_SHA224, CKM_ECDSA));
- d(SIG, "SHA256withECDSA", P11Signature,
- s("1.2.840.10045.4.3.2", "OID.1.2.840.10045.4.3.2"),
+ dA(SIG, "SHA256withECDSA", P11Signature,
- m(CKM_ECDSA));
+ m(CKM_ECDSA_SHA256, CKM_ECDSA));
- d(SIG, "SHA384withECDSA", P11Signature,
- s("1.2.840.10045.4.3.3", "OID.1.2.840.10045.4.3.3"),
+ dA(SIG, "SHA384withECDSA", P11Signature,
- m(CKM_ECDSA));
+ m(CKM_ECDSA_SHA384, CKM_ECDSA));
- d(SIG, "SHA512withECDSA", P11Signature,
- s("1.2.840.10045.4.3.4", "OID.1.2.840.10045.4.3.4"),
+ dA(SIG, "SHA512withECDSA", P11Signature,
- m(CKM_ECDSA));
+ m(CKM_ECDSA_SHA512, CKM_ECDSA));
-+ d(SIG, "SHA3-224withECDSA", P11Signature,
-+ s("1.2.840.10045.4.3.9", "OID.1.2.840.10045.4.3.9"),
++ dA(SIG, "SHA3-224withECDSA", P11Signature,
+ m(CKM_ECDSA_SHA3_224, CKM_ECDSA));
-+ d(SIG, "SHA3-256withECDSA", P11Signature,
-+ s("1.2.840.10045.4.3.10", "OID.1.2.840.10045.4.3.10"),
++ dA(SIG, "SHA3-256withECDSA", P11Signature,
+ m(CKM_ECDSA_SHA3_256, CKM_ECDSA));
-+ d(SIG, "SHA3-384withECDSA", P11Signature,
-+ s("1.2.840.10045.4.3.11", "OID.1.2.840.10045.4.3.11"),
++ dA(SIG, "SHA3-384withECDSA", P11Signature,
+ m(CKM_ECDSA_SHA3_384, CKM_ECDSA));
-+ d(SIG, "SHA3-512withECDSA", P11Signature,
-+ s("1.2.840.10045.4.3.12", "OID.1.2.840.10045.4.3.12"),
++ dA(SIG, "SHA3-512withECDSA", P11Signature,
+ m(CKM_ECDSA_SHA3_512, CKM_ECDSA));
d(SIG, "NONEwithECDSAinP1363Format", P11Signature,
m(CKM_ECDSA));
@@ -1151,29 +1119,25 @@ index cf7cd19b689..7a8bcffb92c 100644
+ d(SIG, "SHA3-512withECDSAinP1363Format", P11Signature,
+ m(CKM_ECDSA_SHA3_512, CKM_ECDSA));
+
- d(SIG, "MD2withRSA", P11Signature,
- s("1.2.840.113549.1.1.2", "OID.1.2.840.113549.1.1.2"),
+ dA(SIG, "MD2withRSA", P11Signature,
m(CKM_MD2_RSA_PKCS, CKM_RSA_PKCS, CKM_RSA_X_509));
-@@ -805,6 +911,18 @@ public final class SunPKCS11 extends AuthProvider {
- d(SIG, "SHA512withRSA", P11Signature,
- s("1.2.840.113549.1.1.13", "OID.1.2.840.113549.1.1.13"),
+ dA(SIG, "MD5withRSA", P11Signature,
+@@ -770,6 +849,14 @@ public final class SunPKCS11 extends AuthProvider {
+ m(CKM_SHA384_RSA_PKCS, CKM_RSA_PKCS, CKM_RSA_X_509));
+ dA(SIG, "SHA512withRSA", P11Signature,
m(CKM_SHA512_RSA_PKCS, CKM_RSA_PKCS, CKM_RSA_X_509));
-+ d(SIG, "SHA3-224withRSA", P11Signature,
-+ s("2.16.840.1.101.3.4.3.13", "OID.2.16.840.1.101.3.4.3.13"),
++ dA(SIG, "SHA3-224withRSA", P11Signature,
+ m(CKM_SHA3_224_RSA_PKCS, CKM_RSA_PKCS, CKM_RSA_X_509));
-+ d(SIG, "SHA3-256withRSA", P11Signature,
-+ s("2.16.840.1.101.3.4.3.14", "OID.2.16.840.1.101.3.4.3.14"),
++ dA(SIG, "SHA3-256withRSA", P11Signature,
+ m(CKM_SHA3_256_RSA_PKCS, CKM_RSA_PKCS, CKM_RSA_X_509));
-+ d(SIG, "SHA3-384withRSA", P11Signature,
-+ s("2.16.840.1.101.3.4.3.15", "OID.2.16.840.1.101.3.4.3.15"),
++ dA(SIG, "SHA3-384withRSA", P11Signature,
+ m(CKM_SHA3_384_RSA_PKCS, CKM_RSA_PKCS, CKM_RSA_X_509));
-+ d(SIG, "SHA3-512withRSA", P11Signature,
-+ s("2.16.840.1.101.3.4.3.16", "OID.2.16.840.1.101.3.4.3.16"),
++ dA(SIG, "SHA3-512withRSA", P11Signature,
+ m(CKM_SHA3_512_RSA_PKCS, CKM_RSA_PKCS, CKM_RSA_X_509));
- d(SIG, "RSASSA-PSS", P11PSSSignature,
- s("1.2.840.113549.1.1.10", "OID.1.2.840.113549.1.1.10"),
+ dA(SIG, "RSASSA-PSS", P11PSSSignature,
m(CKM_RSA_PKCS_PSS));
-@@ -818,6 +936,14 @@ public final class SunPKCS11 extends AuthProvider {
+ d(SIG, "SHA1withRSASSA-PSS", P11PSSSignature,
+@@ -782,6 +869,14 @@ public final class SunPKCS11 extends AuthProvider {
m(CKM_SHA384_RSA_PKCS_PSS));
d(SIG, "SHA512withRSASSA-PSS", P11PSSSignature,
m(CKM_SHA512_RSA_PKCS_PSS));
@@ -1189,7 +1153,7 @@ index cf7cd19b689..7a8bcffb92c 100644
d(KG, "SunTlsRsaPremasterSecret",
"sun.security.pkcs11.P11TlsRsaPremasterSecretGenerator",
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java
-index e077943bbc2..cb04b95304d 100644
+index e077943bbc..cb04b95304 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java
@@ -1,5 +1,5 @@
@@ -1215,7 +1179,7 @@ index e077943bbc2..cb04b95304d 100644
diff --git a/test/jdk/sun/security/pkcs11/KeyGenerator/HmacDefKeySizeTest.java b/test/jdk/sun/security/pkcs11/KeyGenerator/HmacDefKeySizeTest.java
new file mode 100644
-index 00000000000..d6707028d96
+index 0000000000..d6707028d9
--- /dev/null
+++ b/test/jdk/sun/security/pkcs11/KeyGenerator/HmacDefKeySizeTest.java
@@ -0,0 +1,84 @@
@@ -1304,7 +1268,7 @@ index 00000000000..d6707028d96
+ }
+}
diff --git a/test/jdk/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java b/test/jdk/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java
-index b61d10beece..78b7d857e8e 100644
+index b61d10beec..78b7d857e8 100644
--- a/test/jdk/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java
+++ b/test/jdk/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java
@@ -23,7 +23,7 @@
@@ -1336,7 +1300,7 @@ index b61d10beece..78b7d857e8e 100644
test("ARCFOUR", 1024, p, TestResult.TBD);
} else if (p.getName().equals("SunPKCS11-NSS")) {
diff --git a/test/jdk/sun/security/pkcs11/Mac/MacSameTest.java b/test/jdk/sun/security/pkcs11/Mac/MacSameTest.java
-index 59af327c1f2..64c42a6dd06 100644
+index 59af327c1f..64c42a6dd0 100644
--- a/test/jdk/sun/security/pkcs11/Mac/MacSameTest.java
+++ b/test/jdk/sun/security/pkcs11/Mac/MacSameTest.java
@@ -23,7 +23,7 @@
@@ -1421,7 +1385,7 @@ index 59af327c1f2..64c42a6dd06 100644
mac.reset();
diff --git a/test/jdk/sun/security/pkcs11/Mac/ReinitMac.java b/test/jdk/sun/security/pkcs11/Mac/ReinitMac.java
-index 5cad8859840..7e045232e3a 100644
+index 5cad885984..7e045232e3 100644
--- a/test/jdk/sun/security/pkcs11/Mac/ReinitMac.java
+++ b/test/jdk/sun/security/pkcs11/Mac/ReinitMac.java
@@ -1,5 +1,5 @@
@@ -1514,7 +1478,7 @@ index 5cad8859840..7e045232e3a 100644
}
}
diff --git a/test/jdk/sun/security/pkcs11/MessageDigest/ByteBuffers.java b/test/jdk/sun/security/pkcs11/MessageDigest/ByteBuffers.java
-index 7ced00630cc..a7a72e8ea3d 100644
+index 7ced00630c..a7a72e8ea3 100644
--- a/test/jdk/sun/security/pkcs11/MessageDigest/ByteBuffers.java
+++ b/test/jdk/sun/security/pkcs11/MessageDigest/ByteBuffers.java
@@ -1,5 +1,5 @@
@@ -1574,7 +1538,7 @@ index 7ced00630cc..a7a72e8ea3d 100644
byte[] d1 = md.digest(data);
diff --git a/test/jdk/sun/security/pkcs11/MessageDigest/ReinitDigest.java b/test/jdk/sun/security/pkcs11/MessageDigest/ReinitDigest.java
-index ea7909bc397..268f698276b 100644
+index ea7909bc39..268f698276 100644
--- a/test/jdk/sun/security/pkcs11/MessageDigest/ReinitDigest.java
+++ b/test/jdk/sun/security/pkcs11/MessageDigest/ReinitDigest.java
@@ -1,5 +1,5 @@
@@ -1655,7 +1619,7 @@ index ea7909bc397..268f698276b 100644
private static void check(byte[] d1, byte[] d2) throws Exception {
diff --git a/test/jdk/sun/security/pkcs11/MessageDigest/TestCloning.java b/test/jdk/sun/security/pkcs11/MessageDigest/TestCloning.java
-index b931c8564b2..ace601c7233 100644
+index b931c8564b..ace601c723 100644
--- a/test/jdk/sun/security/pkcs11/MessageDigest/TestCloning.java
+++ b/test/jdk/sun/security/pkcs11/MessageDigest/TestCloning.java
@@ -1,5 +1,5 @@
@@ -1744,7 +1708,7 @@ index b931c8564b2..ace601c7233 100644
MessageDigest mdCopy0 = (MessageDigest) mdObj.clone();
diff --git a/test/jdk/sun/security/pkcs11/Signature/ByteBuffers.java b/test/jdk/sun/security/pkcs11/Signature/ByteBuffers.java
-index 26eeacffed9..f5de994779c 100644
+index 26eeacffed..f5de994779 100644
--- a/test/jdk/sun/security/pkcs11/Signature/ByteBuffers.java
+++ b/test/jdk/sun/security/pkcs11/Signature/ByteBuffers.java
@@ -23,7 +23,7 @@
@@ -1770,7 +1734,7 @@ index 26eeacffed9..f5de994779c 100644
sig.update(t);
byte[] signature = sig.sign();
diff --git a/test/jdk/sun/security/pkcs11/Signature/InitAgainPSS.java b/test/jdk/sun/security/pkcs11/Signature/InitAgainPSS.java
-index ccd66599fb0..a2fa7294977 100644
+index ccd66599fb..a2fa729497 100644
--- a/test/jdk/sun/security/pkcs11/Signature/InitAgainPSS.java
+++ b/test/jdk/sun/security/pkcs11/Signature/InitAgainPSS.java
@@ -1,5 +1,5 @@
@@ -1816,7 +1780,7 @@ index ccd66599fb0..a2fa7294977 100644
PSSParameterSpec params = new PSSParameterSpec("SHA-256", "MGF1",
new MGF1ParameterSpec("SHA-256"), 32,
diff --git a/test/jdk/sun/security/pkcs11/Signature/KeyAndParamCheckForPSS.java b/test/jdk/sun/security/pkcs11/Signature/KeyAndParamCheckForPSS.java
-index 2e4fedbf1d5..f1c0492b5fc 100644
+index 2e4fedbf1d..f1c0492b5f 100644
--- a/test/jdk/sun/security/pkcs11/Signature/KeyAndParamCheckForPSS.java
+++ b/test/jdk/sun/security/pkcs11/Signature/KeyAndParamCheckForPSS.java
@@ -1,5 +1,5 @@
@@ -1910,7 +1874,7 @@ index 2e4fedbf1d5..f1c0492b5fc 100644
System.out.println("test#4: pass");
}
diff --git a/test/jdk/sun/security/pkcs11/Signature/ReinitSignature.java b/test/jdk/sun/security/pkcs11/Signature/ReinitSignature.java
-index 42ca7fa203d..8c132ca7e4f 100644
+index 42ca7fa203..8c132ca7e4 100644
--- a/test/jdk/sun/security/pkcs11/Signature/ReinitSignature.java
+++ b/test/jdk/sun/security/pkcs11/Signature/ReinitSignature.java
@@ -23,312 +23,13 @@
@@ -2242,7 +2206,7 @@ index 42ca7fa203d..8c132ca7e4f 100644
new Random().nextBytes(data);
sig.initSign(privateKey);
diff --git a/test/jdk/sun/security/pkcs11/Signature/SigInteropPSS.java b/test/jdk/sun/security/pkcs11/Signature/SigInteropPSS.java
-index 3c3edb5aa6a..11147022771 100644
+index 3c3edb5aa6..1114702277 100644
--- a/test/jdk/sun/security/pkcs11/Signature/SigInteropPSS.java
+++ b/test/jdk/sun/security/pkcs11/Signature/SigInteropPSS.java
@@ -1,5 +1,5 @@
@@ -2263,7 +2227,7 @@ index 3c3edb5aa6a..11147022771 100644
* @library /test/lib ..
diff --git a/test/jdk/sun/security/pkcs11/Signature/SigInteropPSS2.java b/test/jdk/sun/security/pkcs11/Signature/SigInteropPSS2.java
new file mode 100644
-index 00000000000..b8ea9863327
+index 0000000000..b8ea986332
--- /dev/null
+++ b/test/jdk/sun/security/pkcs11/Signature/SigInteropPSS2.java
@@ -0,0 +1,98 @@
@@ -2366,7 +2330,7 @@ index 00000000000..b8ea9863327
+ }
+}
diff --git a/test/jdk/sun/security/pkcs11/Signature/SignatureTestPSS.java b/test/jdk/sun/security/pkcs11/Signature/SignatureTestPSS.java
-index 3a6dbe345e9..4c1f7284bbc 100644
+index 3a6dbe345e..4c1f7284bb 100644
--- a/test/jdk/sun/security/pkcs11/Signature/SignatureTestPSS.java
+++ b/test/jdk/sun/security/pkcs11/Signature/SignatureTestPSS.java
@@ -1,5 +1,5 @@
@@ -2424,7 +2388,7 @@ index 3a6dbe345e9..4c1f7284bbc 100644
hash, "MGF1", new MGF1ParameterSpec(mgfHash), 0, 1);
diff --git a/test/jdk/sun/security/pkcs11/Signature/SignatureTestPSS2.java b/test/jdk/sun/security/pkcs11/Signature/SignatureTestPSS2.java
new file mode 100644
-index 00000000000..516b17972e5
+index 0000000000..516b17972e
--- /dev/null
+++ b/test/jdk/sun/security/pkcs11/Signature/SignatureTestPSS2.java
@@ -0,0 +1,140 @@
@@ -2569,7 +2533,7 @@ index 00000000000..516b17972e5
+ }
+}
diff --git a/test/jdk/sun/security/pkcs11/Signature/TestDSA2.java b/test/jdk/sun/security/pkcs11/Signature/TestDSA2.java
-index 222f8a2a5ed..3161de6fc50 100644
+index 222f8a2a5e..3161de6fc5 100644
--- a/test/jdk/sun/security/pkcs11/Signature/TestDSA2.java
+++ b/test/jdk/sun/security/pkcs11/Signature/TestDSA2.java
@@ -1,5 +1,5 @@
@@ -2664,7 +2628,7 @@ index 222f8a2a5ed..3161de6fc50 100644
}
}
diff --git a/test/jdk/sun/security/pkcs11/Signature/TestRSAKeyLength.java b/test/jdk/sun/security/pkcs11/Signature/TestRSAKeyLength.java
-index f469ca17b65..7e5a012a5ec 100644
+index f469ca17b6..7e5a012a5e 100644
--- a/test/jdk/sun/security/pkcs11/Signature/TestRSAKeyLength.java
+++ b/test/jdk/sun/security/pkcs11/Signature/TestRSAKeyLength.java
@@ -22,8 +22,8 @@
@@ -2697,7 +2661,7 @@ index f469ca17b65..7e5a012a5ec 100644
kpg.initialize(512);
KeyPair kp = kpg.generateKeyPair();
diff --git a/test/jdk/sun/security/pkcs11/nss/p11-nss.txt b/test/jdk/sun/security/pkcs11/nss/p11-nss.txt
-index 49778ea954c..576b1dc4d69 100644
+index 49778ea954..576b1dc4d6 100644
--- a/test/jdk/sun/security/pkcs11/nss/p11-nss.txt
+++ b/test/jdk/sun/security/pkcs11/nss/p11-nss.txt
@@ -11,12 +11,23 @@ library = ${pkcs11test.nss.lib}
diff --git a/jdk8271148-external_doesnt_produce_debuginfo.patch b/jdk8271148-external_doesnt_produce_debuginfo.patch
deleted file mode 100644
index 7eed447..0000000
--- a/jdk8271148-external_doesnt_produce_debuginfo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e2d6aaa1a809c0d49d599812440777549fc36ea4 Mon Sep 17 00:00:00 2001
-From: Severin Gehwolf <sgehwolf(a)redhat.com>
-Date: Thu, 22 Jul 2021 18:30:22 +0200
-Subject: [PATCH] Backport JDK-8271148
-
----
- make/common/NativeCompilation.gmk | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
-index 490a7f4c7fb..2e3b5dd5eca 100644
---- a/make/common/NativeCompilation.gmk
-+++ b/make/common/NativeCompilation.gmk
-@@ -544,15 +544,6 @@ define SetupNativeCompilationBody
- # jmods.
- $1_OBJECT_DIR := $$($1_OBJECT_DIR)/static
- $1_OUTPUT_DIR := $$($1_OBJECT_DIR)
-- # For release builds where debug symbols are configured to be moved to
-- # separate debuginfo files, disable debug symbols for static libs instead.
-- # We don't currently support this configuration and we don't want symbol
-- # information in release builds unless explicitly asked to provide it.
-- ifeq ($(DEBUG_LEVEL), release)
-- ifeq ($(COPY_DEBUG_SYMBOLS), true)
-- $1_COMPILE_WITH_DEBUG_SYMBOLS := false
-- endif
-- endif
- endif
-
- ifeq ($$($1_TYPE), EXECUTABLE)
---
-2.31.1
-
diff --git a/jdk8312489-max_sig_default_increase.patch b/jdk8312489-max_sig_default_increase.patch
new file mode 100644
index 0000000..e0c4eeb
--- /dev/null
+++ b/jdk8312489-max_sig_default_increase.patch
@@ -0,0 +1,50 @@
+commit 50074a04e62f91faa080b831d9ce343396ead252
+Author: Andrew John Hughes <andrew(a)openjdk.org>
+Date: Tue Sep 5 20:48:42 2023 +0000
+
+ 8312489: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar
+
+ Backport-of: e47a84f23dd2608c6f5748093eefe301fb5bf750
+
+diff --git a/src/java.base/share/classes/java/util/jar/JarFile.java b/src/java.base/share/classes/java/util/jar/JarFile.java
+index cb7e308e0d..cce897c0d3 100644
+--- a/src/java.base/share/classes/java/util/jar/JarFile.java
++++ b/src/java.base/share/classes/java/util/jar/JarFile.java
+@@ -809,7 +809,9 @@ class JarFile extends ZipFile {
+ throw new IOException("Unsupported size: " + uncompressedSize +
+ " for JarEntry " + ze.getName() +
+ ". Allowed max size: " +
+- SignatureFileVerifier.MAX_SIG_FILE_SIZE + " bytes");
++ SignatureFileVerifier.MAX_SIG_FILE_SIZE + " bytes. " +
++ "You can use the jdk.jar.maxSignatureFileSize " +
++ "system property to increase the default value.");
+ }
+ int len = (int)uncompressedSize;
+ int bytesRead;
+diff --git a/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
+index cb477fc134..a766b8249f 100644
+--- a/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
++++ b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
+@@ -852,16 +852,16 @@ public class SignatureFileVerifier {
+ * the maximum allowed number of bytes for the signature-related files
+ * in a JAR file.
+ */
+- Integer tmp = GetIntegerAction.privilegedGetProperty(
+- "jdk.jar.maxSignatureFileSize", 8000000);
++ int tmp = GetIntegerAction.privilegedGetProperty(
++ "jdk.jar.maxSignatureFileSize", 16000000);
+ if (tmp < 0 || tmp > MAX_ARRAY_SIZE) {
+ if (debug != null) {
+- debug.println("Default signature file size 8000000 bytes " +
+- "is used as the specified size for the " +
+- "jdk.jar.maxSignatureFileSize system property " +
++ debug.println("The default signature file size of 16000000 bytes " +
++ "will be used for the jdk.jar.maxSignatureFileSize " +
++ "system property since the specified value " +
+ "is out of range: " + tmp);
+ }
+- tmp = 8000000;
++ tmp = 16000000;
+ }
+ return tmp;
+ }
diff --git a/openjdk_news.sh b/openjdk_news.sh
index 560b356..386aa53 100755
--- a/openjdk_news.sh
+++ b/openjdk_news.sh
@@ -18,8 +18,8 @@
OLD_RELEASE=$1
NEW_RELEASE=$2
-SUBDIR=$3
-REPO=$4
+REPO=$3
+SUBDIR=$4
SCRIPT_DIR=$(dirname ${0})
if test "x${SUBDIR}" = "x"; then
diff --git a/remove-intree-libraries.sh b/remove-intree-libraries.sh
index ee02f60..25c2fc8 100644
--- a/remove-intree-libraries.sh
+++ b/remove-intree-libraries.sh
@@ -162,5 +162,3 @@ rm -vf ${LCMS_SRC}/cmsxform.c
rm -vf ${LCMS_SRC}/lcms2.h
rm -vf ${LCMS_SRC}/lcms2_internal.h
rm -vf ${LCMS_SRC}/lcms2_plugin.h
-
-
diff --git a/sources b/sources
index b289e5b..7c58d0e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openjdk-jdk11u-jdk-11.0.20+8.tar.xz) = c518d6c58d2644a34406d7867befe05457b81841e1ff376eb5f80e6b92f9799f921668b133c59008cbb6aa47f7ec9618de14f6848f827c3cbe1b630e000f9105
+SHA512 (openjdk-jdk11u-jdk-11.0.21+9.tar.xz) = 7435bd1b6196f965985fee1aed06eebb97e89fe90d3bd846ffe9cf8451e1d0c7bdedcba373e0d128f9c74fcaf111ddab030efcb032e88f9306a81569aba29ace
diff --git a/update_package.sh b/update_package.sh
index 9831993..09d9504 100644
--- a/update_package.sh
+++ b/update_package.sh
@@ -1,42 +1 @@
-#!/bin/bash -x
-# this file contains defaults for currently generated source tarballs
-
-set -e
-
-# OpenJDK from Shenandoah project
-export PROJECT_NAME="shenandoah"
-export REPO_NAME="jdk11"
-# warning, clonning without shenadnaoh prefix, you will clone pure jdk - thus without shenandaoh GC
-export VERSION="shenandoah-jdk-11.0.3+7"
-export COMPRESSION=xz
-# unset tapsets overrides
-export OPENJDK_URL=""
-export TO_COMPRESS=""
-# warning, filename and filenameroot creation is duplicated here from generate_source_tarball.sh
-export FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
-FILENAME=${FILE_NAME_ROOT}.tar.${COMPRESSION}
-
-if [ ! -f ${FILENAME} ] ; then
-echo "Generating ${FILENAME}"
- sh ./generate_source_tarball.sh
-else
- echo "exists exists exists exists exists exists exists "
- echo "reusing reusing reusing reusing reusing reusing "
- echo ${FILENAME}
-fi
-
-set +e
-
-major=`echo $REPO_NAME | sed 's/[a-zA-Z]*//g'`
-build=`echo $VERSION | sed 's/.*+//g'`
-name_helper=`echo $FILENAME | sed s/$major/'%{majorver}'/g `
-name_helper=`echo $name_helper | sed s/$build/'%{buildver}'/g `
-echo "align specfile acordingly:"
-echo " sed 's/^Source0:.*/Source0: $name_helper/' -i *.spec"
-echo " sed 's/^Source8:.*/Source8: $TAPSET/' -i *.spec"
-echo " sed 's/^%global buildver.*/%global buildver $build/' -i *.spec"
-echo " sed 's/Release:.*/Release: 1%{?dist}/' -i *.spec"
-echo "and maybe others...."
-echo "you should fedpkg/rhpkg new-sources $TAPSET $FILENAME"
-echo "you should fedpkg/rhpkg prep --arch XXXX on all architectures: x86_64 i386 i586 i686 ppc ppc64 ppc64le s390 s390x aarch64 armv7hl"
-
+# this file is intentionally not use din portables, use tarball from main rpms
1
0
Architecture specific change in rpms/rocm-rpm-macros.git
by githook-noreply＠fedoraproject.org 30 Nov '23
by githook-noreply＠fedoraproject.org 30 Nov '23
30 Nov '23
The package rpms/rocm-rpm-macros.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rocm-rpm-macros.git/commit/?id=b705….
Change:
+ExclusiveArch: x86_64
Thanks.
Full change:
============
commit 5fee3af1f81a9248713dcf0ff0dce61f2bcdf298
Author: Jeremy Newton <alexjnewt(a)hotmail.com>
Date: Fri Nov 17 19:00:56 2023 -0500
Forgot to bump release tag
Signed-off-by: Jeremy Newton <alexjnewt(a)hotmail.com>
diff --git a/rocm-rpm-macros.spec b/rocm-rpm-macros.spec
index 88a7d8c..8d7c329 100644
--- a/rocm-rpm-macros.spec
+++ b/rocm-rpm-macros.spec
@@ -1,6 +1,6 @@
Name: rocm-rpm-macros
Version: 1.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: ROCm RPM macros
License: GPL-2.0-or-later
commit e5b83fd4bee2f7753b58b8e3dff9142930210670
Author: Jeremy Newton <alexjnewt(a)hotmail.com>
Date: Fri Nov 17 18:58:10 2023 -0500
Add more directory ownership
There's more directories that are orphaned. Perhaps a rocm-filesystem
package could be added later, but this is ok for now.
Signed-off-by: Jeremy Newton <alexjnewt(a)hotmail.com>
diff --git a/rocm-rpm-macros.spec b/rocm-rpm-macros.spec
index 0a05a66..88a7d8c 100644
--- a/rocm-rpm-macros.spec
+++ b/rocm-rpm-macros.spec
@@ -60,12 +60,17 @@ done
%files modules
%license GPL
+%dir %{_libdir}/rocm
+%dir %{_libdir}/rocm/gfx*
%dir %{_libdir}/rocm/gfx*/bin
%dir %{_libdir}/rocm/gfx*/lib
%dir %{_libdir}/rocm/gfx*/lib/cmake
%{_datadir}/modulefiles/rocm/
%changelog
+* Fri Nov 17 2023 Jeremy Newton <alexjnewt at hotmail dot com> 1.0-7
+- Add more directory ownership
+
* Thu Nov 02 2023 Jeremy Newton <alexjnewt at hotmail dot com> 1.0-6
- change package to arched x86_64 to capture the correct libdir
commit b705f0b7bba60b26e023e6dc5bc4107790171505
Author: Jeremy Newton <alexjnewt(a)hotmail.com>
Date: Thu Nov 2 15:29:19 2023 -0400
Change noarch to x86_64 package
Since the modules contains references to lib64, we should make sure the
package is arched to capture the correct libdir.
Signed-off-by: Jeremy Newton <alexjnewt(a)hotmail.com>
diff --git a/rocm-rpm-macros.spec b/rocm-rpm-macros.spec
index 3faade6..0a05a66 100644
--- a/rocm-rpm-macros.spec
+++ b/rocm-rpm-macros.spec
@@ -1,6 +1,6 @@
Name: rocm-rpm-macros
Version: 1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: ROCm RPM macros
License: GPL-2.0-or-later
@@ -18,7 +18,7 @@ Source6: gfx11
Requires: environment-modules
-BuildArch: noarch
+ExclusiveArch: x86_64
%description
This package contains ROCm RPM macros for building ROCm packages.
@@ -66,6 +66,9 @@ done
%{_datadir}/modulefiles/rocm/
%changelog
+* Thu Nov 02 2023 Jeremy Newton <alexjnewt at hotmail dot com> 1.0-6
+- change package to arched x86_64 to capture the correct libdir
+
* Sun Oct 22 2023 Tom Rix <trix(a)redhat.com> 1.0-5
- make directories rocblas will use
commit d3ed3ad508df78409a909b30ad3a2693d7398a6c
Author: Tom Rix <trix(a)redhat.com>
Date: Sun Oct 22 12:20:03 2023 -0700
Need to make a few directories that users will need
Signed-off-by: Tom Rix <trix(a)redhat.com>
diff --git a/rocm-rpm-macros.spec b/rocm-rpm-macros.spec
index 5c1b870..3faade6 100644
--- a/rocm-rpm-macros.spec
+++ b/rocm-rpm-macros.spec
@@ -1,6 +1,6 @@
Name: rocm-rpm-macros
Version: 1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: ROCm RPM macros
License: GPL-2.0-or-later
@@ -14,6 +14,8 @@ Source4: gfx9
Source5: gfx10
Source6: gfx11
+%global gpu_list gfx8 gfx9 gfx10 gfx11
+
Requires: environment-modules
BuildArch: noarch
@@ -45,6 +47,12 @@ mkdir -p %{buildroot}%{_rpmmacrodir}/
install -Dpm 644 %{SOURCE0} %{buildroot}%{_rpmmacrodir}/
mkdir -p %{buildroot}%{_datadir}/modulefiles/rocm/
cp -p modules/* %{buildroot}%{_datadir}/modulefiles/rocm/
+# Make directories users of modules will install to
+for gpu in %{gpu_list}
+do
+ mkdir -p %{buildroot}%{_libdir}/rocm/$gpu/lib/cmake
+ mkdir -p %{buildroot}%{_libdir}/rocm/$gpu/bin
+done
%files
%license GPL
@@ -52,9 +60,15 @@ cp -p modules/* %{buildroot}%{_datadir}/modulefiles/rocm/
%files modules
%license GPL
+%dir %{_libdir}/rocm/gfx*/bin
+%dir %{_libdir}/rocm/gfx*/lib
+%dir %{_libdir}/rocm/gfx*/lib/cmake
%{_datadir}/modulefiles/rocm/
%changelog
+* Sun Oct 22 2023 Tom Rix <trix(a)redhat.com> 1.0-5
+- make directories rocblas will use
+
* Sat Oct 14 2023 Tom Rix <trix(a)redhat.com> 1.0-4
- Use fedora repo over personal repo
commit 692c8a68ade620d0e554206fa40524af833cafff
Author: Tom Rix <trix(a)redhat.com>
Date: Sat Oct 14 07:38:39 2023 -0700
Initial project
Signed-off-by: Tom Rix <trix(a)redhat.com>
diff --git a/GPL b/GPL
new file mode 100644
index 0000000..d159169
--- /dev/null
+++ b/GPL
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/default b/default
new file mode 100644
index 0000000..fa93d5a
--- /dev/null
+++ b/default
@@ -0,0 +1,11 @@
+#%Module 1.0
+#
+# ROCm module for use with 'environment-modules' package:
+#
+
+conflict rocm
+
+setenv ROCM_BIN /usr/bin
+setenv ROCM_LIB /usr/lib64
+setenv ROCM_GPUS gfx1010,gfx1012,gfx1030,gfx1100,gfx1101,gfx1102
+
diff --git a/gfx10 b/gfx10
new file mode 100644
index 0000000..ee93dae
--- /dev/null
+++ b/gfx10
@@ -0,0 +1,13 @@
+#%Module 1.0
+#
+# ROCm module for use with 'environment-modules' package:
+#
+
+# Only allow one mpi module to be loaded at a time
+conflict rocm
+
+setenv ROCM_BIN /usr/lib64/rocm/gfx10/bin
+setenv ROCM_LIB /usr/lib64/rocm/gfx10/lib
+setenv ROCM_GPUS gfx1010,gfx1012,gfx1030
+prepend-path PATH /usr/lib64/rocm/gfx10/bin
+prepend-path LD_LIBRARY_PATH /usr/lib64/rocm/gfx10/lib
diff --git a/gfx11 b/gfx11
new file mode 100644
index 0000000..6c4ddb1
--- /dev/null
+++ b/gfx11
@@ -0,0 +1,12 @@
+#%Module 1.0
+#
+# ROCm module for use with 'environment-modules' package:
+#
+
+conflict rocm
+
+setenv ROCM_BIN /usr/lib64/rocm/gfx11/bin
+setenv ROCM_LIB /usr/lib64/rocm/gfx11/lib
+setenv ROCM_GPUS gfx1100,gfx1101,gfx1102
+prepend-path PATH /usr/lib64/rocm/gfx11/bin
+prepend-path LD_LIBRARY_PATH /usr/lib64/rocm/gfx11/lib
diff --git a/gfx8 b/gfx8
new file mode 100644
index 0000000..c5bb3fd
--- /dev/null
+++ b/gfx8
@@ -0,0 +1,12 @@
+#%Module 1.0
+#
+# ROCm module for use with 'environment-modules' package:
+#
+
+conflict rocm
+
+setenv ROCM_BIN /usr/lib64/rocm/gfx8/bin
+setenv ROCM_LIB /usr/lib64/rocm/gfx8/lib
+setenv ROCM_GPUS gfx803
+prepend-path PATH /usr/lib64/rocm/gfx8/bin
+prepend-path LD_LIBRARY_PATH /usr/lib64/rocm/gfx8/lib
diff --git a/gfx9 b/gfx9
new file mode 100644
index 0000000..177d55c
--- /dev/null
+++ b/gfx9
@@ -0,0 +1,12 @@
+#%Module 1.0
+#
+# ROCm module for use with 'environment-modules' package:
+#
+
+conflict rocm
+
+setenv ROCM_BIN /usr/lib64/rocm/gfx9/bin
+setenv ROCM_LIB /usr/lib64/rocm/gfx9/lib
+setenv ROCM_GPUS gfx900,gfx906:xnack-,gfx908:xnack-,gfx90a:xnack+,gfx90a:xnack-,gfx940,gfx941,gfx942
+prepend-path PATH /usr/lib64/rocm/gfx9/bin
+prepend-path LD_LIBRARY_PATH /usr/lib64/rocm/gfx9/lib
diff --git a/macros.rocm b/macros.rocm
new file mode 100644
index 0000000..5765904
--- /dev/null
+++ b/macros.rocm
@@ -0,0 +1,33 @@
+%rocm_buildrequires cmake compiler-rt clang-devel lld llvm-devel ninja-build rocm-cmake rocm-comgr-devel rocm-hip-devel rocm-runtime-devel rocm-rpm-macros-modules
+
+%rocm_buildrequires_test gtest-devel
+
+%rocm_requires rocm-rpm-macros-modules
+
+%rocm_cmake_options -G Ninja -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF -DROCM_SYMLINK_LIBS=OFF -DHIP_PLATFORM=amd -DAMDGPU_TARGETS=$ROCM_GPUS -DCMAKE_INSTALL_LIBDIR=$ROCM_LIB -DCMAKE_INSTALL_BINDIR=$ROCM_BIN
+%rocm_cmake_test_options -DBUILD_CLIENTS_BENCHMARKS=ON -DBUILD_CLIENTS_TESTS=ON -DBUILD_CLIENTS_TESTS_OPENMP=OFF -DBUILD_FORTRAN_CLIENTS=OFF
+
+%rocm_gpu_list gfx8 gfx9 gfx10 gfx11 default
+
+%__cc_rocm hipcc
+%__cxx_rocm hipcc
+%__cpp_rocm clang-cpp
+
+%_rocm_extra_ldflags %{?_lto_cflags}
+%build_ldflags -Wl,-z,relro %{_ld_as_needed_flags} %{_ld_symbols_flags} %{_hardened_ldflags} %{_annotation_ldflags} "%{?_rocm_extra_ldflags}" %{_build_id_flags} %{?_package_note_flags} %{?_distro_extra_ldflags}
+
+%__spec_install_post\
+ %{?__brp_llvm_compile_lto_elf} \
+ %{?__debug_package:%{__debug_install_post}}\
+ %{__arch_install_post}\
+ %{__os_install_post}\
+%{nil}
+
+%_hardening_rocm_cflags --config /usr/lib/rpm/redhat/redhat-hardened-clang.cfg
+%_hardening_cflags -fPIE -Xarch_host -fstack-protector-strong
+%_hardening_ldflags -Wl,-z,now
+
+%_annobin_rocm_plugin %dnl-fplugin=/usr/lib64/clang/`clang -dumpversion`/lib/annobin.so
+
+%_rocm_lto_cflags -flto=thin
+
diff --git a/rocm-rpm-macros.spec b/rocm-rpm-macros.spec
new file mode 100644
index 0000000..5c1b870
--- /dev/null
+++ b/rocm-rpm-macros.spec
@@ -0,0 +1,70 @@
+Name: rocm-rpm-macros
+Version: 1.0
+Release: 4%{?dist}
+Summary: ROCm RPM macros
+License: GPL-2.0-or-later
+
+URL: https://github.com/trixirt/rocm-rpm-macros
+Source0: macros.rocm
+Source1: GPL
+# Modules
+Source2: default
+Source3: gfx8
+Source4: gfx9
+Source5: gfx10
+Source6: gfx11
+
+
+Requires: environment-modules
+BuildArch: noarch
+%description
+This package contains ROCm RPM macros for building ROCm packages.
+
+%package modules
+Summary: ROCm enviroment modules
+Requires: environment(modules)
+
+%description modules
+This package contains ROCm environment modules for switching
+between different GPU families.
+
+%prep
+%setup -cT
+install -pm 644 %{SOURCE0} .
+install -pm 644 %{SOURCE1} .
+mkdir modules
+install -pm 644 %{SOURCE2} modules
+install -pm 644 %{SOURCE3} modules
+install -pm 644 %{SOURCE4} modules
+install -pm 644 %{SOURCE5} modules
+install -pm 644 %{SOURCE6} modules
+
+
+%install
+mkdir -p %{buildroot}%{_rpmmacrodir}/
+install -Dpm 644 %{SOURCE0} %{buildroot}%{_rpmmacrodir}/
+mkdir -p %{buildroot}%{_datadir}/modulefiles/rocm/
+cp -p modules/* %{buildroot}%{_datadir}/modulefiles/rocm/
+
+%files
+%license GPL
+%{_rpmmacrodir}/macros.rocm
+
+%files modules
+%license GPL
+%{_datadir}/modulefiles/rocm/
+
+%changelog
+* Sat Oct 14 2023 Tom Rix <trix(a)redhat.com> 1.0-4
+- Use fedora repo over personal repo
+
+* Fri Oct 13 2023 Tom Rix <trix(a)redhat.com> 1.0-3
+- Fix license
+- Fix dist use in version
+
+* Thu Oct 12 2023 Tom Rix <trix(a)redhat.com> 1.0-2
+- Remove version for macros
+- Combine modules as a subpackage
+
+* Sun Oct 8 2023 Tom Rix <trix(a)redhat.com> 5.7.0-1
+- Initial package
1
0
30 Nov '23
The package rpms/rocblas.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rocblas.git/commit/?id=c1235bc10361….
Change:
+ExclusiveArch: x86_64
Thanks.
Full change:
============
commit 64a7eeb56c02c0aab643470826eedc6a5ebd3264
Author: Tom Rix <trix(a)redhat.com>
Date: Tue Oct 31 06:40:49 2023 -0700
Fix comment
Signed-off-by: Tom Rix <trix(a)redhat.com>
diff --git a/rocblas.spec b/rocblas.spec
index 31259c9..edfee8c 100644
--- a/rocblas.spec
+++ b/rocblas.spec
@@ -121,7 +121,7 @@ done
%changelog
* Sun Oct 22 2023 Tom Rix <trix(a)redhat.com> - 5.7.1-3
- Change url
-- capitalize AMD
+- capitalize AND
* Sat Oct 21 2023 Tom Rix <trix(a)redhat.com> - 5.7.1-2
- Fix so location
commit c1235bc103614947f9fe1238dfbd26670fb8cbfc
Author: Tom Rix <trix(a)redhat.com>
Date: Tue Oct 31 06:39:55 2023 -0700
Initial package
Signed-off-by: Tom Rix <trix(a)redhat.com>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0d251f6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/rocBLAS-5.7.1.tar.gz
diff --git a/0001-prepare-rocblas-cmake-for-fedora.patch b/0001-prepare-rocblas-cmake-for-fedora.patch
new file mode 100644
index 0000000..c3c1151
--- /dev/null
+++ b/0001-prepare-rocblas-cmake-for-fedora.patch
@@ -0,0 +1,26 @@
+From aba3a118fd32f415e63b4e24555b8df98e89292d Mon Sep 17 00:00:00 2001
+From: Tom Rix <trix(a)redhat.com>
+Date: Tue, 3 Oct 2023 10:37:12 -0700
+Subject: [PATCH] prepare rocblas cmake for fedora
+
+Signed-off-by: Tom Rix <trix(a)redhat.com>
+---
+ clients/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt
+index da44cef0..6d39c1f3 100755
+--- a/clients/CMakeLists.txt
++++ b/clients/CMakeLists.txt
+@@ -131,7 +131,7 @@ if( BUILD_CLIENTS_BENCHMARKS OR BUILD_CLIENTS_TESTS)
+ message(STATUS "Linking BLIS LIB: ${BLAS_LIBRARY}")
+ endif()
+ else()
+- set( BLAS_LIBRARY "blas" )
++ set( BLAS_LIBRARY "cblas" )
+ endif()
+ else() # WIN32
+ set( BLAS_INCLUDE_DIR ${OPENBLAS_DIR}/include CACHE PATH "OpenBLAS library include path" )
+--
+2.41.0
+
diff --git a/rocblas.spec b/rocblas.spec
new file mode 100644
index 0000000..31259c9
--- /dev/null
+++ b/rocblas.spec
@@ -0,0 +1,146 @@
+%global upstreamname rocBLAS
+%global rocm_release 5.7
+%global rocm_patch 1
+%global rocm_version %{rocm_release}.%{rocm_patch}
+
+%global toolchain rocm
+# hipcc does not support some clang flags
+%global build_cxxflags %(echo %{optflags} | sed -e 's/-fstack-protector-strong/-Xarch_host -fstack-protector-strong/' -e 's/-fcf-protection/-Xarch_host -fcf-protection/')
+
+# $gpu will be evaluated in the loops below
+%global _vpath_builddir %{_vendor}-%{_target_os}-build-${gpu}
+
+# It is necessary to use this with a local build
+# export QA_RPATHS=0xff
+%bcond_with test
+
+Name: rocblas
+Version: %{rocm_version}
+Release: 3%{?dist}
+Summary: BLAS implementation for ROCm
+Url: https://github.com/ROCmSoftwarePlatform/%{upstreamname}
+License: MIT AND BSD-3-Clause
+
+Source0: %{url}/archive/refs/tags/rocm-%{rocm_version}.tar.gz#/%{upstreamname}-%{rocm_version}.tar.gz
+Patch0: 0001-prepare-rocblas-cmake-for-fedora.patch
+
+BuildRequires: cmake
+BuildRequires: clang-devel
+BuildRequires: compiler-rt
+BuildRequires: lld
+BuildRequires: llvm-devel
+BuildRequires: ninja-build
+BuildRequires: rocm-cmake
+BuildRequires: rocm-comgr-devel
+BuildRequires: rocm-hip-devel
+BuildRequires: rocm-runtime-devel
+BuildRequires: rocm-rpm-macros
+BuildRequires: rocm-rpm-macros-modules
+
+%if %{with test}
+BuildRequires: gtest-devel
+BuildRequires: blas-devel
+BuildRequires: libomp-devel
+BuildRequires: python3-pyyaml
+BuildRequires: rocminfo
+%endif
+
+Requires: rocm-rpm-macros-modules
+
+# Only x86_64 works right now:
+ExclusiveArch: x86_64
+
+%description
+rocBLAS is the AMD library for Basic Linear Algebra Subprograms
+(BLAS) on the ROCm platform. It is implemented in the HIP
+programming language and optimized for AMD GPUs.
+
+%package devel
+Summary: Libraries and headers for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+%{summary}
+
+%if %{with test}
+%package test
+Summary: Tests for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description test
+%{summary}
+%endif
+
+%prep
+%autosetup -p1 -n %{upstreamname}-rocm-%{version}
+
+%build
+
+for gpu in %{rocm_gpu_list}
+do
+ module load rocm/$gpu
+ %cmake %rocm_cmake_options \
+%if %{with test}
+ %rocm_cmake_test_options \
+%endif
+ -DBUILD_WITH_TENSILE=OFF
+
+ %cmake_build
+ module purge
+done
+
+%install
+
+for gpu in %{rocm_gpu_list}
+do
+ %cmake_install
+done
+
+%files
+%dir %{_libdir}/cmake/%{name}/
+%license LICENSE.md
+%exclude %{_docdir}/%{name}/LICENSE.md
+%{_libdir}/lib%{name}.so.*
+%{_libdir}/rocm/gfx*/lib/lib%{name}.so.*
+
+
+%files devel
+%doc README.md
+%{_includedir}/%{name}
+%{_libdir}/cmake/%{name}/
+%{_libdir}/lib%{name}.so
+%{_libdir}/rocm/gfx*/lib/lib%{name}.so
+%{_libdir}/rocm/gfx*/lib/cmake/%{name}/
+
+%if %{with test}
+%files test
+%{_bindir}/%{name}*
+%{_libdir}/rocm/gfx*/bin/%{name}*
+%endif
+
+%changelog
+* Sun Oct 22 2023 Tom Rix <trix(a)redhat.com> - 5.7.1-3
+- Change url
+- capitalize AMD
+
+* Sat Oct 21 2023 Tom Rix <trix(a)redhat.com> - 5.7.1-2
+- Fix so location
+- glob gpu family location
+
+* Sun Oct 15 2023 Tom Rix <trix(a)redhat.com> - 5.7.1-1
+- Update to 5.7.1
+- Use rocm-rpm-macros
+
+* Sat Oct 7 2023 Tom Rix <trix(a)redhat.com> - 5.7.0-1
+- Update to 5.7
+- Use WIP rocm-rpm-macros
+- Convert to environent modules
+
+* Sun Oct 1 2023 Tom Rix <trix(a)redhat.com> - 5.6.0-2
+- Split the build into gpu families
+
+* Sat Sep 23 2023 Tom Rix <trix(a)redhat.com> - 5.6.0-1
+- Update to 5.6
+
+* Tue Jun 6 2023 Tom Rix <trix(a)redhat.com> - 5.5.1-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..941f280
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (rocBLAS-5.7.1.tar.gz) = cfc73f6c490595a3c153c2ac2a3cb5926c48c2c19baa07ff3dcdf3a7ccaed82cfdff64ed5a3be64c349cb43d654d4b104d9090e2ec9f2061049d6a4921c07722
1
0
List of packages currently excluding arches (1135)
===========================================
- 0ad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- 90-Second-Portraits
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- BareBonesBrowserLaunch
ExclusiveArch: %{java_arches} noarch
- CFR
ExclusiveArch: %{java_arches} noarch
- CardManager
ExclusiveArch: %{java_arches} noarch
- GAPDoc
ExclusiveArch: %{gap_arches} noarch
- GoldenCheetah
ExclusiveArch: %{qt5_qtwebengine_arches}
- GtkAda
ExclusiveArch: %{GPRbuild_arches}
- GtkAda3
ExclusiveArch: %{GPRbuild_arches}
- IPAddress
ExclusiveArch: %{java_arches} noarch
- Mars
ExclusiveArch: %{java_arches} noarch
- OpenColorIO
ExclusiveArch: x86_64 ppc64le
- OpenImageIO
ExclusiveArch: x86_64 ppc64le
- OpenMolcas
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- OpenStego
ExclusiveArch: %{java_arches} noarch
- PragmARC
ExclusiveArch: %{GPRbuild_arches}
- R-V8
ExclusiveArch: %{nodejs_arches}
- R-rJava
ExclusiveArch: %{java_arches}
- RdRand
ExclusiveArch: %{ix86} x86_64
- RediSearch
ExclusiveArch: x86_64
- SLOF
ExclusiveArch: ppc64le
- YafaRay
ExclusiveArch: %{ix86} x86_64
- aardvark-dns
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- accel-config
ExclusiveArch: %{ix86} x86_64
- acpid
ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64
- ahven
ExclusiveArch: %{GPRbuild_arches}
- algobox
ExclusiveArch: %{qt5_qtwebengine_arches}
- american-fuzzy-lop
ExclusiveArch: %{ix86} x86_64 s390x
- anet
ExclusiveArch: %{GPRbuild_arches}
- ant
ExclusiveArch: %{java_arches} noarch
- ant-antunit
ExclusiveArch: %{java_arches} noarch
- ant-contrib
ExclusiveArch: %{java_arches} noarch
- antlr
ExclusiveArch: %{java_arches}
- antlr3
ExclusiveArch: %{java_arches}
- antlr4-project
ExclusiveArch: %{java_arches}
- antlrworks
ExclusiveArch: %{java_arches} noarch
- aopalliance
ExclusiveArch: %{java_arches} noarch
- apache-commons-beanutils
ExclusiveArch: %{java_arches} noarch
- apache-commons-cli
ExclusiveArch: %{java_arches} noarch
- apache-commons-codec
ExclusiveArch: %{java_arches} noarch
- apache-commons-collections
ExclusiveArch: %{java_arches} noarch
- apache-commons-collections4
ExclusiveArch: %{java_arches} noarch
- apache-commons-compress
ExclusiveArch: %{java_arches} noarch
- apache-commons-configuration
ExclusiveArch: %{java_arches} noarch
- apache-commons-digester
ExclusiveArch: %{java_arches} noarch
- apache-commons-exec
ExclusiveArch: %{java_arches} noarch
- apache-commons-io
ExclusiveArch: %{java_arches} noarch
- apache-commons-jexl
ExclusiveArch: %{java_arches} noarch
- apache-commons-jxpath
ExclusiveArch: %{java_arches} noarch
- apache-commons-lang3
ExclusiveArch: %{java_arches} noarch
- apache-commons-logging
ExclusiveArch: %{java_arches} noarch
- apache-commons-math
ExclusiveArch: %{java_arches} noarch
- apache-commons-modeler
ExclusiveArch: %{java_arches} noarch
- apache-commons-net
ExclusiveArch: %{java_arches} noarch
- apache-commons-parent
ExclusiveArch: %{java_arches} noarch
- apache-commons-pool
ExclusiveArch: %{java_arches} noarch
- apache-commons-vfs
ExclusiveArch: %{java_arches} noarch
- apache-ivy
ExclusiveArch: %{java_arches} noarch
- apache-parent
ExclusiveArch: %{java_arches} noarch
- apache-resource-bundles
ExclusiveArch: %{java_arches} noarch
- apache-sshd
ExclusiveArch: %{java_arches} noarch
- apiguardian
ExclusiveArch: %{java_arches} noarch
- apmd
ExclusiveArch: %{ix86}
- appstream-generator
ExclusiveArch: %{ldc_arches}
- aqute-bnd
ExclusiveArch: %{java_arches} noarch
- args4j
ExclusiveArch: %{java_arches} noarch
- arianna
ExclusiveArch: %{qt6_qtwebengine_arches}
- arm-trusted-firmware
ExclusiveArch: aarch64
- asmjit
ExclusiveArch: aarch64 x86_64
- assertj-core
ExclusiveArch: %{java_arches} noarch
- atinject
ExclusiveArch: %{java_arches} noarch
- aunit
ExclusiveArch: %GPRbuild_arches
- auto
ExclusiveArch: %{java_arches} noarch
- autolink-java
ExclusiveArch: noarch %{java_arches}
- avgtime
ExclusiveArch: %{ldc_arches}
- aws
ExclusiveArch: %GPRbuild_arches
- azure-cli
ExclusiveArch: %{java_arches} noarch
- batik
ExclusiveArch: %{java_arches} noarch
- bcal
ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x
- bcc
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
- bcel
ExclusiveArch: %{java_arches} noarch
- bcm283x-firmware
ExclusiveArch: aarch64
- beansbinding
ExclusiveArch: %{java_arches} noarch
- berusky2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips}
- beust-jcommander
ExclusiveArch: %{java_arches} noarch
- bibletime
ExclusiveArch: %{java_arches}
- biosdevname
ExclusiveArch: %{ix86} x86_64
- bless
ExclusiveArch: %mono_arches
- bodhi-server
ExclusiveArch: %{golang_arches_future}
- bolzplatz2006
ExclusiveArch: %{java_arches}
- bouncycastle
ExclusiveArch: %{java_arches} noarch
- box64
ExclusiveArch: aarch64 ppc64le x86_64
- bpftrace
ExclusiveArch: x86_64 %{power64} aarch64 s390x
- brazil
ExclusiveArch: %{java_arches} noarch
- bsf
ExclusiveArch: %{java_arches} noarch
- bsh
ExclusiveArch: %{java_arches} noarch
- build-helper-maven-plugin
ExclusiveArch: %{java_arches} noarch
- buildah
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- byebyebios
ExclusiveArch: x86_64
- byte-buddy
ExclusiveArch: %{java_arches} noarch
- byteman
ExclusiveArch: %{java_arches} noarch
- cachelib
ExclusiveArch: x86_64 aarch64 ppc64le
- caddy
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: %{golang_arches}
- caffe
ExclusiveArch: x86_64 aarch64 ppc64le
- calamares
ExclusiveArch: %{ix86} x86_64 aarch64
- calibre
ExclusiveArch: aarch64 x86_64
- cambozola
ExclusiveArch: %{java_arches} noarch
- canl-java
ExclusiveArch: %{java_arches} noarch
- catatonit
ExclusiveArch: aarch64 ppc64le s390x x86_64
ExclusiveArch: %{golang_arches_future}
- ccdciel
ExclusiveArch: %{fpc_arches}
- cdcollect
ExclusiveArch: %{mono_arches}
- cdi-api
ExclusiveArch: %{java_arches} noarch
- ceph
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- cglib
ExclusiveArch: %{java_arches} noarch
- chromium
ExclusiveArch: x86_64
ExclusiveArch: x86_64 aarch64
- cjdns
ExclusiveArch: %{nodejs_arches}
- classloader-leak-test-framework
ExclusiveArch: %{java_arches} noarch
- classpathless-compiler
ExclusiveArch: %{java_arches} noarch
- clevis-pin-tpm2
ExclusiveArch: %{rust_arches}
- clojure
ExclusiveArch: %{java_arches} noarch
- clojure-core-specs-alpha
ExclusiveArch: %{java_arches} noarch
- clojure-maven-plugin
ExclusiveArch: %{java_arches} noarch
- clojure-spec-alpha
ExclusiveArch: %{java_arches} noarch
- cmospwd
ExclusiveArch: %{ix86} x86_64
- cmrt
ExclusiveArch: %{ix86} x86_64 ia64
- codehaus-parent
ExclusiveArch: %{java_arches} noarch
- colorful
ExclusiveArch: %{fpc_arches}
- colossus
ExclusiveArch: %{java_arches} noarch
- conmon
ExclusiveArch: %{golang_arches_future}
- console-image-viewer
ExclusiveArch: %{java_arches} noarch
- containernetworking-plugins
ExclusiveArch: %{golang_arches}
- coq
ExclusiveArch: %{ocaml_native_compiler}
- cortado
ExclusiveArch: %{java_arches} noarch
- cpu-x
ExclusiveArch: i686 x86_64
- cpufetch
ExclusiveArch: %{arm} aarch64 x86_64 ppc ppc64 ppc64le
- cpuid
ExclusiveArch: %{ix86} x86_64
- cpuinfo
ExclusiveArch: x86_64 aarch64
- cqrlog
ExclusiveArch: %{fpc_arches}
- crash
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- crash-gcore-command
ExclusiveArch: aarch64 ppc64le x86_64
- crash-trace-command
ExclusiveArch: aarch64 ppc64le s390x x86_64
- credentials-fetcher
ExclusiveArch: x86_64 aarch64 s390x
- cri-o
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- cri-tools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- criu
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- crun
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le riscv64 s390x x86_64
- cryptlib
ExclusiveArch: x86_64 aarch64 ppc64le
- crypto-policies
ExclusiveArch: %{java_arches} noarch
- cryptobone
ExclusiveArch: x86_64 ppc64le aarch64
- csslint
ExclusiveArch: %{nodejs_arches} noarch
- daq
ExclusiveArch: x86_64 aarch64
- dbus-sharp
ExclusiveArch: %mono_arches
- dbus-sharp-glib
ExclusiveArch: %mono_arches
- decentxml
ExclusiveArch: %{java_arches} noarch
- deepin-daemon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- deepin-desktop-schemas
ExclusiveArch: %{go_arches}
- directory-maven-plugin
ExclusiveArch: %{java_arches} noarch
- dirgra
ExclusiveArch: %{java_arches} noarch
- disruptor
ExclusiveArch: %{java_arches} noarch
- ditaa
ExclusiveArch: %{java_arches} noarch
- dlm
ExclusiveArch: i686 x86_64
- dmidecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- dmtcp
ExclusiveArch: x86_64
- docker-distribution
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- dogtag-pki
ExclusiveArch: %{java_arches}
- dolphin-emu
ExclusiveArch: x86_64 aarch64
- dom4j
ExclusiveArch: %{java_arches} noarch
- dotnet6.0
ExclusiveArch: aarch64 x86_64 s390x
ExclusiveArch: x86_64
- dotnet7.0
ExclusiveArch: aarch64 ppc64le s390x x86_64
ExclusiveArch: x86_64
- doublecmd
ExclusiveArch: %{ix86} x86_64
- dpdk
ExclusiveArch: x86_64 i686 aarch64 ppc64le
- dub
ExclusiveArch: %{ldc_arches}
- dxvk-native
ExclusiveArch: %{ix86} x86_64
- dyninst
ExclusiveArch: %{ix86} x86_64 ppc64le aarch64
- e3
ExclusiveArch: %{ix86} x86_64
- easymock
ExclusiveArch: %{java_arches} noarch
- ecj
ExclusiveArch: %{java_arches} noarch
- eclipse-swt
ExclusiveArch: %{java_arches}
- ed25519-java
ExclusiveArch: %{java_arches} noarch
- edk2
ExclusiveArch: x86_64 aarch64 riscv64
- efibootmgr
ExclusiveArch: %{efi}
- efifs
ExclusiveArch: %{efi}
- efitools
ExclusiveArch: %{efi}
- efivar
ExclusiveArch: %{efi}
- elk
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- emacs-slime
ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64
- embree
ExclusiveArch: aarch64 x86_64
- embree3
ExclusiveArch: aarch64 x86_64
- enjarify
ExclusiveArch: %{java_arches} noarch
- enki
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
- envytools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- eric
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
- erlang-corba
ExclusiveArch: %{java_arches}
- esmi_ib_library
ExclusiveArch: x86_64
- eth-tools
ExclusiveArch: x86_64
- exec-maven-plugin
ExclusiveArch: %{java_arches} noarch
- external-editor-revived
ExclusiveArch: %{rust_arches}
- extra-enforcer-rules
ExclusiveArch: %{java_arches} noarch
- fasterxml-oss-parent
ExclusiveArch: %{java_arches} noarch
- fb303
ExclusiveArch: x86_64 aarch64 ppc64le
- fbthrift
ExclusiveArch: x86_64 aarch64 ppc64le
- fcitx-libpinyin
ExclusiveArch: %{qt5_qtwebengine_arches}
- fedora-dockerfiles
ExclusiveArch: %{go_arches}
- felix-parent
ExclusiveArch: %{java_arches} noarch
- felix-utils
ExclusiveArch: %{java_arches} noarch
- fernflower
ExclusiveArch: %{java_arches} noarch
- fes
ExclusiveArch: %{ix86} x86_64
- filedrop
ExclusiveArch: %{java_arches} noarch
- firecracker
ExclusiveArch: aarch64 x86_64
- fishbowl
ExclusiveArch: %{java_arches} noarch
- fizz
ExclusiveArch: x86_64 aarch64 ppc64le
- flexmark-java
ExclusiveArch: noarch %{java_arches}
- flocq
ExclusiveArch: %{ocaml_native_compiler}
- florist
ExclusiveArch: %{GPRbuild_arches}
- fluent-bit
ExclusiveArch: x86_64 aarch64
- flute
ExclusiveArch: %{java_arches} noarch
- folly
ExclusiveArch: x86_64 aarch64 ppc64le
- fop
ExclusiveArch: %{java_arches} noarch
- forge-parent
ExclusiveArch: %{java_arches} noarch
- fpc
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc64le
- frama-c
ExclusiveArch: %{ocaml_native_compiler}
- freecol
ExclusiveArch: %{java_arches} noarch
- freemarker
ExclusiveArch: %{java_arches} noarch
- freerouting
ExclusiveArch: %{java_arches} noarch
- frescobaldi
ExclusiveArch: %{qt5_qtwebengine_arches}
- frysk
ExclusiveArch: x86_64 ppc64
- fuse-overlayfs
ExclusiveArch: %{arm64} ppc64le s390x x86_64
- fusesource-pom
ExclusiveArch: %{java_arches} noarch
- fwts
ExclusiveArch: x86_64 %{arm} aarch64 s390x riscv64 %{power64}
- fwupd-efi
ExclusiveArch: x86_64 aarch64
- ga
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- gap
ExclusiveArch: %{gap_arches}
- gap-pkg-ace
ExclusiveArch: %{gap_arches}
- gap-pkg-aclib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-alnuth
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-atlasrep
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-autodoc
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-automata
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-autpgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-browse
ExclusiveArch: %{gap_arches}
- gap-pkg-caratinterface
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-circle
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-cohomolo
ExclusiveArch: %{gap_arches}
- gap-pkg-congruence
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-corelg
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crime
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crisp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crypting
ExclusiveArch: %{gap_arches}
- gap-pkg-cryst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crystcat
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-ctbllib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-curlinterface
ExclusiveArch: %{gap_arches}
- gap-pkg-cvec
ExclusiveArch: %{gap_arches}
- gap-pkg-datastructures
ExclusiveArch: %{gap_arches}
- gap-pkg-design
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-digraphs
ExclusiveArch: %{gap_arches}
- gap-pkg-edim
ExclusiveArch: %{gap_arches}
- gap-pkg-factint
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-ferret
ExclusiveArch: %{gap_arches}
- gap-pkg-fga
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-fining
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-float
ExclusiveArch: %{gap_arches}
- gap-pkg-format
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-forms
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-fr
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-francy
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-gbnp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-genss
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-grape
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-groupoids
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-grpconst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-guava
ExclusiveArch: %{gap_arches}
- gap-pkg-hap
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-hapcryst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-hecke
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-images
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-io
ExclusiveArch: %{gap_arches}
- gap-pkg-irredsol
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-json
ExclusiveArch: %{gap_arches}
- gap-pkg-jupyterkernel
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-jupyterviz
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-laguna
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liealgdb
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liepring
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liering
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-loops
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-lpres
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-mapclass
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-nautytracesinterface
ExclusiveArch: %{gap_arches}
- gap-pkg-nq
ExclusiveArch: %{gap_arches}
- gap-pkg-openmath
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-orb
ExclusiveArch: %{gap_arches}
- gap-pkg-polenta
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-polycyclic
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-polymaking
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-primgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-profiling
ExclusiveArch: %{gap_arches}
- gap-pkg-qpa
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-quagroup
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-radiroot
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-recog
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-repsn
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-resclasses
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-scscp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-semigroups
ExclusiveArch: %{gap_arches}
- gap-pkg-singular
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sla
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-smallgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-smallsemi
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sonata
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sophus
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-spinsym
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-standardff
ExclusiveArch: %{gap_arches}
- gap-pkg-tomlib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-toric
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-transgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-utils
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-uuid
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-xmod
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-zeromqinterface
ExclusiveArch: %{gap_arches}
- gappalib-coq
ExclusiveArch: %{ocaml_native_compiler}
- gbrainy
ExclusiveArch: %mono_arches
- gdb
ExclusiveArch: %{ix86} x86_64
- gdb-exploitable
ExclusiveArch: x86_64 i386
ExclusiveArch: x86_64 noarch
- gearhead1
ExclusiveArch: %{fpc_arches}
- gearhead2
ExclusiveArch: %{fpc_arches}
- ghdl
ExclusiveArch: %{GNAT_arches}
- ghostwriter
ExclusiveArch: %{qt5_qtwebengine_arches}
- gio-sharp
ExclusiveArch: %mono_arches
- gir-to-d
ExclusiveArch: %{ldc_arches}
- git-octopus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- gitqlient
ExclusiveArch: %{qt5_qtwebengine_arches}
- giver
ExclusiveArch: %{mono_arches}
- gkeyfile-sharp
ExclusiveArch: %mono_arches
- glibc32
ExclusiveArch: x86_64
- glibd
ExclusiveArch: %{ldc_arches}
- gnatcoll
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-bindings
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-db
ExclusiveArch: %{GPRbuild_arches}
- gnome-boxes
ExclusiveArch: x86_64
- gnome-desktop-sharp
ExclusiveArch: %mono_arches
- gnome-do
ExclusiveArch: %mono_arches
- gnome-keyring-sharp
ExclusiveArch: %mono_arches
- gnome-rdp
ExclusiveArch: %{mono_arches}
- gnome-sharp
ExclusiveArch: %mono_arches
- gnome-subtitles
ExclusiveArch: %mono_arches
- gnu-efi
ExclusiveArch: %{efi}
- go-bindata
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- godep
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang
ExclusiveArch: %{golang_arches}
- google-gson
ExclusiveArch: %{java_arches} noarch
- google-guice
ExclusiveArch: %{java_arches} noarch
- gotun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: x86_64
- goverlay
ExclusiveArch: %{fpc_arches}
- gprbuild
ExclusiveArch: %{GPRbuild_arches}
- gprolog
ExclusiveArch: x86_64 %{ix86} ppc alpha aarch64
- grafana
ExclusiveArch: %{grafana_arches}
- grafana-pcp
ExclusiveArch: %{grafanapcp_arches}
- gtk-sharp-beans
ExclusiveArch: %mono_arches
- gtk-sharp2
ExclusiveArch: %mono_arches
- gtk-sharp3
ExclusiveArch: %{mono_arches}
- gtkd
ExclusiveArch: %{ldc_arches}
- guava
ExclusiveArch: %{java_arches} noarch
- gudev-sharp
ExclusiveArch: %mono_arches
- guestfs-tools
ExclusiveArch: %{kernel_arches}
- gvisor-tap-vsock
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- hamcrest
ExclusiveArch: %{java_arches} noarch
- harec
ExclusiveArch: x86_64 aarch64
- hawtjni
ExclusiveArch: %{java_arches} noarch
- hedgewars
ExclusiveArch: %{fpc_arches}
- hibernate-jpa-2.0-api
ExclusiveArch: %{java_arches} noarch
- hid4java
ExclusiveArch: %{java_arches} noarch
- hipblas
ExclusiveArch: x86_64
- hipcub
ExclusiveArch: x86_64
- hipify
ExclusiveArch: x86_64
- hsakmt
ExclusiveArch: x86_64 aarch64 ppc64le
- httpcomponents-client
ExclusiveArch: %{java_arches} noarch
- httpcomponents-core
ExclusiveArch: %{java_arches} noarch
- httpcomponents-project
ExclusiveArch: %{java_arches} noarch
- hyena
ExclusiveArch: %{mono_arches}
- hyperscan
ExclusiveArch: x86_64
- hyperv-daemons
ExclusiveArch: i686 x86_64 aarch64
- icaro
ExclusiveArch: %{ix86} x86_64 noarch
- icedtea-web
ExclusiveArch: %{java_arches}
- icu4j
ExclusiveArch: %{java_arches} noarch
- imagej
ExclusiveArch: %{java_arches} noarch
- imhex
ExclusiveArch: x86_64 %{arm64}
- imvirt
ExclusiveArch: %{ix86} x86_64 ia64
- indistarter
ExclusiveArch: %{fpc_arches}
- infinipath-psm
ExclusiveArch: x86_64
- intel-cm-compiler
ExclusiveArch: i686 x86_64
- intel-cmt-cat
ExclusiveArch: x86_64
- intel-compute-runtime
ExclusiveArch: x86_64
- intel-gmmlib
ExclusiveArch: x86_64 i686
- intel-igc
ExclusiveArch: x86_64
- intel-ipp-crypto-mb
ExclusiveArch: x86_64
- intel-ipsec-mb
ExclusiveArch: x86_64
- intel-mediasdk
ExclusiveArch: x86_64
- intel-undervolt
ExclusiveArch: i386 x86_64
- ioport
ExclusiveArch: %{ix86} x86_64
- ipmctl
ExclusiveArch: x86_64
- ispc
ExclusiveArch: x86_64 aarch64
- iucode-tool
ExclusiveArch: %{ix86} x86_64
- iyfct
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- jFormatString
ExclusiveArch: %{java_arches} noarch
- jackson-annotations
ExclusiveArch: %{java_arches} noarch
- jackson-bom
ExclusiveArch: %{java_arches} noarch
- jackson-core
ExclusiveArch: %{java_arches} noarch
- jackson-databind
ExclusiveArch: %{java_arches} noarch
- jackson-dataformats-binary
ExclusiveArch: %{java_arches} noarch
- jackson-dataformats-text
ExclusiveArch: %{java_arches} noarch
- jackson-jaxrs-providers
ExclusiveArch: %{java_arches} noarch
- jackson-modules-base
ExclusiveArch: %{java_arches} noarch
- jackson-parent
ExclusiveArch: %{java_arches} noarch
- jacoco
ExclusiveArch: %{java_arches} noarch
- jacop
ExclusiveArch: %{java_arches} noarch
- jakarta-activation
ExclusiveArch: %{java_arches} noarch
- jakarta-activation1
ExclusiveArch: %{java_arches} noarch
- jakarta-annotations
ExclusiveArch: %{java_arches} noarch
- jakarta-el
ExclusiveArch: %{java_arches} noarch
- jakarta-interceptors
ExclusiveArch: %{java_arches} noarch
- jakarta-json
ExclusiveArch: %{java_arches} noarch
- jakarta-mail
ExclusiveArch: %{java_arches} noarch
- jakarta-mail1
ExclusiveArch: %{java_arches} noarch
- jakarta-oro
ExclusiveArch: %{java_arches} noarch
- jakarta-saaj
ExclusiveArch: %{java_arches} noarch
- jakarta-server-pages
ExclusiveArch: %{java_arches} noarch
- jakarta-servlet
ExclusiveArch: %{java_arches} noarch
- jakarta-xml-ws
ExclusiveArch: %{java_arches} noarch
- janino
ExclusiveArch: %{java_arches} noarch
- jansi
ExclusiveArch: %{java_arches}
- jansi-native
ExclusiveArch: %{java_arches}
- jansi1
ExclusiveArch: %{java_arches} noarch
- java-1.8.0-openjdk
ExclusiveArch: %{java_arches}
- java-1.8.0-openjdk-aarch32
ExclusiveArch: %{arm}
- java-1.8.0-openjdk-portable
ExclusiveArch: %{java_arches}
- java-11-openjdk
ExclusiveArch: %{java_arches}
- java-11-openjdk-portable
ExclusiveArch: %{java_arches}
- java-17-openjdk
ExclusiveArch: %{java_arches}
- java-17-openjdk-portable
ExclusiveArch: %{java_arches}
- java-diff-utils
ExclusiveArch: %{java_arches} noarch
- java-dirq
ExclusiveArch: %{java_arches} noarch
- java-jd-decompiler
ExclusiveArch: %{java_arches} noarch
- java-latest-openjdk
ExclusiveArch: %{java_arches}
- java-latest-openjdk-portable
ExclusiveArch: %{java_arches}
- java-runtime-decompiler
ExclusiveArch: %{java_arches} noarch
- java-scrypt
ExclusiveArch: %{java_arches} noarch
- java_cup
ExclusiveArch: %{java_arches} noarch
- javacc
ExclusiveArch: %{java_arches} noarch
- javacc-maven-plugin
ExclusiveArch: %{java_arches} noarch
- javaewah
ExclusiveArch: %{java_arches} noarch
- javapackages-bootstrap
ExclusiveArch: %{java_arches}
- javaparser
ExclusiveArch: %{java_arches} noarch
- javapoet
ExclusiveArch: %{java_arches} noarch
- javassist
ExclusiveArch: %{java_arches} noarch
- jaxb
ExclusiveArch: %{java_arches} noarch
- jaxb-api
ExclusiveArch: %{java_arches} noarch
- jaxb-api2
ExclusiveArch: %{java_arches} noarch
- jaxb-dtd-parser
ExclusiveArch: %{java_arches} noarch
- jaxb-fi
ExclusiveArch: %{java_arches} noarch
- jaxb-istack-commons
ExclusiveArch: %{java_arches} noarch
- jaxb-stax-ex
ExclusiveArch: %{java_arches} noarch
- jaxen
ExclusiveArch: %{java_arches} noarch
- jboss-jaxrs-2.0-api
ExclusiveArch: %{java_arches} noarch
- jboss-logging
ExclusiveArch: %{java_arches} noarch
- jboss-logging-tools
ExclusiveArch: %{java_arches} noarch
- jboss-parent
ExclusiveArch: %{java_arches} noarch
- jchardet
ExclusiveArch: %{java_arches} noarch
- jcip-annotations
ExclusiveArch: %{java_arches} noarch
- jctools
ExclusiveArch: %{java_arches} noarch
- jcuber
ExclusiveArch: %{java_arches} noarch
- jdeparser
ExclusiveArch: %{java_arches} noarch
- jdepend
ExclusiveArch: %{java_arches} noarch
- jdependency
ExclusiveArch: %{java_arches} noarch
- jdom
ExclusiveArch: %{java_arches} noarch
- jdom2
ExclusiveArch: %{java_arches} noarch
- jedit
ExclusiveArch: %{java_arches} noarch
- jericho-html
ExclusiveArch: %{java_arches} noarch
- jetbrains-annotations
ExclusiveArch: noarch %{java_arches}
- jetty
ExclusiveArch: %{java_arches} noarch
- jflex
ExclusiveArch: %{java_arches} noarch
- jfreechart
ExclusiveArch: %{java_arches} noarch
- jgit
ExclusiveArch: %{java_arches} noarch
- jglobus
ExclusiveArch: %{java_arches} noarch
- jgoodies-common
ExclusiveArch: %{java_arches} noarch
- jgoodies-forms
ExclusiveArch: %{java_arches} noarch
- jgoodies-looks
ExclusiveArch: %{java_arches} noarch
- jigawatts
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- jline
ExclusiveArch: %{java_arches}
- jline2
ExclusiveArch: %{java_arches} noarch
- jmock
ExclusiveArch: %{java_arches} noarch
- jmol
ExclusiveArch: %{java_arches} noarch
- jna
ExclusiveArch: %{java_arches}
- jneuroml-core
ExclusiveArch: %{java_arches} noarch
- jni-inchi
ExclusiveArch: %{java_arches}
- jol
ExclusiveArch: %{java_arches} noarch
- jolokia-jvm-agent
ExclusiveArch: %{java_arches} noarch
- jopt-simple
ExclusiveArch: %{java_arches} noarch
- jorbis
ExclusiveArch: %{java_arches} noarch
- jowl
ExclusiveArch: %{nodejs_arches} noarch
- jpanoramamaker
ExclusiveArch: %{java_arches} noarch
- jsch
ExclusiveArch: %{java_arches} noarch
- jsch-agent-proxy
ExclusiveArch: %{java_arches} noarch
- json_simple
ExclusiveArch: %{java_arches} noarch
- jsoup
ExclusiveArch: %{java_arches} noarch
- jsr-305
ExclusiveArch: %{java_arches} noarch
- jss
ExclusiveArch: %{java_arches}
- jssc
ExclusiveArch: %{java_arches}
- jtidy
ExclusiveArch: %{java_arches} noarch
- julia
ExclusiveArch: x86_64
- junit
ExclusiveArch: %{java_arches} noarch
- junit5
ExclusiveArch: %{java_arches} noarch
- juniversalchardet
ExclusiveArch: %{java_arches} noarch
- jzlib
ExclusiveArch: %{java_arches} noarch
- kaidan
ExclusiveArch: %{qt5_qtwebengine_arches}
- kchmviewer
ExclusiveArch: %{qt5_qtwebengine_arches}
- kernel
ExclusiveArch: noarch x86_64 s390x aarch64 ppc64le
ExclusiveArch: noarch i386 i686 x86_64 s390x aarch64 ppc64le
- keylime-agent-rust
ExclusiveArch: %{rust_arches}
- keyring-ima-signer
ExclusiveArch: %{rust_arches}
- kf5-akonadi-search
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-audiocd-kio
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kblog
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarcore
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarutils
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kitinerary
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-ktnef
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-libkdcraw
ExclusiveArch: x86_64 ppc64le %{arm}
- khelpcenter
ExclusiveArch: %{qt6_qtwebengine_arches}
- kicad
ExclusiveArch: x86_64 aarch64 ppc64le
- kiwix-desktop
ExclusiveArch: %{qt5_qtwebengine_arches}
- knot-resolver
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- knotes
ExclusiveArch: x86_64 %{arm}
- kubernetes
ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm}
- laf-plugin
ExclusiveArch: %{java_arches} noarch
- lazarus
ExclusiveArch: %{fpc_arches}
- lazpaint
ExclusiveArch: %{fpc_arches}
- ldapjdk
ExclusiveArch: %{java_arches} noarch
- ldc
ExclusiveArch: %{ldc_arches} ppc64le
- ldc1.32
ExclusiveArch: %{ldc_arches} ppc64le
- libbase
ExclusiveArch: %{java_arches} noarch
- libclc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x
- libcxl
ExclusiveArch: %{power64}
- libdfp
ExclusiveArch: ppc ppc64 ppc64le s390 s390x x86_64
- libdispatch
ExclusiveArch: x86_64 aarch64 ppc64le
- libfonts
ExclusiveArch: %{java_arches} noarch
- libformula
ExclusiveArch: %{java_arches} noarch
- libguestfs
ExclusiveArch: %{kernel_arches}
- libica
ExclusiveArch: s390 s390x
- libipt
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- libkgapi
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- libkrun
ExclusiveArch: x86_64 aarch64
- libkrunfw
ExclusiveArch: x86_64 aarch64
- liblayout
ExclusiveArch: %{java_arches} noarch
- libloader
ExclusiveArch: %{java_arches} noarch
- libnxz
ExclusiveArch: ppc64le
- libocxl
ExclusiveArch: ppc64le
- libpsm2
ExclusiveArch: x86_64
- libquentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- libreoffice-TexMaths
ExclusiveArch: %{java_arches}
- librepository
ExclusiveArch: %{java_arches} noarch
- libretro-desmume2015
ExclusiveArch: i686 x86_64
- librtas
ExclusiveArch: %{power64}
- libserializer
ExclusiveArch: %{java_arches} noarch
- libservicelog
ExclusiveArch: ppc %{power64}
- libsmbios
ExclusiveArch: x86_64 %{ix86}
- libunicode
ExclusiveArch: x86_64 aarch64
- libunwind
ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64
- libva-nvidia-driver
ExclusiveArch: %{x86_64} %{ix86} %{arm64} ppc64le
- libvirt-java
ExclusiveArch: %{java_arches} noarch
- libvma
ExclusiveArch: x86_64 ppc64le ppc64 aarch64
- libvmi
ExclusiveArch: x86_64
- libvpd
ExclusiveArch: %{power64}
- libxsmm
ExclusiveArch: x86_64
- libzdnn
ExclusiveArch: s390x
- libzfcphbaapi
ExclusiveArch: s390 s390x
- libzpc
ExclusiveArch: s390x
- llhttp
ExclusiveArch: %{nodejs_arches}
- log4j
ExclusiveArch: %{java_arches} noarch
- log4net
ExclusiveArch: %mono_arches
- lrmi
ExclusiveArch: %{ix86}
- lsvpd
ExclusiveArch: %{power64}
- luajit
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- lucene
ExclusiveArch: %{java_arches} noarch
- lujavrite
ExclusiveArch: %{java_arches}
- luxcorerender
ExclusiveArch: x86_64
- mactel-boot
ExclusiveArch: x86_64
- magicmirror
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-airnow
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-onthisday
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-singlestock
ExclusiveArch: %{nodejs_arches} noarch
- manifest-tool
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- mariadb-java-client
ExclusiveArch: %{java_arches} noarch
- marked
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- matrix-synapse
ExclusiveArch: %{rust_arches}
- maui-mauikit
ExclusiveArch: %{ix86} s390x aarch64 x86_64
- maven
ExclusiveArch: %{java_arches} noarch
- maven-antrun-plugin
ExclusiveArch: %{java_arches} noarch
- maven-archetype
ExclusiveArch: %{java_arches} noarch
- maven-archiver
ExclusiveArch: %{java_arches} noarch
- maven-artifact-transfer
ExclusiveArch: %{java_arches} noarch
- maven-assembly-plugin
ExclusiveArch: %{java_arches} noarch
- maven-bundle-plugin
ExclusiveArch: %{java_arches} noarch
- maven-clean-plugin
ExclusiveArch: %{java_arches} noarch
- maven-common-artifact-filters
ExclusiveArch: %{java_arches} noarch
- maven-compiler-plugin
ExclusiveArch: %{java_arches} noarch
- maven-dependency-analyzer
ExclusiveArch: %{java_arches} noarch
- maven-dependency-plugin
ExclusiveArch: %{java_arches} noarch
- maven-dependency-tree
ExclusiveArch: %{java_arches} noarch
- maven-doxia
ExclusiveArch: %{java_arches} noarch
- maven-doxia-sitetools
ExclusiveArch: %{java_arches} noarch
- maven-enforcer
ExclusiveArch: %{java_arches} noarch
- maven-file-management
ExclusiveArch: %{java_arches} noarch
- maven-filtering
ExclusiveArch: %{java_arches} noarch
- maven-invoker
ExclusiveArch: %{java_arches} noarch
- maven-invoker-plugin
ExclusiveArch: %{java_arches} noarch
- maven-jar-plugin
ExclusiveArch: %{java_arches} noarch
- maven-mapping
ExclusiveArch: %{java_arches} noarch
- maven-native
ExclusiveArch: %{java_arches} noarch
- maven-parent
ExclusiveArch: %{java_arches} noarch
- maven-patch-plugin
ExclusiveArch: %{java_arches} noarch
- maven-plugin-testing
ExclusiveArch: %{java_arches} noarch
- maven-plugin-tools
ExclusiveArch: %{java_arches} noarch
- maven-remote-resources-plugin
ExclusiveArch: %{java_arches} noarch
- maven-reporting-api
ExclusiveArch: %{java_arches} noarch
- maven-reporting-impl
ExclusiveArch: %{java_arches} noarch
- maven-resolver
ExclusiveArch: %{java_arches} noarch
- maven-resources-plugin
ExclusiveArch: %{java_arches} noarch
- maven-script-interpreter
ExclusiveArch: %{java_arches} noarch
- maven-shade-plugin
ExclusiveArch: %{java_arches} noarch
- maven-shared-incremental
ExclusiveArch: %{java_arches} noarch
- maven-shared-io
ExclusiveArch: %{java_arches} noarch
- maven-shared-utils
ExclusiveArch: %{java_arches} noarch
- maven-source-plugin
ExclusiveArch: %{java_arches} noarch
- maven-surefire
ExclusiveArch: %{java_arches} noarch
- maven-verifier
ExclusiveArch: %{java_arches} noarch
- maven-verifier-plugin
ExclusiveArch: %{java_arches} noarch
- maven-wagon
ExclusiveArch: %{java_arches} noarch
- maxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- mbpfan
ExclusiveArch: x86_64
- mcelog
ExclusiveArch: i686 x86_64
- mcrouter
ExclusiveArch: x86_64 aarch64 ppc64le
- mecab-java
ExclusiveArch: %java_arches
- mediaconch
ExclusiveArch: %{qt5_qtwebengine_arches}
- mellowplayer
ExclusiveArch: %{qt5_qtwebengine_arches}
- memkind
ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64
- memtest86+
ExclusiveArch: x86_64 %{ix86}
- merkuro
ExclusiveArch: %{qt5_qtwebengine_arches}
- microcode_ctl
ExclusiveArch: %{ix86} x86_64
- micropython
ExclusiveArch: %{arm} x86_64 riscv64
- miglayout
ExclusiveArch: %{java_arches} noarch
- mine_detector
ExclusiveArch: %{GPRbuild_arches}
- minetest
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mingw-libidn2
ExclusiveArch: %{ix86} x86_64 %{arm}
- mingw-wine-gecko
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- mkbootdisk
ExclusiveArch: %{ix86} sparc sparc64 x86_64
- moby-engine
ExclusiveArch: %{golang_arches}
- mockito
ExclusiveArch: %{java_arches} noarch
- mod_mono
ExclusiveArch: %mono_arches
- modello
ExclusiveArch: %{java_arches} noarch
- moditect
ExclusiveArch: %{java_arches} noarch
- module-build-service
ExclusiveArch: %{ix86} x86_64 noarch
- modulemaker-maven-plugin
ExclusiveArch: %{java_arches} noarch
- mojo-executor
ExclusiveArch: %{java_arches} noarch
- mojo-parent
ExclusiveArch: %{java_arches} noarch
- mokutil
ExclusiveArch: %{ix86} x86_64 aarch64 %{arm}
- mono
ExclusiveArch: %mono_arches
- mono-addins
ExclusiveArch: %mono_arches
- mono-basic
ExclusiveArch: %{mono_arches}
- mono-bouncycastle
ExclusiveArch: %mono_arches
- mono-cecil
ExclusiveArch: %mono_arches
- mono-cecil-flowanalysis
ExclusiveArch: %mono_arches
- mono-reflection
ExclusiveArch: %mono_arches
- mono-tools
ExclusiveArch: %mono_arches
- mono-zeroconf
ExclusiveArch: %mono_arches
- monodevelop
ExclusiveArch: %mono_arches
- monodevelop-debugger-gdb
ExclusiveArch: %{mono_arches}
- mrrescue
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- msr-tools
ExclusiveArch: %{ix86} x86_64
- msv
ExclusiveArch: %{java_arches} noarch
- mvfst
ExclusiveArch: x86_64 aarch64 ppc64le
- mxparser
ExclusiveArch: %{java_arches} noarch
- mysql-connector-java
ExclusiveArch: %{java_arches} noarch
- mysql-connector-net
ExclusiveArch: %{mono_arches}
- naev
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- naga
ExclusiveArch: %{java_arches} noarch
- nant
ExclusiveArch: %mono_arches
- nativejit
ExclusiveArch: x86_64
- nbc
ExclusiveArch: %{fpc_arches}
- nbdkit
ExclusiveArch: x86_64
- ndesk-dbus
ExclusiveArch: %{mono_arches}
- ndesk-dbus-glib
ExclusiveArch: %{mono_arches}
- nekohtml
ExclusiveArch: %{java_arches} noarch
- netavark
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- newtonsoft-json
ExclusiveArch: %{mono_arches}
- nodejs-acorn-object-spread
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-backbone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bash-language-server
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buble
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cjs-module-lexer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-generic-pool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-less
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-linefix
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nodemon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-packaging
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-replace-require-self
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-underscore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-undici
ExclusiveArch: %{nodejs_arches} noarch
- nodejs18
ExclusiveArch: %{nodejs_arches}
- nodejs20
ExclusiveArch: %{nodejs_arches}
- nom-tam-fits
ExclusiveArch: %{java_arches} noarch
- notify-sharp
ExclusiveArch: %{mono_arches}
- notify-sharp3
ExclusiveArch: %{mono_arches}
- nuget
ExclusiveArch: %{mono_arches}
- numatop
ExclusiveArch: x86_64 ppc64le
- nunit
ExclusiveArch: %{mono_arches}
- nunit2
ExclusiveArch: %{mono_arches}
- nvml
ExclusiveArch: x86_64 ppc64le
- objectweb-asm
ExclusiveArch: %{java_arches} noarch
- objenesis
ExclusiveArch: %{java_arches} noarch
- obs-service-rust2rpm
ExclusiveArch: %{rust_arches} noarch
- oci-seccomp-bpf-hook
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
ExclusiveArch: %{golang_arches_future}
- oidn
ExclusiveArch: x86_64
- olpc-utils
ExclusiveArch: %{ix86} %{arm}
- oneVPL
ExclusiveArch: x86_64
- oneVPL-intel-gpu
ExclusiveArch: x86_64
- oneapi-level-zero
ExclusiveArch: x86_64
- onednn
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- onedrive
ExclusiveArch: %{ldc_arches}
- ongres-scram
ExclusiveArch: %{java_arches} noarch
- ongres-stringprep
ExclusiveArch: %{java_arches} noarch
- opae
ExclusiveArch: x86_64
- opal-prd
ExclusiveArch: ppc64le
- open-vm-tools
ExclusiveArch: x86_64 aarch64
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: x86_64
- openblas
ExclusiveArch: %{openblas_arches}
- openjdk-asmtools
ExclusiveArch: %{java_arches} noarch
- openjdk-asmtools7
ExclusiveArch: %{java_arches} noarch
- openjfx
ExclusiveArch: %{java_arches}
- openjfx8
ExclusiveArch: x86_64
- openlibm
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64}
- openms
ExclusiveArch: %{qt5_qtwebengine_arches}
- openni
ExclusiveArch: x86_64 %{arm}
- openni-primesense
ExclusiveArch: %{ix86} x86_64 %{arm}
- openoffice.org-diafilter
ExclusiveArch: %{java_arches}
- openpgl
ExclusiveArch: aarch64 x86_64
- openssl-ibmca
ExclusiveArch: s390 s390x
- openstack-java-sdk
ExclusiveArch: %{java_arches} noarch
- opentest4j
ExclusiveArch: %{java_arches} noarch
- openvkl
ExclusiveArch: aarch64 x86_64
- optee_client
ExclusiveArch: aarch64
- optee_os
ExclusiveArch: aarch64
- options
ExclusiveArch: %{java_arches} noarch
- orthorobot
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- osgi-annotation
ExclusiveArch: %{java_arches} noarch
- osgi-compendium
ExclusiveArch: %{java_arches} noarch
- osgi-core
ExclusiveArch: %{java_arches} noarch
- pacemaker
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64 %{arm}
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- pageedit
ExclusiveArch: %{qt5_qtwebengine_arches}
- parserng
ExclusiveArch: %{java_arches} noarch
- pasdoc
ExclusiveArch: %{fpc_arches}
- pcc
ExclusiveArch: %{ix86} x86_64
- pcfi
ExclusiveArch: %{java_arches} noarch
- pcm
ExclusiveArch: %{ix86} x86_64
- pcmciautils
ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm}
- pdbg
ExclusiveArch: ppc64le
- pdfbox
ExclusiveArch: %{java_arches} noarch
- pdfmod
ExclusiveArch: %mono_arches
- pdftk-java
ExclusiveArch: %{java_arches} noarch
- pentaho-libxml
ExclusiveArch: %{java_arches} noarch
- pentaho-reporting-flow-engine
ExclusiveArch: %{java_arches} noarch
- perl-Dumbbench
ExclusiveArch: %{ix86} x86_64 noarch
- perl-Parse-DMIDecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- pesign
ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm}
- pesign-test-app
ExclusiveArch: x86_64
- picocli
ExclusiveArch: %{java_arches} noarch
- pinta
ExclusiveArch: %mono_arches
- pioneer
ExclusiveArch: %{ix86} x86_64
- plantuml
ExclusiveArch: %{java_arches} noarch
- plasma-dialer
ExclusiveArch: %{java_arches}
- playonlinux
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- plexus-archiver
ExclusiveArch: %{java_arches} noarch
- plexus-build-api
ExclusiveArch: %{java_arches} noarch
- plexus-build-api0
ExclusiveArch: %{java_arches} noarch
- plexus-cipher
ExclusiveArch: %{java_arches} noarch
- plexus-classworlds
ExclusiveArch: %{java_arches} noarch
- plexus-compiler
ExclusiveArch: %{java_arches} noarch
- plexus-component-api
ExclusiveArch: %{java_arches} noarch
- plexus-components-pom
ExclusiveArch: %{java_arches} noarch
- plexus-containers
ExclusiveArch: %{java_arches} noarch
- plexus-i18n
ExclusiveArch: %{java_arches} noarch
- plexus-interpolation
ExclusiveArch: %{java_arches} noarch
- plexus-io
ExclusiveArch: %{java_arches} noarch
- plexus-languages
ExclusiveArch: %{java_arches} noarch
- plexus-pom
ExclusiveArch: %{java_arches} noarch
- plexus-resources
ExclusiveArch: %{java_arches} noarch
- plexus-sec-dispatcher
ExclusiveArch: %{java_arches} noarch
- plexus-utils
ExclusiveArch: %{java_arches} noarch
- plexus-velocity
ExclusiveArch: %{java_arches} noarch
- podman
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- poppler-sharp
ExclusiveArch: %mono_arches
- popub
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- postgresql-jdbc
ExclusiveArch: %{java_arches} noarch
- powerpc-utils
ExclusiveArch: ppc %{power64}
- powerstat
ExclusiveArch: %{ix86} x86_64
- ppc64-diag
ExclusiveArch: ppc %{power64}
- procyon
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
- proguard
ExclusiveArch: %{java_arches} noarch
- prometheus-jmx-exporter
ExclusiveArch: %{java_arches} noarch
- prometheus-simpleclient-java
ExclusiveArch: %{java_arches} noarch
- proxygen
ExclusiveArch: x86_64 aarch64 ppc64le
- pveclib
ExclusiveArch: ppc %{power64}
- pyqtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- python-ast-monitor
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
- python-cryptography
ExclusiveArch: %{rust_arches}
- python-damo
ExclusiveArch: x86_64 aarch64 ppc64le s390x noarch
- python-etcd
ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- python-javaobj
ExclusiveArch: %{java_arches} noarch
- python-jnius
ExclusiveArch: %{java_arches}
- python-jupyter-polymake
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- python-openoffice
ExclusiveArch: noarch x86_64
- python-pyahocorasick
ExclusiveArch: x86_64 %{arm64} ppc64le
- python-pymoc
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-pyqt6-webengine
ExclusiveArch: aarch64 x86_64
- q4wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- qatengine
ExclusiveArch: x86_64
- qatzip
ExclusiveArch: x86_64
- qbe
ExclusiveArch: x86_64 aarch64
- qcint
ExclusiveArch: x86_64
- qclib
ExclusiveArch: s390 s390x
- qdox
ExclusiveArch: %{java_arches} noarch
- qemu-sanity-check
ExclusiveArch: %{kernel_arches}
- qevercloud
ExclusiveArch: %{qt5_qtwebengine_arches}
- qmapshack
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt4pas
ExclusiveArch: %{fpc_arches}
- qt5-qtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt6-qtwebengine
ExclusiveArch: aarch64 x86_64
- qt6-qtwebview
ExclusiveArch: aarch64 x86_64
- quantum-espresso
ExclusiveArch: x86_64 %{ix86} aarch64 %{power64}
- quentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- rEFInd
ExclusiveArch: %{efi}
- rachota
ExclusiveArch: %{java_arches} noarch
- rear
ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64
- reflections
ExclusiveArch: %{java_arches} noarch
- reg
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- regexp
ExclusiveArch: %{java_arches} noarch
- relaxng-datatype-java
ExclusiveArch: %{java_arches} noarch
- replacer
ExclusiveArch: %{java_arches} noarch
- reptyr
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- rescene
ExclusiveArch: %{mono_arches}
- resteasy
ExclusiveArch: %{java_arches} noarch
- restool
ExclusiveArch: aarch64
- restsharp
ExclusiveArch: %{mono_arches}
- retsnoop
ExclusiveArch: %{rust_arches}
- rhino
ExclusiveArch: %{java_arches} noarch
- river
ExclusiveArch: %{zig_arches}
- rkcommon
ExclusiveArch: x86_64 aarch64
- rocalution
ExclusiveArch: x86_64
- rocblas
ExclusiveArch: x86_64
- rocclr
ExclusiveArch: x86_64
- rocm-compilersupport
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-device-libs
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-rpm-macros
ExclusiveArch: x86_64
- rocm-runtime
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-smi
ExclusiveArch: x86_64 aarch64 ppc64le
- rocminfo
ExclusiveArch: x86_64 aarch64 ppc64le
- rocprim
ExclusiveArch: x86_64
- rocrand
ExclusiveArch: x86_64
- rocsparse
ExclusiveArch: x86_64
- rocthrust
ExclusiveArch: x86_64
- rpm-ostree
ExclusiveArch: %{rust_arches}
- rr
ExclusiveArch: %{ix86} x86_64 aarch64
- rssguard
ExclusiveArch: %{qt6_qtwebengine_arches}
- rstudio
ExclusiveArch: %{java_arches}
- rsyntaxtextarea
ExclusiveArch: %{java_arches} noarch
- rubygem-childprocess
ExclusiveArch: %{ix86} x86_64 noarch
- runc
ExclusiveArch: %{golang_arches_future}
- rundoc
ExclusiveArch: %{java_arches} noarch
- rust
ExclusiveArch: %{rust_arches}
- rust-brotli
ExclusiveArch: %{rust_arches}
- rust-compress-tools
ExclusiveArch: %{rust_arches}
- rust-coreos-installer
ExclusiveArch: %{rust_arches}
- rust-ctr
ExclusiveArch: %{rust_arches}
- rust-dashmap4
ExclusiveArch: %{rust_arches}
- rust-deflate
ExclusiveArch: %{rust_arches}
- rust-deflate0.8
ExclusiveArch: %{rust_arches}
- rust-drg
ExclusiveArch: %{rust_arches}
- rust-epoll
ExclusiveArch: %{rust_arches}
- rust-getch
ExclusiveArch: %{rust_arches}
- rust-gzip-header
ExclusiveArch: %{rust_arches}
- rust-hamming
ExclusiveArch: %{rust_arches}
- rust-hidapi
ExclusiveArch: %{rust_arches}
- rust-httparse
ExclusiveArch: %{rust_arches}
- rust-humantime-serde
ExclusiveArch: %{rust_arches}
- rust-hyperlocal
ExclusiveArch: %{rust_arches}
- rust-image0.23
ExclusiveArch: %{rust_arches}
- rust-inflate
ExclusiveArch: %{rust_arches}
- rust-jpeg-decoder0.1
ExclusiveArch: %{rust_arches}
- rust-k9
ExclusiveArch: %{rust_arches}
- rust-krunvm
ExclusiveArch: x86_64 aarch64
- rust-kstring
ExclusiveArch: %{rust_arches}
- rust-kvm-ioctls
ExclusiveArch: x86_64 aarch64
- rust-lebe
ExclusiveArch: %{rust_arches}
- rust-libslirp-sys
ExclusiveArch: %{rust_arches}
- rust-msru
ExclusiveArch: x86_64
- rust-nanorand
ExclusiveArch: %{rust_arches}
- rust-netstat2
ExclusiveArch: %{rust_arches}
- rust-onig
ExclusiveArch: %{rust_arches}
- rust-openat-ext
ExclusiveArch: %{rust_arches}
- rust-os_type
ExclusiveArch: %{rust_arches}
- rust-pager
ExclusiveArch: %{rust_arches}
- rust-pathsearch
ExclusiveArch: %{rust_arches}
- rust-pretty-bytes
ExclusiveArch: %{rust_arches}
- rust-pretty-hex
ExclusiveArch: %{rust_arches}
- rust-primal-bit
ExclusiveArch: %{rust_arches}
- rust-primal-check
ExclusiveArch: %{rust_arches}
- rust-primal-estimate
ExclusiveArch: %{rust_arches}
- rust-procfs0.9
ExclusiveArch: %{rust_arches}
- rust-psl-types
ExclusiveArch: %{rust_arches}
- rust-psm
ExclusiveArch: %{rust_arches}
- rust-pwd
ExclusiveArch: %{rust_arches}
- rust-rand_core
ExclusiveArch: %{rust_arches}
- rust-schemafy_core
ExclusiveArch: %{rust_arches}
- rust-schemafy_lib
ExclusiveArch: %{rust_arches}
- rust-seahash
ExclusiveArch: %{rust_arches}
- rust-serde-big-array
ExclusiveArch: %{rust_arches}
- rust-serde_qs
ExclusiveArch: %{rust_arches}
- rust-serde_yaml0.8
ExclusiveArch: %{rust_arches}
- rust-sev
ExclusiveArch: x86_64
- rust-sevctl
ExclusiveArch: x86_64
- rust-silver
ExclusiveArch: %{rust_arches}
- rust-sinit
ExclusiveArch: %{rust_arches}
- rust-snphost
ExclusiveArch: x86_64
- rust-ssh-key-dir
ExclusiveArch: %{rust_arches}
- rust-stacker
ExclusiveArch: %{rust_arches}
- rust-structopt
ExclusiveArch: %{rust_arches}
- rust-tiff0.6
ExclusiveArch: %{rust_arches}
- rust-totp-lite
ExclusiveArch: %{rust_arches}
- rust-tower-layer
ExclusiveArch: %{rust_arches}
- rust-tpm2-policy
ExclusiveArch: %{rust_arches}
- rust-unicode-normalization
ExclusiveArch: %{rust_arches}
- rust-unicode-xid
ExclusiveArch: %{rust_arches}
- rust-uriparse
ExclusiveArch: %{rust_arches}
- rust-uucore
ExclusiveArch: %{rust_arches}
- rust-varlink_generator
ExclusiveArch: %{rust_arches}
- rust-varlink_parser
ExclusiveArch: %{rust_arches}
- rust-virtio-bindings
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-vmm-sys-util
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-vtparse
ExclusiveArch: %{rust_arches}
- rust-web-ext-native-messaging
ExclusiveArch: %{rust_arches}
- rust-wezterm-color-types
ExclusiveArch: %{rust_arches}
- rust-wezterm-dynamic
ExclusiveArch: %{rust_arches}
- rust-wezterm-dynamic-derive
ExclusiveArch: %{rust_arches}
- rust-zbus1
ExclusiveArch: %{rust_arches}
- rust-zbus_macros1
ExclusiveArch: %{rust_arches}
- rust-zvariant2
ExclusiveArch: %{rust_arches}
- rust-zvariant_derive2
ExclusiveArch: %{rust_arches}
- rutabaga-gfx-ffi
ExclusiveArch: x86_64 aarch64
- sac
ExclusiveArch: %{java_arches} noarch
- safetyblanket
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- sat4j
ExclusiveArch: %{java_arches} noarch
- sbcl
ExclusiveArch: %{ix86} x86_64 aarch64 %{power64}
- sbd
ExclusiveArch: i686 x86_64 s390x aarch64 ppc64le
- sblim-cim-client
ExclusiveArch: %{java_arches} noarch
- sblim-cim-client2
ExclusiveArch: %{java_arches} noarch
- sbsigntools
ExclusiveArch: x86_64 aarch64 %{arm} %{ix86}
- scala
ExclusiveArch: %{java_arches} noarch
- scannotation
ExclusiveArch: %{java_arches} noarch
- sdljava
ExclusiveArch: %{java_arches}
- sdrangel
ExclusiveArch: %{qt5_qtwebengine_arches}
- sdsl-lite
ExclusiveArch: %{power64} x86_64 aarch64
- sdubby
ExclusiveArch: %{efi}
- seabios
ExclusiveArch: x86_64
- seadrive-gui
ExclusiveArch: %{qt5_qtwebengine_arches}
- seafile-client
ExclusiveArch: %{qt5_qtwebengine_arches}
- seamonkey
ExclusiveArch: x86_64
- seqan3
ExclusiveArch: %{power64} x86_64 aarch64
- sequence-library
ExclusiveArch: %{java_arches} noarch
- servicelog
ExclusiveArch: ppc %{power64}
- shaman
ExclusiveArch: %{java_arches} noarch
- sharpfont
ExclusiveArch: %mono_arches
- sharpziplib
ExclusiveArch: %{mono_arches}
- shim
ExclusiveArch: %{efi}
- shim-unsigned-aarch64
ExclusiveArch: aarch64
- shim-unsigned-x64
ExclusiveArch: x86_64
- sigil
ExclusiveArch: %{qt5_qtwebengine_arches}
- sigul
ExclusiveArch: x86_64
- singularity-ce
ExclusiveArch: %{go_arches}
- sisu
ExclusiveArch: %{java_arches} noarch
- sisu-mojos
ExclusiveArch: %{java_arches} noarch
- skopeo
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- skychart
ExclusiveArch: %{fpc_arches}
- slf4j
ExclusiveArch: %{java_arches} noarch
- slirp4netns
ExclusiveArch: %{golang_arches_future}
- snakeyaml
ExclusiveArch: %{java_arches} noarch
- snapd
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x}
- snip
ExclusiveArch: %{java_arches} noarch
- softnet-stat
ExclusiveArch: %{rust_arches}
- soup-sharp
ExclusiveArch: %{mono_arches}
- spacebar
ExclusiveArch: %{java_arches}
- sparkleshare
ExclusiveArch: %{mono_arches}
- spec-version-maven-plugin
ExclusiveArch: %{java_arches} noarch
- spicctrl
ExclusiveArch: %{ix86} x86_64
- spice
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- spice-parent
ExclusiveArch: %{java_arches} noarch
- springlobby
ExclusiveArch: %{ix86} x86_64
- spyder
ExclusiveArch: %{qt5_qtwebengine_arches}
- sqljet
ExclusiveArch: %{java_arches} noarch
- squeekboard
ExclusiveArch: %{rust_arches}
- startdde
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- stats-collect
ExclusiveArch: %{ix86} x86_64 noarch
- statsd
ExclusiveArch: %{nodejs_arches} noarch
- stratis-cli
ExclusiveArch: %{rust_arches} noarch
- stratisd
ExclusiveArch: %{rust_arches}
ExclusiveArch: %{rust_arches}
ExclusiveArch: %{rust_arches}
- string-template-maven-plugin
ExclusiveArch: %{java_arches} noarch
- stringtemplate
ExclusiveArch: %{java_arches} noarch
- stringtemplate4
ExclusiveArch: %{java_arches} noarch
- stripesnoop
ExclusiveArch: %{ix86} x86_64
- subscription-manager-cockpit
ExclusiveArch: %{nodejs_arches} noarch
- supercollider
ExclusiveArch: %{qt5_qtwebengine_arches}
- supermin
ExclusiveArch: %{kernel_arches}
- svnkit
ExclusiveArch: %{java_arches} noarch
- svt-vp9
ExclusiveArch: x86_64
- swift-lang
ExclusiveArch: x86_64 aarch64
- swiftlint
ExclusiveArch: x86_64 aarch64
- swing-layout
ExclusiveArch: %{java_arches} noarch
- sysbench
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64le s390x
- syslinux
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- system-rules
ExclusiveArch: %{java_arches} noarch
- systemd-boot
ExclusiveArch: %efi
- t-digest
ExclusiveArch: %{java_arches} noarch
- taglib-sharp
ExclusiveArch: %{mono_arches}
- tagsoup
ExclusiveArch: %{java_arches} noarch
- tarantool
ExclusiveArch: %{ix86} x86_64
- tboot
ExclusiveArch: %{ix86} x86_64
- tdlib
ExclusiveArch: x86_64 aarch64
- templates_parser
ExclusiveArch: %GPRbuild_arches
- ternimal
ExclusiveArch: %{rust_arches}
- testcloud
ExclusiveArch: %{kernel_arches} noarch
- testng
ExclusiveArch: %{java_arches} noarch
- texlive
ExclusiveArch: %{java_arches} noarch
- thermald
ExclusiveArch: %{ix86} x86_64
- tilix
ExclusiveArch: %{ldc_arches}
- tokodon
ExclusiveArch: %{qt6_qtwebengine_arches}
- tomboy
ExclusiveArch: %{mono_arches}
- tomcat
ExclusiveArch: %{java_arches} noarch
- tomcat-native
ExclusiveArch: %{java_arches}
- tomcat-taglibs-parent
ExclusiveArch: %{java_arches} noarch
- tomcatjss
ExclusiveArch: %{java_arches} noarch
- torbrowser-launcher
ExclusiveArch: %{ix86} x86_64
- treelayout
ExclusiveArch: %{java_arches} noarch
- trilead-ssh2
ExclusiveArch: %{java_arches} noarch
- truth
ExclusiveArch: %{java_arches} noarch
- tuned-profiles-nfv-host-bin
ExclusiveArch: %{ix86} x86_64
- typescript
ExclusiveArch: %{nodejs_arches} noarch
- uClibc
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
- ucx
ExclusiveArch: aarch64 ppc64le x86_64
- uglify-js
ExclusiveArch: %{nodejs_arches} noarch
- umr
ExclusiveArch: x86_64 aarch64 ppc64le
- unetbootin
ExclusiveArch: %{ix86} x86_64
- univocity-parsers
ExclusiveArch: %{java_arches} noarch
- ursa-major
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- usd
ExclusiveArch: aarch64 x86_64
- v8-314
ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64
- vakzination
ExclusiveArch: %{java_arches}
- valgrind
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
- vboot-utils
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- vecmath1.2
ExclusiveArch: %{java_arches} noarch
- velocity
ExclusiveArch: %{java_arches} noarch
- vim-go
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}}
- vim-syntastic
ExclusiveArch: %{java_arches} noarch
- virt-p2v
ExclusiveArch: x86_64
- virt-v2v
ExclusiveArch: x86_64
- virtiofsd
ExclusiveArch: %{rust_arches}
- virtualbox-guest-additions
ExclusiveArch: i686 x86_64
- vkd3d
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- vmaf
ExclusiveArch: x86_64
- voms-api-java
ExclusiveArch: %{java_arches} noarch
- voms-clients-java
ExclusiveArch: %{java_arches} noarch
- vrq
ExclusiveArch: %{ix86} x86_64
- wangle
ExclusiveArch: x86_64 aarch64 ppc64le
- warsow
ExclusiveArch: %{ix86} x86_64 %{arm}
- warsow-data
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{ix86} x86_64 %{arm}
- wasmedge
ExclusiveArch: x86_64 aarch64
- watchman
ExclusiveArch: x86_64 aarch64 ppc64le
- wdt
ExclusiveArch: x86_64 aarch64 ppc64le
- webkit2-sharp
ExclusiveArch: %mono_arches
- weld-parent
ExclusiveArch: %{java_arches} noarch
- why3
ExclusiveArch: %{ocaml_native_compiler}
- widevine-installer
ExclusiveArch: aarch64
- wine
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86}
- wine-dxvk
ExclusiveArch: %{ix86} x86_64
- winetricks
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- ws-commons-util
ExclusiveArch: %{java_arches} noarch
- wsdl4j
ExclusiveArch: %{java_arches} noarch
- wult
ExclusiveArch: x86_64
- wxMaxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
- x2goclient
ExclusiveArch: x86_64
- x86-simd-sort
ExclusiveArch: x86_64
- xalan-j2
ExclusiveArch: %{java_arches} noarch
- xbean
ExclusiveArch: %{java_arches} noarch
- xbyak
ExclusiveArch: x86_64
- xbyak_aarch64
ExclusiveArch: aarch64
- xe-guest-utilities-latest
ExclusiveArch: %{ix86} x86_64
- xen
ExclusiveArch: x86_64 aarch64
- xerces-j2
ExclusiveArch: %{java_arches} noarch
- xgap
ExclusiveArch: %{gap_arches}
- xml-commons-apis
ExclusiveArch: %{java_arches} noarch
- xml-commons-resolver
ExclusiveArch: %{java_arches} noarch
- xml-maven-plugin
ExclusiveArch: %{java_arches} noarch
- xmlada
ExclusiveArch: %{GPRbuild_arches}
- xmlgraphics-commons
ExclusiveArch: %{java_arches} noarch
- xmlpull
ExclusiveArch: %{java_arches} noarch
- xmlstreambuffer
ExclusiveArch: %{java_arches} noarch
- xmlunit
ExclusiveArch: %{java_arches} noarch
- xmvn
ExclusiveArch: %{java_arches} noarch
- xmvn-connector-ivy
ExclusiveArch: %{java_arches} noarch
- xmvn-generator
ExclusiveArch: %{java_arches}
- xnnpack
ExclusiveArch: x86_64 aarch64
- xorg-x11-drv-armsoc
ExclusiveArch: %{arm} aarch64
- xorg-x11-drv-intel
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-openchrome
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vesa
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vmware
ExclusiveArch: %{ix86} x86_64 ia64
- xsp
ExclusiveArch: %mono_arches
- xstream
ExclusiveArch: %{java_arches} noarch
- xz-java
ExclusiveArch: %{java_arches} noarch
- yarnpkg
ExclusiveArch: %{nodejs_arches} noarch
- zcfan
ExclusiveArch: x86_64
- zeal
ExclusiveArch: aarch64 x86_64
- zenon
ExclusiveArch: %{ocaml_native_compiler}
- zeromq-ada
ExclusiveArch: %{GPRbuild_arches}
- zig
ExclusiveArch: %{zig_arches}
- zlib-ada
ExclusiveArch: %{GPRbuild_arches}
- zlib-ng
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- zola
ExclusiveArch: %{rust_arches}
1
0
Architecture specific change in rpms/rust-fallible-iterator.git
by githook-noreply＠fedoraproject.org 29 Nov '23
by githook-noreply＠fedoraproject.org 29 Nov '23
29 Nov '23
The package rpms/rust-fallible-iterator.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-fallible-iterator.git/commit/?….
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 78c686222fd3c60c7ee6270ae149b7abd2f79b1d
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Wed Nov 29 20:22:53 2023 +0100
Update to version 0.3.0
diff --git a/.gitignore b/.gitignore
index 7330ca2..10279c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/fallible-iterator-0.1.5.crate
/fallible-iterator-0.1.6.crate
/fallible-iterator-0.2.0.crate
+/fallible-iterator-0.3.0.crate
diff --git a/rust-fallible-iterator.spec b/rust-fallible-iterator.spec
index 01b268a..d1e5564 100644
--- a/rust-fallible-iterator.spec
+++ b/rust-fallible-iterator.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 25
%bcond_without check
%global debug_package %{nil}
%global crate fallible-iterator
Name: rust-fallible-iterator
-Version: 0.2.0
+Version: 0.3.0
Release: %autorelease
Summary: Fallible iterator traits
@@ -14,7 +14,7 @@ License: MIT OR Apache-2.0
URL: https://crates.io/crates/fallible-iterator
Source: %{crates_source}
-BuildRequires: rust-packaging >= 21
+BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
Fallible iterator traits.}
@@ -74,7 +74,7 @@ use the "std" feature of the "%{crate}" crate.
%ghost %{crate_instdir}/Cargo.toml
%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
%cargo_prep
%generate_buildrequires
diff --git a/sources b/sources
index 95bf042..97df1f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fallible-iterator-0.2.0.crate) = c558fea3fcf3a7756acc0b63d38f76dfe7eeed4dd9c12c46b7a7e8b8bea64d00e0cc115492e8b3a1a19e86e6083477dcf7d2d72ef960b44f24d61819a3077e79
+SHA512 (fallible-iterator-0.3.0.crate) = c655918fcda5deb8ce792708509e4959139f113c1006dd41b94d7073ffc204512a22cdeeee05c87534db9c414da3f4eb716e1a26970646fcb1c139a14eb8a2fa
commit 88532e48bf882e117476c3071f4ae8e3e579e4b1
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 21 20:23:11 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
commit d919dc16568167b2d2d0eb6db51c565ad50e8be8
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Thu May 25 20:10:20 2023 +0200
Regenerate with rust2rpm v24
diff --git a/README.md b/README.md
deleted file mode 100644
index 09f0992..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-fallible-iterator
-
-The rust-fallible-iterator package
\ No newline at end of file
diff --git a/rust-fallible-iterator.spec b/rust-fallible-iterator.spec
index 5bfad38..01b268a 100644
--- a/rust-fallible-iterator.spec
+++ b/rust-fallible-iterator.spec
@@ -1,25 +1,20 @@
-# Generated by rust2rpm 19
+# Generated by rust2rpm 24
%bcond_without check
%global debug_package %{nil}
%global crate fallible-iterator
-Name: rust-%{crate}
+Name: rust-fallible-iterator
Version: 0.2.0
Release: %autorelease
Summary: Fallible iterator traits
# Upstream license specification: MIT/Apache-2.0
-License: MIT or ASL 2.0
+License: MIT OR Apache-2.0
URL: https://crates.io/crates/fallible-iterator
Source: %{crates_source}
-ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
-
-BuildRequires: rust-packaging
+BuildRequires: rust-packaging >= 21
%global _description %{expand:
Fallible iterator traits.}
@@ -33,12 +28,14 @@ BuildArch: noarch
%description devel %{_description}
This package contains library source intended for building other packages which
-use "%{crate}" crate.
+use the "%{crate}" crate.
%files devel
-%license LICENSE-APACHE LICENSE-MIT
-%doc CHANGELOG.md README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE-APACHE
+%license %{crate_instdir}/LICENSE-MIT
+%doc %{crate_instdir}/CHANGELOG.md
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -47,10 +44,10 @@ BuildArch: noarch
%description -n %{name}+default-devel %{_description}
This package contains library source intended for building other packages which
-use "the default" feature of the "%{crate}" crate.
+use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+alloc-devel
Summary: %{summary}
@@ -59,10 +56,10 @@ BuildArch: noarch
%description -n %{name}+alloc-devel %{_description}
This package contains library source intended for building other packages which
-use "the alloc" feature of the "%{crate}" crate.
+use the "alloc" feature of the "%{crate}" crate.
%files -n %{name}+alloc-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+std-devel
Summary: %{summary}
@@ -71,10 +68,10 @@ BuildArch: noarch
%description -n %{name}+std-devel %{_description}
This package contains library source intended for building other packages which
-use "the std" feature of the "%{crate}" crate.
+use the "std" feature of the "%{crate}" crate.
%files -n %{name}+std-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
1
0
29 Nov '23
The package rpms/cockpit.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/cockpit.git/commit/?id=2267494a2f04….
Change:
+%ifarch %ix86
Thanks.
Full change:
============
commit 2267494a2f043e69719c22c3f9d9c9ba895f91a7
Author: Packit <hello(a)packit.dev>
Date: Wed Nov 29 09:32:57 2023 +0000
[packit] 306 upstream release
Upstream tag: 306
Upstream commit: 516cc081
diff --git a/.gitignore b/.gitignore
index 6789590..eac44f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -275,3 +275,4 @@
/cockpit-303.tar.xz
/cockpit-304.tar.xz
/cockpit-305.tar.xz
+/cockpit-306.tar.xz
diff --git a/README.packit b/README.packit
index b6ea2f6..ef95206 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
This repository is maintained by packit.
https://packit.dev/
-The file was generated using packit 0.85.0.post1.dev17+g1f3036b1.
+The file was generated using packit 0.87.0.
diff --git a/cockpit.spec b/cockpit.spec
index 96be119..d59c3a0 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -49,7 +49,7 @@ Summary: Web Console for Linux servers
License: LGPL-2.1-or-later
URL: https://cockpit-project.org/
-Version: 305
+Version: 306
Release: 1%{?dist}
Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/coc…
@@ -86,6 +86,14 @@ Source0: https://github.com/cockpit-project/cockpit/releases/download/%{v
%define disallow_root 1
%endif
+# pcp stopped building on ix86
+%define build_pcp 1
+%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
+%ifarch %ix86
+%define build_pcp 0
+%endif
+%endif
+
# Ship custom SELinux policy (but not for cockpit-appstream)
%if "%{name}" == "cockpit"
%define selinuxtype targeted
@@ -124,15 +132,19 @@ BuildRequires: glib2-devel >= 2.50.0
BuildRequires: systemd-devel >= 235
%if 0%{?suse_version}
BuildRequires: distribution-release
+%if %{build_pcp}
BuildRequires: libpcp-devel
BuildRequires: pcp-devel
BuildRequires: libpcp3
BuildRequires: libpcp_import1
+%endif
BuildRequires: openssh
BuildRequires: distribution-logos
BuildRequires: wallpaper-branding
%else
+%if %{build_pcp}
BuildRequires: pcp-libs-devel
+%endif
BuildRequires: openssh-clients
BuildRequires: docbook-style-xsl
%endif
@@ -199,6 +211,9 @@ BuildRequires: python3-tox-current-env
%if 0%{?build_basic} == 0
--disable-ssh \
%endif
+%if %{build_pcp} == 0
+ --disable-pcp \
+%endif
%make_build
@@ -230,8 +245,10 @@ find %{buildroot}%{_datadir}/cockpit/ssh -type f >> base.list
%endif
echo '%{_libexecdir}/cockpit-ssh' >> base.list
+%if %{build_pcp}
echo '%dir %{_datadir}/cockpit/pcp' > pcp.list
find %{buildroot}%{_datadir}/cockpit/pcp -type f >> pcp.list
+%endif
echo '%dir %{_datadir}/cockpit/shell' >> system.list
find %{buildroot}%{_datadir}/cockpit/shell -type f >> system.list
@@ -424,7 +441,7 @@ Provides: cockpit-sosreport = %{version}-%{release}
Recommends: (reportd if abrt)
%endif
-Provides: bundled(npm(@babel/runtime)) = 7.23.2
+Provides: bundled(npm(@babel/runtime)) = 7.23.4
Provides: bundled(npm(@patternfly/patternfly)) = 5.1.0
Provides: bundled(npm(@patternfly/react-core)) = 5.1.1
Provides: bundled(npm(@patternfly/react-icons)) = 5.1.1
@@ -755,6 +772,8 @@ These files are not required for running Cockpit.
%{_unitdir}/cockpit-session.socket
%{_unitdir}/cockpit-session@.service
+%if %{build_pcp}
+
%package -n cockpit-pcp
Summary: Cockpit PCP integration
Requires: cockpit-bridge >= %{required_base}
@@ -770,6 +789,8 @@ Cockpit support for reading PCP metrics and loading PCP archives.
%post -n cockpit-pcp
systemctl reload-or-try-restart pmlogger
+%endif
+
%package -n cockpit-packagekit
Summary: Cockpit user interface for packages
BuildArch: noarch
@@ -790,6 +811,9 @@ via PackageKit.
# The changelog is automatically generated and merged
%changelog
+* Wed Nov 29 2023 Packit <hello(a)packit.dev> - 306-1
+- Kdump: Add Ansible/shell automation
+
* Wed Nov 15 2023 Packit <hello(a)packit.dev> - 305-1
- Performance and stability improvements
diff --git a/sources b/sources
index c092355..01aee8d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-305.tar.xz) = d1fc38b4f1566bcab79fc4558a072955ba100fbda9f13af694fe060225ee3c84de5d15a146784ba816711bf51d0203986192c7ab720f4ec6a7044125340204a7
+SHA512 (cockpit-306.tar.xz) = aed080a00d4cac50a87fdf22b92635e9f63b0944103868d0e666798380309acdc06de62ff26846f87c5d894b2383b4fee6ad720f4a4105ebe8e75b8ff768c8b8
1
0
29 Nov '23
The package rpms/cockpit.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/cockpit.git/commit/?id=ce47d2ffe577….
Change:
+%ifarch %ix86
Thanks.
Full change:
============
commit ce47d2ffe5772cd94f33e28a2b05c82263bcfe00
Author: Packit <hello(a)packit.dev>
Date: Wed Nov 29 09:33:53 2023 +0000
[packit] 306 upstream release
Upstream tag: 306
Upstream commit: 516cc081
diff --git a/.gitignore b/.gitignore
index 6789590..eac44f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -275,3 +275,4 @@
/cockpit-303.tar.xz
/cockpit-304.tar.xz
/cockpit-305.tar.xz
+/cockpit-306.tar.xz
diff --git a/README.packit b/README.packit
index b6ea2f6..ef95206 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
This repository is maintained by packit.
https://packit.dev/
-The file was generated using packit 0.85.0.post1.dev17+g1f3036b1.
+The file was generated using packit 0.87.0.
diff --git a/cockpit.spec b/cockpit.spec
index 40678b2..93748a6 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -49,7 +49,7 @@ Summary: Web Console for Linux servers
License: LGPL-2.1-or-later
URL: https://cockpit-project.org/
-Version: 305
+Version: 306
Release: 1%{?dist}
Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/coc…
@@ -86,6 +86,14 @@ Source0: https://github.com/cockpit-project/cockpit/releases/download/%{v
%define disallow_root 1
%endif
+# pcp stopped building on ix86
+%define build_pcp 1
+%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
+%ifarch %ix86
+%define build_pcp 0
+%endif
+%endif
+
# Ship custom SELinux policy (but not for cockpit-appstream)
%if "%{name}" == "cockpit"
%define selinuxtype targeted
@@ -124,15 +132,19 @@ BuildRequires: glib2-devel >= 2.50.0
BuildRequires: systemd-devel >= 235
%if 0%{?suse_version}
BuildRequires: distribution-release
+%if %{build_pcp}
BuildRequires: libpcp-devel
BuildRequires: pcp-devel
BuildRequires: libpcp3
BuildRequires: libpcp_import1
+%endif
BuildRequires: openssh
BuildRequires: distribution-logos
BuildRequires: wallpaper-branding
%else
+%if %{build_pcp}
BuildRequires: pcp-libs-devel
+%endif
BuildRequires: openssh-clients
BuildRequires: docbook-style-xsl
%endif
@@ -199,6 +211,9 @@ BuildRequires: python3-tox-current-env
%if 0%{?build_basic} == 0
--disable-ssh \
%endif
+%if %{build_pcp} == 0
+ --disable-pcp \
+%endif
%make_build
@@ -230,8 +245,10 @@ find %{buildroot}%{_datadir}/cockpit/ssh -type f >> base.list
%endif
echo '%{_libexecdir}/cockpit-ssh' >> base.list
+%if %{build_pcp}
echo '%dir %{_datadir}/cockpit/pcp' > pcp.list
find %{buildroot}%{_datadir}/cockpit/pcp -type f >> pcp.list
+%endif
echo '%dir %{_datadir}/cockpit/shell' >> system.list
find %{buildroot}%{_datadir}/cockpit/shell -type f >> system.list
@@ -424,7 +441,7 @@ Provides: cockpit-sosreport = %{version}-%{release}
Recommends: (reportd if abrt)
%endif
-Provides: bundled(npm(@babel/runtime)) = 7.23.2
+Provides: bundled(npm(@babel/runtime)) = 7.23.4
Provides: bundled(npm(@patternfly/patternfly)) = 5.1.0
Provides: bundled(npm(@patternfly/react-core)) = 5.1.1
Provides: bundled(npm(@patternfly/react-icons)) = 5.1.1
@@ -755,6 +772,8 @@ These files are not required for running Cockpit.
%{_unitdir}/cockpit-session.socket
%{_unitdir}/cockpit-session@.service
+%if %{build_pcp}
+
%package -n cockpit-pcp
Summary: Cockpit PCP integration
Requires: cockpit-bridge >= %{required_base}
@@ -770,6 +789,8 @@ Cockpit support for reading PCP metrics and loading PCP archives.
%post -n cockpit-pcp
systemctl reload-or-try-restart pmlogger
+%endif
+
%package -n cockpit-packagekit
Summary: Cockpit user interface for packages
BuildArch: noarch
@@ -790,6 +811,9 @@ via PackageKit.
# The changelog is automatically generated and merged
%changelog
+* Wed Nov 29 2023 Packit <hello(a)packit.dev> - 306-1
+- Kdump: Add Ansible/shell automation
+
* Wed Nov 15 2023 Packit <hello(a)packit.dev> - 305-1
- Performance and stability improvements
diff --git a/sources b/sources
index c092355..01aee8d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-305.tar.xz) = d1fc38b4f1566bcab79fc4558a072955ba100fbda9f13af694fe060225ee3c84de5d15a146784ba816711bf51d0203986192c7ab720f4ec6a7044125340204a7
+SHA512 (cockpit-306.tar.xz) = aed080a00d4cac50a87fdf22b92635e9f63b0944103868d0e666798380309acdc06de62ff26846f87c5d894b2383b4fee6ad720f4a4105ebe8e75b8ff768c8b8
1
0
29 Nov '23
The package rpms/ghc.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ghc.git/commit/?id=204697fda0ea1fe3….
Change:
+%ifarch s390x
Thanks.
Full change:
============
commit f3741279b306a52c893e92474c7d605c1451eee5
Author: Jens Petersen <petersen(a)redhat.com>
Date: Sat Nov 25 09:58:52 2023 +0800
BR ghc-*-devel instead of ghc-*-static
diff --git a/ghc.spec b/ghc.spec
index 9e2cd13..becb44d 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -197,20 +197,20 @@ BuildRequires: elfutils-devel
# needed for binary-dist-dir
BuildRequires: autoconf automake
%if %{with build_hadrian}
-BuildRequires: ghc-Cabal-static
-BuildRequires: ghc-QuickCheck-static
-BuildRequires: ghc-base-static
-BuildRequires: ghc-bytestring-static
-BuildRequires: ghc-containers-static
-BuildRequires: ghc-directory-static
-BuildRequires: ghc-extra-static
-BuildRequires: ghc-filepath-static
-BuildRequires: ghc-mtl-static
-BuildRequires: ghc-parsec-static
-BuildRequires: ghc-shake-static
-BuildRequires: ghc-stm-static
-BuildRequires: ghc-transformers-static
-BuildRequires: ghc-unordered-containers-static
+BuildRequires: ghc-Cabal-devel
+BuildRequires: ghc-QuickCheck-devel
+BuildRequires: ghc-base-devel
+BuildRequires: ghc-bytestring-devel
+BuildRequires: ghc-containers-devel
+BuildRequires: ghc-directory-devel
+BuildRequires: ghc-extra-devel
+BuildRequires: ghc-filepath-devel
+BuildRequires: ghc-mtl-devel
+BuildRequires: ghc-parsec-devel
+BuildRequires: ghc-shake-devel
+BuildRequires: ghc-stm-devel
+BuildRequires: ghc-transformers-devel
+BuildRequires: ghc-unordered-containers-devel
%else
BuildRequires: %{name}-hadrian
%endif
commit 204697fda0ea1fe314373a382cccb7b0a26b6649
Author: Jens Petersen <petersen(a)redhat.com>
Date: Sat Nov 25 09:58:41 2023 +0800
s390x: patch from @stefansf (IBM) to fix llvm alignment of data sections
diff --git a/11662.patch b/11662.patch
new file mode 100644
index 0000000..ce6ca44
--- /dev/null
+++ b/11662.patch
@@ -0,0 +1,31 @@
+From bed85f7bc358fdca4677a3070b94ea544bb9e7ff Mon Sep 17 00:00:00 2001
+From: Stefan Schulze Frielinghaus <stefansf(a)linux.ibm.com>
+Date: Mon, 27 Nov 2023 12:34:47 +0100
+Subject: [PATCH] llvmGen: Align objects in the data section
+
+Objects in the data section may be referenced via tagged pointers.
+Thus, align those objects to a 4- or 8-byte boundary for 32- or 64-bit
+platforms, respectively. Note, this may need to be reconsidered if
+objects with a greater natural alignment requirement are emitted as e.g.
+128-bit atomics.
+
+Fixes #24163.
+---
+ compiler/GHC/CmmToLlvm/Data.hs | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/compiler/GHC/CmmToLlvm/Data.hs b/compiler/GHC/CmmToLlvm/Data.hs
+index caac121413c..5e8912e3bc7 100644
+--- a/compiler/GHC/CmmToLlvm/Data.hs
++++ b/compiler/GHC/CmmToLlvm/Data.hs
+@@ -89,6 +89,7 @@ genLlvmData (sec, CmmStaticsRaw lbl xs) = do
+ align = case sec of
+ Section CString _ -> if (platformArch platform == ArchS390X)
+ then Just 2 else Just 1
++ Section Data _ -> Just $ platformWordSizeInBytes platform
+ _ -> Nothing
+ const = if sectionProtection sec == ReadOnlySection
+ then Constant else Global
+--
+GitLab
+
diff --git a/ghc.spec b/ghc.spec
index fed7508..9e2cd13 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -87,7 +87,7 @@ Version: 9.4.5
# - release can only be reset if *all* library versions get bumped simultaneously
# (sometimes after a major release)
# - minor release numbers for a branch should be incremented monotonically
-Release: 136%{?dist}
+Release: 137%{?dist}
Summary: Glasgow Haskell Compiler
License: BSD-3-Clause AND HaskellReport
@@ -133,6 +133,11 @@ Patch13: text2-allow-ghc8-arm.patch
Patch15: ghc-warnings.mk-CC-Wall.patch
Patch16: ghc-hadrian-s390x-rts--qg.patch
+# s390x
+# https://gitlab.haskell.org/ghc/ghc/-/issues/24163
+# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/11662
+Patch17: https://gitlab.haskell.org/ghc/ghc/-/merge_requests/11662.patch
+
# Debian patches:
Patch24: buildpath-abi-stability.patch
Patch26: no-missing-haddock-file-warning.patch
@@ -454,6 +459,10 @@ rm libffi-tarballs/libffi-*.tar.gz
%patch -P16 -p1 -b .orig
%endif
+%ifarch s390x
+%patch -P17 -p1 -b .orig
+%endif
+
#debian
#%%patch -P24 -p1 -b .orig
%patch -P26 -p1 -b .orig
@@ -1005,6 +1014,10 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index
%changelog
+* Sat Nov 25 2023 Jens Petersen <petersen(a)redhat.com> - 9.4.5-137
+- s390x: patch from @stefansf (IBM) to fix llvm alignment in data sections
+ which should fix certain runtime crashes (#2248097)
+
* Mon Sep 11 2023 Jens Petersen <petersen(a)redhat.com> - 9.4.5-136
- sync with ghc9.4: add sphinx7 patch
- user_guide: update external links patch in line with final upstream
commit af12036cab473c67685db60e7156cb2ee0dc257f
Author: Jens Petersen <petersen(a)redhat.com>
Date: Mon Sep 11 14:08:22 2023 +0800
changelog for sphinx7 and external links tweak
diff --git a/ghc.spec b/ghc.spec
index 1ae6bb6..fed7508 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -87,7 +87,7 @@ Version: 9.4.5
# - release can only be reset if *all* library versions get bumped simultaneously
# (sometimes after a major release)
# - minor release numbers for a branch should be incremented monotonically
-Release: 135%{?dist}
+Release: 136%{?dist}
Summary: Glasgow Haskell Compiler
License: BSD-3-Clause AND HaskellReport
@@ -1005,6 +1005,10 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index
%changelog
+* Mon Sep 11 2023 Jens Petersen <petersen(a)redhat.com> - 9.4.5-136
+- sync with ghc9.4: add sphinx7 patch
+- user_guide: update external links patch in line with final upstream
+
* Tue Aug 8 2023 Jens Petersen <petersen(a)redhat.com> - 9.4.5-135
- disable ghc9.4 obsoletes due to 9.4.6 release
commit 24eeb06d7d5ebdf9458d8c8bb3861a7a5578f292
Author: Jens Petersen <petersen(a)redhat.com>
Date: Mon Sep 11 14:03:30 2023 +0800
tweak a couple of comments
diff --git a/ghc.spec b/ghc.spec
index f60e9e3..1ae6bb6 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -17,7 +17,7 @@
%undefine with_haddock
%endif
-# use Hadrian buildsystem for production builds
+# use Hadrian buildsystem for production builds: seems redundant
%bcond hadrian 1
# disabled to allow parallel install of ghcX.Y-X.Y.(Z+1) and ghc-X.Y.Z
@@ -449,7 +449,6 @@ rm libffi-tarballs/libffi-*.tar.gz
%patch -P13 -p1 -b .orig
%endif
-# remove s390x after complete switching to llvm
%ifarch %{ghc_unregisterized_arches}
%patch -P15 -p1 -b .orig
%patch -P16 -p1 -b .orig
commit afd169846dc70049ccf75c3e2c1169ac63b90a91
Author: Jens Petersen <petersen(a)redhat.com>
Date: Mon Sep 11 14:00:31 2023 +0800
sync ghc9.4: add sphinx7 patch
diff --git a/ghc.spec b/ghc.spec
index 206b08b..f60e9e3 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -1,5 +1,5 @@
# Start: prod settings
-# all bcond_without for production builds:
+# all *bcond_without* for production builds:
# - performance build (disable for quick build)
%bcond perfbuild 1
%bcond build_hadrian 1
@@ -9,7 +9,7 @@
%endif
# End: prod settings
-# without for production builds
+# not for production builds
%if %{without perfbuild}
# disable profiling libraries (overriding macros.ghc-srpm)
%undefine with_ghc_prof
@@ -138,6 +138,10 @@ Patch24: buildpath-abi-stability.patch
Patch26: no-missing-haddock-file-warning.patch
Patch27: haddock-remove-googleapis-fonts.patch
+Patch30: https://src.opensuse.org/rpm/ghc/raw/branch/factory/sphinx7.patch
+
+# https://gitlab.haskell.org/ghc/ghc/-/wikis/platforms
+
# fedora ghc has been bootstrapped on
# %%{ix86} x86_64 s390x ppc64le aarch64
# and retired arches: alpha sparcv9 armv5tel ppc ppc64 s390 armv7hl
@@ -456,6 +460,11 @@ rm libffi-tarballs/libffi-*.tar.gz
%patch -P26 -p1 -b .orig
%patch -P27 -p1 -b .orig
+#sphinx 7
+%if 0%{?fedora} >= 40
+%patch -P30 -p1 -b .orig
+%endif
+
%if %{with haddock} && %{without hadrian}
%global gen_contents_index gen_contents_index.orig
if [ ! -f "libraries/%{gen_contents_index}" ]; then
@@ -465,7 +474,6 @@ fi
%endif
%if %{without hadrian}
-# https://gitlab.haskell.org/ghc/ghc/-/wikis/platforms
cat > mk/build.mk << EOF
%if %{with perfbuild}
%ifarch %{ghc_llvm_archs}
@@ -552,6 +560,9 @@ cd hadrian
%global hadrian_llvm +llvm
%endif
%define hadrian_docs %{!?with_haddock:--docs=no-haddocks} --docs=%[%{?with_manual} ? "no-sphinx-pdfs" : "no-sphinx"]
+# aarch64 with 224 cpus: _build/stage0/bin/ghc: createProcess: pipe: resource exhausted (Too many open files)
+# https://koji.fedoraproject.org/koji/taskinfo?taskID=105428124
+%global _smp_ncpus_max 64
# quickest does not build shared libs
# try release instead of perf
%{hadrian} %{?_smp_mflags} --flavour=%[%{?with_perfbuild} ? "perf" : "quick"]%{!?with_ghc_prof:+no_profiled_libs}%{?hadrian_llvm} %{hadrian_docs} binary-dist-dir
diff --git a/sphinx7.patch b/sphinx7.patch
new file mode 100644
index 0000000..0eb1dbd
--- /dev/null
+++ b/sphinx7.patch
@@ -0,0 +1,26 @@
+From 52d701b31dc4427b7e321a04be3f5f13a5fc271e Mon Sep 17 00:00:00 2001
+From: "mimi.vx" <mimi.vx(a)gmail.com>
+Date: Wed, 24 May 2023 12:42:15 +0000
+Subject: [PATCH] Fix for Sphinx 7 removed style key
+
+Fixes https://gitlab.haskell.org/ghc/ghc/-/issues/23444
+---
+ docs/users_guide/rtd-theme/layout.html | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/users_guide/rtd-theme/layout.html b/docs/users_guide/rtd-theme/layout.html
+index 2a61142514a..7ffeff7befc 100644
+--- a/docs/users_guide/rtd-theme/layout.html
++++ b/docs/users_guide/rtd-theme/layout.html
+@@ -64,7 +64,7 @@
+ {%- endif %}
+
+ {# CSS #}
+- <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
++ <link rel="stylesheet" href="{{ pathto('_static/' + styles[-1], 1) }}" type="text/css" />
+ <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
+ {%- for css in css_files %}
+ {%- if css|attr("rel") %}
+--
+GitLab
+
commit 029e0a36829e907145b4c1929048d3a347be4687
Author: Jens Petersen <petersen(a)redhat.com>
Date: Mon Sep 11 13:28:30 2023 +0800
user_guide: update external links patch to final upstream
https://gitlab.haskell.org/ghc/ghc/-/issues/22690
diff --git a/00dc51060881df81258ba3b3bdf447294618a4de.patch b/00dc51060881df81258ba3b3bdf447294618a4de.patch
index 91a37b3..822f75e 100644
--- a/00dc51060881df81258ba3b3bdf447294618a4de.patch
+++ b/00dc51060881df81258ba3b3bdf447294618a4de.patch
@@ -34,8 +34,8 @@ index dcc7fbaef62..c9888a13adc 100644
extlinks = {
- 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', '#'),
- 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', '#'),
-+ 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', '%s'),
-+ 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', '#%s'),
++ 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', '#%s'),
++ 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', '%s'),
}
libs_base_uri = '../libraries'
1
0
List of packages currently excluding arches (1135)
===========================================
- 0ad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- 90-Second-Portraits
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- BareBonesBrowserLaunch
ExclusiveArch: %{java_arches} noarch
- CFR
ExclusiveArch: %{java_arches} noarch
- CardManager
ExclusiveArch: %{java_arches} noarch
- GAPDoc
ExclusiveArch: %{gap_arches} noarch
- GoldenCheetah
ExclusiveArch: %{qt5_qtwebengine_arches}
- GtkAda
ExclusiveArch: %{GPRbuild_arches}
- GtkAda3
ExclusiveArch: %{GPRbuild_arches}
- IPAddress
ExclusiveArch: %{java_arches} noarch
- Mars
ExclusiveArch: %{java_arches} noarch
- OpenColorIO
ExclusiveArch: x86_64 ppc64le
- OpenImageIO
ExclusiveArch: x86_64 ppc64le
- OpenMolcas
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- OpenStego
ExclusiveArch: %{java_arches} noarch
- PragmARC
ExclusiveArch: %{GPRbuild_arches}
- R-V8
ExclusiveArch: %{nodejs_arches}
- R-rJava
ExclusiveArch: %{java_arches}
- RdRand
ExclusiveArch: %{ix86} x86_64
- RediSearch
ExclusiveArch: x86_64
- SLOF
ExclusiveArch: ppc64le
- YafaRay
ExclusiveArch: %{ix86} x86_64
- aardvark-dns
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- accel-config
ExclusiveArch: %{ix86} x86_64
- acpid
ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64
- ahven
ExclusiveArch: %{GPRbuild_arches}
- algobox
ExclusiveArch: %{qt5_qtwebengine_arches}
- american-fuzzy-lop
ExclusiveArch: %{ix86} x86_64 s390x
- anet
ExclusiveArch: %{GPRbuild_arches}
- ant
ExclusiveArch: %{java_arches} noarch
- ant-antunit
ExclusiveArch: %{java_arches} noarch
- ant-contrib
ExclusiveArch: %{java_arches} noarch
- antlr
ExclusiveArch: %{java_arches}
- antlr3
ExclusiveArch: %{java_arches}
- antlr4-project
ExclusiveArch: %{java_arches}
- antlrworks
ExclusiveArch: %{java_arches} noarch
- aopalliance
ExclusiveArch: %{java_arches} noarch
- apache-commons-beanutils
ExclusiveArch: %{java_arches} noarch
- apache-commons-cli
ExclusiveArch: %{java_arches} noarch
- apache-commons-codec
ExclusiveArch: %{java_arches} noarch
- apache-commons-collections
ExclusiveArch: %{java_arches} noarch
- apache-commons-collections4
ExclusiveArch: %{java_arches} noarch
- apache-commons-compress
ExclusiveArch: %{java_arches} noarch
- apache-commons-configuration
ExclusiveArch: %{java_arches} noarch
- apache-commons-digester
ExclusiveArch: %{java_arches} noarch
- apache-commons-exec
ExclusiveArch: %{java_arches} noarch
- apache-commons-io
ExclusiveArch: %{java_arches} noarch
- apache-commons-jexl
ExclusiveArch: %{java_arches} noarch
- apache-commons-jxpath
ExclusiveArch: %{java_arches} noarch
- apache-commons-lang3
ExclusiveArch: %{java_arches} noarch
- apache-commons-logging
ExclusiveArch: %{java_arches} noarch
- apache-commons-math
ExclusiveArch: %{java_arches} noarch
- apache-commons-modeler
ExclusiveArch: %{java_arches} noarch
- apache-commons-net
ExclusiveArch: %{java_arches} noarch
- apache-commons-parent
ExclusiveArch: %{java_arches} noarch
- apache-commons-pool
ExclusiveArch: %{java_arches} noarch
- apache-commons-vfs
ExclusiveArch: %{java_arches} noarch
- apache-ivy
ExclusiveArch: %{java_arches} noarch
- apache-parent
ExclusiveArch: %{java_arches} noarch
- apache-resource-bundles
ExclusiveArch: %{java_arches} noarch
- apache-sshd
ExclusiveArch: %{java_arches} noarch
- apiguardian
ExclusiveArch: %{java_arches} noarch
- apmd
ExclusiveArch: %{ix86}
- appstream-generator
ExclusiveArch: %{ldc_arches}
- aqute-bnd
ExclusiveArch: %{java_arches} noarch
- args4j
ExclusiveArch: %{java_arches} noarch
- arianna
ExclusiveArch: %{qt6_qtwebengine_arches}
- arm-trusted-firmware
ExclusiveArch: aarch64
- asmjit
ExclusiveArch: aarch64 x86_64
- assertj-core
ExclusiveArch: %{java_arches} noarch
- atinject
ExclusiveArch: %{java_arches} noarch
- aunit
ExclusiveArch: %GPRbuild_arches
- auto
ExclusiveArch: %{java_arches} noarch
- autolink-java
ExclusiveArch: noarch %{java_arches}
- avgtime
ExclusiveArch: %{ldc_arches}
- aws
ExclusiveArch: %GPRbuild_arches
- azure-cli
ExclusiveArch: %{java_arches} noarch
- batik
ExclusiveArch: %{java_arches} noarch
- bcal
ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x
- bcc
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
- bcel
ExclusiveArch: %{java_arches} noarch
- bcm283x-firmware
ExclusiveArch: aarch64
- beansbinding
ExclusiveArch: %{java_arches} noarch
- berusky2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips}
- beust-jcommander
ExclusiveArch: %{java_arches} noarch
- bibletime
ExclusiveArch: %{java_arches}
- biosdevname
ExclusiveArch: %{ix86} x86_64
- bless
ExclusiveArch: %mono_arches
- bodhi-server
ExclusiveArch: %{golang_arches_future}
- bolzplatz2006
ExclusiveArch: %{java_arches}
- bouncycastle
ExclusiveArch: %{java_arches} noarch
- box64
ExclusiveArch: aarch64 ppc64le x86_64
- bpftrace
ExclusiveArch: x86_64 %{power64} aarch64 s390x
- brazil
ExclusiveArch: %{java_arches} noarch
- bsf
ExclusiveArch: %{java_arches} noarch
- bsh
ExclusiveArch: %{java_arches} noarch
- build-helper-maven-plugin
ExclusiveArch: %{java_arches} noarch
- buildah
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- byebyebios
ExclusiveArch: x86_64
- byte-buddy
ExclusiveArch: %{java_arches} noarch
- byteman
ExclusiveArch: %{java_arches} noarch
- cachelib
ExclusiveArch: x86_64 aarch64 ppc64le
- caddy
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: %{golang_arches}
- caffe
ExclusiveArch: x86_64 aarch64 ppc64le
- calamares
ExclusiveArch: %{ix86} x86_64 aarch64
- calibre
ExclusiveArch: aarch64 x86_64
- cambozola
ExclusiveArch: %{java_arches} noarch
- canl-java
ExclusiveArch: %{java_arches} noarch
- catatonit
ExclusiveArch: aarch64 ppc64le s390x x86_64
ExclusiveArch: %{golang_arches_future}
- ccdciel
ExclusiveArch: %{fpc_arches}
- cdcollect
ExclusiveArch: %{mono_arches}
- cdi-api
ExclusiveArch: %{java_arches} noarch
- ceph
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- cglib
ExclusiveArch: %{java_arches} noarch
- chromium
ExclusiveArch: x86_64
ExclusiveArch: x86_64 aarch64
- cjdns
ExclusiveArch: %{nodejs_arches}
- classloader-leak-test-framework
ExclusiveArch: %{java_arches} noarch
- classpathless-compiler
ExclusiveArch: %{java_arches} noarch
- clevis-pin-tpm2
ExclusiveArch: %{rust_arches}
- clojure
ExclusiveArch: %{java_arches} noarch
- clojure-core-specs-alpha
ExclusiveArch: %{java_arches} noarch
- clojure-maven-plugin
ExclusiveArch: %{java_arches} noarch
- clojure-spec-alpha
ExclusiveArch: %{java_arches} noarch
- cmospwd
ExclusiveArch: %{ix86} x86_64
- cmrt
ExclusiveArch: %{ix86} x86_64 ia64
- codehaus-parent
ExclusiveArch: %{java_arches} noarch
- colorful
ExclusiveArch: %{fpc_arches}
- colossus
ExclusiveArch: %{java_arches} noarch
- conmon
ExclusiveArch: %{golang_arches_future}
- console-image-viewer
ExclusiveArch: %{java_arches} noarch
- containernetworking-plugins
ExclusiveArch: %{golang_arches}
- coq
ExclusiveArch: %{ocaml_native_compiler}
- cortado
ExclusiveArch: %{java_arches} noarch
- cpu-x
ExclusiveArch: i686 x86_64
- cpufetch
ExclusiveArch: %{arm} aarch64 x86_64 ppc ppc64 ppc64le
- cpuid
ExclusiveArch: %{ix86} x86_64
- cpuinfo
ExclusiveArch: x86_64 aarch64
- cqrlog
ExclusiveArch: %{fpc_arches}
- crash
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- crash-gcore-command
ExclusiveArch: aarch64 ppc64le x86_64
- crash-trace-command
ExclusiveArch: aarch64 ppc64le s390x x86_64
- credentials-fetcher
ExclusiveArch: x86_64 aarch64 s390x
- cri-o
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- cri-tools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- criu
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- crun
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le riscv64 s390x x86_64
- cryptlib
ExclusiveArch: x86_64 aarch64 ppc64le
- crypto-policies
ExclusiveArch: %{java_arches} noarch
- cryptobone
ExclusiveArch: x86_64 ppc64le aarch64
- csslint
ExclusiveArch: %{nodejs_arches} noarch
- daq
ExclusiveArch: x86_64 aarch64
- dbus-sharp
ExclusiveArch: %mono_arches
- dbus-sharp-glib
ExclusiveArch: %mono_arches
- decentxml
ExclusiveArch: %{java_arches} noarch
- deepin-daemon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- deepin-desktop-schemas
ExclusiveArch: %{go_arches}
- directory-maven-plugin
ExclusiveArch: %{java_arches} noarch
- dirgra
ExclusiveArch: %{java_arches} noarch
- disruptor
ExclusiveArch: %{java_arches} noarch
- ditaa
ExclusiveArch: %{java_arches} noarch
- dlm
ExclusiveArch: i686 x86_64
- dmidecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- dmtcp
ExclusiveArch: x86_64
- docker-distribution
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- dogtag-pki
ExclusiveArch: %{java_arches}
- dolphin-emu
ExclusiveArch: x86_64 aarch64
- dom4j
ExclusiveArch: %{java_arches} noarch
- dotnet6.0
ExclusiveArch: aarch64 x86_64 s390x
ExclusiveArch: x86_64
- dotnet7.0
ExclusiveArch: aarch64 ppc64le s390x x86_64
ExclusiveArch: x86_64
- doublecmd
ExclusiveArch: %{ix86} x86_64
- dpdk
ExclusiveArch: x86_64 i686 aarch64 ppc64le
- dub
ExclusiveArch: %{ldc_arches}
- dxvk-native
ExclusiveArch: %{ix86} x86_64
- dyninst
ExclusiveArch: %{ix86} x86_64 ppc64le aarch64
- e3
ExclusiveArch: %{ix86} x86_64
- easymock
ExclusiveArch: %{java_arches} noarch
- ecj
ExclusiveArch: %{java_arches} noarch
- eclipse-swt
ExclusiveArch: %{java_arches}
- ed25519-java
ExclusiveArch: %{java_arches} noarch
- edk2
ExclusiveArch: x86_64 aarch64 riscv64
- efibootmgr
ExclusiveArch: %{efi}
- efifs
ExclusiveArch: %{efi}
- efitools
ExclusiveArch: %{efi}
- efivar
ExclusiveArch: %{efi}
- elk
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- emacs-slime
ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64
- embree
ExclusiveArch: aarch64 x86_64
- embree3
ExclusiveArch: aarch64 x86_64
- enjarify
ExclusiveArch: %{java_arches} noarch
- enki
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
- envytools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- eric
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
- erlang-corba
ExclusiveArch: %{java_arches}
- esmi_ib_library
ExclusiveArch: x86_64
- eth-tools
ExclusiveArch: x86_64
- exec-maven-plugin
ExclusiveArch: %{java_arches} noarch
- external-editor-revived
ExclusiveArch: %{rust_arches}
- extra-enforcer-rules
ExclusiveArch: %{java_arches} noarch
- fasterxml-oss-parent
ExclusiveArch: %{java_arches} noarch
- fb303
ExclusiveArch: x86_64 aarch64 ppc64le
- fbthrift
ExclusiveArch: x86_64 aarch64 ppc64le
- fcitx-libpinyin
ExclusiveArch: %{qt5_qtwebengine_arches}
- fedora-dockerfiles
ExclusiveArch: %{go_arches}
- felix-parent
ExclusiveArch: %{java_arches} noarch
- felix-utils
ExclusiveArch: %{java_arches} noarch
- fernflower
ExclusiveArch: %{java_arches} noarch
- fes
ExclusiveArch: %{ix86} x86_64
- filedrop
ExclusiveArch: %{java_arches} noarch
- firecracker
ExclusiveArch: aarch64 x86_64
- fishbowl
ExclusiveArch: %{java_arches} noarch
- fizz
ExclusiveArch: x86_64 aarch64 ppc64le
- flexmark-java
ExclusiveArch: noarch %{java_arches}
- flocq
ExclusiveArch: %{ocaml_native_compiler}
- florist
ExclusiveArch: %{GPRbuild_arches}
- fluent-bit
ExclusiveArch: x86_64 aarch64
- flute
ExclusiveArch: %{java_arches} noarch
- folly
ExclusiveArch: x86_64 aarch64 ppc64le
- fop
ExclusiveArch: %{java_arches} noarch
- forge-parent
ExclusiveArch: %{java_arches} noarch
- fpc
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc64le
- frama-c
ExclusiveArch: %{ocaml_native_compiler}
- freecol
ExclusiveArch: %{java_arches} noarch
- freemarker
ExclusiveArch: %{java_arches} noarch
- freerouting
ExclusiveArch: %{java_arches} noarch
- frescobaldi
ExclusiveArch: %{qt5_qtwebengine_arches}
- frysk
ExclusiveArch: x86_64 ppc64
- fuse-overlayfs
ExclusiveArch: %{arm64} ppc64le s390x x86_64
- fusesource-pom
ExclusiveArch: %{java_arches} noarch
- fwts
ExclusiveArch: x86_64 %{arm} aarch64 s390x riscv64 %{power64}
- fwupd-efi
ExclusiveArch: x86_64 aarch64
- ga
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- gap
ExclusiveArch: %{gap_arches}
- gap-pkg-ace
ExclusiveArch: %{gap_arches}
- gap-pkg-aclib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-alnuth
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-atlasrep
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-autodoc
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-automata
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-autpgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-browse
ExclusiveArch: %{gap_arches}
- gap-pkg-caratinterface
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-circle
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-cohomolo
ExclusiveArch: %{gap_arches}
- gap-pkg-congruence
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-corelg
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crime
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crisp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crypting
ExclusiveArch: %{gap_arches}
- gap-pkg-cryst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crystcat
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-ctbllib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-curlinterface
ExclusiveArch: %{gap_arches}
- gap-pkg-cvec
ExclusiveArch: %{gap_arches}
- gap-pkg-datastructures
ExclusiveArch: %{gap_arches}
- gap-pkg-design
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-digraphs
ExclusiveArch: %{gap_arches}
- gap-pkg-edim
ExclusiveArch: %{gap_arches}
- gap-pkg-factint
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-ferret
ExclusiveArch: %{gap_arches}
- gap-pkg-fga
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-fining
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-float
ExclusiveArch: %{gap_arches}
- gap-pkg-format
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-forms
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-fr
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-francy
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-gbnp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-genss
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-grape
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-groupoids
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-grpconst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-guava
ExclusiveArch: %{gap_arches}
- gap-pkg-hap
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-hapcryst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-hecke
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-images
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-io
ExclusiveArch: %{gap_arches}
- gap-pkg-irredsol
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-json
ExclusiveArch: %{gap_arches}
- gap-pkg-jupyterkernel
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-jupyterviz
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-laguna
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liealgdb
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liepring
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liering
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-loops
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-lpres
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-mapclass
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-nautytracesinterface
ExclusiveArch: %{gap_arches}
- gap-pkg-nq
ExclusiveArch: %{gap_arches}
- gap-pkg-openmath
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-orb
ExclusiveArch: %{gap_arches}
- gap-pkg-polenta
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-polycyclic
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-polymaking
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-primgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-profiling
ExclusiveArch: %{gap_arches}
- gap-pkg-qpa
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-quagroup
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-radiroot
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-recog
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-repsn
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-resclasses
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-scscp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-semigroups
ExclusiveArch: %{gap_arches}
- gap-pkg-singular
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sla
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-smallgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-smallsemi
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sonata
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sophus
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-spinsym
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-standardff
ExclusiveArch: %{gap_arches}
- gap-pkg-tomlib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-toric
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-transgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-utils
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-uuid
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-xmod
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-zeromqinterface
ExclusiveArch: %{gap_arches}
- gappalib-coq
ExclusiveArch: %{ocaml_native_compiler}
- gbrainy
ExclusiveArch: %mono_arches
- gdb
ExclusiveArch: %{ix86} x86_64
- gdb-exploitable
ExclusiveArch: x86_64 i386
ExclusiveArch: x86_64 noarch
- gearhead1
ExclusiveArch: %{fpc_arches}
- gearhead2
ExclusiveArch: %{fpc_arches}
- ghdl
ExclusiveArch: %{GNAT_arches}
- ghostwriter
ExclusiveArch: %{qt5_qtwebengine_arches}
- gio-sharp
ExclusiveArch: %mono_arches
- gir-to-d
ExclusiveArch: %{ldc_arches}
- git-octopus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- gitqlient
ExclusiveArch: %{qt5_qtwebengine_arches}
- giver
ExclusiveArch: %{mono_arches}
- gkeyfile-sharp
ExclusiveArch: %mono_arches
- glibc32
ExclusiveArch: x86_64
- glibd
ExclusiveArch: %{ldc_arches}
- gnatcoll
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-bindings
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-db
ExclusiveArch: %{GPRbuild_arches}
- gnome-boxes
ExclusiveArch: x86_64
- gnome-desktop-sharp
ExclusiveArch: %mono_arches
- gnome-do
ExclusiveArch: %mono_arches
- gnome-keyring-sharp
ExclusiveArch: %mono_arches
- gnome-rdp
ExclusiveArch: %{mono_arches}
- gnome-sharp
ExclusiveArch: %mono_arches
- gnome-subtitles
ExclusiveArch: %mono_arches
- gnu-efi
ExclusiveArch: %{efi}
- go-bindata
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- godep
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang
ExclusiveArch: %{golang_arches}
- google-gson
ExclusiveArch: %{java_arches} noarch
- google-guice
ExclusiveArch: %{java_arches} noarch
- gotun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: x86_64
- goverlay
ExclusiveArch: %{fpc_arches}
- gprbuild
ExclusiveArch: %{GPRbuild_arches}
- gprolog
ExclusiveArch: x86_64 %{ix86} ppc alpha aarch64
- grafana
ExclusiveArch: %{grafana_arches}
- grafana-pcp
ExclusiveArch: %{grafanapcp_arches}
- gtk-sharp-beans
ExclusiveArch: %mono_arches
- gtk-sharp2
ExclusiveArch: %mono_arches
- gtk-sharp3
ExclusiveArch: %{mono_arches}
- gtkd
ExclusiveArch: %{ldc_arches}
- guava
ExclusiveArch: %{java_arches} noarch
- gudev-sharp
ExclusiveArch: %mono_arches
- guestfs-tools
ExclusiveArch: %{kernel_arches}
- gvisor-tap-vsock
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- hamcrest
ExclusiveArch: %{java_arches} noarch
- harec
ExclusiveArch: x86_64 aarch64
- hawtjni
ExclusiveArch: %{java_arches} noarch
- hedgewars
ExclusiveArch: %{fpc_arches}
- hibernate-jpa-2.0-api
ExclusiveArch: %{java_arches} noarch
- hid4java
ExclusiveArch: %{java_arches} noarch
- hipblas
ExclusiveArch: x86_64
- hipcub
ExclusiveArch: x86_64
- hipify
ExclusiveArch: x86_64
- hsakmt
ExclusiveArch: x86_64 aarch64 ppc64le
- httpcomponents-client
ExclusiveArch: %{java_arches} noarch
- httpcomponents-core
ExclusiveArch: %{java_arches} noarch
- httpcomponents-project
ExclusiveArch: %{java_arches} noarch
- hyena
ExclusiveArch: %{mono_arches}
- hyperscan
ExclusiveArch: x86_64
- hyperv-daemons
ExclusiveArch: i686 x86_64 aarch64
- icaro
ExclusiveArch: %{ix86} x86_64 noarch
- icedtea-web
ExclusiveArch: %{java_arches}
- icu4j
ExclusiveArch: %{java_arches} noarch
- imagej
ExclusiveArch: %{java_arches} noarch
- imhex
ExclusiveArch: x86_64 %{arm64}
- imvirt
ExclusiveArch: %{ix86} x86_64 ia64
- indistarter
ExclusiveArch: %{fpc_arches}
- infinipath-psm
ExclusiveArch: x86_64
- intel-cm-compiler
ExclusiveArch: i686 x86_64
- intel-cmt-cat
ExclusiveArch: x86_64
- intel-compute-runtime
ExclusiveArch: x86_64
- intel-gmmlib
ExclusiveArch: x86_64 i686
- intel-igc
ExclusiveArch: x86_64
- intel-ipp-crypto-mb
ExclusiveArch: x86_64
- intel-ipsec-mb
ExclusiveArch: x86_64
- intel-mediasdk
ExclusiveArch: x86_64
- intel-undervolt
ExclusiveArch: i386 x86_64
- ioport
ExclusiveArch: %{ix86} x86_64
- ipmctl
ExclusiveArch: x86_64
- ispc
ExclusiveArch: x86_64 aarch64
- iucode-tool
ExclusiveArch: %{ix86} x86_64
- iyfct
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- jFormatString
ExclusiveArch: %{java_arches} noarch
- jackson-annotations
ExclusiveArch: %{java_arches} noarch
- jackson-bom
ExclusiveArch: %{java_arches} noarch
- jackson-core
ExclusiveArch: %{java_arches} noarch
- jackson-databind
ExclusiveArch: %{java_arches} noarch
- jackson-dataformats-binary
ExclusiveArch: %{java_arches} noarch
- jackson-dataformats-text
ExclusiveArch: %{java_arches} noarch
- jackson-jaxrs-providers
ExclusiveArch: %{java_arches} noarch
- jackson-modules-base
ExclusiveArch: %{java_arches} noarch
- jackson-parent
ExclusiveArch: %{java_arches} noarch
- jacoco
ExclusiveArch: %{java_arches} noarch
- jacop
ExclusiveArch: %{java_arches} noarch
- jakarta-activation
ExclusiveArch: %{java_arches} noarch
- jakarta-activation1
ExclusiveArch: %{java_arches} noarch
- jakarta-annotations
ExclusiveArch: %{java_arches} noarch
- jakarta-el
ExclusiveArch: %{java_arches} noarch
- jakarta-interceptors
ExclusiveArch: %{java_arches} noarch
- jakarta-json
ExclusiveArch: %{java_arches} noarch
- jakarta-mail
ExclusiveArch: %{java_arches} noarch
- jakarta-mail1
ExclusiveArch: %{java_arches} noarch
- jakarta-oro
ExclusiveArch: %{java_arches} noarch
- jakarta-saaj
ExclusiveArch: %{java_arches} noarch
- jakarta-server-pages
ExclusiveArch: %{java_arches} noarch
- jakarta-servlet
ExclusiveArch: %{java_arches} noarch
- jakarta-xml-ws
ExclusiveArch: %{java_arches} noarch
- janino
ExclusiveArch: %{java_arches} noarch
- jansi
ExclusiveArch: %{java_arches}
- jansi-native
ExclusiveArch: %{java_arches}
- jansi1
ExclusiveArch: %{java_arches} noarch
- java-1.8.0-openjdk
ExclusiveArch: %{java_arches}
- java-1.8.0-openjdk-aarch32
ExclusiveArch: %{arm}
- java-1.8.0-openjdk-portable
ExclusiveArch: %{java_arches}
- java-11-openjdk
ExclusiveArch: %{java_arches}
- java-11-openjdk-portable
ExclusiveArch: %{java_arches}
- java-17-openjdk
ExclusiveArch: %{java_arches}
- java-17-openjdk-portable
ExclusiveArch: %{java_arches}
- java-diff-utils
ExclusiveArch: %{java_arches} noarch
- java-dirq
ExclusiveArch: %{java_arches} noarch
- java-jd-decompiler
ExclusiveArch: %{java_arches} noarch
- java-latest-openjdk
ExclusiveArch: %{java_arches}
- java-latest-openjdk-portable
ExclusiveArch: %{java_arches}
- java-runtime-decompiler
ExclusiveArch: %{java_arches} noarch
- java-scrypt
ExclusiveArch: %{java_arches} noarch
- java_cup
ExclusiveArch: %{java_arches} noarch
- javacc
ExclusiveArch: %{java_arches} noarch
- javacc-maven-plugin
ExclusiveArch: %{java_arches} noarch
- javaewah
ExclusiveArch: %{java_arches} noarch
- javapackages-bootstrap
ExclusiveArch: %{java_arches}
- javaparser
ExclusiveArch: %{java_arches} noarch
- javapoet
ExclusiveArch: %{java_arches} noarch
- javassist
ExclusiveArch: %{java_arches} noarch
- jaxb
ExclusiveArch: %{java_arches} noarch
- jaxb-api
ExclusiveArch: %{java_arches} noarch
- jaxb-api2
ExclusiveArch: %{java_arches} noarch
- jaxb-dtd-parser
ExclusiveArch: %{java_arches} noarch
- jaxb-fi
ExclusiveArch: %{java_arches} noarch
- jaxb-istack-commons
ExclusiveArch: %{java_arches} noarch
- jaxb-stax-ex
ExclusiveArch: %{java_arches} noarch
- jaxen
ExclusiveArch: %{java_arches} noarch
- jboss-jaxrs-2.0-api
ExclusiveArch: %{java_arches} noarch
- jboss-logging
ExclusiveArch: %{java_arches} noarch
- jboss-logging-tools
ExclusiveArch: %{java_arches} noarch
- jboss-parent
ExclusiveArch: %{java_arches} noarch
- jchardet
ExclusiveArch: %{java_arches} noarch
- jcip-annotations
ExclusiveArch: %{java_arches} noarch
- jctools
ExclusiveArch: %{java_arches} noarch
- jcuber
ExclusiveArch: %{java_arches} noarch
- jdeparser
ExclusiveArch: %{java_arches} noarch
- jdepend
ExclusiveArch: %{java_arches} noarch
- jdependency
ExclusiveArch: %{java_arches} noarch
- jdom
ExclusiveArch: %{java_arches} noarch
- jdom2
ExclusiveArch: %{java_arches} noarch
- jedit
ExclusiveArch: %{java_arches} noarch
- jericho-html
ExclusiveArch: %{java_arches} noarch
- jetbrains-annotations
ExclusiveArch: noarch %{java_arches}
- jetty
ExclusiveArch: %{java_arches} noarch
- jflex
ExclusiveArch: %{java_arches} noarch
- jfreechart
ExclusiveArch: %{java_arches} noarch
- jgit
ExclusiveArch: %{java_arches} noarch
- jglobus
ExclusiveArch: %{java_arches} noarch
- jgoodies-common
ExclusiveArch: %{java_arches} noarch
- jgoodies-forms
ExclusiveArch: %{java_arches} noarch
- jgoodies-looks
ExclusiveArch: %{java_arches} noarch
- jigawatts
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- jline
ExclusiveArch: %{java_arches}
- jline2
ExclusiveArch: %{java_arches} noarch
- jmock
ExclusiveArch: %{java_arches} noarch
- jmol
ExclusiveArch: %{java_arches} noarch
- jna
ExclusiveArch: %{java_arches}
- jneuroml-core
ExclusiveArch: %{java_arches} noarch
- jni-inchi
ExclusiveArch: %{java_arches}
- jol
ExclusiveArch: %{java_arches} noarch
- jolokia-jvm-agent
ExclusiveArch: %{java_arches} noarch
- jopt-simple
ExclusiveArch: %{java_arches} noarch
- jorbis
ExclusiveArch: %{java_arches} noarch
- jowl
ExclusiveArch: %{nodejs_arches} noarch
- jpanoramamaker
ExclusiveArch: %{java_arches} noarch
- jsch
ExclusiveArch: %{java_arches} noarch
- jsch-agent-proxy
ExclusiveArch: %{java_arches} noarch
- json_simple
ExclusiveArch: %{java_arches} noarch
- jsoup
ExclusiveArch: %{java_arches} noarch
- jsr-305
ExclusiveArch: %{java_arches} noarch
- jss
ExclusiveArch: %{java_arches}
- jssc
ExclusiveArch: %{java_arches}
- jtidy
ExclusiveArch: %{java_arches} noarch
- julia
ExclusiveArch: x86_64
- junit
ExclusiveArch: %{java_arches} noarch
- junit5
ExclusiveArch: %{java_arches} noarch
- juniversalchardet
ExclusiveArch: %{java_arches} noarch
- jzlib
ExclusiveArch: %{java_arches} noarch
- kaidan
ExclusiveArch: %{qt5_qtwebengine_arches}
- kchmviewer
ExclusiveArch: %{qt5_qtwebengine_arches}
- kernel
ExclusiveArch: noarch x86_64 s390x aarch64 ppc64le
ExclusiveArch: noarch i386 i686 x86_64 s390x aarch64 ppc64le
- keylime-agent-rust
ExclusiveArch: %{rust_arches}
- keyring-ima-signer
ExclusiveArch: %{rust_arches}
- kf5-akonadi-search
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-audiocd-kio
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kblog
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarcore
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarutils
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kitinerary
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-ktnef
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-libkdcraw
ExclusiveArch: x86_64 ppc64le %{arm}
- khelpcenter
ExclusiveArch: %{qt6_qtwebengine_arches}
- kicad
ExclusiveArch: x86_64 aarch64 ppc64le
- kiwix-desktop
ExclusiveArch: %{qt5_qtwebengine_arches}
- knot-resolver
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- knotes
ExclusiveArch: x86_64 %{arm}
- kubernetes
ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm}
- laf-plugin
ExclusiveArch: %{java_arches} noarch
- lazarus
ExclusiveArch: %{fpc_arches}
- lazpaint
ExclusiveArch: %{fpc_arches}
- ldapjdk
ExclusiveArch: %{java_arches} noarch
- ldc
ExclusiveArch: %{ldc_arches} ppc64le
- ldc1.32
ExclusiveArch: %{ldc_arches} ppc64le
- libbase
ExclusiveArch: %{java_arches} noarch
- libclc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x
- libcxl
ExclusiveArch: %{power64}
- libdfp
ExclusiveArch: ppc ppc64 ppc64le s390 s390x x86_64
- libdispatch
ExclusiveArch: x86_64 aarch64 ppc64le
- libfonts
ExclusiveArch: %{java_arches} noarch
- libformula
ExclusiveArch: %{java_arches} noarch
- libguestfs
ExclusiveArch: %{kernel_arches}
- libica
ExclusiveArch: s390 s390x
- libipt
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- libkgapi
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- libkrun
ExclusiveArch: x86_64 aarch64
- libkrunfw
ExclusiveArch: x86_64 aarch64
- liblayout
ExclusiveArch: %{java_arches} noarch
- libloader
ExclusiveArch: %{java_arches} noarch
- libnxz
ExclusiveArch: ppc64le
- libocxl
ExclusiveArch: ppc64le
- libpsm2
ExclusiveArch: x86_64
- libquentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- libreoffice-TexMaths
ExclusiveArch: %{java_arches}
- librepository
ExclusiveArch: %{java_arches} noarch
- libretro-desmume2015
ExclusiveArch: i686 x86_64
- librtas
ExclusiveArch: %{power64}
- libserializer
ExclusiveArch: %{java_arches} noarch
- libservicelog
ExclusiveArch: ppc %{power64}
- libsmbios
ExclusiveArch: x86_64 %{ix86}
- libunicode
ExclusiveArch: x86_64 aarch64
- libunwind
ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64
- libva-nvidia-driver
ExclusiveArch: %{x86_64} %{ix86} %{arm64} ppc64le
- libvirt-java
ExclusiveArch: %{java_arches} noarch
- libvma
ExclusiveArch: x86_64 ppc64le ppc64 aarch64
- libvmi
ExclusiveArch: x86_64
- libvpd
ExclusiveArch: %{power64}
- libxsmm
ExclusiveArch: x86_64
- libzdnn
ExclusiveArch: s390x
- libzfcphbaapi
ExclusiveArch: s390 s390x
- libzpc
ExclusiveArch: s390x
- llhttp
ExclusiveArch: %{nodejs_arches}
- log4j
ExclusiveArch: %{java_arches} noarch
- log4net
ExclusiveArch: %mono_arches
- lrmi
ExclusiveArch: %{ix86}
- lsvpd
ExclusiveArch: %{power64}
- luajit
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- lucene
ExclusiveArch: %{java_arches} noarch
- lujavrite
ExclusiveArch: %{java_arches}
- luxcorerender
ExclusiveArch: x86_64
- mactel-boot
ExclusiveArch: x86_64
- magicmirror
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-airnow
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-onthisday
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-singlestock
ExclusiveArch: %{nodejs_arches} noarch
- manifest-tool
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- mariadb-java-client
ExclusiveArch: %{java_arches} noarch
- marked
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- matrix-synapse
ExclusiveArch: %{rust_arches}
- maui-mauikit
ExclusiveArch: %{ix86} s390x aarch64 x86_64
- maven
ExclusiveArch: %{java_arches} noarch
- maven-antrun-plugin
ExclusiveArch: %{java_arches} noarch
- maven-archetype
ExclusiveArch: %{java_arches} noarch
- maven-archiver
ExclusiveArch: %{java_arches} noarch
- maven-artifact-transfer
ExclusiveArch: %{java_arches} noarch
- maven-assembly-plugin
ExclusiveArch: %{java_arches} noarch
- maven-bundle-plugin
ExclusiveArch: %{java_arches} noarch
- maven-clean-plugin
ExclusiveArch: %{java_arches} noarch
- maven-common-artifact-filters
ExclusiveArch: %{java_arches} noarch
- maven-compiler-plugin
ExclusiveArch: %{java_arches} noarch
- maven-dependency-analyzer
ExclusiveArch: %{java_arches} noarch
- maven-dependency-plugin
ExclusiveArch: %{java_arches} noarch
- maven-dependency-tree
ExclusiveArch: %{java_arches} noarch
- maven-doxia
ExclusiveArch: %{java_arches} noarch
- maven-doxia-sitetools
ExclusiveArch: %{java_arches} noarch
- maven-enforcer
ExclusiveArch: %{java_arches} noarch
- maven-file-management
ExclusiveArch: %{java_arches} noarch
- maven-filtering
ExclusiveArch: %{java_arches} noarch
- maven-invoker
ExclusiveArch: %{java_arches} noarch
- maven-invoker-plugin
ExclusiveArch: %{java_arches} noarch
- maven-jar-plugin
ExclusiveArch: %{java_arches} noarch
- maven-mapping
ExclusiveArch: %{java_arches} noarch
- maven-native
ExclusiveArch: %{java_arches} noarch
- maven-parent
ExclusiveArch: %{java_arches} noarch
- maven-patch-plugin
ExclusiveArch: %{java_arches} noarch
- maven-plugin-testing
ExclusiveArch: %{java_arches} noarch
- maven-plugin-tools
ExclusiveArch: %{java_arches} noarch
- maven-remote-resources-plugin
ExclusiveArch: %{java_arches} noarch
- maven-reporting-api
ExclusiveArch: %{java_arches} noarch
- maven-reporting-impl
ExclusiveArch: %{java_arches} noarch
- maven-resolver
ExclusiveArch: %{java_arches} noarch
- maven-resources-plugin
ExclusiveArch: %{java_arches} noarch
- maven-script-interpreter
ExclusiveArch: %{java_arches} noarch
- maven-shade-plugin
ExclusiveArch: %{java_arches} noarch
- maven-shared-incremental
ExclusiveArch: %{java_arches} noarch
- maven-shared-io
ExclusiveArch: %{java_arches} noarch
- maven-shared-utils
ExclusiveArch: %{java_arches} noarch
- maven-source-plugin
ExclusiveArch: %{java_arches} noarch
- maven-surefire
ExclusiveArch: %{java_arches} noarch
- maven-verifier
ExclusiveArch: %{java_arches} noarch
- maven-verifier-plugin
ExclusiveArch: %{java_arches} noarch
- maven-wagon
ExclusiveArch: %{java_arches} noarch
- maxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- mbpfan
ExclusiveArch: x86_64
- mcelog
ExclusiveArch: i686 x86_64
- mcrouter
ExclusiveArch: x86_64 aarch64 ppc64le
- mecab-java
ExclusiveArch: %java_arches
- mediaconch
ExclusiveArch: %{qt5_qtwebengine_arches}
- mellowplayer
ExclusiveArch: %{qt5_qtwebengine_arches}
- memkind
ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64
- memtest86+
ExclusiveArch: x86_64 %{ix86}
- merkuro
ExclusiveArch: %{qt5_qtwebengine_arches}
- microcode_ctl
ExclusiveArch: %{ix86} x86_64
- micropython
ExclusiveArch: %{arm} x86_64 riscv64
- miglayout
ExclusiveArch: %{java_arches} noarch
- mine_detector
ExclusiveArch: %{GPRbuild_arches}
- minetest
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mingw-libidn2
ExclusiveArch: %{ix86} x86_64 %{arm}
- mingw-wine-gecko
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- mkbootdisk
ExclusiveArch: %{ix86} sparc sparc64 x86_64
- moby-engine
ExclusiveArch: %{golang_arches}
- mockito
ExclusiveArch: %{java_arches} noarch
- mod_mono
ExclusiveArch: %mono_arches
- modello
ExclusiveArch: %{java_arches} noarch
- moditect
ExclusiveArch: %{java_arches} noarch
- module-build-service
ExclusiveArch: %{ix86} x86_64 noarch
- modulemaker-maven-plugin
ExclusiveArch: %{java_arches} noarch
- mojo-executor
ExclusiveArch: %{java_arches} noarch
- mojo-parent
ExclusiveArch: %{java_arches} noarch
- mokutil
ExclusiveArch: %{ix86} x86_64 aarch64 %{arm}
- mono
ExclusiveArch: %mono_arches
- mono-addins
ExclusiveArch: %mono_arches
- mono-basic
ExclusiveArch: %{mono_arches}
- mono-bouncycastle
ExclusiveArch: %mono_arches
- mono-cecil
ExclusiveArch: %mono_arches
- mono-cecil-flowanalysis
ExclusiveArch: %mono_arches
- mono-reflection
ExclusiveArch: %mono_arches
- mono-tools
ExclusiveArch: %mono_arches
- mono-zeroconf
ExclusiveArch: %mono_arches
- monodevelop
ExclusiveArch: %mono_arches
- monodevelop-debugger-gdb
ExclusiveArch: %{mono_arches}
- mrrescue
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- msr-tools
ExclusiveArch: %{ix86} x86_64
- msv
ExclusiveArch: %{java_arches} noarch
- mvfst
ExclusiveArch: x86_64 aarch64 ppc64le
- mxparser
ExclusiveArch: %{java_arches} noarch
- mysql-connector-java
ExclusiveArch: %{java_arches} noarch
- mysql-connector-net
ExclusiveArch: %{mono_arches}
- naev
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- naga
ExclusiveArch: %{java_arches} noarch
- nant
ExclusiveArch: %mono_arches
- nativejit
ExclusiveArch: x86_64
- nbc
ExclusiveArch: %{fpc_arches}
- nbdkit
ExclusiveArch: x86_64
- ndesk-dbus
ExclusiveArch: %{mono_arches}
- ndesk-dbus-glib
ExclusiveArch: %{mono_arches}
- nekohtml
ExclusiveArch: %{java_arches} noarch
- netavark
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- newtonsoft-json
ExclusiveArch: %{mono_arches}
- nodejs-acorn-object-spread
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-backbone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bash-language-server
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buble
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cjs-module-lexer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-generic-pool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-less
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-linefix
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nodemon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-packaging
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-replace-require-self
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-underscore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-undici
ExclusiveArch: %{nodejs_arches} noarch
- nodejs18
ExclusiveArch: %{nodejs_arches}
- nodejs20
ExclusiveArch: %{nodejs_arches}
- nom-tam-fits
ExclusiveArch: %{java_arches} noarch
- notify-sharp
ExclusiveArch: %{mono_arches}
- notify-sharp3
ExclusiveArch: %{mono_arches}
- nuget
ExclusiveArch: %{mono_arches}
- numatop
ExclusiveArch: x86_64 ppc64le
- nunit
ExclusiveArch: %{mono_arches}
- nunit2
ExclusiveArch: %{mono_arches}
- nvml
ExclusiveArch: x86_64 ppc64le
- objectweb-asm
ExclusiveArch: %{java_arches} noarch
- objenesis
ExclusiveArch: %{java_arches} noarch
- obs-service-rust2rpm
ExclusiveArch: %{rust_arches} noarch
- oci-seccomp-bpf-hook
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
ExclusiveArch: %{golang_arches_future}
- oidn
ExclusiveArch: x86_64
- olpc-utils
ExclusiveArch: %{ix86} %{arm}
- oneVPL
ExclusiveArch: x86_64
- oneVPL-intel-gpu
ExclusiveArch: x86_64
- oneapi-level-zero
ExclusiveArch: x86_64
- onednn
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- onedrive
ExclusiveArch: %{ldc_arches}
- ongres-scram
ExclusiveArch: %{java_arches} noarch
- ongres-stringprep
ExclusiveArch: %{java_arches} noarch
- opae
ExclusiveArch: x86_64
- opal-prd
ExclusiveArch: ppc64le
- open-vm-tools
ExclusiveArch: x86_64 aarch64
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: x86_64
- openblas
ExclusiveArch: %{openblas_arches}
- openjdk-asmtools
ExclusiveArch: %{java_arches} noarch
- openjdk-asmtools7
ExclusiveArch: %{java_arches} noarch
- openjfx
ExclusiveArch: %{java_arches}
- openjfx8
ExclusiveArch: x86_64
- openlibm
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64}
- openms
ExclusiveArch: %{qt5_qtwebengine_arches}
- openni
ExclusiveArch: x86_64 %{arm}
- openni-primesense
ExclusiveArch: %{ix86} x86_64 %{arm}
- openoffice.org-diafilter
ExclusiveArch: %{java_arches}
- openpgl
ExclusiveArch: aarch64 x86_64
- openssl-ibmca
ExclusiveArch: s390 s390x
- openstack-java-sdk
ExclusiveArch: %{java_arches} noarch
- opentest4j
ExclusiveArch: %{java_arches} noarch
- openvkl
ExclusiveArch: aarch64 x86_64
- optee_client
ExclusiveArch: aarch64
- optee_os
ExclusiveArch: aarch64
- options
ExclusiveArch: %{java_arches} noarch
- orthorobot
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- osgi-annotation
ExclusiveArch: %{java_arches} noarch
- osgi-compendium
ExclusiveArch: %{java_arches} noarch
- osgi-core
ExclusiveArch: %{java_arches} noarch
- pacemaker
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64 %{arm}
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- pageedit
ExclusiveArch: %{qt5_qtwebengine_arches}
- parserng
ExclusiveArch: %{java_arches} noarch
- pasdoc
ExclusiveArch: %{fpc_arches}
- pcc
ExclusiveArch: %{ix86} x86_64
- pcfi
ExclusiveArch: %{java_arches} noarch
- pcm
ExclusiveArch: %{ix86} x86_64
- pcmciautils
ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm}
- pdbg
ExclusiveArch: ppc64le
- pdfbox
ExclusiveArch: %{java_arches} noarch
- pdfmod
ExclusiveArch: %mono_arches
- pdftk-java
ExclusiveArch: %{java_arches} noarch
- pentaho-libxml
ExclusiveArch: %{java_arches} noarch
- pentaho-reporting-flow-engine
ExclusiveArch: %{java_arches} noarch
- perl-Dumbbench
ExclusiveArch: %{ix86} x86_64 noarch
- perl-Parse-DMIDecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- pesign
ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm}
- pesign-test-app
ExclusiveArch: x86_64
- picocli
ExclusiveArch: %{java_arches} noarch
- pinta
ExclusiveArch: %mono_arches
- pioneer
ExclusiveArch: %{ix86} x86_64
- plantuml
ExclusiveArch: %{java_arches} noarch
- plasma-dialer
ExclusiveArch: %{java_arches}
- playonlinux
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- plexus-archiver
ExclusiveArch: %{java_arches} noarch
- plexus-build-api
ExclusiveArch: %{java_arches} noarch
- plexus-build-api0
ExclusiveArch: %{java_arches} noarch
- plexus-cipher
ExclusiveArch: %{java_arches} noarch
- plexus-classworlds
ExclusiveArch: %{java_arches} noarch
- plexus-compiler
ExclusiveArch: %{java_arches} noarch
- plexus-component-api
ExclusiveArch: %{java_arches} noarch
- plexus-components-pom
ExclusiveArch: %{java_arches} noarch
- plexus-containers
ExclusiveArch: %{java_arches} noarch
- plexus-i18n
ExclusiveArch: %{java_arches} noarch
- plexus-interpolation
ExclusiveArch: %{java_arches} noarch
- plexus-io
ExclusiveArch: %{java_arches} noarch
- plexus-languages
ExclusiveArch: %{java_arches} noarch
- plexus-pom
ExclusiveArch: %{java_arches} noarch
- plexus-resources
ExclusiveArch: %{java_arches} noarch
- plexus-sec-dispatcher
ExclusiveArch: %{java_arches} noarch
- plexus-utils
ExclusiveArch: %{java_arches} noarch
- plexus-velocity
ExclusiveArch: %{java_arches} noarch
- podman
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- poppler-sharp
ExclusiveArch: %mono_arches
- popub
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- postgresql-jdbc
ExclusiveArch: %{java_arches} noarch
- powerpc-utils
ExclusiveArch: ppc %{power64}
- powerstat
ExclusiveArch: %{ix86} x86_64
- ppc64-diag
ExclusiveArch: ppc %{power64}
- procyon
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
- proguard
ExclusiveArch: %{java_arches} noarch
- prometheus-jmx-exporter
ExclusiveArch: %{java_arches} noarch
- prometheus-simpleclient-java
ExclusiveArch: %{java_arches} noarch
- proxygen
ExclusiveArch: x86_64 aarch64 ppc64le
- pveclib
ExclusiveArch: ppc %{power64}
- pyqtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- python-ast-monitor
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
- python-cryptography
ExclusiveArch: %{rust_arches}
- python-damo
ExclusiveArch: x86_64 aarch64 ppc64le s390x noarch
- python-etcd
ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- python-javaobj
ExclusiveArch: %{java_arches} noarch
- python-jnius
ExclusiveArch: %{java_arches}
- python-jupyter-polymake
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- python-openoffice
ExclusiveArch: noarch x86_64
- python-pyahocorasick
ExclusiveArch: x86_64 %{arm64} ppc64le
- python-pymoc
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-pyqt6-webengine
ExclusiveArch: aarch64 x86_64
- q4wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- qatengine
ExclusiveArch: x86_64
- qatzip
ExclusiveArch: x86_64
- qbe
ExclusiveArch: x86_64 aarch64
- qcint
ExclusiveArch: x86_64
- qclib
ExclusiveArch: s390 s390x
- qdox
ExclusiveArch: %{java_arches} noarch
- qemu-sanity-check
ExclusiveArch: %{kernel_arches}
- qevercloud
ExclusiveArch: %{qt5_qtwebengine_arches}
- qmapshack
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt4pas
ExclusiveArch: %{fpc_arches}
- qt5-qtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt6-qtwebengine
ExclusiveArch: aarch64 x86_64
- qt6-qtwebview
ExclusiveArch: aarch64 x86_64
- quantum-espresso
ExclusiveArch: x86_64 %{ix86} aarch64 %{power64}
- quentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- rEFInd
ExclusiveArch: %{efi}
- rachota
ExclusiveArch: %{java_arches} noarch
- rear
ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64
- reflections
ExclusiveArch: %{java_arches} noarch
- reg
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- regexp
ExclusiveArch: %{java_arches} noarch
- relaxng-datatype-java
ExclusiveArch: %{java_arches} noarch
- replacer
ExclusiveArch: %{java_arches} noarch
- reptyr
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- rescene
ExclusiveArch: %{mono_arches}
- resteasy
ExclusiveArch: %{java_arches} noarch
- restool
ExclusiveArch: aarch64
- restsharp
ExclusiveArch: %{mono_arches}
- retsnoop
ExclusiveArch: %{rust_arches}
- rhino
ExclusiveArch: %{java_arches} noarch
- river
ExclusiveArch: %{zig_arches}
- rkcommon
ExclusiveArch: x86_64 aarch64
- rocalution
ExclusiveArch: x86_64
- rocblas
ExclusiveArch: x86_64
- rocclr
ExclusiveArch: x86_64
- rocm-compilersupport
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-device-libs
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-rpm-macros
ExclusiveArch: x86_64
- rocm-runtime
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-smi
ExclusiveArch: x86_64 aarch64 ppc64le
- rocminfo
ExclusiveArch: x86_64 aarch64 ppc64le
- rocprim
ExclusiveArch: x86_64
- rocrand
ExclusiveArch: x86_64
- rocsparse
ExclusiveArch: x86_64
- rocthrust
ExclusiveArch: x86_64
- rpm-ostree
ExclusiveArch: %{rust_arches}
- rr
ExclusiveArch: %{ix86} x86_64 aarch64
- rssguard
ExclusiveArch: %{qt6_qtwebengine_arches}
- rstudio
ExclusiveArch: %{java_arches}
- rsyntaxtextarea
ExclusiveArch: %{java_arches} noarch
- rubygem-childprocess
ExclusiveArch: %{ix86} x86_64 noarch
- runc
ExclusiveArch: %{golang_arches_future}
- rundoc
ExclusiveArch: %{java_arches} noarch
- rust
ExclusiveArch: %{rust_arches}
- rust-brotli
ExclusiveArch: %{rust_arches}
- rust-compress-tools
ExclusiveArch: %{rust_arches}
- rust-coreos-installer
ExclusiveArch: %{rust_arches}
- rust-ctr
ExclusiveArch: %{rust_arches}
- rust-dashmap4
ExclusiveArch: %{rust_arches}
- rust-deflate
ExclusiveArch: %{rust_arches}
- rust-deflate0.8
ExclusiveArch: %{rust_arches}
- rust-drg
ExclusiveArch: %{rust_arches}
- rust-epoll
ExclusiveArch: %{rust_arches}
- rust-getch
ExclusiveArch: %{rust_arches}
- rust-gzip-header
ExclusiveArch: %{rust_arches}
- rust-hamming
ExclusiveArch: %{rust_arches}
- rust-hidapi
ExclusiveArch: %{rust_arches}
- rust-httparse
ExclusiveArch: %{rust_arches}
- rust-humantime-serde
ExclusiveArch: %{rust_arches}
- rust-hyperlocal
ExclusiveArch: %{rust_arches}
- rust-image0.23
ExclusiveArch: %{rust_arches}
- rust-inflate
ExclusiveArch: %{rust_arches}
- rust-jpeg-decoder0.1
ExclusiveArch: %{rust_arches}
- rust-k9
ExclusiveArch: %{rust_arches}
- rust-krunvm
ExclusiveArch: x86_64 aarch64
- rust-kstring
ExclusiveArch: %{rust_arches}
- rust-kvm-ioctls
ExclusiveArch: x86_64 aarch64
- rust-lebe
ExclusiveArch: %{rust_arches}
- rust-libslirp-sys
ExclusiveArch: %{rust_arches}
- rust-msru
ExclusiveArch: x86_64
- rust-nanorand
ExclusiveArch: %{rust_arches}
- rust-netstat2
ExclusiveArch: %{rust_arches}
- rust-onig
ExclusiveArch: %{rust_arches}
- rust-openat-ext
ExclusiveArch: %{rust_arches}
- rust-os_type
ExclusiveArch: %{rust_arches}
- rust-pager
ExclusiveArch: %{rust_arches}
- rust-pathsearch
ExclusiveArch: %{rust_arches}
- rust-pretty-bytes
ExclusiveArch: %{rust_arches}
- rust-pretty-hex
ExclusiveArch: %{rust_arches}
- rust-primal-bit
ExclusiveArch: %{rust_arches}
- rust-primal-check
ExclusiveArch: %{rust_arches}
- rust-primal-estimate
ExclusiveArch: %{rust_arches}
- rust-procfs0.9
ExclusiveArch: %{rust_arches}
- rust-psl-types
ExclusiveArch: %{rust_arches}
- rust-psm
ExclusiveArch: %{rust_arches}
- rust-pwd
ExclusiveArch: %{rust_arches}
- rust-rand_core
ExclusiveArch: %{rust_arches}
- rust-schemafy_core
ExclusiveArch: %{rust_arches}
- rust-schemafy_lib
ExclusiveArch: %{rust_arches}
- rust-seahash
ExclusiveArch: %{rust_arches}
- rust-serde-big-array
ExclusiveArch: %{rust_arches}
- rust-serde_qs
ExclusiveArch: %{rust_arches}
- rust-serde_yaml0.8
ExclusiveArch: %{rust_arches}
- rust-sev
ExclusiveArch: x86_64
- rust-sevctl
ExclusiveArch: x86_64
- rust-silver
ExclusiveArch: %{rust_arches}
- rust-sinit
ExclusiveArch: %{rust_arches}
- rust-snphost
ExclusiveArch: x86_64
- rust-ssh-key-dir
ExclusiveArch: %{rust_arches}
- rust-stacker
ExclusiveArch: %{rust_arches}
- rust-structopt
ExclusiveArch: %{rust_arches}
- rust-tiff0.6
ExclusiveArch: %{rust_arches}
- rust-totp-lite
ExclusiveArch: %{rust_arches}
- rust-tower-layer
ExclusiveArch: %{rust_arches}
- rust-tpm2-policy
ExclusiveArch: %{rust_arches}
- rust-unicode-normalization
ExclusiveArch: %{rust_arches}
- rust-unicode-xid
ExclusiveArch: %{rust_arches}
- rust-uriparse
ExclusiveArch: %{rust_arches}
- rust-uucore
ExclusiveArch: %{rust_arches}
- rust-varlink_generator
ExclusiveArch: %{rust_arches}
- rust-varlink_parser
ExclusiveArch: %{rust_arches}
- rust-virtio-bindings
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-vmm-sys-util
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-vtparse
ExclusiveArch: %{rust_arches}
- rust-web-ext-native-messaging
ExclusiveArch: %{rust_arches}
- rust-wezterm-color-types
ExclusiveArch: %{rust_arches}
- rust-wezterm-dynamic
ExclusiveArch: %{rust_arches}
- rust-wezterm-dynamic-derive
ExclusiveArch: %{rust_arches}
- rust-zbus1
ExclusiveArch: %{rust_arches}
- rust-zbus_macros1
ExclusiveArch: %{rust_arches}
- rust-zvariant2
ExclusiveArch: %{rust_arches}
- rust-zvariant_derive2
ExclusiveArch: %{rust_arches}
- rutabaga-gfx-ffi
ExclusiveArch: x86_64 aarch64
- sac
ExclusiveArch: %{java_arches} noarch
- safetyblanket
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- sat4j
ExclusiveArch: %{java_arches} noarch
- sbcl
ExclusiveArch: %{ix86} x86_64 aarch64 %{power64}
- sbd
ExclusiveArch: i686 x86_64 s390x aarch64 ppc64le
- sblim-cim-client
ExclusiveArch: %{java_arches} noarch
- sblim-cim-client2
ExclusiveArch: %{java_arches} noarch
- sbsigntools
ExclusiveArch: x86_64 aarch64 %{arm} %{ix86}
- scala
ExclusiveArch: %{java_arches} noarch
- scannotation
ExclusiveArch: %{java_arches} noarch
- sdljava
ExclusiveArch: %{java_arches}
- sdrangel
ExclusiveArch: %{qt5_qtwebengine_arches}
- sdsl-lite
ExclusiveArch: %{power64} x86_64 aarch64
- sdubby
ExclusiveArch: %{efi}
- seabios
ExclusiveArch: x86_64
- seadrive-gui
ExclusiveArch: %{qt5_qtwebengine_arches}
- seafile-client
ExclusiveArch: %{qt5_qtwebengine_arches}
- seamonkey
ExclusiveArch: x86_64
- seqan3
ExclusiveArch: %{power64} x86_64 aarch64
- sequence-library
ExclusiveArch: %{java_arches} noarch
- servicelog
ExclusiveArch: ppc %{power64}
- shaman
ExclusiveArch: %{java_arches} noarch
- sharpfont
ExclusiveArch: %mono_arches
- sharpziplib
ExclusiveArch: %{mono_arches}
- shim
ExclusiveArch: %{efi}
- shim-unsigned-aarch64
ExclusiveArch: aarch64
- shim-unsigned-x64
ExclusiveArch: x86_64
- sigil
ExclusiveArch: %{qt5_qtwebengine_arches}
- sigul
ExclusiveArch: x86_64
- singularity-ce
ExclusiveArch: %{go_arches}
- sisu
ExclusiveArch: %{java_arches} noarch
- sisu-mojos
ExclusiveArch: %{java_arches} noarch
- skopeo
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- skychart
ExclusiveArch: %{fpc_arches}
- slf4j
ExclusiveArch: %{java_arches} noarch
- slirp4netns
ExclusiveArch: %{golang_arches_future}
- snakeyaml
ExclusiveArch: %{java_arches} noarch
- snapd
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x}
- snip
ExclusiveArch: %{java_arches} noarch
- softnet-stat
ExclusiveArch: %{rust_arches}
- soup-sharp
ExclusiveArch: %{mono_arches}
- spacebar
ExclusiveArch: %{java_arches}
- sparkleshare
ExclusiveArch: %{mono_arches}
- spec-version-maven-plugin
ExclusiveArch: %{java_arches} noarch
- spicctrl
ExclusiveArch: %{ix86} x86_64
- spice
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- spice-parent
ExclusiveArch: %{java_arches} noarch
- springlobby
ExclusiveArch: %{ix86} x86_64
- spyder
ExclusiveArch: %{qt5_qtwebengine_arches}
- sqljet
ExclusiveArch: %{java_arches} noarch
- squeekboard
ExclusiveArch: %{rust_arches}
- startdde
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- stats-collect
ExclusiveArch: %{ix86} x86_64 noarch
- statsd
ExclusiveArch: %{nodejs_arches} noarch
- stratis-cli
ExclusiveArch: %{rust_arches} noarch
- stratisd
ExclusiveArch: %{rust_arches}
ExclusiveArch: %{rust_arches}
ExclusiveArch: %{rust_arches}
- string-template-maven-plugin
ExclusiveArch: %{java_arches} noarch
- stringtemplate
ExclusiveArch: %{java_arches} noarch
- stringtemplate4
ExclusiveArch: %{java_arches} noarch
- stripesnoop
ExclusiveArch: %{ix86} x86_64
- subscription-manager-cockpit
ExclusiveArch: %{nodejs_arches} noarch
- supercollider
ExclusiveArch: %{qt5_qtwebengine_arches}
- supermin
ExclusiveArch: %{kernel_arches}
- svnkit
ExclusiveArch: %{java_arches} noarch
- svt-vp9
ExclusiveArch: x86_64
- swift-lang
ExclusiveArch: x86_64 aarch64
- swiftlint
ExclusiveArch: x86_64 aarch64
- swing-layout
ExclusiveArch: %{java_arches} noarch
- sysbench
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64le s390x
- syslinux
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- system-rules
ExclusiveArch: %{java_arches} noarch
- systemd-boot
ExclusiveArch: %efi
- t-digest
ExclusiveArch: %{java_arches} noarch
- taglib-sharp
ExclusiveArch: %{mono_arches}
- tagsoup
ExclusiveArch: %{java_arches} noarch
- tarantool
ExclusiveArch: %{ix86} x86_64
- tboot
ExclusiveArch: %{ix86} x86_64
- tdlib
ExclusiveArch: x86_64 aarch64
- templates_parser
ExclusiveArch: %GPRbuild_arches
- ternimal
ExclusiveArch: %{rust_arches}
- testcloud
ExclusiveArch: %{kernel_arches} noarch
- testng
ExclusiveArch: %{java_arches} noarch
- texlive
ExclusiveArch: %{java_arches} noarch
- thermald
ExclusiveArch: %{ix86} x86_64
- tilix
ExclusiveArch: %{ldc_arches}
- tokodon
ExclusiveArch: %{qt6_qtwebengine_arches}
- tomboy
ExclusiveArch: %{mono_arches}
- tomcat
ExclusiveArch: %{java_arches} noarch
- tomcat-native
ExclusiveArch: %{java_arches}
- tomcat-taglibs-parent
ExclusiveArch: %{java_arches} noarch
- tomcatjss
ExclusiveArch: %{java_arches} noarch
- torbrowser-launcher
ExclusiveArch: %{ix86} x86_64
- treelayout
ExclusiveArch: %{java_arches} noarch
- trilead-ssh2
ExclusiveArch: %{java_arches} noarch
- truth
ExclusiveArch: %{java_arches} noarch
- tuned-profiles-nfv-host-bin
ExclusiveArch: %{ix86} x86_64
- typescript
ExclusiveArch: %{nodejs_arches} noarch
- uClibc
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
- ucx
ExclusiveArch: aarch64 ppc64le x86_64
- uglify-js
ExclusiveArch: %{nodejs_arches} noarch
- umr
ExclusiveArch: x86_64 aarch64 ppc64le
- unetbootin
ExclusiveArch: %{ix86} x86_64
- univocity-parsers
ExclusiveArch: %{java_arches} noarch
- ursa-major
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- usd
ExclusiveArch: aarch64 x86_64
- v8-314
ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64
- vakzination
ExclusiveArch: %{java_arches}
- valgrind
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
- vboot-utils
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- vecmath1.2
ExclusiveArch: %{java_arches} noarch
- velocity
ExclusiveArch: %{java_arches} noarch
- vim-go
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}}
- vim-syntastic
ExclusiveArch: %{java_arches} noarch
- virt-p2v
ExclusiveArch: x86_64
- virt-v2v
ExclusiveArch: x86_64
- virtiofsd
ExclusiveArch: %{rust_arches}
- virtualbox-guest-additions
ExclusiveArch: i686 x86_64
- vkd3d
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- vmaf
ExclusiveArch: x86_64
- voms-api-java
ExclusiveArch: %{java_arches} noarch
- voms-clients-java
ExclusiveArch: %{java_arches} noarch
- vrq
ExclusiveArch: %{ix86} x86_64
- wangle
ExclusiveArch: x86_64 aarch64 ppc64le
- warsow
ExclusiveArch: %{ix86} x86_64 %{arm}
- warsow-data
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{ix86} x86_64 %{arm}
- wasmedge
ExclusiveArch: x86_64 aarch64
- watchman
ExclusiveArch: x86_64 aarch64 ppc64le
- wdt
ExclusiveArch: x86_64 aarch64 ppc64le
- webkit2-sharp
ExclusiveArch: %mono_arches
- weld-parent
ExclusiveArch: %{java_arches} noarch
- why3
ExclusiveArch: %{ocaml_native_compiler}
- widevine-installer
ExclusiveArch: aarch64
- wine
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86}
- wine-dxvk
ExclusiveArch: %{ix86} x86_64
- winetricks
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- ws-commons-util
ExclusiveArch: %{java_arches} noarch
- wsdl4j
ExclusiveArch: %{java_arches} noarch
- wult
ExclusiveArch: x86_64
- wxMaxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
- x2goclient
ExclusiveArch: x86_64
- x86-simd-sort
ExclusiveArch: x86_64
- xalan-j2
ExclusiveArch: %{java_arches} noarch
- xbean
ExclusiveArch: %{java_arches} noarch
- xbyak
ExclusiveArch: x86_64
- xbyak_aarch64
ExclusiveArch: aarch64
- xe-guest-utilities-latest
ExclusiveArch: %{ix86} x86_64
- xen
ExclusiveArch: x86_64 aarch64
- xerces-j2
ExclusiveArch: %{java_arches} noarch
- xgap
ExclusiveArch: %{gap_arches}
- xml-commons-apis
ExclusiveArch: %{java_arches} noarch
- xml-commons-resolver
ExclusiveArch: %{java_arches} noarch
- xml-maven-plugin
ExclusiveArch: %{java_arches} noarch
- xmlada
ExclusiveArch: %{GPRbuild_arches}
- xmlgraphics-commons
ExclusiveArch: %{java_arches} noarch
- xmlpull
ExclusiveArch: %{java_arches} noarch
- xmlstreambuffer
ExclusiveArch: %{java_arches} noarch
- xmlunit
ExclusiveArch: %{java_arches} noarch
- xmvn
ExclusiveArch: %{java_arches} noarch
- xmvn-connector-ivy
ExclusiveArch: %{java_arches} noarch
- xmvn-generator
ExclusiveArch: %{java_arches}
- xnnpack
ExclusiveArch: x86_64 aarch64
- xorg-x11-drv-armsoc
ExclusiveArch: %{arm} aarch64
- xorg-x11-drv-intel
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-openchrome
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vesa
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vmware
ExclusiveArch: %{ix86} x86_64 ia64
- xsp
ExclusiveArch: %mono_arches
- xstream
ExclusiveArch: %{java_arches} noarch
- xz-java
ExclusiveArch: %{java_arches} noarch
- yarnpkg
ExclusiveArch: %{nodejs_arches} noarch
- zcfan
ExclusiveArch: x86_64
- zeal
ExclusiveArch: aarch64 x86_64
- zenon
ExclusiveArch: %{ocaml_native_compiler}
- zeromq-ada
ExclusiveArch: %{GPRbuild_arches}
- zig
ExclusiveArch: %{zig_arches}
- zlib-ada
ExclusiveArch: %{GPRbuild_arches}
- zlib-ng
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- zola
ExclusiveArch: %{rust_arches}
1
0
28 Nov '23
The package rpms/inkscape.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/inkscape.git/commit/?id=afa399ea761…
https://src.fedoraproject.org/cgit/rpms/inkscape.git/commit/?id=6aa10117f87….
Change:
-%ifarch %{ix86}
-ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit 183945798da28b9e06d313b1e3b182042970df7f
Author: Gwyn Ciesla <gwync(a)protonmail.com>
Date: Tue Nov 28 19:35:07 2023 -0600
1.3.2
diff --git a/sources b/sources
index c3ba677..f2dbcec 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
SHA512 (inkscape-1.3.2.tar.xz) = a6da4b676ba3e7f954f95e3916ce78ce358b49c8052795a52d478064ef02eeae0337b0a94e89b9752ea6824a5758d28072c2bbf83f1e9ee28daebd3b0ef87343
+SHA512 (inkscape-1.3.2_2023-11-25_091e20ef0f.tar.xz.sig) = d2a23f6615c4b9cd954613cc946ea444fa41bcb81286c97a11e87c674336b09af5519becb97107b45b0c2026e5d63caf6775af66fa77b199eb0df80b32a53ea9
commit 443c46305cad71ef4ccf4cf077e51dd90c33a666
Author: Gwyn Ciesla <gwync(a)protonmail.com>
Date: Tue Nov 28 19:33:46 2023 -0600
1.3.2
diff --git a/inkscape.spec b/inkscape.spec
index 72b7e5c..9662735 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -22,7 +22,7 @@
%global shortcommit %(c=%{commit}; echo ${c:0:10})
Name: inkscape
-Version: 1.3.1
+Version: 1.3.2
Release: %autorelease
Summary: Vector-based drawing program using SVG
@@ -30,8 +30,8 @@ License: GPL-2.0-or-later AND CC-BY-3.0
URL: https://inkscape.org/
Source0: https://media.inkscape.org/dl/resources/file/inkscape-%{version}.tar.xz
-# The signatures were uploaded by the responsible release manager, and includes release date and commit
-Source1: https://media.inkscape.org/media/resources/sigs/inkscape-%{version}_%{inksc…
+# The signatures were uploaded by the responsible release manager, and includes release date and commit, not using macros because it's inconsistent.
+Source1: https://media.inkscape.org/media/resources/sigs/inkscape-1.3.2_2023-11-25_0…
# Keyring(s)
Source10: https://inkscape.org/~MarcJeanmougin/gpg/#/MarcJeanmougin.gpg
@@ -179,7 +179,7 @@ graphics in W3C standard Scalable Vector Graphics (SVG) file format.
%prep
%{gpgverify} --keyring='%{SOURCE10}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
-%autosetup -n inkscape-%{version}_%{inkscape_date}_%{shortcommit} -p1
+%autosetup -n inkscape-1.3.2_2023-11-25_091e20ef0f -p1
%py3_shebang_fix .
# https://bugs.launchpad.net/inkscape/+bug/314381
diff --git a/sources b/sources
index e300e50..c3ba677 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (inkscape-1.3.1.tar.xz) = cb0f8984c2dd33708021400384eeb2cfe32af4ba34a2f371a767b100a000cfe35b8c4fe88eb294a8f6fc0795d9991d53552df5b152288130da91228066f68a26
-SHA512 (inkscape-1.3.1.tar.xz.sig) = b42735933ecfdec8a4a4023c51eb429fc9a811139c800c15d0e4f8339df320cdb3e45389a8d52bd98bbc04a913c6b662fc194be0cbdda16267e9586209576e59
+SHA512 (inkscape-1.3.2.tar.xz) = a6da4b676ba3e7f954f95e3916ce78ce358b49c8052795a52d478064ef02eeae0337b0a94e89b9752ea6824a5758d28072c2bbf83f1e9ee28daebd3b0ef87343
commit afa399ea761976dcc5a27d647fe30c9471936a76
Author: Zephyr Lykos <git(a)mochaa.ws>
Date: Thu Oct 26 23:19:52 2023 +0800
Split inkscape_base.so as a subpackage and a few misc changes
- Migrated to rpmautospec
- Renovate entire spec, cleanup unused dependencies
- Add %check and option to disable test (according to Alpine Linux
maintainers, "take extremely long and use absurd amounts of memory")
- Introduce reduced debug symbols
- Depend on python3-libs instead of the commandline package
- Verify the signature of source tarball
diff --git a/.gitignore b/.gitignore
index a90165b..f39a990 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,39 +1,2 @@
-inkscape.tar.bz2
-/inkscape-0.48.0.tar.bz2
-/inkscape-0.48.1.tar.bz2
-/inkscape-0.48.2.tar.bz2
-/inkscape-0.48.3.1.tar.bz2
-/inkscape-0.48.4.tar.bz2
-/inkscape-0.48.5.tar.bz2
-/inkscape-0.91.tar.bz2
-/inkscape-0.92pre0.tar.bz2
-/inkscape-0.92pre1.tar.bz2
-/inkscape-0.92pre2.tar.bz2
-/inkscape-0.92pre3.tar.bz2
-/inkscape-0.92pre4.tar_Bv5Tl5T.bz2
-/inkscape-0.92pre5.tar.bz2
-/inkscape-0.92.0.tar.bz2
-/inkscape-0.92.1.tar_XlpI7qT.bz2
-/inkscape-r15604.tar.bz2
-/inkscape-r15686.tar.bz2
-/inkscape-r15740.tar.bz2
-/inkscape-0.92.2.tar.bz2
-/inkscape-0.92.3.tar.bz2
-/inkscape-INKSCAPE_0_92_3.tar.bz2
-/inkscape-INKSCAPE_0_92_4.tar.bz2
-/inkscape-master.tar.gz
-/inkscape-INKSCAPE_1_0_BETA.tar.bz2
-/inkscape-1.0beta1.tar.bz2
-/inkscape-INKSCAPE_1_0_BETA2.tar.bz2
-/inkscape-INKSCAPE_1_0_RC1.tar.bz2
-/inkscape-1.0rc1_2020-04-09_09960d6f05.tar.xz
-/inkscape-1.0_2020-05-01_4035a4fb49.tar.xz
-/inkscape-1.0.1.tar.xz
-/inkscape-1.0.2.tar.xz
-/inkscape-1.1.tar.xz
-/inkscape-1.1.1.tar.xz
-/inkscape-1.1.2.tar.xz
-/inkscape-1.2_2022-05-15_dc2aedaf03.tar.xz
-/inkscape-1.2.1.tar.xz
-/inkscape-1.2.2.tar.xz
-/inkscape-1.3.tar.xz
+/inkscape-*.tar.xz
+/inkscape-*.tar.xz.sig
diff --git a/0001-add-xmlmemory-include.patch b/0001-add-xmlmemory-include.patch
new file mode 100644
index 0000000..e2c0cd9
--- /dev/null
+++ b/0001-add-xmlmemory-include.patch
@@ -0,0 +1,10 @@
+--- a/src/object/uri.h
++++ b/src/object/uri.h
+@@ -13,6 +13,7 @@
+ #define INKSCAPE_URI_H
+
+ #include <libxml/uri.h>
++#include <libxml/xmlmemory.h>
+ #include <memory>
+ #include <string>
+
diff --git a/MarcJeanmougin.gpg b/MarcJeanmougin.gpg
new file mode 100644
index 0000000..dd611e8
--- /dev/null
+++ b/MarcJeanmougin.gpg
@@ -0,0 +1,410 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+xsDiBEuU3AERBADHMi4Uxcq6weVkyFudFz0UDEHKexFz9Q/NMu1+uV8Erkn+lK6k
+XJUaV73TPWwkmBpZbs3GTQrKAuk9UAOjkJU9V/9g+X3mzCZW9rzpuasZe8IpMIV9
+PiP2YOspDy6YOQ0kNSPgUkttbaEZVU1TGWDsY1ucuQ02YIdG6cF6pPh4fwCgySnf
+OBha6wkBttzzf64QlqNZAi0D/1JsbS5VxFMM9UrqTCUVCdmKBOibBiZrYdZEGoCJ
+OvoXidkgyD9LeJtKeDgsQQAQsVQUnrTiyRyVRBScgbtZhXWFHUwiRCyyIkJR3+J0
+MmgK/U0c2NqsWFjZRNTTwPR5suxDHrLVXDPG/gfuInBs27SDLyqFNwDAbmrfmssO
++8rIBACMTldgR/wW6rlUskfr0R8beoWolfOovdLhmD1cOJ3uqkT/PInUyR7SVv6o
+CRIjNto6Pu0MnVCEfCTrTlQmLZvvb7P6KSYMrr/SWOiE/zmC9zo/XHx5TpSByhDm
+YsCuMJ9jfZCQyVD2QEgqtCI7caCrKlF5taVrLYJL8KPqDRZfbs0kTWFyYyBKZWFu
+bW91Z2luIDxtYXJjQGplYW5tb3VnaW4uZnI+wmgEExECACgCGyMGCwkIBwMCBhUI
+AgkKCwQWAgMBAh4BAheABQJVAjpoBQkS01/fAAoJEF/LIE74grB6wCQAnjkXXwfg
+MhOPcYFKUE+st1tYYCN5AJ4il9aY7fDAmPmu6AuabVQI1wJgJMJoBBMRAgAoBQJQ
+6HLLAhsjBQkJZgGABgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBfyyBO+IKw
+etZbAKCY8HwIxg5KAybJzryziMKVe2zkpgCdE6a3jJCinj5xRurh25kibZhd9lzC
+aAQTEQIAKAUCUOhzEAIbIwUJCWYBgAYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AA
+CgkQX8sgTviCsHr3GQCcCU2NH4DqrXKtrQQOi19UmjtrGxsAn1XCgPcRaTBpsnfK
+60OSQdYggh90wl4EEBEIAAYFAlHNC9UACgkQIW1+kuthgZ5AlAEAiKHjQG+Fa97H
++7Bc8SktU4Gk0tLM7f0+2yk5wIrZjJQA/1sOqBcZ7jQXBuVj4FiTd+lSBziJ1e6J
+oKNS9yqRwHl3wl4EExEIAAYFAlUDXoYACgkQIW1+kuthgZ5tkQEA3a49pIh6qJSp
+zaXcAy30aGj/xMhVSu2yA93qg0VCcVAA/j/0IwhZGjlChI1/P4hbsCSvDUqs2+tf
+aafVWlBg++uuwmsEExECACsCGyMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheABQkS
+01/fBQJVArDUAhkBAAoJEF/LIE74grB6BY8AoME/c/HrI3nupiq+cWOWa3kjaiGg
+AJ49xqevOOz6BcWdGGzoQ6CXbXiEW8KcBBMBAgAGBQJVAwyOAAoJEMRKuLhQMn35
+9MgD/RI2JT7tsU3wE+EGgVxes+O8WJizt3PHtM1eeILLqCToLMK251DJ60WckkiP
+xN9FGRKszdLMPyRQU2xRkvO9Z8nciyMEhtPuNeGTLyhPyY9guIFKLJ7hcBhQAbAi
+fTaQhCBSmSLzjQg5xTWxQweX/dL+BWCglNqjDrM+YXH0vTHQwsFcBBIBCAAGBQJV
+GDMiAAoJEHe1ty9ZojkeI3EP/1DojLv5qF4vvtLn/hEiWlf80h59M5CrsDUgmfx+
+DlzZma7fPCUi4RxPPY6VuRldG57TCWecJEX9NN6XhpNLyTRmYAB3f8iMpOX7ASFs
+iPzHcejiVIJFfaKWyBcWC4WuXcUCs5dHjelWqw0bIrzZatGVAnwSZ0TgVAtn4oOT
+kFChYG0vtAVDzWI/Iqj5dq1iHlydyB/8P6VtkQoNdB75AyGEVepePHyZmIVFa5E+
+f+WAsWVwkah416bVDZYhC71uv3V1etH644mPrXI1kX7N/eWTZTfIH3abor1T9D9a
+dskyddXpj24PzKdkefnlasncdszuvXPfHyQkc40iXhWTpX8i4NTdnLuQ7Kj2s0nc
+dkIziwc4bZl1ZqyHAxt6iExXHZGagVfU2LXDNzULkXIde00fMoitYxH1ijUDraby
+uCGsVLQzNEUtyMPxYCofUu8+C2+sKfoIGGOxvhdYy8NDtfC3JDCxX9cXtSe5zOci
+a+OkvoOIIq+wUipfxMn/m8b3GBq9ju0pSkiWZ/tUQ+M/MJCHaOKdhXRll+yQB2DQ
+EmeNzR1YeXuD+4SdHiM4NC6JFAimvL7XNAtH2DHFCHjgXk9H6FLL/7YWZs+yXlUL
+lOtwUqZSkyIgWIpNSaNmLJNREpZloP5whNxdtxLxW6UKYeLDB01Oo3G5arEFAAfJ
+1RV9wsFcBBMBAgAGBQJVGCxEAAoJEBOSl86SL+OnMXsP/3mRAPLohj6mNeXWWvIm
+F6fpsckbUTXXah757biu2eRrsaZINqzxxcquN88Otu/wEE12Am1DS4GPXw+hTwq3
++35cUy4Nml9DoIn7W85qDY0pNARJ0TYJyXC88wiDy5lkX7KrlMIKyeNaQTOWQ9nQ
+CWp3pALI+F+XLZrKxzVnyrcUxi1piLUPkUVoiud2gCif6lsIj8VRXRrSNYmoO/HN
+92DcbS7bI5viOAN1j+SXL1Hh+XhSYb58CXhLGHpZOz7YZa3gOf0IAVhF2CUHmxgP
+AkelXTl6vk2LBwQRClweiHNoNFknHsX77L6KXEztW35leQKI8y+YrkitWR6oJBDm
++g2A6sIvp9GRfcZ1WAwPGbhradLf7N5jCx3hmo5Q/3hPCDfvYPWq9lS0N0whHgxc
+1xQPVsQlml84yd1b8whykjlnUoQ0VDMjNqOdueTPkClDfJXrh6wCy/gFb/7uMjPZ
+5eCdLv/1UZKR0Ll8YpFt27kvDMwKWjjejd49qxswr88WaxrBP2x/Q/vR1XXQab70
+IKazmNgLNgAfuZ+pHn2M3JHILR0rm1E2/j9MbWKXXTkLvbqe1u+AcQM9BtivzGZT
+ubjyc2JpbFOCAdQ3tS5TCEZuoe5me2ChSHco0uy/lX4+2MANReITLbDxfdoLMivS
+lfHdboLV1A2yl1ovsU+tsO8cwsFcBBMBAgAGBQJVGDFpAAoJEPmzOVlHhIyx1QIQ
+AK1ypKReSPJqIqT8hl3rdSEPT4yptwda/nYtui2OCPp4CW4sFQiMkiYd/bmAJYFN
++5CRKsdrfoyxdMy5kHMNCZ+gdySpu/pKR6qPmGiVpnKhjWTKnUbeOdUkIW0np9e/
+5tCWpEeu2gOTiSZShca9rO4ZlrK4mVx2P04qDrMIZqe1sDYn7at5fmjdvhG9ZLtz
+WXBRnjNZOmseEZp9fTWWtpuXc0uLNQ++IUFPOijUjQ+bnP/BaWbAbVZIITLsTtEP
+MYNiC4QcX90ZZVs9bz0j6lzG2LY5zKtgJVBugm5JJ31X7h07E8/mO8gugYmMWLiZ
+AbIUsSF3vK77rj+1C/lQNgjld0SWT1uM2kHnMCdN81xyAsBkKodHnbawm/WW/Mym
+auUPFeLjo3FF46VaNwBhXIRfycXjQAcryZf6RHc+tVWyDdHQvQGvftQ5L8BKjAuc
+Ko7fS5GbBKX40tdEX0xOKIz53nJoTWHvfCjJAPM243JBVd5nK7BCUge0oQ6Cshc7
+n1GoQBfWYHqOrtvvM6rMYKfvkfE9CcVD9Xk+3vokT2lUzC+jttJrgkXhjutG0Jir
+H5sEdy8mq8yKrJzbVlyLxpio8y5wSjc4BzLaCx2d1GXgEFmjgK/jmrwUldQvyAse
+2nUB5Q4FOQeJY4scxp8oYmVn7MR4D4xkNx2mALZB4JTgwsFcBBMBCAAGBQJVGCfM
+AAoJEJw6fhcQvJaAokEP/1TNh0RMG80Qm/aibgY6ucynJrFM1S73ZGB7VK3c58GZ
+YaVrnsHWT9pcJDB89ejJLbG2AzPzpXZc3xv/miZRJaeBpypfTjGXGuBUCGt+pt0k
+UMAZyANdxMsjD9qXM30QgbV/ra/LY9G1uE2mlnLiQfraxUCKC8nahLa6c5IfKEEo
+RmEurO/jlt1IRcK6KQzkeor9Al9QdDSfY5wXq4PbI4HWuqcXFPhW078KnpM7a28t
+M7L+BfSmFozGJf0l4/+yazLDmdsyrxGP9bszmoO+3heB7uIxXAiDgU7MpqYdpRpE
+ozJU67Y12mDhw5qr2GrF8P53tx/dtHnWeo0Tvn+hW4ko0eQc8Uyt4ZZLG7oQSh5H
+ILYTE4UAw21LEt82WK9mABQAN7WZ+GExblqZxdK+SF2s1qD72Kh9alC7VUShfCdQ
+0A+GKmF6d2rcvbfGlqMVIfrhYIBqhxhOMilnO65G3XH7gY12q6xggZZqYhy9ZT6d
++ok+G5/gDUr8hnmPguQjbeYPfm4j82UWSjSczTkufvzs030AL7rNlv0AwMGu/7cX
+LLrMx57OtJyrum/TPzExDPs/zfcohLukiiTdno6+Gwpvhzcj2IdkKOqean12fiUu
+6Be7KR3YbFam7WLxzdG4GvA+4c5DcBzoO51RkJlO9auCdXw3z+g/4lMdz0CHmqth
+wsFcBBMBCAAGBQJV71IFAAoJEJ0b+iwJMGmMUVEQAIgpr1j9X6ZJ326NT8oCrF6O
+f/2H+KUHARVrkNnPzF/rQ+kA5ITCzAXKKBZ77PFHFxUJlFTLUtxaz+vB7wr0pmpV
+9KYULd5997go2YBsUKclbEAWa90SKMy6uYmon/Ykee3HKL9IXsXgRtKWNIcCQCaB
+1oDekZRMHyGOi4/10iZF77h6A9y3EEA9zDv8FmtihV1cIuCSbIvBIIrpmhU/yq1D
+wBRmeFkNNYDNr2Zg7bhAJvntTcBufq3g4Vf2HDResZftlgIOereDV3ZMqbMK/kfw
+SWan0+EjTOAIMgwacNteIbbUQuBUCbsp5Fi+8qcZ9v/MNuPHkaV+H/3BPx9yQ6mj
+ZB0R7VbrpKsmr1tI9IM5gcCULak5SoGVtKLwiwq+v6c0u0c6lpLVHi5Mcv0KZW8x
+DLJLwlNcHgDbfwtUgIvF8J7OR5O8QNLHZiUIcnHbxaMD/As6qjnJVNEAVKR1wiVk
+ZFWQmb/Eihs6MkY6dhRVHwamQyS1j4YsA+SmSkWhqKyD1JCnZJzjIHhA8pfxZOJT
+QR0CBSgLl5ZRpDAZ0XuBPTolUmiA8lxZAAKvu5v1fHa/LL0hT2a+jtAxyXwzfK6d
+u4FrBi0nkdt1Bk2EXBl659CU/cAOaZiZa2bmu98M+2frhwL0WZLeXKMFxMciFZqr
+qjrpo1jCFM90ZkOzpCXJwsFcBBMBCgAGBQJTvG5eAAoJEIDYiyLUMwMxexoP/AmD
+TW8o0iaxC0SnOCQm55FhOef2kOq14PSxUy3YKKffxG73g64EumQxEvzAsanLe6Wv
+DptM/IcV5omyzbBVEE/6f66l7m0BYCKDq67/RpsQipXyK989j9ZFUimALN2pJ6Vk
+J5WMN0uzoruGNmSpTMYp+bPqb+gIDH0BlT3hErn6iCnfZR6E3P/97nAEQ6rJpq0g
+MXs4hgg/rm9pzJcC9ta8b/V8v8BKffPWXuO0zRAvRKKbkGub3PgayhRGT6UIvgoT
+NGcAauAGI+Djfzr94+2H8B1TCsIttdmugMYP0OcMpZWaSTZ43z9eI9aWuqEZVPNV
+c7v1Hg9bwhTesUIHi20YQNU/e1yu/gtO/XPT/PjgiOtuPYgk04Nwli3KmVWBQF2A
+ZRgK/z20X4E3H96f8y+XloVgT5XGXpt+eeiScBXsuAL+P0quio5CgH2DdN5xvSnN
+GHdZv06R9wMzj6SA/UoqNV/5yK4BzCelWx6Kyu3jXofdS1fZml9U+JPiNlZ6Q9qM
+6EceB7THls79yZqjmZGnWSVxzXhIBAlgLYu6LHbHKHBVaKl4MEnUEAZcDLCeR/1M
+If6g6NZVj9t3dupuZhNqFXGRKDkAYcYZ7w9FCYzyToBQdOocLxr6fdFg8fPJWsfn
+Z+lsWvgxNUxwb5GrUK+SjHGVusCGCSJe59yqx2yowsBcBBIBCAAGBQJZ6j7oAAoJ
+EJr37XyX5Fg8UrwH/iHBkjrNfE5Rx2Q1DXj/U4W7T+ctKXj0QBaXpm1gLqilnMkg
+wsSKuECEa406pusB5l03Ux4JQvQGbL8RQdEQXIxUtaRl8DQlRx3iCpFWB4FqvPnw
+SuNiyjspOv0yFLMiz/y7y9Fak6KwXAfrw8XZXBSYdpl/UG3kwyXkh4iJ9IsLfWrE
+IS7t3YXD2G4KGdonItPSfcvVfV2I12aGyJwmHrnfYTTJP8+XM3Ue4ss/A3U8uoJt
+TMaHtN5C8cX0MXvNnvkHgeniQt9GI3YxqzJswuxKIglfpOA+bLGs4yCdWTl3LjrW
+rJxgEAwsjLtmz5vEAIgYoQ68L49/s11a9wAoyIPCwHMEEAEIAB0WIQQ/SNYjlZVa
+su0qqXuu6aljnoZWeQUCWePKbgAKCRCu6aljnoZWeYQUCADUDXFQc+hcZavFSKGx
+aT9ySsswc7NKcsWqXIAwJoxVhPEd9NwdWcI3P1Ia9rs3lEjGcayZgIvNTIFfhpvv
+utV01KKLuCp5gYgF3bpMYieYFeF8raUgZGoL4uIXUaKezKOWUkjSX3IXaNcS8fk4
+8tq2bbV3hSE4Qv7Ju/4lA/JD4fr2hckFpkUFB3bVjeLkahz/tqlNXl/B75J/fco8
+a9aSu3x2CyqCAKoaRIISjgYK7qXm+0G3qNAxhByQjQ4F2FzXX5uUf/mA8WdLlwqh
+A4pRaTzfZZzGZdPnQlCcWOpKldI3UnzvdSd1g+mBVaSRmy5duyQ9Xs+CP4O60Hl1
+afmnwsFcBBIBCAAGBQJZ6j9iAAoJEChupH8SHtx4gsoP/011t79QEdtO6HPnk6zP
+rLBmYXFH8RdmEVWyQZD6haCpw/BW+8cwFg9+xzGBUPthBBy9rQk1n9daASS3/Oc1
+QA4GXeQOO+t0fmtPJygCWbRyTqd1z67VPnLV/dNutDv3sCE4IfILdCSIvpAtgc1U
+/v8DSuKj1x/EL31Lsi9/Xk7KlD6ZwxI6/AdLnd2GI2qrhVJk4ZY2OyTtSJuyl68r
+M6AvgTBYK5DQpdWtRUeMuzj9KkMX6F/QI83hxY+DlziIIdGMpdBmQKE+vw6vgMNV
+MBIOFc/8yOMsaEN8xsIT8XZpTYtK+eiRzCZIdF1Zxw0OxeE4SbPQylIYgL/oBW6p
+gehbVUEsU72sw3H310EZjz9jTIwjUq/8quLeJ9Rl8DXWNWOyiSXxqn15R1TklkLv
+FznbDb/3On2NDLwbY7k0cDTBoJjm7xMKpN6QcfyjM7y6D7oylXitxaNxvFolGFiM
+/BrPvzVpkVBC/Wede60EUV6tJubB51+crGivtUCw6M30IQov3PItQzmOzoJGjLKk
+jsWEEVkKxc1sOdahCb3WNOCK+liHULvJzplXXsVnhf3t96ZFCiqC0kt4moMlECXT
+vaUccc2VlMXuYntVFjKMKovW1DI9vUz1s5R+m6buxJV+il5qTflWhNGxFKaEcqrD
+2h9/QwMKWPLSdaJaP+L8Ek9PwoIEExECAEICGyMGCwkIBwMCBhUIAgkKCwQWAgMB
+Ah4BAheAAhkBFiEEdOjaE5gFWoEgsnbrX8sgTviCsHoFAmSPA/oFCSI/M/kACgkQ
+X8sgTviCsHrZaACdFKkhhhnTLtzpLkrIowEcURC3dKMAoIbtOV1/7EXZComRPwO/
+XMFrJeKcwoIEExEIAEICGyMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAhkBFiEE
+dOjaE5gFWoEgsnbrX8sgTviCsHoFAl5DP3kFCRwUZPgACgkQX8sgTviCsHpOJgCg
+omnAD8cZOk7HeY35ViF0gHcfokYAn1Gci3XW80ihFV6bAm4Szn08+aV3woIEExEC
+AEICGyMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAhkBFiEEdOjaE5gFWoEgsnbr
+X8sgTviCsHoFAl6PT/cFCRieDnYACgkQX8sgTviCsHpRZgCeN4cWt8LyChxpvtyj
+6GgKDAjPojEAoL+ByiaQHPgOKSxR7im3oNbiEaH0zShNYXJjIEplYW5tb3VnaW4g
+PG1hcmMuamVhbm1vdWdpbkBlbnMuZnI+wm0EMBECAC0FAlZBEfAmHSBleHBpcmVk
+IGluc3RpdHV0aW9uYWwgZS1tYWlsIGFkZHJlc3MACgkQX8sgTviCsHqb+gCfXEHq
+WtgcUfVmf4SbF+DtLXAlx60AoLVJwclwW9/6OA5huXrnmAB/YY87wmYEExECACYF
+AkuU3AECGyMFCQlmAYAGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRBfyyBO+IKw
+ej60AKCg5nZF5pjjmu2XlaTeFL8XvGpayACeNcbIMvZiz8//weI07x/zX6SxLn/C
+aQQTEQIAKQIbIwUJCWYBgAYLCQgHAwIEFQIIAwQWAgMBAh4BAheABQJLlPtkAhkB
+AAoJEF/LIE74grB6KYQAoMbZh8vr10InIrdw9/Z5cR5swrB0AJ4hBMexp0uFL2Wc
+21ToB+s19D5OEMJGBBIRCAAGBQJLlTEEAAoJEHwUAzX9MxZ6XvoAoIRXMK2AUkfy
+CghLKqRFQSSTYY9IAJ9CqWkwSKrPTMMHniRM0LKEX1EEJsJoBBMRAgAoAhsjBgsJ
+CAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCVQI6YAUJEtNf3wAKCRBfyyBO+IKwehJe
+AJ4p5ePf0d5QJ99Yz3iRg+E7iEBaXgCgmuAUHKDI4ouCWY0erPUAHV9TYW7CwVwE
+EwECAAYFAk+ucfkACgkQ6fkOI8pg2ZLUDhAA5hHcVusAosWG++F4kNn7xjTbX+g2
++twZM1pHMNg5F2e044iyd7uthBgx4/Im7PZRA8vgZ3d4+XEm5DnZ65ld2pvHl9Sp
+PbNNKJb6msoMfBPogBESnOoyKndKmAciq3mXs9SHzYbN6TYjFDXBOYLwkIIR46DN
+1hMt8dl3Jte6rO8qAIz5KyOXxMiWhPdxWSPskBNN0X/vwRYTJLHmJsdVfZl9ZIny
+POAHnL7qOwO4tSUSgf+pTf32bqt10KUfJcRfVUEwEYalK0PpurarwBRpPG8+UUAG
+GwBethPmXSZCx0Tp+T49Pi3PWmG/cavwd9czQRyax+IitnSw29dQmbtLRDWGlb0O
+csXie7nJXvrjYfealZidVMbNczYWh20RR28BdYS4ciEUcXa5APXtEzTMBnOIoIAt
+AG25LWvPclYv0kw9Em1X2dw2flDCcvdes3N/NArCy7UTVHbub4Mes8fDSZCrqXvp
+9uo1SAWbO62DwdXMXmNxEBfjhk1CWl1vodUOdpHBUXQcd9qr1jjM68f+YDbabdc2
+xvwePut0KPfoD6K1qXmESlNd9O8tN5G1EuAKkMslLCTCY0IB9JCQTySbOsNZv9gh
+Htz6Cr1rN3JrSXNnJg+FKWewzUzEP1FFebdKB2JpwO/eRsb/IZ3DbvivF8YST7p6
+Oxv+anhSWYjHCtrCwVwEEwECAAYFAk/Hn4gACgkQHQLEDK/IUtKdsxAAo/vknyv8
+MtzVjaXDafuclTuVPGoV6W6MspPaDuzrve9PzfAI9PxWzd5OjEmJ9FZi/8Ez4dDX
+KcElUhnN/PW3m0bPPPW3NwOElYlmIPCepdmOvaNbSMnZc9xCg7psNQghz3npz+b6
+wArslK/IxlJ+P5v2qz2ameEZ8mW3yKzkYAI8XTg9m74g0qmsXmTWG8+CCbweXqpk
+RFCr+KNARtSN239nD8IXeahXg1VRXhoFSu5ZPZzUoQoO/suR2TG6ZIdmkSjnH9F9
+h05ZKhdbAF2+uhzGeTOFzwAlbW3/O6U7HTgRSpx4R9HTku/ZeTL652KbHFB+s5hI
+s+W4uawR4CRcRSISOlt84QjFNE2WxcJsFuTsH0fWG8kgMN3RCQqXodINoJM6t5fE
+P3M7piDzkBc/3cvqADy0UMsylTS2uIcbRmxrTGqA4VSGSLYvs6oCEflwftySebOS
+JASHoorsdPykNhewQwZfdOjzD8f19yMo+cTkOldx9YIe+QVLRu39EWkEjnI3hH4A
+LlZfdDPjlEG/h8Dwp4QIaNWJNehTtE/SopG4UHWMLZ7aO4AkAQWVe48fUVg6J3fG
+NTu/g62jj5qZ7eItBSCfc81vfQdBMMZ9GDKBQ7Spk4Ng1Q91Ev8mllQdI01IOihj
+3q8EQSH5WzAxydV5DRcPwX92WyddY6v2UIDCaAQTEQIAKAUCUOhzfwIbIwUJCWYB
+gAYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQX8sgTviCsHoEkgCfcTt/gBgh
+D2yv5ZQI/055moLzwnQAnRdYO85NF8jOt8/do8O8P8b5BwQpwl4EEBEIAAYFAlHN
+C9UACgkQIW1+kuthgZ7wTwD8CCUeEf9nTR8zZ5CQevwI34PwJwX6LtdXWCOZncOF
+r4cA/04odjwBOoh9ukH29+MR/MCzpXZPYfhQNb0e2RtUObCdwl4EExEIAAYFAlUD
+XoYACgkQIW1+kuthgZ6e3QEA2qc87V6E6vKELWGcTkvdazol5tD4rwN/usDo52zM
+nEoA+QHyI3AYxcxSWiBvZem/LKCcrNI2Yw+oOl5PupY19GFVwmgEExECACgCGyMG
+CwkIBwMCBhUIAgkKCwQWAgMBAh4BAheABQkiPzP5BQJkjwP7AAoJEF/LIE74grB6
+wpkAoKURnuMtqPlCocaDrNL36QoVgzzSAKCfxBZ2H6TwjwBoF/ste/PGGpESPsKc
+BBMBAgAGBQJVAwyOAAoJEMRKuLhQMn35MKUD/3mDnov+HeOQmiEBoSN5x7SFQGCH
+y/9tpeYi87Q3ARkFkGhvD/VPu88pjTr/xWUwkZ7o5aWaTLWT5YkXdBySiDnG2qIL
+m6H+0aERqmY5dBdWgak84QklpFtm2aXkRhOvkJ2fVU0M63uC4ROdeL6DMXX2AI8r
+WdeDFSqSyfEHpGOYwsFcBBIBCAAGBQJVGDMpAAoJEHe1ty9ZojkeoyIQAIkwKYh2
+l1gtSxQkUZAFyR9C3TZoXq8dm/3eUme/K9sC1oFDAcMh41qSgEJoQOUkWIFV50X7
+QTBv2PdbSCTjhkG6e4Y3Me4XygouTgsl450oIwH9BqGeELK9niWtEM2rg99qTBLK
+55Gxdyw/urQW3FYkOdFC4v1dAA3gPhYGpr7xmAJ9JBnek1I6XKICKXk5wXwozR7I
+gUNgsoc7w+lWI/jmrNHBpgDiOTcmx+HzWPPw4bOchRa+F21VAz16tT4WhCMkTHbL
+Zpt+K8jCZ3niQ8xrhOmd+k/834yLt0Qhwf9p1DvxvEitJBuWAFiDNTvhbaCPlqLO
+7wHNFaPNOh72DyfdSl2tgESM11HJ72DeGDEYxEWQIUyJsIsvT7D/asw50kWLq6Tr
+WJhGA64pAXCssZQbJB2V5UQZ5caaxwX0Z8/RqR8prapE6/GYKDNtZIksIqqLDXR/
+6q3+DNM1zaTQyZlI1kfpbCOFkCTT3EWAsWJRleDeI+m8Oe4nDsQBPDybt2btoMc1
++Il+S9KCo05m+txulsVDSyYykfF3w+BCE9j3FHZJZSSx0Hrvn+OmzswOvTEtfvXW
+wXUH4/RzgMG3QOwfpLmzztN1Rz07Wpz0mvwIiPx/1JvwF+Ie4OhSm2XHLgycW8Mw
+KvGjRQdTcXqdKsY5HpRGKv6VrjAi5BTC19bJwsFcBBMBAgAGBQJVGCxEAAoJEBOS
+l86SL+OndsgP/3u8a+XFJ46n/wgQxJxcSY7rBJoIiK9vQP5vf1005AhnPgeKBurz
+3MjcqE1US6zuGLDn2WicoImjxVHU5El5eZmac39C8q2MsrXfeZOsTQ1YE/k6C7hJ
+3T0lH5+AnCfdEU7oWRj/6GLFdmR5Q64215CbLaFU0PnKeoDDIepIHmGFFX8MVVF0
+txxis2sSMs5m0GYhhg0n1MI25dXS1Pw74YZ0x6iTsqmRzQT+mcy951RY7+zYY0iR
+WqD/9b+LQPRKAq6Anpt3awYXr+MqLiHpklUG2MondyR4dHizxjrDZxoTROEXwJ5N
+1T3mlBjS6P1S6svcEX2W4MSH/dA7NxAQUJjVed6WSLbDxnLw1FY4g/zhdGuZDTH3
+5gXCjniASpxUXF5aquHLtUxgd58+Wd2Gj2uSK9i4dj9vP7MwliLsBd108Ecoajp5
+9DPEBCFLDpCBuYLpbYxUan7WM+F0/XJiTZbGcneFxyE4aWvyS1UwTFJKbTGYIJSA
+Jlpy0NXZU/qdFjN8MOXABxbwQgchZ4uRIZATUIAOtI6byIe4neS0LHNyCvrMKck0
+f+Kw/lxgpi3Bjy83iu1cv8jb7kGE7Xhm8mKXLLzBhopd3LC+HPP4PyBZgkNaZRX9
+ayPnIJTQMYWvTkiP8gEQAqFIZLe9z1jMbzWjc9IW44Jch+mDXlWHO5HiwsFcBBMB
+AgAGBQJVGDFpAAoJEPmzOVlHhIyxjo4P/3LeaZbPZ7bjBfzYmJaRdHfXptODH6FU
+l8avh7dhpj1qi4H+b5d0oEaUppMLf/vJ8tOVGiClG2c838ae5umWxCuvaEK9QU50
+euMzOR5jKTc8hO1rOgBgfZQZcsspTxWgw242r0duD8z4aEUe4SK3YmgRGAwIlbjA
+VUIikB6xL+67YZhxdqAUCrVXbUkePtnxuHm6B0HPSbA1s7lp0J42PdzeIK1/l20o
+wjNysWC73IaARwrAflbVCSGGoROXdOIDOsH693wkXnpAjcFuVFOnqjhp99p0kGFc
+sQr14m5y5XzNzByPQ6ii1q8k9UoYw0LNjyUluwzFL96PCiz/HGgANWUPzHwLfSu0
+GllB6NZvpV0nyPdMqokqfe26ZiirZ3y9Nt4uHxQ9FSPPbsVqhXZU4iuC1xtBK0Y7
+2WTbbInxtzsJHC0mGzI9KMhfkDz3fq7sFmQOw0zGEozvwcfp1K0zUUTJyXaL1/L7
+blHpAA9hjm2LA57F3EV3+CUzJieVECTedaK5y2RkNHZgAkVzp8ZqGG+Q9J8q7pkg
+2Z/6SIN+Y4ydzINbialQkCnile17/NgkgyzVBjGfobJl7ix+sRNqV0t7hca5l/Uu
+MUtI2XbzsZpKuCW6woiWiBJVCiVZ8pCakGehrjnuVQS7qpAB3C2oE7OdY5IkUEmY
+Fx1JaWHaBIS8wsFcBBMBCAAGBQJVGCfMAAoJEJw6fhcQvJaAkVIP/3i5AzrK2GBI
+4MyXKh2FeHJ2P+RBZUdneOgQ1wKE5saB6ZblFhw9aNR8Bi4NU/QPwZlwUt7f43fY
+eVI5AZAdOxpoKFKrsvDfz9ktExiZ+PymZcse7YgNqMvhNnJ5ae99jEPtgFXqzGxL
+oYVDXq8iD5U+XkSN877mSFFs7yC3tiPtAm3b/7v/Ntw9XpQ+ewKY5N16kySMp8JI
+lJ14uagS90yZZXYHkMAqpy2JxztVBoNm5Jugimx9WLhkvKFZJQdTuWG88G8GC4pd
+at8vWtR4aGSirZknXF/W+W0tE6DvnekvHNCHoHTDq+NzFRE5f9VwHPw2/ybgwHYX
+7YRB5nrd1rhvqaO/4T7ULTZFoLKVJR+Rw5p8n6QkQdmBI/00guHkmpMghsjG1oSd
+9VdxLT6vGMypE9QSk7ZraPFOBvxU8Zmmp61ffD6Pqg3O1+qdYX/zS1c2XSSOVN00
+sn87AYXRP9WXD49BbDMmm9c4yG+zA9Jpxa0sDApn6YbGjZ2BInKNQmg+NvwNfXfW
+fx8X3rVmVNkaopGzwHrrcG2NytOHt+b5t3qZEk43V9pX354OF21Df+UCocIRzHpQ
+CgvbZ6UkOqy3HsWE+H5S8KCLE9vQJXi8EAjhuYA79kXl4OGPp1KWBdFWqKk7LN5X
+cIbVz/OQiCfgxtd9/IcLo6KxIwF3gbnWwsFcBBMBCAAGBQJV71IGAAoJEJ0b+iwJ
+MGmMPgcP/3lcXyjlV40gFQxDTXWvQKGQ0IaKdsPbvUtJkbDgqeLRbm+OOTe61e2b
+H+PjHt2QEVkrcajs12xIHpW5BN5Nivo+70MsoWAG/u7Jd+f0AiGO5UIV6+MpfxQy
+Jf0Hv9jFRGzh/3+xs5mJFKEGLTt/iCIxhJbRVXIb2IzCUne9NiQyZmoR0o8xolMF
+CScY55Q7AOLqrVv7+rNyQJQC7VDvIbkXpVwrXrgIKoyBuQoQhniuTXEd42d7fxre
+cMfmmnUm1mH945XmXCaZTSkQNTzyDQcrRGzr9BllOXtdMIuoYPSIXh9IYLDPgbZf
+hK3VO1hExZ1SJ+RIlV6tToOn1pGR/1dQdAO4xTUwzHGv7lXxaJzbHwAly3J+J9Hy
+81catCaoMFIYOtdgscaUAjzU7KcAlvRnuhDVvbGwXcnN5ETHTDzPh5RwtJ+cEsD+
+mnKMqd0dkAZnFQo27fdRKbUEk6vP4IxbIdlPlQDx6Ps/qDQGY8jX7FdDEfSqpVQG
+jCuQwACO+HEJU5kJM1IViqBOexco6QegPotf+HEzie2I3juWgTwSF0ci0UnnHFqc
+hSs5SBaxs/8NrTWsuqH9W0IEuULfXYKanU0muEto+B0esIwvX3geeYVmPuOvzGna
+eyrevMI934T6Bk6dsrOrm1/wJekl7IL/RaF6qbquw6w3uldlZaZIwsFcBBMBCgAG
+BQJTvG5eAAoJEIDYiyLUMwMxpyQP/A+H37Um6YcENeKtsszO2VX+YAADXjbPEWAk
+Q7rt20azzT2E9L6Oe8zs6To6lLYoMimX72VGvK9GQGEgNHhMDHF3m6dDWnstOPSw
+IkkDI/dJp04zkt7UlKiaC8GQysoTYp73gx6vkvOn+VVkJIBzczLen9NN3fcPE7EM
+u6OtkJuAwhP+cLme60OOCy2nQotPYO+ZzcLKGPUdW6BToRlw7ZcmoLJPJoSFYEBE
+PAgqpJBGH5H0r/4C+SpY8CnJZfmbDSaxkJPsp9R1gGcv9r1kDRRzdddfFlxmQ0Kl
+DCg9o0/4qKjRhdHgM1Utz7jFfdy2iTvK6h6SgV2T91lktsJyhxgLnY68c8zlyKgd
+3+k23sjFm4Sl9RPVK02vsnqExiBxHmf9/d9lsrZJJFKXVp37PA8RYqU00CKYYZSU
+vZ315NPMfQVRrL7RhtntDHGuoW7vM68R0SI3DpzMtb4EnK3I3vcods4ymtGFbcLs
+fs1Jmhj+wOgZGQI+o1RGGeNcGNbGuYHfX7EVeQx0mA8T78LD6+YzXnNXlas34nOE
+h4LJ2T1xrQ9iLhQ2K42fdcvCla2rpEaUaAiYb39VShDuSdA7WmIGgNODGNcohnZT
+DxpwbHK458qh/5fxQ/WqgzAdI5qAFxZmfg2ZlMiiUhy2f1redmLZBz8lre2P5bIL
+A3CMRhEAwmgEExECACgCGyMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheABQkS01/f
+BQJVArDUAAoJEF/LIE74grB6mKkAn0jlDuHILI2jdSBF+FGPYXaY/sP0AKCcHrhO
+pFUXUL4fBaX/k62Mf/jhEM0oTWFyYyBKZWFubW91Z2luIDxtYXJjamVhbm1vdWdp
+bkBmcmVlLmZyPsJmBBMRAgAmAhsjBgsJCAcDAgQVAggDBBYCAwECHgECF4AFAlUC
+OmgFCRLTX98ACgkQX8sgTviCsHprCACdFHtpEXjjJxy9Ol/L+YQn3SF7Nn0AmgLQ
+AsHdS1uPggsfPL1R+z9V3YIlwl4EExEIAAYFAlUDXoYACgkQIW1+kuthgZ49HQEA
+yzAfReZsTgUCh2ByUms1eN9RO2g2bJy7a0UuBiGk0ZIA/jFWoDqNmAD8QAw3e8oH
+ssT2VsH5B9lclIqccGvXORL5wpwEEwECAAYFAlUDDI4ACgkQxEq4uFAyffloPwP/
+YkIsrSNpNXiQ0Z4GyzhVj7S8P03ufTRpph93XWFAOYaKlcNjWwI9R0nUMez8xCrY
+5VLxxknOG/zWCVx2KQuPH5P2UXiEVcy5M2UHlVM7+AU5H1XZ+Sp+Y4npfwYBrjvD
+pg3TPil8byQgmA1SOB9d0DzyDIlAj//Yt0+gTuIYssvCwVwEEgEIAAYFAlUYMykA
+CgkQd7W3L1miOR7/XxAAjfKO85iYJJhror+NrZ+py4XYkR0fgsfl8u+jBjfqbRPd
+cn/eVndCgiEppHtAdwfTmvbzl0tk1OsH6yfoPdissviW7aoYr6Xlq8MAZb+02l3I
+LhUZSKBQxI+kY4OOfiju/YeIydmxH2bYGeEQYxNfEg8u5JcHvfpu+fpNQmtJ2/F8
+gFnm3Mp0o7Aw28BPeFTQHFCXB/lUhm7iMrWY6pns3rOSw4GTAG9hEUM+EI7/7p3T
+rP57Abb4gvR2Po0Jgyu8dNTUj2KiR7t0xlnR+7AA7GXHjMbzko9UPMpKaIPT3xJp
+Fc6Dr8R1VFcsMLGuCg0K6GrWhrqvgCnh9MEboTOUhrterHOAFSPHgQi6gFT4RAzy
+NFMD6EUH4/PlTrShhD4sC8eyma+G6JrC/8G8dDruLJIuTcERy8wiUOPWNSomKq7G
+7nWFqkI456ypcNuuqfQ6rPNTz3HdnR2xqaS6+FN0sVqlvPgtuKVQGA7aXIEoHVYd
+2+0pEOQQDnbMC0zjIOGwZX0/SMZA3a0yFUqlsWZE01qMNAB4nS7gDrLbCphYgMkA
+Z8hzK197XQ1OXj52QVXtBR5Xx4VG+sovIZuvtPVd780lOWJ5hOWS+bW94KfGMtrT
+E/8tUv5oi4BG0QIsqlI9RzsasCDTMEOtQFTQoto8uVwPaEjU1M+jP0w+uJX2I9bC
+wVwEEwECAAYFAlUYLEQACgkQE5KXzpIv46dMzg//R8O4xe+60pt9PoLF5Ixkcrz4
+Xg62vjgHh/tWEHBRCIFn6uzM5IFh4imJ/9YHII6O4hFDScXH8V8OrBgejaMLZaoU
+zRfjFDpOGEzBSN3j9/d4SooA/c3Jszq75qhSZEx+dYaV1ip/BhQKphE8xrqUDtzB
+wJQo0VlZ1hvOpcjG5bV/dpf8TtPzGKpSZpFY8K85TSKKwSwg0NtDnmcMunjXOtUf
+K2wjivdJOzlOj8lQM/Yumc6kMjpXd5XW812rNRak6n1m1yph/TkIl1we3toqxJVc
+BLPBc9mAwYIZjYRIVHEk0HcmuL+rpR12pNm6y+qjSnyzVI/iDH4vxBEvvLvSPAbQ
+VJLLVrfUoPYS/lBRb3nw3b+W8gJkeNEw8NTqf5XfBiT4LqdeXAETk80S3Rj0sVlE
+vPSKHiWVCW1uZLsdrvD0KO334X99l05dyJID33bsj9BI0dk1Wl5Yhju+Kb+Q1iox
+DITyslBGVux4xqtHTvcn1umYkz50tVjCW7vf+ksThbw0pVHEQmB2D5mOSt3aPqnQ
+FRoEb3XlFhkABcjuekVOhpOYlejwEEFrz+/8wll5sEP0DRra2jdcEX4C74z0piCd
+eS9ApIzb7aTZTXERpXQ339fYWlgW187+9NqJpezSkXtxXUYP2ayDQVxPFgSosn9F
+iSWttVjnHpaSf2sKrWfCwVwEEwECAAYFAlUYMWkACgkQ+bM5WUeEjLFNIA//av29
+Ib0nShG6QSxDBmH5tlmWaE56WzBlCty0Wbl+fIufWOTNlsS0d8hboplNxRW5SS5z
+R1o4W7aadeXJdubZPFVgNUvHZJcDUjJOavrTTmDbtQeX4SP+e9So1mpwE8VqstIB
+rhaMp1sxx0lahdYxAiHxKl+C5ZQcg7kLkxtQdD+Ikl0XvU6WrQhtbk3uvmHBEbge
+pnTF32Oge5MWBuhsYD3ptTBGknZqYjNZC0PiNBKzetIubKBEkBvMaeBWo4rmcoaj
+bzE4+echwzAcSjIJFpD1HYs1+/YqxHCHuLpqytQ/b0/1zQKRZTBo6GorZVRFi8A6
+5zplPt+D794zJRQ8x5ZUiY8q4LW/7EHMNWAda9HzNBM+qw2CiknE//4TyPd5TCvA
+OPzWRmk4qugmWnUIarIz6BQo0KZrm9OmZe/4nuOcXtYaBLxVp+B/c2xMqnQ029KR
+EweTnKzFSxCBmOvcju8+UFUstyrNJhLOqTnij/Mu3x2ImrD6altv4fkwQuNwJOpG
+jVtNjsbhYiMgt9Ogg6uQjEUskJbO04DiYUyF6w0ZMCk5zvCaOTVPirJzlzpDl/lJ
+GIMaVpnWBF4lTk5XU+eMDoTjBqMJviPGACf5eqP82L2s00uCaHSv2IaenSizUZYb
+qmqzawLq/NVZ0LL+VjuaMpoq7vzw/3YORRDWPy/CwVwEEwEIAAYFAlUYJ8wACgkQ
+nDp+FxC8loACJRAAoDUC+LbmxF1cxTcS8Yt8ITFtDjT5Lwz3irpRoFbK9wNkrTyN
+fW2ns63ieZT8txaMDKTbZGLRXmwH1Y6HWSmcqXS0qxc8kiLv5BUeDNqzWQ/uLGNT
+GurLspAY/p1F4JlCO42NLCFyGoeKYPYg2rPzeWOJceIeI4P/9tv9q8UgwwFHIors
+4sV+0o8LD1yFf8YEJcspXFfx0o/Z2p900zXyTMGlAcw6f+8v+FdZrQSxmAqMgpN7
+ZuH6XVd9AEr1M3obKQDQVlscJWTx9TW04fWvFJDuHqcSymP/5jlyLPmOgQcitGus
+k71VevVppR6Q9RxhNu/T6FJdTio+zOCXoq4u4EPhRxMvQ7GUDvbkqrrFUAwH+w9t
+sXR11LH0+S4i16BgpixNYJDAA0nn52XS14hGAmGwoiCKAXdIN65Jc/Rob54dTgQN
+Ek/aNYZKAIZBTLCicaziTjewOx7+3yGs0arNjdBUY2D4rRtpTuBgZO8gDwWUjofd
+2m8cVYmuqLLAvBSFQIzHAVQ6ekdgR20Cu3rzM5uLmjz8doUprlCein/f0GFWYG6D
+7kpL6lXqYQNNrOpWjnnTHMrPxk8WrG+4MMJySg9NG8r4dDb/JfH4Nqu8/34uoqIK
+jj7N887fnN7ifKyqkWh1swFF0GZVekMXpSAb8iGI5Zl2Ci9xxRo/YLBNf9PCwVwE
+EwEIAAYFAlXvUgYACgkQnRv6LAkwaYxuDhAAs7A7T9TBEltYW1wSyBsDj6sY+xaB
+SpRul2XQ3ANOTxJaDrSxpQjvqCnOhCPs7vgv0iy1VfeuJ1lt2W6mVKLa+aLc3tRl
+c0qZ7jN/bcxwlgGOcGZHJUfPuOmvkXDVSbddrYcJ1kXwbOdRu8ZI94/5DxxNEHc3
+bXP68NXrX2mM5Y0rH8no2Z1DhN2F9Jj8nl+fWj87mhiBOhKjM+Si3N27Mhs6oJPJ
+c8CdN7nSiYR5ObsBBlOD8iZPZII6O4XvOklq/CeHJVSWyE8j5ANLylW5iRuVF7Ms
+qAz/qsiw0dHTqMOweHs17U3TPdpOvPVtVYrNhcFpueeWS0wBLUe31hbWtopmZROA
+at2NtF0rVTEZe3yi4wmJm26/O1sqnACeZtpNJM3FVyk0Dn0K/Jhcvey8zSxssMau
+oec4gZnal9+tmjisoPTgFZKP91sLPpY9MzlpdPCSduoUd5KlKHn1e/50HALtazVe
+60gSx09gC4/qhtebgT3fnSbtD2NfuYZqD44rfDXTQ05nIa+xOgIgT9CS/89E6Thn
+6VGhpC+fOS/2RnrPfUr2FDS8wIoQbm2ady6NTS5dr3uZvsBycCPv/1EJqBZGLONH
+i3z5Ip0YN8ONWvnHSngKu+veG6euGbbVwXa+w9qjuyA8szZyvXI/j+SNyS0PhS4w
+SgohPSxTBUSditfCwFwEEgEIAAYFAlnqPugACgkQmvftfJfkWDygyAgAwth6zAOV
+Kw9R2bpLFjUXK+7qOFbQM+U47iOUqCm+P5iclc5Wvz4tIrlaHlOEvAY8t32QTag+
+7W1V4mApvve7IaFpCrAeWOCqxUxTehJSR0hz/EH5pVeTveS4+PLYMiXha9KA6dhS
+k5iGVKxfsbNmtIOBhFBRBFqhDRxKiRNDsY5MBZgZN4oGTxoiG6rL7ti3qWSCIUic
+RgHMH2DRwm6Zd6pLfEl3Fb8IGf3NSStxMLPXsp2uUL6xaaVDhX7a22nSfaRaQ9Ou
+UWmJ/qn/XBe7bHT+ppkdgaRzPw/iNNAaamEIPVwBG5v0rFl6BpDvrxrr/DGIojS3
+ZipqrH0TAMbecsLAcwQQAQgAHRYhBD9I1iOVlVqy7Sqpe67pqWOehlZ5BQJZ48pv
+AAoJEK7pqWOehlZ5LeAH/RsnxHdspUx3vNMCAaRDTCde8ws0zYR4X6BYacWrKvnb
+xtiHxgX/7VnIB3FZGaObpMHbiF334A8/6lwGpVX/DbzdeOuqk7yiGeMuf5ewiuzH
+ycany6AjgtnKYCEY0Il3olh8pvgUwd6nvl7wJDU72NMz53K5s4nde1uV3WT+aGSq
+zRhkqgLeaaSwvTN3epTyn4SOukZq6ONtqUhS04KfWduoMFlxX4ASQUIsZPeDZm1v
+b31udbVryi5OVsMp56jGEDGC3+QJgpJSdBaTty85NxRdJCL3/IZY2cwxQBm0W7b5
+jLq/GbjQFY/x+CfWfFy+hAzlVpqG39KlSJZWQpn90IXCwVwEEgEIAAYFAlnqP2IA
+CgkQKG6kfxIe3HhabA//Q2OAFrxqRbR/Mz0hs71/T7S9wzNnNfLLvORFhlpuKmGy
+5K3APj9giUkYXPDDG+FFCxVw9z4279a0xzscuim29z/bFxDxPriV0bmunwrWdKsM
+I4+coE1XIIZbvqSZDa56eCI4suR3x5PnNu7LJjk5q2egj7ojvGpU6/UxoIUOn4So
+hJGfLOUUQBqB2o+m4ziwRyZHgX12LMAFGegnOu6u2k30d7XSKTFkTk59z7iwQXpC
+N/RAYlo6cnn+rYP6v76oucpuyRImKZBaGfJ9excyuh67oLYRPQhOgaIFzPUOIt46
+fUwCk2WcUfUhXsjtJJGdEnoYr7zHmqGLshuDvxuN6pi6gBSd0bU8u4YekGp8mibU
+1iU2eeHbMXdToIchfyMfJCv1SAlaATRZhp3rRzFCArXqmr1HFrT6T2/Q2raBdkR8
+FYn33bFk4/7Pi21GK9DaK0bWwPsAfgxmnnj427ROSQR2iYSBJr+YnEFBypW+sNkl
+jo7OMTme6SguwBtn6byEHez4+vJ39W2lam8FeJ1ir7EifAefAaj/iippPs4mGRi4
+aG+QwOvuwbBzKtKDprxlPeSqX9B1dYICMLAqtGlJhKvFAIddqjNLcPETlj8CQFtW
+toQu8Qt3dRe1VzIm5Dz4YlXcIEftbyG/omBRoO6R8CTF2DqllLAqraSWGuzulRvC
+fQQTEQIAPQIbIwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAFiEEdOjaE5gFWoEgsnbr
+X8sgTviCsHoFAmSPA/sFCSI/M/kACgkQX8sgTviCsHoCGQCgqCTDkkOINdZJcMvT
+Ry9vPnP7OM0An1eIXJ95DmkqgtZxvnxF6GUk1HVxwn0EExEIAD0CGyMGCwkIBwMC
+BBUCCAMEFgIDAQIeAQIXgBYhBHTo2hOYBVqBILJ261/LIE74grB6BQJeQz99BQkc
+FGT4AAoJEF/LIE74grB6P2UAn3m2c5GLkLJ8hDKuQS/wURQQRPKhAJsHzJud7a0w
+pzDp0Iwk9Uq7zSWcFMJ9BBMRAgA9AhsjBgsJCAcDAgQVAggDBBYCAwECHgECF4AW
+IQR06NoTmAVagSCydutfyyBO+IKwegUCXo9P+gUJGJ4OdgAKCRBfyyBO+IKwevr7
+AJ4tpt+CFrenqIQKM2s4YXpgkhXF3ACgiKFHJcSHUkw1yR3SnAYNqbbQNiLNKU1h
+cmMgSmVhbm1vdWdpbiA8bWFyYy5qZWFubW91Z2luQGNuYW0uZnI+wmkEExECACkF
+AmSPA/sCGyMFCSI/M/kHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgAAKCRBfyyBO
++IKwejvAAJ9chJZO5W+kaFt8QbJbOI88zhWrkgCgnrdoIkF5E+FxGUJBxY9/LBb1
+IyLCwFwEEgEIAAYFAlnqPugACgkQmvftfJfkWDwuHQf/TVA5QcBe9p8+eQLkTLL5
+1SR6ugC3bSfiWc+/vKbUm3s6ZT1YlptpksxlMMhOotOgExfkeJexFN76Ex/GkTNy
+gNregb+XFkWka6vr4woc/xJx/Lq9swXcVhhbsqS5MtBt1A183Cj7v1SA7Ucu5Ge2
+GOpMwAbCeWUdrfFS6UL4yplbncjkeVU3JN63Fh79jCZxUfdREUxfjtitteCgU2B3
+lgshnmOKAYGNvDiB6vy4pTYf/7h5q+eOcJZZFCdEs/aPTZzf/xntkEdL0/3DrGXo
+ecc2M816rzTPtu+v5TUjmwmKM7OZZsrDcbBHTc8SbK2BANM2obE0OCCepZ2spkt4
+3MLBXAQSAQgABgUCWeo/YgAKCRAobqR/Eh7ceB72D/0U/Adh0L2zOd3CHNzLuLvW
+fNSb/weC0VCUiBPMD621vC06AquJ7AREu+ehaxy1mKN0LYHHwvDYr0bX9QxBCRJa
+Ml2Q9nGJStbzBvypT7TutQVmnKf8NoXP+Ycekwa+MkcVNy9Hu0zCXfyF27yBqmah
+4bz0mdZXLgcucA9Oy3fcTeevs5s98f4ygz7Uh0AOYA/dJLDRTGISwKBBGRahPPY9
+Mo3tARIFsjTthvb/7JuT+cUAUGSx2sdGsgMv/4P4ssiQjH8uq5Ckh+f+LTtZABkn
+9wO58lpj3XyG/5PCINQZirRHB1mAtAWQ2eVxg8pKMkNLj764dKNZEEiunyV0yG65
+IqPu7lhw2m17NQJk9wafqrcRF2itrGvPiYE5q6cm8u2QpB1NW1LOrwN0KnwA7qQQ
+6HkA6kSbWIQ7kvtf5d8NTfdawrNTj5tNy9RiJye+UjI7jWJ+veeDPxCTS0JKQ2DW
+8ZfkFqaZ6JLC4/FIJfinkaFdkBmp40qUdJ1MjiLZrJwMwfWGvzr9IczOY1jFckAC
+Q/oDZ0hoYY5mz16waM79Zqwy4nMR+EadVy8Fa5iZwZD1amP9xi6s4k8ABx0DA8D8
+RSNvY9x6UKs4biORUu2f77NMs96BxEKGe9/gnOOzf63xVKjXTbiQgtD+fLmcYBQS
+rOHIyMroRwPacxUyJPH64MJgBDARAgAgFiEEdOjaE5gFWoEgsnbrX8sgTviCsHoF
+Al6PUA4CHQAACgkQX8sgTviCsHoXOACgrtHxiuSLgGgjDrr2rqVCd4E+WJ4AoL5v
+BJQshL1Zh0HG+oUqLZh5WBdCwoAEExECAEACGyMHCwkIBwMCAQYVCAIJCgsEFgID
+AQIeAQIXgBYhBHTo2hOYBVqBILJ261/LIE74grB6BQJej0/7BQkYng52AAoJEF/L
+IE74grB6RFsAoIAMBAaPHHCZWCZHapoHaCwOjuCIAJsGmg9f0ai0NFiC/eYV6ITm
+/NgdlMJpBBMRAgApBQJWD/UgAhsjBQkS01/fBwsJCAcDAgEGFQgCCQoLBBYCAwEC
+HgECF4AACgkQX8sgTviCsHp+ogCeIGxA3HocRnJcL2QzLRdv4pnOE40An1Y1sVX0
+z/FG35h7IHDbvBaH5uP0zTJNYXJjIEplYW5tb3VnaW4gPG1hcmMuamVhbm1vdWdp
+bkB0ZWxlY29tLXBhcmlzLmZyPsJ+BBMRAgA+FiEEdOjaE5gFWoEgsnbrX8sgTviC
+sHoFAmSPA/sCGyMFCSI/M/kFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQX8sg
+TviCsHqQVwCgtyvGQXyslKVSDepa3Vqf77dKB+QAoKuTaaaUPo1JhasTtsLv4DGk
+BdBDwn4EExEIAD4WIQR06NoTmAVagSCydutfyyBO+IKwegUCXkM/1AIbIwUJHBRk
++AULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBfyyBO+IKwevkrAKC6lEwMFVX8
+V4hkcjo6hp5hVOO3uQCffvQbORrdMCWcRDfhShoeN1dIE9XCfgQTEQIAPhYhBHTo
+2hOYBVqBILJ261/LIE74grB6BQJej1AeAhsjBQkYng52BQsJCAcCBhUKCQgLAgQW
+AgMBAh4BAheAAAoJEF/LIE74grB6GVYAn3HG59KMFXQjTgfspSCPjKRDxGLtAJoD
+1mW+edkEChwlwE2YSAjYcORzDs7DTQRLlNwBEBAAsJ4lbq7MZqHeBrSHBjKcqr+Q
+gyf5Tz+4sFE0f45VRbxEH1aARLQYbfIc4+Aa7lHPaGj25KHB07jM+J8r+CY1VqK/
+hAyIxQo0vK2OKRwX5Vknu1lDqY3oYawZngNpPPRHPFtv9TLAUfGKShJYwv8M2lUe
+lMLXEg0DamKF0iwFFh0t7fr1Z0s++jqN3Nb+7S3a2wiR3lMH4FwMw1kvKSkx7Ack
+1F4YpwhrbBI9P2ZOYK6FpVKQO+Vr24WJAoAWTYR9OxHtI3XLVlsdcYXYLSinU7Y0
+0FBVXXG2k9+DTtUbdOpPC9H7Xb64dZueyVJo4Ko+lDu47Xx9/ZKZQWAeQwiSz0ID
+xXJqJDoNcUzsbWo5jT1+Ex3DcrkKk0Ee1w9E+vCm63epjlUGq56Dui0T5HiSjcXg
+8iFPLWxmFp6fJTfuPhC+jgBBHZF+hFODpUokGEZotFWXayTLTBgyl8Y0KzllHo86
+cEijyJfF4d2mSFGYGqf40nHX+gwsczEJLF3gVEVBXVvkKkspRmJdzpOIk18AINA+
+ETDWaxmMDdF4BXB/zY/SMK8DpQVgF5Y1eDSSPhp8KiHOfxxITeze4KxIENPk87Ql
+fQ2PxGRSZQdc4fdZFHKHBdd082Gg8k4MKi2C4vxNRXVv6OC1L0bUJwtcPQ0cCnoH
+wQoO6Q9IdtkFjKKOaF8AAwUP/0FV2F8eQv/tS7MowbbLDm18UgGzybZacv/qXyio
+Iq8yN19IlsCb5DxUtczL6YtfF4S9Jvqf7DOvGwo/JmY5JKwAQuvkM09q4oY8eF90
+463Bq94Dl4t9dzKORxRUbBBtJcTLHYyloSUjJ1PQZZ+TxWh9N5GipDqvvsYULTBr
+REKSJySdeNvnflsKLlYUE2tFVSCbkhOrjukXlk5XvartjIFk5rtVoCVdPxRqlIbJ
+Afm44DEXEIfPT94jGWOFbyvLYTxtvixo8NCKTGkEbjuxwYY8myLAcRRmjPQbk6Qv
+JV3mtg03jM9XnWWrkWwZlr2DYnQEpuadcu6Hl+VxxuXsHE8u3dn/nhxOhmVOxy8p
+M4ZZtpQLYGO1E4H/7qkB119ytFGTLDD7Qx+Z1hLZ+5m/zobiJi8IJJUsJRw6BPIz
+xSXOAtqwTAVtsnFzvFwRK9YBqiIS3o/a0tbML05C9dF3E4dpo5HTURLSJNCFhhBx
+Bqx0GZNvjkiUMAeFrUlJk82V34N9Vnnsq3HqJXQYx9lUj0gi0crTsg0VPXM5qXnM
+1qSneyhyYGGjI/tbcuk2RjgOihlFEaCzr2X3gsWWIeGUScuJxspK+GJ7f/460ULV
+uouWWShZDo0ri8Q6JMEyKWjPKPvAehLWYqEXBEeNN/KunEHu8op3QI2/ciXovasa
+f3dZwk8EGBECAA8CGwwFAlUCOmgFCRLTX+cACgkQX8sgTviCsHrQiQCePYpDk0JT
+bk20hLag2OZwz4+ND+EAnio48IBdEEPTq5Lr+usorxmqDhGvwmYEGBECACYCGwwW
+IQR06NoTmAVagSCydutfyyBO+IKwegUCZI8D+wUJIj8z+QAKCRBfyyBO+IKwep2f
+AJ0ZpykdY1joQmaA/M8Eznuxh9vkKwCcCQGHyDsI6rS5RVDjsOycsxgAwavCZgQY
+EQgAJgIbDBYhBHTo2hOYBVqBILJ261/LIE74grB6BQJeQz9+BQkcFGT9AAoJEF/L
+IE74grB6HbYAoJ/r+/whChYbhlSiipSBcFm1dIVMAJ91a9/CqBN26bdBuYn7jkJz
+QMvZ9cJPBBgRAgAPBQJLlNwBAhsMBQkJZgGAAAoJEF/LIE74grB6URoAnjNqPU2m
+hDMW9uVQZ6Yxy9nXCeRzAKCmGZLya+H6hh+bRLd084BL9QZz9cJmBBgRAgAmAhsM
+FiEEdOjaE5gFWoEgsnbrX8sgTviCsHoFAl6PT/sFCRieDnoACgkQX8sgTviCsHps
+mgCdH1CbVIpnCiLGvg+ZNuLS7/w9AngAnjJDv2NP4knPAHW0cmth7H3an113
+=v6yp
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..5c5e062
--- /dev/null
+++ b/changelog
@@ -0,0 +1,1043 @@
+* Wed Nov 08 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1.3-7
+- Use system inkex
+
+* Thu Aug 24 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1.3-6
+- Use system lib2geom on f39+
+
+* Thu Aug 10 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1.3-5
+- Bring back i686 on f39+
+
+* Wed Aug 02 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1.3-4
+- No lto on i686
+
+* Wed Aug 02 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1.3-3
+- Restore i686 for f38.
+- Poppler rebuild.
+
+* Tue Aug 01 2023 Kalev Lember <klember(a)redhat.com> - 1.3-2
+- Add missing python3-requests requires (rhbz#2227974)
+
+* Mon Jul 24 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1.3-1
+- 1.3
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.2-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Jun 28 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1.2.2-10
+- aspell->hunspell
+
+* Wed May 10 2023 Tomas Popela <tpopela(a)redhat.com> - 1.2.2-9
+- Drop BR on dbus-glib as the project is not using it
+
+* Wed Mar 08 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1.2.2-8
+- migrated to SPDX license
+
+* Fri Feb 24 2023 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 1.2.2-7
+- Fix build with GCC 13
+
+* Mon Feb 20 2023 Jonathan Wakely <jwakely(a)redhat.com> - 1.2.2-6
+- Rebuilt for Boost 1.81
+
+* Fri Feb 03 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1.2.2-5
+- poppler rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Jan 09 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1.2.2-3
+- Require python3-pillow
+
+* Tue Jan 03 2023 Carl George <carl(a)george.computer> - 1.2.2-2
+- Build against GraphicsMagick instead of ImageMagick on F38+, resolves rhbz#2158052
+
+* Tue Dec 06 2022 Gwyn Ciesla <gwync(a)protonmail.com> - 1.2.2-1
+- 1.2.2
+
+* Tue Aug 23 2022 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 1.2.1-4
+- Rebuild for gsl-2.7.1
+
+* Tue Aug 02 2022 Gwyn Ciesla <gwync(a)protonmail.com> - 1.2.1-3
+- Poppler rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jul 14 2022 Gwyn Ciesla <gwync(a)protonmail.com> - 1.2.1-1
+- 1.2.1
+
+* Mon May 23 2022 Gwyn Ciesla <gwync(a)protonmail.com> - 1.2-2
+- Add missing Requires on python3-cssselect
+
+* Tue May 17 2022 Gwyn Ciesla <gwync(a)protonmail.com> - 1.2-1
+- 1.2
+
+* Tue May 17 2022 Sérgio Basto <sergio(a)serjux.com> - 1.1.2-4
+- ImageMagick is not intended to be on RHEL >= 8 (just on EPEL)
+
+* Wed May 11 2022 Gwyn Ciesla <gwync(a)protonmail.com> - 1.1.2-3
+- ImageMagick build.
+
+* Wed May 04 2022 Thomas Rodgers <trodgers(a)redhat.com> - 1.1.2-2
+- Rebuilt for Boost 1.78
+
+* Sun Feb 06 2022 Gwyn Ciesla <gwync(a)protonmail.com> - 1.1.2-1
+- 1.1.2
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.1.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jan 13 2022 Gwyn Ciesla <gwync(a)protonmail.com> - 1.1.1-3
+- Poppler rebuild, with upstream patches.
+
+* Wed Nov 10 2021 Gwyn Ciesla <gwync(a)protonmail.com> - 1.1.1-2
+- Patch for Pango multiline issue.
+
+* Thu Nov 04 2021 Gwyn Ciesla <gwync(a)protonmail.com> - 1.1.1-1
+- 1.1.1
+
+* Wed Aug 18 2021 Gwyn Ciesla <gwync(a)protonmail.com> - 1.1-10
+- Cmake cleanup, BZ 1995130
+
+* Thu Aug 12 2021 Björn Esser <besser82(a)fedoraproject.org> - 1.1-9
+- poppler rebuild, again
+
+* Fri Aug 06 2021 Jonathan Wakely <jwakely(a)redhat.com> - 1.1-8
+- Rebuilt for Boost 1.76
+
+* Mon Aug 02 2021 Gwyn Ciesla <gwync(a)protonmail.com> - 1.1-7
+- poppler rebuild.
+
+* Tue Jul 27 2021 Gwyn Ciesla <gwync(a)protonmail.com> - 1.1-6
+- poppler rebuild.
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Jun 14 2021 Gwyn Ciesla <gwync(a)protonmail.com> - 1.1-4
+- Enable gspell.
+
+* Wed May 26 2021 Gwyn Ciesla <gwync(a)protonmail.com> - 1.1-3
+- Require python3-appdirs
+
+* Tue May 25 2021 Kalev Lember <klember(a)redhat.com> - 1.1-2
+- Don't install development files for bundled 2geom
+
+* Mon May 24 2021 Gwyn Ciesla <gwync(a)protonmail.com> - 1.1-1
+- 1.1
+
+* Thu Feb 11 2021 Jan Horak <jhorak(a)redhat.com> - 1.0.2-2
+- Added missing bundled source, removed libgdlmm depencency
+
+* Mon Feb 01 2021 Gwyn Ciesla <gwync(a)protonmail.com> - 1.0.2-1
+- 1.0.2
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jan 12 2021 Gwyn Ciesla <gwync(a)protonmail.com> - 1.0.1-4
+- Poppler rebuild.
+
+* Mon Jan 04 2021 Tomas Popela <tpopela(a)redhat.com> - 1.0.1-3
+- Don't build with ImageMagick support in ELN/RHEL
+
+* Fri Sep 11 2020 Kalev Lember <klember(a)redhat.com> - 1.0.1-2
+- Fix appdata 1.0.1 release info
+
+* Tue Sep 08 2020 Gwyn Ciesla <gwync(a)protonmail.com> - 1.0.1-1
+- 1.0.1
+
+* Thu Sep 03 2020 Jeff Law <law(a)redhat.com> - 1.0-8
+- Refine dynamic casts to avoid -Wnonnull warning with gcc-11
+
+* Mon Aug 17 2020 Kalev Lember <klember(a)redhat.com> - 1.0-7
+- Drop two unneeded dependencies
+- Validate appdata file in check rather than install section
+- Use desktop-file-validate instead of desktop-file-install
+- Drop unused gtk2 buildrequires
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 14 2020 Tom Stellard <tstellar(a)redhat.com> - 1.0-5
+- Use make macros
+- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
+
+* Mon Jul 13 2020 Gwyn Ciesla <gwync(a)protonmail.com> - 1.0-4
+- Poppler 0.90.0 rebuild.
+
+* Tue Jun 23 2020 Gwyn Ciesla <gwync(a)protonmail.com> - 1.0-3
+- BR python3-setuptools.
+
+* Thu May 07 2020 Gwyn Ciesla <gwync(a)protonmail.com> - 1.0-2
+- Fix runtime dependencies.
+
+* Fri May 01 2020 Gwyn Ciesla <gwync(a)protonmail.com> - 1.0-1
+- 1.0 final
+
+* Wed Apr 15 2020 Gwyn Ciesla <gwync(a)protonmail.com> - 1.0-0.rc1.1
+- Download version with extensions.
+
+* Sat Apr 11 2020 Gwyn Ciesla <gwync(a)protonmail.com> - 1.0-0.rc1
+- 1.0 RC1
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0-0.beta.5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jan 17 2020 Marek Kasik <mkasik(a)redhat.com> - 1.0-0.beta.4
+- Rebuild for poppler-0.84.0
+
+* Wed Dec 04 2019 Gwyn Ciesla <gwync(a)protonmail.com> - 1.0-0.beta.3
+- 1.0 beta 2
+
+* Mon Oct 14 2019 Gwyn Ciesla <gwync(a)protonmail.com> - 1.0-0.beta.2
+- 1.0 beta 1
+
+* Tue Sep 24 2019 Christoph Junghans <junghans(a)votca.org> - 1.0-0.beta.1
+- Rebuild for libdouble-conversion
+
+* Mon Sep 09 2019 Gwyn Ciesla <gwync(a)protonmail.com> - 1.0-0.beta
+- 1.0 beta
+
+* Mon Sep 09 2019 Kalev Lember <klember(a)redhat.com> - 0.92.4-12.git179c1e14
+- Use upstream appdata
+
+* Fri Aug 30 2019 Miro Hrončok <mhroncok(a)redhat.com> - 0.92.4-11.git179c1e14
+- Explicitly depend on Python 3 interpreter
+- Use python3 explicitly when building
+
+* Mon Aug 26 2019 Gwyn Ciesla <gwync(a)protonmail.com> - 0.92.4-10.git179c1e14
+- git snapshot for Python 3.
+
+* Tue Aug 20 2019 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 0.92.4-9
+- Rebuilt for GSL 2.6.
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.92.4-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jun 20 2019 Kalev Lember <klember(a)redhat.com> - 0.92.4-7
+- Don't hardcode /usr prefix
+
+* Wed Jun 12 2019 Kalev Lember <klember(a)redhat.com> - 0.92.4-6
+- Avoid ruby dep for flatpak builds
+
+* Wed Mar 27 2019 Gwyn Ciesla <gwync(a)protonmail.com> - 0.92.4-5
+- Build without -D_FORTIFY_SOURCE=2 to work around https://bugs.launchpad.net/inkscape/+bug/1778951
+
+* Fri Feb 08 2019 Gwyn Ciesla <gwync(a)protonmail.com> - 0.92.4-4
+- Drop gvfs.
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.92.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jan 25 2019 Marek Kasik <mkasik(a)redhat.com> - 0.92.4-2
+- Rebuild for poppler-0.73.0
+
+* Thu Jan 17 2019 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.4-1
+- 0.92.4
+
+* Tue Jan 15 2019 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.3-11
+- End of line patch.
+
+* Mon Jan 14 2019 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.3-10
+- Alternate out of bounds patch.
+
+* Fri Jan 11 2019 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.3-9
+- Patch for out of bounds.
+
+* Tue Dec 04 2018 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.3-8
+- Add bundled provides.
+
+* Tue Sep 11 2018 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.3-7
+- Fix shebang handling.
+
+* Tue Aug 28 2018 Michael Cronenworth <mike(a)cchtml.com> - 0.92.3-6
+- Rebuild for ImageMagick 6.9.10
+
+* Tue Aug 14 2018 Marek Kasik <mkasik(a)redhat.com> - 0.92.3-5
+- Rebuild for poppler-0.67.0
+
+* Fri Jul 20 2018 Debarshi Ray <rishi(a)fedoraproject.org> - 0.92.3-4
+- Fix FTBFS due to Python2
+- Remove GTK3-based BuildRequires
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.92.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Jun 27 2018 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.3-2
+- Fix for crash, 1575842.
+
+* Tue Apr 17 2018 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.3-1
+- 0.92.3.
+
+* Fri Mar 23 2018 Marek Kasik <mkasik(a)redhat.com> - 0.92.2-8
+- Rebuild for poppler-0.63.0
+
+* Thu Mar 01 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 0.92.2-7
+- Update Python 2 dependency declarations to new packaging standards
+ (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
+* Wed Feb 14 2018 David Tardon <dtardon(a)redhat.com> - 0.92.2-6
+- rebuild for poppler 0.62.0
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.92.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jan 11 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.92.2-4
+- Remove obsolete scriptlets
+
+* Wed Nov 08 2017 David Tardon <dtardon(a)redhat.com> - 0.92.2-3
+- rebuild for poppler 0.61.0
+
+* Fri Oct 06 2017 David Tardon <dtardon(a)redhat.com> - 0.92.2-2
+- rebuild for poppler 0.60.1
+
+* Mon Sep 25 2017 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.2-1
+- 0.92.2 final.
+
+* Fri Sep 08 2017 David Tardon <dtardon(a)redhat.com> - 0.92.1-15.20170713bzr15740
+- rebuild for poppler 0.59.0
+
+* Tue Sep 05 2017 Adam Williamson <awilliam(a)redhat.com> - 0.92.1-14.20170713bzr15740
+- Rebuild for ImageMagick 6 reversion, drop ImageMagick 7 patch
+
+* Sun Aug 27 2017 Ville Skyttä <ville.skytta(a)iki.fi> - 0.92.1-13.20170713bzr15740
+- Own the /usr/lib/inkscape dir
+- %%langify non-English man pages
+
+* Fri Aug 25 2017 Michael Cronenworth <mike(a)cchtml.com> - 0.92.1-12.20170713bzr15740
+- Rebuilt for ImageMagick
+
+* Tue Aug 08 2017 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.1-11.20170713bzr15740
+- Require aspell-en
+
+* Thu Aug 03 2017 David Tardon <dtardon(a)redhat.com> - 0.92.1-10.20170713bzr15740
+- rebuild for poppler 0.57.0
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.92.1-9.20170713bzr15740
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Sun Jul 30 2017 Kevin Fenzi <kevin(a)scrye.com> - 0.92.1-8.20170713bzr15740
+- Rebuilt for ImageMagick
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.92.1-7.20170713bzr15740
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Jul 13 2017 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.1-6.20170713bzr15740
+- Updated snapshot.
+
+* Fri Jun 23 2017 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.1-5.20170510bzr15686
+- Move from gtkspell to gtkspell3, BZ 1464487.
+
+* Wed May 10 2017 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.1-4.20170510bzr15686
+- Update to fix on Wayland.
+- Fix CFLAGS.
+
+* Tue Mar 28 2017 David Tardon <dtardon(a)redhat.com> - 0.92.1-3.20170321bzr15604
+- rebuild for poppler 0.53.0
+
+* Tue Mar 21 2017 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.1-2.20170321bzr15604
+- Snapshot to fix gcc7 FTBFS.
+
+* Thu Feb 16 2017 Jon Ciesla <limburgher(a)gmail.com> - 0.92.1-1
+- 0.92.1 final.
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.92.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Jan 05 2017 Jon Ciesla <limburgher(a)gmail.com> - 0.92.0-11
+- 0.92 final.
+
+* Fri Dec 30 2016 Jon Ciesla <limburgher(a)gmail.com> - 0.92-10.pre5
+- 0.92pre5.
+
+* Thu Dec 22 2016 Jon Ciesla <limburgher(a)gmail.com> - 0.92-9.pre4
+- 0.92pre4.
+
+* Fri Dec 16 2016 David Tardon <dtardon(a)redhat.com> - 0.92-8.pre3
+- rebuild for poppler 0.50.0
+
+* Mon Nov 28 2016 Jon Ciesla <limburgher(a)gmail.com> - 0.92-7.pre3
+- 0.92pre3.
+- Include Fedora Color Palette, BZ 981748
+
+* Wed Nov 23 2016 David Tardon <dtardon(a)redhat.com> - 0.92-6.pre2
+- rebuild for poppler 0.49.0
+
+* Fri Oct 28 2016 Jon Ciesla <limburgher(a)gmail.com> - 0.92-5.pre2
+- Require python-scour, BZ 1389772.
+
+* Fri Oct 28 2016 Jon Ciesla <limburgher(a)gmail.com> - 0.92-4.pre2
+- BR potrace-devel, BZ 1389772.
+
+* Fri Oct 21 2016 Jon Ciesla <limburgher(a)gmail.com> - 0.92-3.pre2
+- Fix release tag.
+
+* Fri Oct 21 2016 Marek Kasik <mkasik(a)redhat.com> - 0.92-2.pre2
+- Rebuild for poppler-0.48.0
+
+* Wed Oct 19 2016 Jon Ciesla <limburgher(a)gmail.com> - 0.92-0.pre2
+- 0.92pre2.
+
+* Mon Jul 18 2016 Marek Kasik <mkasik(a)redhat.com> - 0.92-1.pre1
+- Rebuild for poppler-0.45.0
+
+* Tue Jun 14 2016 Jon Ciesla <limburgher(a)gmail.com> - 0.92-0.pre1
+- 0.92pre1.
+- Drop docs requirement on main package, BZ 1247239.
+
+* Tue May 17 2016 Jon Ciesla <limburgher(a)gmail.com> - 0.92-0.pre0
+- 0.92pre0, BZ 1336412.
+
+* Tue May 3 2016 Marek Kasik <mkasik(a)redhat.com> - 0.91-27
+- Rebuild for poppler-0.43.0
+
+* Fri Apr 08 2016 Jon Ciesla <limburgher(a)gmail.com> - 0.91-26
+- Fix FTBFS with patch from https://bugzilla.gnome.org/show_bug.cgi?id=586626
+
+* Mon Feb 22 2016 Orion Poplawski <orion(a)cora.nwra.com>
+- Rebuild for gsl 2.1
+
+* Tue Feb 16 2016 Jonathan Underwood <jonathan.underwood(a)gmail.com> - 0.91-24
+- Add Requires for gvfs
+
+* Mon Feb 15 2016 Jonathan Underwood <jonathan.underwood(a)gmail.com> - 0.91-23
+- Break appdata file out of spec into its own file
+- Validate appdata file once installed
+- Add BuildRequires for libappstream-glib (provides appstream-util)
+- Remove commented out line in file list
+- Re-add export CXXFLAGS="%%{optflags} -std=c++11" to fix build
+
+* Mon Feb 15 2016 Jonathan Underwood <jonathan.underwood(a)gmail.com> - 0.91-22
+- Drop --disable-strict-build since this is fixed:
+ https://bugzilla.gnome.org/show_bug.cgi?id=752797
+- Drop export CXXFLAGS="%%{optflags} -std=c++11" since that's now default
+
+* Mon Feb 15 2016 Jonathan Underwood <jonathan.underwood(a)gmail.com> - 0.91-21
+- Remove BuildRequires for gnome-vfs2-devel
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.91-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jan 22 2016 Marek Kasik <mkasik(a)redhat.com> - 0.91-19
+- Rebuild for poppler-0.40.0
+
+* Fri Jan 15 2016 Jonathan Wakely <jwakely(a)redhat.com> - 0.91-18
+- Rebuilt for Boost 1.60
+
+* Wed Sep 23 2015 Kalev Lember <klember(a)redhat.com> - 0.91-17
+- Fix the build with latest glibmm24
+
+* Thu Aug 27 2015 Jonathan Wakely <jwakely(a)redhat.com> - 0.91-16
+- Rebuilt for Boost 1.59
+
+* Wed Aug 05 2015 Jonathan Wakely <jwakely(a)redhat.com> 0.91-15
+- Rebuilt for Boost 1.58
+
+* Tue Aug 4 2015 Jonathan Underwood <jonathan.underwood(a)gmail.com> - 0.91-14
+- Remove some entries from unused Requires block that we now
+ explicitly Require or Suggests.
+
+* Tue Aug 4 2015 Jonathan Underwood <jonathan.underwood(a)gmail.com> - 0.91-13
+- Add Suggests deps for packages needed to enable LaTeX fragment
+ embedding
+
+* Wed Jul 29 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.91-12
+- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
+
+* Thu Jul 23 2015 Adam Williamson <awilliam(a)redhat.com> - 0.91-11
+- --disable-strict-build (as gtkmm currently uses a deprecated glibmm symbol)
+
+* Wed Jul 22 2015 David Tardon <dtardon(a)redhat.com>
+- rebuild for Boost 1.58
+
+* Wed Jul 22 2015 Marek Kasik <mkasik(a)redhat.com> - 0.91-10
+- Rebuild (poppler-0.34.0)
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.91-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Fri Jun 5 2015 Marek Kasik <mkasik(a)redhat.com> - 0.91-8
+- Rebuild (poppler-0.33.0)
+
+* Wed Apr 29 2015 Kalev Lember <kalevlember(a)gmail.com> - 0.91-7
+- Rebuilt for GCC 5 ABI change
+
+* Thu Mar 26 2015 Richard Hughes <rhughes(a)redhat.com> - 0.91-6
+- Add an AppData file for the software center
+
+* Fri Mar 06 2015 Jon Ciesla <limburgher(a)gmail.com> - 0.91-5
+- ImageMagick rebuild.
+
+* Thu Feb 12 2015 Peter Robinson <pbrobinson(a)fedoraproject.org> 0.91-4
+- Cleanup spec
+- Use %%license
+- Drop (now unneeded) perl requirements (rhbz#579390)
+- Drop ChangeLog as details are covered in NEWS
+
+* Wed Feb 04 2015 Petr Machata <pmachata(a)redhat.com> - 0.91-3
+- Bump for rebuild.
+
+* Fri Jan 30 2015 Jon Ciesla <limburgher(a)gmail.com> - 0.91-2
+- Move tutorials into main package, BZ 1187686.
+
+* Thu Jan 29 2015 Jon Ciesla <limburgher(a)gmail.com> - 0.91-1
+- Latest upstream.
+
+* Tue Jan 27 2015 Petr Machata <pmachata(a)redhat.com> - 0.48.5-7
+- Rebuild for boost 1.57.0
+
+* Fri Jan 23 2015 Marek Kasik <mkasik(a)redhat.com> - 0.48.5-6
+- Rebuild (poppler-0.30.0)
+- Backport commit "Fix build with poppler 0.29.0 (Bug #1399811)"
+
+* Fri Jan 09 2015 Jon Ciesla <limburgher(a)gmail.com> - 0.48.5-5
+- Added aspell support, BZ 1171934.
+
+* Thu Nov 27 2014 Marek Kasik <mkasik(a)redhat.com> - 0.48.5-4
+- Rebuild (poppler-0.28.1)
+
+* Thu Aug 28 2014 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.48.5-3
+- Perl 5.20 rebuild
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.48.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Mon Jul 21 2014 Jon Ciesla <limburgher(a)gmail.com> - 0.48.5-1
+- Latest bugfix release.
+- Spurious comma patch upstreamed.
+- Dropped Freetype, poppler, gc patches.
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.48.4-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue Jun 03 2014 Jon Ciesla <limburgher(a)gmail.com> - 0.48.4-17
+- Switch to lcms2.
+
+* Tue May 27 2014 David Tardon <dtardon(a)redhat.com> - 0.48.4-16
+- switch to librevenge-based import libs
+
+* Fri May 23 2014 Petr Machata <pmachata(a)redhat.com> - 0.48.4-15
+- Rebuild for boost 1.55.0
+
+* Thu May 15 2014 Lubomir Rintel <lkundrak(a)v3.sk> - 0.48.4-14
+- Fix build with new Poppler and GC (Sandro Mani, #1097945)
+
+* Wed May 14 2014 Jon Ciesla <limburgher(a)gmail.com> - 0.48.4-13
+- poppler rebuild.
+
+* Mon Mar 31 2014 Jon Ciesla <limburgher(a)gmail.com> - 0.48.4-12
+- ImageMagick rebuild.
+- Patch for Freetype path.
+
+* Wed Oct 09 2013 Jon Ciesla <limburgher(a)gmail.com> - 0.48.4-11
+- ImageMagick rebuild.
+
+* Mon Aug 19 2013 Marek Kasik <mkasik(a)redhat.com> - 0.48.4-10
+- Rebuild (poppler-0.24.0)
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.48.4-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue Jul 30 2013 Petr Machata <pmachata(a)redhat.com> - 0.48.4-8
+- Rebuild for boost 1.54.0
+
+* Wed Jul 24 2013 Petr Pisar <ppisar(a)redhat.com> - 0.48.4-7
+- Perl 5.18 rebuild
+
+* Tue Jun 25 2013 Jon Ciesla <limburgher(a)gmail.com> - 0.48.4-6
+- libpoppler rebuild.
+
+* Mon Mar 18 2013 Jon Ciesla <limburgher(a)gmail.com> - 0.48.4-5
+- ImageMagick rebuild.
+
+* Fri Feb 15 2013 Jon Ciesla <limburgher(a)gmail.com> - 0.48.4-4
+- Fix FTBFS.
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.48.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Fri Jan 18 2013 Marek Kasik <mkasik(a)redhat.com> - 0.48.4-2
+- Rebuild (poppler-0.22.0)
+
+* Thu Dec 06 2012 Jon Ciesla <limburgher(a)gmail.com> - 0.48.3.1-4
+- 0.48.4, fix XXE security flaw.
+- Correct man page ownership.
+
+* Thu Dec 06 2012 Jon Ciesla <limburgher(a)gmail.com> - 0.48.3.1-4
+- Fix directory ownership, BZ 873817.
+- Fix previous changelog version.
+
+* Mon Nov 19 2012 Nils Philippsen <nils(a)redhat.com> - 0.48.3.1-3
+- update sourceforge download URL
+
+* Thu Nov 01 2012 Jon Ciesla <limburgher(a)gmail.com> - 0.48.3.1-2
+- Allow loading large XML, BZ 871012.
+
+* Fri Oct 05 2012 Jon Ciesla <limburgher(a)gmail.com> - 0.48.3.1-1
+- Lastest upstream.
+
+* Thu Oct 04 2012 Jon Ciesla <limburgher(a)gmail.com> - 0.48.2-13
+- Added dep on uniconvertor, BZ 796424.
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.48.2-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Mon Jul 09 2012 Petr Pisar <ppisar(a)redhat.com> - 0.48.2-11
+- Perl 5.16 rebuild
+
+* Mon Jul 2 2012 Marek Kasik <mkasik(a)redhat.com> - 0.48.2-10
+- Rebuild (poppler-0.20.1)
+
+* Wed Jun 27 2012 Petr Pisar <ppisar(a)redhat.com> - 0.48.2-9
+- Perl 5.16 rebuild
+
+* Sat Jun 23 2012 Rex Dieter <rdieter(a)fedoraproject.org>
+- 0.48.2-8
+- fix icon/desktop-file scriptlets (#739375)
+- drop .desktop vendor (f18+)
+- inkscape doesn't build with poppler-0.20.0 (#822413)
+
+* Fri Jun 15 2012 Petr Pisar <ppisar(a)redhat.com> - 0.48.2-7
+- Perl 5.16 rebuild
+
+* Mon Jun 11 2012 Adel Gadllah <adel.gadllah(a)gmail.com> - 0.48.2-6
+- Rebuild for new poppler
+
+* Wed Apr 11 2012 Peter Robinson <pbrobinson(a)fedoraproject.org> - 0.48.2-5
+- Rebuild for ImageMagik
+
+* Thu Mar 8 2012 Daniel Drake <dsd(a)laptop.org> - 0.48.2-4
+- Fix build with GCC 4.7
+
+* Tue Feb 28 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.48.2-3
+- Rebuilt for c++ ABI breakage
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.48.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Nov 15 2011 German Ruiz <germanrs(a)fedoraproject.org> - 0.48.2-1
+- New upstream version
+- Fix glib include compile problem
+- Fix compilation against libpng-1.5
+
+* Fri Oct 28 2011 Rex Dieter <rdieter(a)fedoraproject.org> - 0.48.1-10
+- rebuild(poppler)
+
+* Fri Sep 30 2011 Marek Kasik <mkasik(a)redhat.com> - 0.48.1-9
+- Rebuild (poppler-0.18.0)
+
+* Mon Sep 19 2011 Marek Kasik <mkasik(a)redhat.com> - 0.48.1-8
+- Rebuild (poppler-0.17.3)
+
+* Thu Jul 21 2011 Petr Sabata <contyk(a)redhat.com> - 0.48.1-7
+- Perl mass rebuild
+
+* Tue Jul 19 2011 Petr Sabata <contyk(a)redhat.com> - 0.48.1-6
+- Perl mass rebuild
+
+* Fri Jul 15 2011 Marek Kasik <mkasik(a)redhat.com> - 0.48.1-5
+- Rebuild (poppler-0.17.0)
+
+* Sun Mar 13 2011 Marek Kasik <mkasik(a)redhat.com> - 0.48.1-4
+- Rebuild (poppler-0.16.3)
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.48.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Feb 09 2011 Lubomir Rintel <lkundrak(a)v3.sk> - 0.48.1-2
+- Re-enable GVFS for OCAL
+
+* Mon Feb 07 2011 Lubomir Rintel <lkundrak(a)v3.sk> - 0.48.1-1
+- Bump release
+
+* Fri Feb 04 2011 Lubomir Rintel <lkundrak(a)v3.sk> - 0.48.0-10
+- Drop gnome-vfs requirement
+- Fix Rawhide build
+
+* Sat Jan 01 2011 Rex Dieter <rdieter(a)fedoraproject.org> - 0.48.0-9
+- rebuild (poppler)
+
+* Wed Dec 15 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 0.48.0-8
+- rebuild (poppler)
+
+* Wed Dec 08 2010 Caolán McNamara <caolanm(a)redhat.com> - 0.48.0-7
+- rebuilt (libwpd)
+
+* Sun Nov 14 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 0.48.0-6
+- rebuilt (poppler)
+
+* Tue Oct 05 2010 Nils Philippsen <nils(a)redhat.com> - 0.48.0-5
+- Rebuild for poppler update
+
+* Wed Sep 29 2010 jkeating - 0.48.0-4
+- Rebuilt for gcc bug 634757
+
+* Wed Sep 29 2010 Dan Horák <dan[at]danny.cz> - 0.48.0-3
+- drop the s390(x) ExcludeArch
+
+* Mon Sep 20 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.48.0-2
+- rebuild for new ImageMagick
+
+* Wed Aug 25 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 0.48.0-1
+- New upstream release
+- Drop el5 support
+
+* Thu Aug 19 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 0.48-0.5.20100505bzr
+- rebuild (poppler)
+
+* Tue Jul 27 2010 David Malcolm <dmalcolm(a)redhat.com> - 0.48-0.4.20100505bzr
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
+* Tue Jun 01 2010 Marcela Maslanova <mmaslano(a)redhat.com> - 0.48-0.3.20100505bzr
+- Mass rebuild with perl-5.12.0
+
+* Wed May 05 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 0.48-0.2.20100505bzr
+- Move to later snapshot
+- Drop uniconvertor patch
+
+* Tue Apr 06 2010 Caolán McNamara <caolanm(a)redhat.com> - 0.48-0.2.20100318bzr
+- Resolves: rhbz#565106 fix inkscape-0.47-x11.patch to not clobber INKSCAPE_LIBS
+
+* Thu Mar 18 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 0.48-0.1.20100318bzr
+- Update to latest bazaar snapshot
+
+* Thu Feb 18 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-7
+- Fix build
+
+* Wed Jan 20 2010 Stepan Kasal <skasal(a)redhat.com> - 0.47-6
+- ExcludeArch: s390 s390x
+
+* Fri Jan 15 2010 Stepan Kasal <skasal(a)redhat.com> - 0.47-5
+- require perl(:MODULE_COMPAT_5.10.x) because the package requires libperl.so
+- the same for inkscape-view
+
+* Fri Jan 8 2010 Owen Taylor <otaylor(a)redhat.com> - 0.47-4
+- Remove loudmouth BuildRequires; there is no current usage of loudmouth in the code
+
+* Sun Dec 06 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-2
+- Fix Rawhide build.
+
+* Wed Nov 25 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-1
+- Stable release
+
+* Mon Nov 23 2009 Adam Jackson <ajax(a)redhat.com> 0.47-0.18.pre4.20091101svn
+- Fix RHEL6 build.
+
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.17.pre4.20091101svn
+- Icon for main window (#532325)
+
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.16.pre4.20091101svn
+- Move to a later snapshot
+- python-lxml and numpy seem to be rather popular, add them as hard deps
+
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.16.pre3.20091017svn
+- Move to a later snapshot
+
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.16.pre3.20090925svn
+- Move to a later snapshot
+- Drop debugging compiler flags, enable optimizations again
+- Make it build on everything since EL5 again
+
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.16.pre2.20090907svn
+- Move inkview man page to -view subpackage (#515358)
+- Add license, etc. to main package
+
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.15.pre2.20090907svn
+- Update to a post-pre2 snapshot
+
+* Mon Aug 10 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.15.pre1.20090629svn
+- Update to a post-pre1 snapshot
+- Drop upstreamed CRC32 fix
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.47-0.14.pre0.20090629svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 29 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.13.pre0.20090629svn
+- Update to a newer snapshot
+
+* Tue Jun 16 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.12.pre0.20090616svn
+- Update to post-pre0 snapshot
+
+* Tue Jun 02 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.11.20090602svn
+- More recent snapshot
+- Upstream removed rasterized icons again
+
+* Sat May 23 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.10.20090518svn
+- Rebuild for new poppler
+
+* Mon May 18 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.9.20090518svn
+- Update past upstream Beta release
+
+* Mon May 18 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.8.20090508svn
+- Fix ODG export
+
+* Fri May 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.7.20090508svn
+- Update to a post-alpha snapshot
+- Upstream applied our GCC 4.4 patch
+
+* Fri Apr 10 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.6.20090410svn
+- Update to newer snapshot
+- Fix doc/incview reversed subpackage content
+
+* Wed Mar 04 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.6.20090301svn
+- Rebuild for new ImageMagick
+
+* Wed Mar 04 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.5.20090301svn
+- Split documentation and inkview into subpackages
+
+* Mon Mar 02 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.4.20090301svn
+- Bump to later SVN snapshot to fix inkscape/+bug/331864
+- Fix a startup crash when compiled with GCC 4.4
+- It even runs now! :)
+
+* Fri Feb 27 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.4.20090227svn
+- Enable the test suite
+
+* Fri Feb 27 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.3.20090227svn
+- Past midnight! :)
+- More recent snapshot, our gcc44 fixes now upstream
+- One more gcc44 fix, it even compiles now
+- We install icons now, update icon cache
+- Disable inkboard, for it won't currently compile
+
+* Thu Feb 26 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.3.20090226svn
+- Later snapshot
+- Compile with GCC 4.4
+
+* Tue Jan 06 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.3.20090105svn
+- Update to newer SVN
+- Drop upstreamed patches
+- Enable WordPerfect Graphics support
+- Enable embedded Perl scripting
+- Enable Imagemagick support
+- Disable OpenSSL due to licensing issues
+
+* Thu Aug 14 2008 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.3.20080814svn
+- Update to today's SVN snapshot
+- Drop the upstreamed poppler patch
+
+* Wed Aug 13 2008 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.2.20080705svn
+- Rediff patches for zero fuzz
+- Use uniconvertor to handle CDR and WMF (#458845)
+
+* Wed Jul 09 2008 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.1.20080705svn
+- Subversion snapshot
+
+* Wed Jul 09 2008 Lubomir Rintel <lkundrak(a)v3.sk> - 0.46-4
+- Fix compile issues with newer gtk and poppler
+
+* Thu Jun 26 2008 Lubomir Rintel <lkundrak(a)v3.sk> - 0.46-3
+- Remove useless old hack, that triggered an assert after gtkfilechooser switched to gio
+
+* Fri Apr 11 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.46-2.1
+- More buildrequires more flexible, so that this builds on RHEL
+
+* Sat Apr 05 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.46-2
+- Fix LaTeX rendering, #441017
+
+* Tue Mar 25 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.46-1
+- 0.46 released
+
+* Sun Mar 23 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.46-0.3.pre3
+- Rebuild for newer Poppler
+
+* Wed Mar 12 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.46-0.2.pre3
+- Probably last prerelease?
+
+* Fri Feb 22 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.46-0.2.pre2
+- Panel icon sizes
+
+* Sun Feb 17 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.46-0.1.pre2
+- 0.46pre2
+- Dropping upstreamed patches
+
+* Sat Feb 16 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.45.1+0.46pre1-5
+- Attempt to fix the font selector (#432892)
+
+* Thu Feb 14 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.45.1+0.46pre1-4
+- Tolerate recoverable errors in OCAL feeds
+- Fix OCAL insecure temporary file usage (#432807)
+
+* Wed Feb 13 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.45.1+0.46pre1-3
+- Fix crash when adding text objects (#432220)
+
+* Thu Feb 07 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.45.1+0.46pre1-2
+- Build with gcc-4.3
+
+* Wed Feb 06 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.45.1+0.46pre1-1
+- 0.46 prerelease
+- Minor cosmetic changes to satisfy the QA script
+- Dependency on Boost
+- Inkboard is not optional
+- Merge from Denis Leroy's svn16571 snapshot:
+- Require specific gtkmm24-devel versions
+- enable-poppler-cairo
+- No longer BuildRequire libsigc++20-devel
+
+* Wed Dec 5 2007 Denis Leroy <denis(a)poolshark.org> - 0.45.1-5
+- Rebuild with new openssl
+
+* Sun Dec 02 2007 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.45.1-4
+- Added missing dependencies for modules (#301881)
+
+* Sun Dec 02 2007 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.45.1-3
+- Satisfy desktop-file-validate, so that Rawhide build won't break
+
+* Sat Dec 01 2007 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.45.1-2
+- Use GTK print dialog
+- Added compressed SVG association (#245413)
+- popt headers went into popt-devel, post Fedora 7
+- Fix macro usage in changelog
+
+* Wed Mar 21 2007 Denis Leroy <denis(a)poolshark.org> - 0.45.1-1
+- Update to bugfix release 0.45.1
+- Added R to ImageMagick-perl (#231563)
+
+* Wed Feb 7 2007 Denis Leroy <denis(a)poolshark.org> - 0.45-1
+- Update to 0.45
+- Enabled inkboard, perl and python extensions
+- Added patch for correct python autodetection
+- LaTex patch integrated upstreamed, removed
+- Some rpmlint cleanups
+
+* Wed Dec 6 2006 Denis Leroy <denis(a)poolshark.org> - 0.44.1-2
+- Added patches to fix LaTex import (#217699)
+- Added patch to base postscript import on pstoedit plot-svg
+
+* Thu Sep 7 2006 Denis Leroy <denis(a)poolshark.org> - 0.44.1-1
+- Update to 0.44.1
+- Removed png export patch, integrated upstream
+- Some updated BRs
+
+* Mon Aug 28 2006 Denis Leroy <denis(a)poolshark.org> - 0.44-6
+- FE6 Rebuild
+
+* Tue Aug 22 2006 Denis Leroy <denis(a)poolshark.org> - 0.44-5
+- Removed skencil Require (bug 203229)
+
+* Thu Aug 10 2006 Denis Leroy <denis(a)poolshark.org> - 0.44-4
+- Added patch to fix png dpi export problem (#168406)
+
+* Wed Aug 9 2006 Denis Leroy <denis(a)poolshark.org> - 0.44-3
+- Bumping up release to fix upgrade path
+
+* Wed Jun 28 2006 Denis Leroy <denis(a)poolshark.org> - 0.44-2
+- Update to 0.44
+- Removed obsolete patches
+- Disabled experimental perl and python extensions
+- Added pstoedit, skencil, gtkspell and LittleCms support
+- Inkboard feature disabled pending further security tests
+
+* Tue Feb 28 2006 Denis Leroy <denis(a)poolshark.org> - 0.43-3
+- Rebuild
+
+* Mon Jan 16 2006 Denis Leroy <denis(a)poolshark.org> - 0.43-2
+- Updated GC patch, bug 171791
+
+* Sat Dec 17 2005 Denis Leroy <denis(a)poolshark.org> - 0.43-1
+- Update to 0.43
+- Added 2 patches to fix g++ 4.1 compilation issues
+- Enabled new jabber/loudmouth-based inkboard feature
+
+* Mon Sep 26 2005 Denis Leroy <denis(a)poolshark.org> - 0.42.2-2
+- rebuilt with newer glibmm
+
+* Thu Sep 1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.42.2-1
+- update to 0.42.2
+
+* Thu Aug 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.42-3
+- rebuilt
+- add patch to repair link-check of GC >= 6.5 (needs pthread and dl)
+
+* Fri Jul 29 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.42-2
+- Extend ngettext/dgettext patch for x86_64 build.
+
+* Tue Jul 26 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.42-1
+- update to 0.42 (also fixes #160326)
+- BR gnome-vfs2-devel
+- no files left in %%_libdir/inkscape
+- include French manual page
+- GCC4 patch obsolete, 64-bit patch obsolete, dgettext patch split off
+
+* Tue May 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.41-7
+- append another 64-bit related patch (dgettext configure check failed)
+
+* Tue May 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.41-6
+- remove explicit aclocal/autoconf calls in %%build as they create a
+ bad Makefile for FC4/i386, which causes build to fail (#156228),
+ and no comment explains where they were added/needed
+
+* Tue May 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.41-5
+- bump and rebuild as 0.41-4 failed in build system setup
+
+* Wed May 25 2005 Jeremy Katz <katzj(a)redhat.com> - 0.41-4
+- add patch for gcc4 problems (ignacio, #156228)
+- fix build on 64bit boxes. sizeof(int) != sizeof(void*)
+
+* Sun May 22 2005 Jeremy Katz <katzj(a)redhat.com> - 0.41-3
+- rebuild on all arches
+
+* Thu Apr 07 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
+* Wed Feb 09 2005 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.41-1
+- 0.41.
+- enable python.
+
+* Sat Dec 04 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.40-1
+- 0.40.
+
+* Tue Nov 16 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.40-0.pre3
+- 0.40pre3.
+
+* Thu Nov 11 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.39-0.fdr.2
+- post/postun for new mime system.
+- Dropped redundant BR XFree86-devel.
+
+* Sun Aug 29 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.39-0.fdr.1
+- 0.39.
+
+* Sat Apr 10 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.38.1-0.fdr.1
+- respin real fix for Provides/Requires for perl(SpSVG)
+
+* Fri Apr 9 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.38.1-0.fdr.0
+- respin with updated tarball with fix for postscript printing
+
+* Thu Apr 8 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.38-0.fdr.2
+- respin to fix provides
+
+* Thu Apr 8 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.38.0.fdr.1
+- version upgrade with many improvements and bug fixes
+
+* Fri Mar 19 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.7
+- repsin - sourceforge does not allow reloading files with same name
+* Tue Mar 16 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.6
+- fix typo in provides
+* Tue Mar 16 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.5
+- add %%{release} to provides perl(SpSVG) = %%{epoch}:%%{version}:%%{release} only
+* Tue Mar 16 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.4
+- add %%{release} to provides
+* Sun Mar 14 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.3
+- add arch dependent flags
+* Thu Mar 11 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.2
+- add libsigc++-devel instead of add libsigc++ - duh
+- add BuildRequires: perl-XML-Parser
+- fix package name to follow package naming guidelines
+* Mon Mar 1 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.1.fdr.1
+- disable static libs
+- enable inkjar
+* Tue Feb 10 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.1
+- pgp'd tarball from inkscape.org
+- clean out the cvs tweaks in spec file
+- enable gnome-print
+- add the new tutorial files
+- make sure .mo file gets packaged
+- add provides: perlSVG
+- submit to Fedora QA
+* Sat Feb 7 2004 P Linnell <scribusdocs at atlantictechsolutions.com>
+- rebuild of current cvs
+- tweaks to build cvs instead of dist tarball
+- add inkview
+* Sat Dec 20 2003 P Linnell <scribusdocs at atlantictechsolutions.com>
+- First crack at Fedora/RH spec file
+- nuke gnome print - it won't work (bug is filed already)
diff --git a/inkscape.spec b/inkscape.spec
index bfbc6ef..72b7e5c 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -1,4 +1,12 @@
-%define debug_package %{nil}
+# Reduce debuginfo verbosity
+%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
+
+%bcond_with check
+%bcond_with toolchain_clang
+
+%if %{with toolchain_clang}
+%global toolchain clang
+%endif
%if %{undefined flatpak} && %{undefined rhel}
%if 0%{?fedora} >= 38
@@ -8,96 +16,124 @@
%endif
%endif
+%global inkscape_date 2023-11-16
+%global date %(d=%{inkscape_date}; echo ${d//-/})
+%global commit 91b66b078370477bd794fe0e1db149c34333dae8
+%global shortcommit %(c=%{commit}; echo ${c:0:10})
+
Name: inkscape
-Version: 1.3
-Release: 7%{?dist}
+Version: 1.3.1
+Release: %autorelease
Summary: Vector-based drawing program using SVG
-# Inkscape tags their releases with underscores and in ALLCAPS
-%global repotag %(echo %{name}_%{version} |tr "." "_" |tr "[:lower:]" "[:upper:]")
-
License: GPL-2.0-or-later AND CC-BY-3.0
URL: https://inkscape.org/
-Source0: https://inkscape.org/release/inkscape-%{version}/source/archive/xz/dl/inksc…
+Source0: https://media.inkscape.org/dl/resources/file/inkscape-%{version}.tar.xz
+
+# The signatures were uploaded by the responsible release manager, and includes release date and commit
+Source1: https://media.inkscape.org/media/resources/sigs/inkscape-%{version}_%{inksc…
+# Keyring(s)
+Source10: https://inkscape.org/~MarcJeanmougin/gpg/#/MarcJeanmougin.gpg
+
+
+# Should we split this package and mark it as a Enhance,
+# to clarify the upstream license for this package? -- mochaa, 2023-10-23
# Fedora Color Palette, GIMP format, CC-BY 3.0
-Source2: Fedora-Color-Palette.gpl
+Source100: Fedora-Color-Palette.gpl
+
+Patch0: 0001-add-xmlmemory-include.patch
# Don't drop i686 until at least texlive no longer needs it -GC, 2023-08-10
#%%if 0%%{?fedora} >= 39
#ExcludeArch: %%{ix86}
#%%endif
-Provides: bundled(libcroco)
-Provides: bundled(autotrace)
-Provides: bundled(libdepixelize)
-Provides: bundled(libuemf)
-Provides: bundled(adaptagrams)
+Provides: bundled(libcroco) = 0.6.99~gitb9e4b47
+Provides: bundled(autotrace) = 0.40.0~git0de6201
+Provides: bundled(libdepixelize) = 0~git19b7601
+Provides: bundled(libuemf) = 0.2.8
+Provides: bundled(adaptagrams) = 0~gitc8e3196
+%if %{with toolchain_clang}
+BuildRequires: clang
+%else
BuildRequires: gcc-c++
-BuildRequires: hunspell-devel hunspell-en
-BuildRequires: atk-devel
-BuildRequires: boost-devel
-BuildRequires: cairo-devel
+%endif
+
+BuildRequires: cmake
+
+BuildRequires: gnupg2
BuildRequires: dos2unix
BuildRequires: desktop-file-utils
-BuildRequires: double-conversion-devel
-BuildRequires: freetype-devel
-BuildRequires: gc-devel >= 6.4
-BuildRequires: libgdl-devel
-BuildRequires: gettext
-BuildRequires: gsl-devel
-BuildRequires: gtkmm30-devel
+BuildRequires: libappstream-glib
+BuildRequires: python3-rpm-macros
+
+%if %{with check}
+BuildRequires: %{_bindir}/bc
+BuildRequires: %{_bindir}/convert
+%endif
+
+BuildRequires: gettext-devel
+BuildRequires: pkgconfig(gtest)
+
+%global gtk3_version 3.24
+
+BuildRequires: pkgconfig(gtkmm-3.0) >= %{gtk3_version}
+BuildRequires: pkgconfig(gdkmm-3.0) >= %{gtk3_version}
+BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
+BuildRequires: pkgconfig(gdk-3.0) >= %{gtk3_version}
+BuildRequires: pkgconfig(gtksourceview-4)
+BuildRequires: pkgconfig(gspell-1)
+
+BuildRequires: cmake(double-conversion)
+BuildRequires: pkgconfig(harfbuzz)
+BuildRequires: pkgconfig(pangocairo) >= 1.44
+BuildRequires: pkgconfig(pangoft2)
+BuildRequires: pkgconfig(fontconfig)
+BuildRequires: pkgconfig(gsl)
+BuildRequires: pkgconfig(gmodule-2.0)
+BuildRequires: pkgconfig(libsoup-2.4) >= 2.42
+BuildRequires: pkgconfig(bdw-gc)
+BuildRequires: pkgconfig(lcms2)
+%if 0%{?fedora} >= 39
+BuildRequires: pkgconfig(2geom) >= 1.3.0
+%endif
+BuildRequires: pkgconfig(poppler) >= 0.20.0
+BuildRequires: pkgconfig(poppler-glib) >= 0.20.0
+BuildRequires: pkgconfig(cairo-svg)
+BuildRequires: pkgconfig(librevenge-0.0)
+BuildRequires: pkgconfig(librevenge-stream-0.0)
+BuildRequires: pkgconfig(libwpg-0.3)
+BuildRequires: pkgconfig(libvisio-0.1)
+BuildRequires: pkgconfig(libcdr-0.1)
+
%if %{with imagemagick}
BuildRequires: pkgconfig(ImageMagick++) < 7
%endif
%if %{with graphicsmagick}
BuildRequires: pkgconfig(GraphicsMagick++)
%endif
-BuildRequires: intltool
-BuildRequires: lcms2-devel
-BuildRequires: lib2geom-devel
-BuildRequires: libpng-devel >= 1.2
-BuildRequires: libwpg-devel
-BuildRequires: libxml2-devel >= 2.6.11
-BuildRequires: libxslt-devel >= 1.0.15
-BuildRequires: pango-devel
-BuildRequires: pkgconfig
-BuildRequires: python3-devel
-BuildRequires: python3-setuptools
-BuildRequires: poppler-glib-devel
-BuildRequires: popt-devel
-BuildRequires: libappstream-glib
-BuildRequires: libtool
-BuildRequires: potrace-devel
-BuildRequires: cmake
-BuildRequires: libwpd-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libsigc++20-devel
-BuildRequires: libsoup-devel
-BuildRequires: gspell-devel
-%if 0%{?fedora} >= 39
-BuildRequires: lib2geom-devel
-%endif
-BuildRequires: make
-# Disable all for now. TODO: Be smarter
-%if 0
-Requires: dia
-Requires: ghostscript
-Requires: perl(Image::Magick)
-Requires: transfig
-Requires: gimp
+BuildRequires: pkgconfig(libjpeg)
+BuildRequires: pkgconfig(libpng) >= 1.2
+
+BuildRequires: pkgconfig(libxslt) >= 1.0.15
+BuildRequires: pkgconfig(libxml-2.0) >= 2.6.11
+
+BuildRequires: pkgconfig(zlib)
+BuildRequires: pkgconfig(readline)
+BuildRequires: pkgconfig(epoxy)
+
+BuildRequires: boost-devel >= 1.19.0
+%if %{with toolchain_clang}
+BuildRequires: libomp-devel
%endif
-Requires: python3
-Requires: python3-lxml
-Requires: python3-numpy
-Requires: python3-scour
-Requires: python3-appdirs
-Requires: python3-cssselect
-Requires: python3-pillow
-Requires: python3-requests
-Requires: python3-inkex
+BuildRequires: potrace-devel
+
+Requires: python%{python3_pkgversion}-libs >= 3.7
+Requires: %{py3_dist inkex}
+
# Weak dependencies for the LaTeX plugin
Suggests: pstoedit
Suggests: tex(latex)
@@ -117,6 +153,12 @@ blending, etc.) and great care is taken in designing a streamlined
interface. It is very easy to edit nodes, perform complex path operations,
trace bitmaps and much more.
+%package libs
+Summary: Shared libraries for Inkscape
+
+%description libs
+This package provides base libraries to share between Inkscape and Inkview.
+
%package view
Summary: Viewing program for SVG files
@@ -135,62 +177,50 @@ graphics in W3C standard Scalable Vector Graphics (SVG) file format.
%prep
-%autosetup -n inkscape-1.3_2023-07-21_0e150ed6c4 -p1
-%py3_shebang_fix .
-find . -name CMakeLists.txt | xargs sed -i 's|COMMAND python |COMMAND %{__python3} |g'
+%{gpgverify} --keyring='%{SOURCE10}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
-#strip invalid tag
-sed -i /url/d org.inkscape.Inkscape.appdata.xml.in
+%autosetup -n inkscape-%{version}_%{inkscape_date}_%{shortcommit} -p1
+%py3_shebang_fix .
# https://bugs.launchpad.net/inkscape/+bug/314381
# A couple of files have executable bits set,
# despite not being executable
-find . -name '*.cpp' | xargs chmod -x
-find . -name '*.h' | xargs chmod -x
-
-# Fix end of line encodings
-dos2unix -k -q share/extensions/*.py
+find . -name '*.cpp' -print0 | xargs -0 chmod -x
+find . -name '*.h' -print0 | xargs -0 chmod -x
%build
-
-%ifarch %{ix86}
-# FTBFS on i686 with LTO enabled
-%define _lto_cflags %{nil}
-%endif
-
-%cmake3 \
+%cmake \
-DWITH_GRAPHICS_MAGICK=%{?with_graphicsmagick:ON}%{!?with_graphicsmagick:OFF} \
-DWITH_IMAGE_MAGICK=%{?with_imagemagick:ON}%{!?with_imagemagick:OFF} \
- -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
- -DBUILD_SHARED_LIBS:BOOL=OFF
+ -DBUILD_TESTING:BOOL=%{?with_check:ON}%{!?with_check:OFF}
%cmake_build
%install
%cmake_install
-find $RPM_BUILD_ROOT -type f -name 'lib*.a' | xargs rm -f
-
-# No skencil anymore
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/sk2svg.sh
# Install Fedora Color Pallette
-install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/inkscape/palettes/
+install -pm 644 %{SOURCE100} %{buildroot}%{_datadir}/inkscape/palettes/
%find_lang %{name} --with-man
-rm -rf $RPM_BUILD_ROOT%{_datadir}/inkscape/doc
-rm -f $RPM_BUILD_ROOT%{_datadir}/doc/inkscape/copyright
+rm -rf %{buildroot}%{_datadir}/inkscape/doc
+rm -f %{buildroot}%{_datadir}/doc/inkscape/copyright
# Use system inkex
-rm -rf $RPM_BUILD_ROOT%{_datadir}/inkscape/extensions/inkex
-ln -s %{python3_sitelib}/inkex $RPM_BUILD_ROOT%{_datadir}/inkscape/extensions/inkex
+rm -rf %{buildroot}%{_datadir}/inkscape/extensions/inkex
+ln -s %{python3_sitelib}/inkex %{buildroot}%{_datadir}/inkscape/extensions/inkex
%check
+%if %{with check}
+%ctest
+%endif
+
# Validate appdata file
-appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/*.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
# Validate desktop file
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.inkscape.Inkscape.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%pretrans -p <lua>
-- Remove directories that will become symlinks
@@ -243,6 +273,13 @@ end
%{_datadir}/bash-completion/completions/inkscape
%ghost %{_datadir}/inkscape/extensions/inkex.removed
+
+%files libs
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%{_libdir}/inkscape/libinkscape_base.so*
+
+
%files view
%{!?_licensedir:%global license %%doc}
%license COPYING
@@ -259,1046 +296,4 @@ end
%changelog
-* Wed Nov 08 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1.3-7
-- Use system inkex
-
-* Thu Aug 24 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1.3-6
-- Use system lib2geom on f39+
-
-* Thu Aug 10 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1.3-5
-- Bring back i686 on f39+
-
-* Wed Aug 02 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1.3-4
-- No lto on i686
-
-* Wed Aug 02 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1.3-3
-- Restore i686 for f38.
-- Poppler rebuild.
-
-* Tue Aug 01 2023 Kalev Lember <klember(a)redhat.com> - 1.3-2
-- Add missing python3-requests requires (rhbz#2227974)
-
-* Mon Jul 24 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1.3-1
-- 1.3
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.2-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jun 28 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1.2.2-10
-- aspell->hunspell
-
-* Wed May 10 2023 Tomas Popela <tpopela(a)redhat.com> - 1.2.2-9
-- Drop BR on dbus-glib as the project is not using it
-
-* Wed Mar 08 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1.2.2-8
-- migrated to SPDX license
-
-* Fri Feb 24 2023 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 1.2.2-7
-- Fix build with GCC 13
-
-* Mon Feb 20 2023 Jonathan Wakely <jwakely(a)redhat.com> - 1.2.2-6
-- Rebuilt for Boost 1.81
-
-* Fri Feb 03 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1.2.2-5
-- poppler rebuild
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Mon Jan 09 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1.2.2-3
-- Require python3-pillow
-
-* Tue Jan 03 2023 Carl George <carl(a)george.computer> - 1.2.2-2
-- Build against GraphicsMagick instead of ImageMagick on F38+, resolves rhbz#2158052
-
-* Tue Dec 06 2022 Gwyn Ciesla <gwync(a)protonmail.com> - 1.2.2-1
-- 1.2.2
-
-* Tue Aug 23 2022 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 1.2.1-4
-- Rebuild for gsl-2.7.1
-
-* Tue Aug 02 2022 Gwyn Ciesla <gwync(a)protonmail.com> - 1.2.1-3
-- Poppler rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jul 14 2022 Gwyn Ciesla <gwync(a)protonmail.com> - 1.2.1-1
-- 1.2.1
-
-* Mon May 23 2022 Gwyn Ciesla <gwync(a)protonmail.com> - 1.2-2
-- Add missing Requires on python3-cssselect
-
-* Tue May 17 2022 Gwyn Ciesla <gwync(a)protonmail.com> - 1.2-1
-- 1.2
-
-* Tue May 17 2022 Sérgio Basto <sergio(a)serjux.com> - 1.1.2-4
-- ImageMagick is not intended to be on RHEL >= 8 (just on EPEL)
-
-* Wed May 11 2022 Gwyn Ciesla <gwync(a)protonmail.com> - 1.1.2-3
-- ImageMagick build.
-
-* Wed May 04 2022 Thomas Rodgers <trodgers(a)redhat.com> - 1.1.2-2
-- Rebuilt for Boost 1.78
-
-* Sun Feb 06 2022 Gwyn Ciesla <gwync(a)protonmail.com> - 1.1.2-1
-- 1.1.2
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.1.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jan 13 2022 Gwyn Ciesla <gwync(a)protonmail.com> - 1.1.1-3
-- Poppler rebuild, with upstream patches.
-
-* Wed Nov 10 2021 Gwyn Ciesla <gwync(a)protonmail.com> - 1.1.1-2
-- Patch for Pango multiline issue.
-
-* Thu Nov 04 2021 Gwyn Ciesla <gwync(a)protonmail.com> - 1.1.1-1
-- 1.1.1
-
-* Wed Aug 18 2021 Gwyn Ciesla <gwync(a)protonmail.com> - 1.1-10
-- Cmake cleanup, BZ 1995130
-
-* Thu Aug 12 2021 Björn Esser <besser82(a)fedoraproject.org> - 1.1-9
-- poppler rebuild, again
-
-* Fri Aug 06 2021 Jonathan Wakely <jwakely(a)redhat.com> - 1.1-8
-- Rebuilt for Boost 1.76
-
-* Mon Aug 02 2021 Gwyn Ciesla <gwync(a)protonmail.com> - 1.1-7
-- poppler rebuild.
-
-* Tue Jul 27 2021 Gwyn Ciesla <gwync(a)protonmail.com> - 1.1-6
-- poppler rebuild.
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon Jun 14 2021 Gwyn Ciesla <gwync(a)protonmail.com> - 1.1-4
-- Enable gspell.
-
-* Wed May 26 2021 Gwyn Ciesla <gwync(a)protonmail.com> - 1.1-3
-- Require python3-appdirs
-
-* Tue May 25 2021 Kalev Lember <klember(a)redhat.com> - 1.1-2
-- Don't install development files for bundled 2geom
-
-* Mon May 24 2021 Gwyn Ciesla <gwync(a)protonmail.com> - 1.1-1
-- 1.1
-
-* Thu Feb 11 2021 Jan Horak <jhorak(a)redhat.com> - 1.0.2-2
-- Added missing bundled source, removed libgdlmm depencency
-
-* Mon Feb 01 2021 Gwyn Ciesla <gwync(a)protonmail.com> - 1.0.2-1
-- 1.0.2
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jan 12 2021 Gwyn Ciesla <gwync(a)protonmail.com> - 1.0.1-4
-- Poppler rebuild.
-
-* Mon Jan 04 2021 Tomas Popela <tpopela(a)redhat.com> - 1.0.1-3
-- Don't build with ImageMagick support in ELN/RHEL
-
-* Fri Sep 11 2020 Kalev Lember <klember(a)redhat.com> - 1.0.1-2
-- Fix appdata 1.0.1 release info
-
-* Tue Sep 08 2020 Gwyn Ciesla <gwync(a)protonmail.com> - 1.0.1-1
-- 1.0.1
-
-* Thu Sep 03 2020 Jeff Law <law(a)redhat.com> - 1.0-8
-- Refine dynamic casts to avoid -Wnonnull warning with gcc-11
-
-* Mon Aug 17 2020 Kalev Lember <klember(a)redhat.com> - 1.0-7
-- Drop two unneeded dependencies
-- Validate appdata file in check rather than install section
-- Use desktop-file-validate instead of desktop-file-install
-- Drop unused gtk2 buildrequires
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 14 2020 Tom Stellard <tstellar(a)redhat.com> - 1.0-5
-- Use make macros
-- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
-
-* Mon Jul 13 2020 Gwyn Ciesla <gwync(a)protonmail.com> - 1.0-4
-- Poppler 0.90.0 rebuild.
-
-* Tue Jun 23 2020 Gwyn Ciesla <gwync(a)protonmail.com> - 1.0-3
-- BR python3-setuptools.
-
-* Thu May 07 2020 Gwyn Ciesla <gwync(a)protonmail.com> - 1.0-2
-- Fix runtime dependencies.
-
-* Fri May 01 2020 Gwyn Ciesla <gwync(a)protonmail.com> - 1.0-1
-- 1.0 final
-
-* Wed Apr 15 2020 Gwyn Ciesla <gwync(a)protonmail.com> - 1.0-0.rc1.1
-- Download version with extensions.
-
-* Sat Apr 11 2020 Gwyn Ciesla <gwync(a)protonmail.com> - 1.0-0.rc1
-- 1.0 RC1
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0-0.beta.5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Jan 17 2020 Marek Kasik <mkasik(a)redhat.com> - 1.0-0.beta.4
-- Rebuild for poppler-0.84.0
-
-* Wed Dec 04 2019 Gwyn Ciesla <gwync(a)protonmail.com> - 1.0-0.beta.3
-- 1.0 beta 2
-
-* Mon Oct 14 2019 Gwyn Ciesla <gwync(a)protonmail.com> - 1.0-0.beta.2
-- 1.0 beta 1
-
-* Tue Sep 24 2019 Christoph Junghans <junghans(a)votca.org> - 1.0-0.beta.1
-- Rebuild for libdouble-conversion
-
-* Mon Sep 09 2019 Gwyn Ciesla <gwync(a)protonmail.com> - 1.0-0.beta
-- 1.0 beta
-
-* Mon Sep 09 2019 Kalev Lember <klember(a)redhat.com> - 0.92.4-12.git179c1e14
-- Use upstream appdata
-
-* Fri Aug 30 2019 Miro Hrončok <mhroncok(a)redhat.com> - 0.92.4-11.git179c1e14
-- Explicitly depend on Python 3 interpreter
-- Use python3 explicitly when building
-
-* Mon Aug 26 2019 Gwyn Ciesla <gwync(a)protonmail.com> - 0.92.4-10.git179c1e14
-- git snapshot for Python 3.
-
-* Tue Aug 20 2019 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 0.92.4-9
-- Rebuilt for GSL 2.6.
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.92.4-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jun 20 2019 Kalev Lember <klember(a)redhat.com> - 0.92.4-7
-- Don't hardcode /usr prefix
-
-* Wed Jun 12 2019 Kalev Lember <klember(a)redhat.com> - 0.92.4-6
-- Avoid ruby dep for flatpak builds
-
-* Wed Mar 27 2019 Gwyn Ciesla <gwync(a)protonmail.com> - 0.92.4-5
-- Build without -D_FORTIFY_SOURCE=2 to work around https://bugs.launchpad.net/inkscape/+bug/1778951
-
-* Fri Feb 08 2019 Gwyn Ciesla <gwync(a)protonmail.com> - 0.92.4-4
-- Drop gvfs.
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.92.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jan 25 2019 Marek Kasik <mkasik(a)redhat.com> - 0.92.4-2
-- Rebuild for poppler-0.73.0
-
-* Thu Jan 17 2019 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.4-1
-- 0.92.4
-
-* Tue Jan 15 2019 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.3-11
-- End of line patch.
-
-* Mon Jan 14 2019 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.3-10
-- Alternate out of bounds patch.
-
-* Fri Jan 11 2019 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.3-9
-- Patch for out of bounds.
-
-* Tue Dec 04 2018 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.3-8
-- Add bundled provides.
-
-* Tue Sep 11 2018 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.3-7
-- Fix shebang handling.
-
-* Tue Aug 28 2018 Michael Cronenworth <mike(a)cchtml.com> - 0.92.3-6
-- Rebuild for ImageMagick 6.9.10
-
-* Tue Aug 14 2018 Marek Kasik <mkasik(a)redhat.com> - 0.92.3-5
-- Rebuild for poppler-0.67.0
-
-* Fri Jul 20 2018 Debarshi Ray <rishi(a)fedoraproject.org> - 0.92.3-4
-- Fix FTBFS due to Python2
-- Remove GTK3-based BuildRequires
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.92.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Jun 27 2018 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.3-2
-- Fix for crash, 1575842.
-
-* Tue Apr 17 2018 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.3-1
-- 0.92.3.
-
-* Fri Mar 23 2018 Marek Kasik <mkasik(a)redhat.com> - 0.92.2-8
-- Rebuild for poppler-0.63.0
-
-* Thu Mar 01 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 0.92.2-7
-- Update Python 2 dependency declarations to new packaging standards
- (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Wed Feb 14 2018 David Tardon <dtardon(a)redhat.com> - 0.92.2-6
-- rebuild for poppler 0.62.0
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.92.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Jan 11 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.92.2-4
-- Remove obsolete scriptlets
-
-* Wed Nov 08 2017 David Tardon <dtardon(a)redhat.com> - 0.92.2-3
-- rebuild for poppler 0.61.0
-
-* Fri Oct 06 2017 David Tardon <dtardon(a)redhat.com> - 0.92.2-2
-- rebuild for poppler 0.60.1
-
-* Mon Sep 25 2017 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.2-1
-- 0.92.2 final.
-
-* Fri Sep 08 2017 David Tardon <dtardon(a)redhat.com> - 0.92.1-15.20170713bzr15740
-- rebuild for poppler 0.59.0
-
-* Tue Sep 05 2017 Adam Williamson <awilliam(a)redhat.com> - 0.92.1-14.20170713bzr15740
-- Rebuild for ImageMagick 6 reversion, drop ImageMagick 7 patch
-
-* Sun Aug 27 2017 Ville Skyttä <ville.skytta(a)iki.fi> - 0.92.1-13.20170713bzr15740
-- Own the /usr/lib/inkscape dir
-- %%langify non-English man pages
-
-* Fri Aug 25 2017 Michael Cronenworth <mike(a)cchtml.com> - 0.92.1-12.20170713bzr15740
-- Rebuilt for ImageMagick
-
-* Tue Aug 08 2017 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.1-11.20170713bzr15740
-- Require aspell-en
-
-* Thu Aug 03 2017 David Tardon <dtardon(a)redhat.com> - 0.92.1-10.20170713bzr15740
-- rebuild for poppler 0.57.0
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.92.1-9.20170713bzr15740
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Sun Jul 30 2017 Kevin Fenzi <kevin(a)scrye.com> - 0.92.1-8.20170713bzr15740
-- Rebuilt for ImageMagick
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.92.1-7.20170713bzr15740
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Thu Jul 13 2017 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.1-6.20170713bzr15740
-- Updated snapshot.
-
-* Fri Jun 23 2017 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.1-5.20170510bzr15686
-- Move from gtkspell to gtkspell3, BZ 1464487.
-
-* Wed May 10 2017 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.1-4.20170510bzr15686
-- Update to fix on Wayland.
-- Fix CFLAGS.
-
-* Tue Mar 28 2017 David Tardon <dtardon(a)redhat.com> - 0.92.1-3.20170321bzr15604
-- rebuild for poppler 0.53.0
-
-* Tue Mar 21 2017 Gwyn Ciesla <limburgher(a)gmail.com> - 0.92.1-2.20170321bzr15604
-- Snapshot to fix gcc7 FTBFS.
-
-* Thu Feb 16 2017 Jon Ciesla <limburgher(a)gmail.com> - 0.92.1-1
-- 0.92.1 final.
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.92.0-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Jan 05 2017 Jon Ciesla <limburgher(a)gmail.com> - 0.92.0-11
-- 0.92 final.
-
-* Fri Dec 30 2016 Jon Ciesla <limburgher(a)gmail.com> - 0.92-10.pre5
-- 0.92pre5.
-
-* Thu Dec 22 2016 Jon Ciesla <limburgher(a)gmail.com> - 0.92-9.pre4
-- 0.92pre4.
-
-* Fri Dec 16 2016 David Tardon <dtardon(a)redhat.com> - 0.92-8.pre3
-- rebuild for poppler 0.50.0
-
-* Mon Nov 28 2016 Jon Ciesla <limburgher(a)gmail.com> - 0.92-7.pre3
-- 0.92pre3.
-- Include Fedora Color Palette, BZ 981748
-
-* Wed Nov 23 2016 David Tardon <dtardon(a)redhat.com> - 0.92-6.pre2
-- rebuild for poppler 0.49.0
-
-* Fri Oct 28 2016 Jon Ciesla <limburgher(a)gmail.com> - 0.92-5.pre2
-- Require python-scour, BZ 1389772.
-
-* Fri Oct 28 2016 Jon Ciesla <limburgher(a)gmail.com> - 0.92-4.pre2
-- BR potrace-devel, BZ 1389772.
-
-* Fri Oct 21 2016 Jon Ciesla <limburgher(a)gmail.com> - 0.92-3.pre2
-- Fix release tag.
-
-* Fri Oct 21 2016 Marek Kasik <mkasik(a)redhat.com> - 0.92-2.pre2
-- Rebuild for poppler-0.48.0
-
-* Wed Oct 19 2016 Jon Ciesla <limburgher(a)gmail.com> - 0.92-0.pre2
-- 0.92pre2.
-
-* Mon Jul 18 2016 Marek Kasik <mkasik(a)redhat.com> - 0.92-1.pre1
-- Rebuild for poppler-0.45.0
-
-* Tue Jun 14 2016 Jon Ciesla <limburgher(a)gmail.com> - 0.92-0.pre1
-- 0.92pre1.
-- Drop docs requirement on main package, BZ 1247239.
-
-* Tue May 17 2016 Jon Ciesla <limburgher(a)gmail.com> - 0.92-0.pre0
-- 0.92pre0, BZ 1336412.
-
-* Tue May 3 2016 Marek Kasik <mkasik(a)redhat.com> - 0.91-27
-- Rebuild for poppler-0.43.0
-
-* Fri Apr 08 2016 Jon Ciesla <limburgher(a)gmail.com> - 0.91-26
-- Fix FTBFS with patch from https://bugzilla.gnome.org/show_bug.cgi?id=586626
-
-* Mon Feb 22 2016 Orion Poplawski <orion(a)cora.nwra.com>
-- Rebuild for gsl 2.1
-
-* Tue Feb 16 2016 Jonathan Underwood <jonathan.underwood(a)gmail.com> - 0.91-24
-- Add Requires for gvfs
-
-* Mon Feb 15 2016 Jonathan Underwood <jonathan.underwood(a)gmail.com> - 0.91-23
-- Break appdata file out of spec into its own file
-- Validate appdata file once installed
-- Add BuildRequires for libappstream-glib (provides appstream-util)
-- Remove commented out line in file list
-- Re-add export CXXFLAGS="%%{optflags} -std=c++11" to fix build
-
-* Mon Feb 15 2016 Jonathan Underwood <jonathan.underwood(a)gmail.com> - 0.91-22
-- Drop --disable-strict-build since this is fixed:
- https://bugzilla.gnome.org/show_bug.cgi?id=752797
-- Drop export CXXFLAGS="%%{optflags} -std=c++11" since that's now default
-
-* Mon Feb 15 2016 Jonathan Underwood <jonathan.underwood(a)gmail.com> - 0.91-21
-- Remove BuildRequires for gnome-vfs2-devel
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.91-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Jan 22 2016 Marek Kasik <mkasik(a)redhat.com> - 0.91-19
-- Rebuild for poppler-0.40.0
-
-* Fri Jan 15 2016 Jonathan Wakely <jwakely(a)redhat.com> - 0.91-18
-- Rebuilt for Boost 1.60
-
-* Wed Sep 23 2015 Kalev Lember <klember(a)redhat.com> - 0.91-17
-- Fix the build with latest glibmm24
-
-* Thu Aug 27 2015 Jonathan Wakely <jwakely(a)redhat.com> - 0.91-16
-- Rebuilt for Boost 1.59
-
-* Wed Aug 05 2015 Jonathan Wakely <jwakely(a)redhat.com> 0.91-15
-- Rebuilt for Boost 1.58
-
-* Tue Aug 4 2015 Jonathan Underwood <jonathan.underwood(a)gmail.com> - 0.91-14
-- Remove some entries from unused Requires block that we now
- explicitly Require or Suggests.
-
-* Tue Aug 4 2015 Jonathan Underwood <jonathan.underwood(a)gmail.com> - 0.91-13
-- Add Suggests deps for packages needed to enable LaTeX fragment
- embedding
-
-* Wed Jul 29 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.91-12
-- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
-
-* Thu Jul 23 2015 Adam Williamson <awilliam(a)redhat.com> - 0.91-11
-- --disable-strict-build (as gtkmm currently uses a deprecated glibmm symbol)
-
-* Wed Jul 22 2015 David Tardon <dtardon(a)redhat.com>
-- rebuild for Boost 1.58
-
-* Wed Jul 22 2015 Marek Kasik <mkasik(a)redhat.com> - 0.91-10
-- Rebuild (poppler-0.34.0)
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.91-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Fri Jun 5 2015 Marek Kasik <mkasik(a)redhat.com> - 0.91-8
-- Rebuild (poppler-0.33.0)
-
-* Wed Apr 29 2015 Kalev Lember <kalevlember(a)gmail.com> - 0.91-7
-- Rebuilt for GCC 5 ABI change
-
-* Thu Mar 26 2015 Richard Hughes <rhughes(a)redhat.com> - 0.91-6
-- Add an AppData file for the software center
-
-* Fri Mar 06 2015 Jon Ciesla <limburgher(a)gmail.com> - 0.91-5
-- ImageMagick rebuild.
-
-* Thu Feb 12 2015 Peter Robinson <pbrobinson(a)fedoraproject.org> 0.91-4
-- Cleanup spec
-- Use %%license
-- Drop (now unneeded) perl requirements (rhbz#579390)
-- Drop ChangeLog as details are covered in NEWS
-
-* Wed Feb 04 2015 Petr Machata <pmachata(a)redhat.com> - 0.91-3
-- Bump for rebuild.
-
-* Fri Jan 30 2015 Jon Ciesla <limburgher(a)gmail.com> - 0.91-2
-- Move tutorials into main package, BZ 1187686.
-
-* Thu Jan 29 2015 Jon Ciesla <limburgher(a)gmail.com> - 0.91-1
-- Latest upstream.
-
-* Tue Jan 27 2015 Petr Machata <pmachata(a)redhat.com> - 0.48.5-7
-- Rebuild for boost 1.57.0
-
-* Fri Jan 23 2015 Marek Kasik <mkasik(a)redhat.com> - 0.48.5-6
-- Rebuild (poppler-0.30.0)
-- Backport commit "Fix build with poppler 0.29.0 (Bug #1399811)"
-
-* Fri Jan 09 2015 Jon Ciesla <limburgher(a)gmail.com> - 0.48.5-5
-- Added aspell support, BZ 1171934.
-
-* Thu Nov 27 2014 Marek Kasik <mkasik(a)redhat.com> - 0.48.5-4
-- Rebuild (poppler-0.28.1)
-
-* Thu Aug 28 2014 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.48.5-3
-- Perl 5.20 rebuild
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.48.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Mon Jul 21 2014 Jon Ciesla <limburgher(a)gmail.com> - 0.48.5-1
-- Latest bugfix release.
-- Spurious comma patch upstreamed.
-- Dropped Freetype, poppler, gc patches.
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.48.4-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Tue Jun 03 2014 Jon Ciesla <limburgher(a)gmail.com> - 0.48.4-17
-- Switch to lcms2.
-
-* Tue May 27 2014 David Tardon <dtardon(a)redhat.com> - 0.48.4-16
-- switch to librevenge-based import libs
-
-* Fri May 23 2014 Petr Machata <pmachata(a)redhat.com> - 0.48.4-15
-- Rebuild for boost 1.55.0
-
-* Thu May 15 2014 Lubomir Rintel <lkundrak(a)v3.sk> - 0.48.4-14
-- Fix build with new Poppler and GC (Sandro Mani, #1097945)
-
-* Wed May 14 2014 Jon Ciesla <limburgher(a)gmail.com> - 0.48.4-13
-- poppler rebuild.
-
-* Mon Mar 31 2014 Jon Ciesla <limburgher(a)gmail.com> - 0.48.4-12
-- ImageMagick rebuild.
-- Patch for Freetype path.
-
-* Wed Oct 09 2013 Jon Ciesla <limburgher(a)gmail.com> - 0.48.4-11
-- ImageMagick rebuild.
-
-* Mon Aug 19 2013 Marek Kasik <mkasik(a)redhat.com> - 0.48.4-10
-- Rebuild (poppler-0.24.0)
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.48.4-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Tue Jul 30 2013 Petr Machata <pmachata(a)redhat.com> - 0.48.4-8
-- Rebuild for boost 1.54.0
-
-* Wed Jul 24 2013 Petr Pisar <ppisar(a)redhat.com> - 0.48.4-7
-- Perl 5.18 rebuild
-
-* Tue Jun 25 2013 Jon Ciesla <limburgher(a)gmail.com> - 0.48.4-6
-- libpoppler rebuild.
-
-* Mon Mar 18 2013 Jon Ciesla <limburgher(a)gmail.com> - 0.48.4-5
-- ImageMagick rebuild.
-
-* Fri Feb 15 2013 Jon Ciesla <limburgher(a)gmail.com> - 0.48.4-4
-- Fix FTBFS.
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.48.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Fri Jan 18 2013 Marek Kasik <mkasik(a)redhat.com> - 0.48.4-2
-- Rebuild (poppler-0.22.0)
-
-* Thu Dec 06 2012 Jon Ciesla <limburgher(a)gmail.com> - 0.48.3.1-4
-- 0.48.4, fix XXE security flaw.
-- Correct man page ownership.
-
-* Thu Dec 06 2012 Jon Ciesla <limburgher(a)gmail.com> - 0.48.3.1-4
-- Fix directory ownership, BZ 873817.
-- Fix previous changelog version.
-
-* Mon Nov 19 2012 Nils Philippsen <nils(a)redhat.com> - 0.48.3.1-3
-- update sourceforge download URL
-
-* Thu Nov 01 2012 Jon Ciesla <limburgher(a)gmail.com> - 0.48.3.1-2
-- Allow loading large XML, BZ 871012.
-
-* Fri Oct 05 2012 Jon Ciesla <limburgher(a)gmail.com> - 0.48.3.1-1
-- Lastest upstream.
-
-* Thu Oct 04 2012 Jon Ciesla <limburgher(a)gmail.com> - 0.48.2-13
-- Added dep on uniconvertor, BZ 796424.
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.48.2-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Mon Jul 09 2012 Petr Pisar <ppisar(a)redhat.com> - 0.48.2-11
-- Perl 5.16 rebuild
-
-* Mon Jul 2 2012 Marek Kasik <mkasik(a)redhat.com> - 0.48.2-10
-- Rebuild (poppler-0.20.1)
-
-* Wed Jun 27 2012 Petr Pisar <ppisar(a)redhat.com> - 0.48.2-9
-- Perl 5.16 rebuild
-
-* Sat Jun 23 2012 Rex Dieter <rdieter(a)fedoraproject.org>
-- 0.48.2-8
-- fix icon/desktop-file scriptlets (#739375)
-- drop .desktop vendor (f18+)
-- inkscape doesn't build with poppler-0.20.0 (#822413)
-
-* Fri Jun 15 2012 Petr Pisar <ppisar(a)redhat.com> - 0.48.2-7
-- Perl 5.16 rebuild
-
-* Mon Jun 11 2012 Adel Gadllah <adel.gadllah(a)gmail.com> - 0.48.2-6
-- Rebuild for new poppler
-
-* Wed Apr 11 2012 Peter Robinson <pbrobinson(a)fedoraproject.org> - 0.48.2-5
-- Rebuild for ImageMagik
-
-* Thu Mar 8 2012 Daniel Drake <dsd(a)laptop.org> - 0.48.2-4
-- Fix build with GCC 4.7
-
-* Tue Feb 28 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.48.2-3
-- Rebuilt for c++ ABI breakage
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.48.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Nov 15 2011 German Ruiz <germanrs(a)fedoraproject.org> - 0.48.2-1
-- New upstream version
-- Fix glib include compile problem
-- Fix compilation against libpng-1.5
-
-* Fri Oct 28 2011 Rex Dieter <rdieter(a)fedoraproject.org> - 0.48.1-10
-- rebuild(poppler)
-
-* Fri Sep 30 2011 Marek Kasik <mkasik(a)redhat.com> - 0.48.1-9
-- Rebuild (poppler-0.18.0)
-
-* Mon Sep 19 2011 Marek Kasik <mkasik(a)redhat.com> - 0.48.1-8
-- Rebuild (poppler-0.17.3)
-
-* Thu Jul 21 2011 Petr Sabata <contyk(a)redhat.com> - 0.48.1-7
-- Perl mass rebuild
-
-* Tue Jul 19 2011 Petr Sabata <contyk(a)redhat.com> - 0.48.1-6
-- Perl mass rebuild
-
-* Fri Jul 15 2011 Marek Kasik <mkasik(a)redhat.com> - 0.48.1-5
-- Rebuild (poppler-0.17.0)
-
-* Sun Mar 13 2011 Marek Kasik <mkasik(a)redhat.com> - 0.48.1-4
-- Rebuild (poppler-0.16.3)
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.48.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Wed Feb 09 2011 Lubomir Rintel <lkundrak(a)v3.sk> - 0.48.1-2
-- Re-enable GVFS for OCAL
-
-* Mon Feb 07 2011 Lubomir Rintel <lkundrak(a)v3.sk> - 0.48.1-1
-- Bump release
-
-* Fri Feb 04 2011 Lubomir Rintel <lkundrak(a)v3.sk> - 0.48.0-10
-- Drop gnome-vfs requirement
-- Fix Rawhide build
-
-* Sat Jan 01 2011 Rex Dieter <rdieter(a)fedoraproject.org> - 0.48.0-9
-- rebuild (poppler)
-
-* Wed Dec 15 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 0.48.0-8
-- rebuild (poppler)
-
-* Wed Dec 08 2010 Caolán McNamara <caolanm(a)redhat.com> - 0.48.0-7
-- rebuilt (libwpd)
-
-* Sun Nov 14 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 0.48.0-6
-- rebuilt (poppler)
-
-* Tue Oct 05 2010 Nils Philippsen <nils(a)redhat.com> - 0.48.0-5
-- Rebuild for poppler update
-
-* Wed Sep 29 2010 jkeating - 0.48.0-4
-- Rebuilt for gcc bug 634757
-
-* Wed Sep 29 2010 Dan Horák <dan[at]danny.cz> - 0.48.0-3
-- drop the s390(x) ExcludeArch
-
-* Mon Sep 20 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.48.0-2
-- rebuild for new ImageMagick
-
-* Wed Aug 25 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 0.48.0-1
-- New upstream release
-- Drop el5 support
-
-* Thu Aug 19 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 0.48-0.5.20100505bzr
-- rebuild (poppler)
-
-* Tue Jul 27 2010 David Malcolm <dmalcolm(a)redhat.com> - 0.48-0.4.20100505bzr
-- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
-
-* Tue Jun 01 2010 Marcela Maslanova <mmaslano(a)redhat.com> - 0.48-0.3.20100505bzr
-- Mass rebuild with perl-5.12.0
-
-* Wed May 05 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 0.48-0.2.20100505bzr
-- Move to later snapshot
-- Drop uniconvertor patch
-
-* Tue Apr 06 2010 Caolán McNamara <caolanm(a)redhat.com> - 0.48-0.2.20100318bzr
-- Resolves: rhbz#565106 fix inkscape-0.47-x11.patch to not clobber INKSCAPE_LIBS
-
-* Thu Mar 18 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 0.48-0.1.20100318bzr
-- Update to latest bazaar snapshot
-
-* Thu Feb 18 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-7
-- Fix build
-
-* Wed Jan 20 2010 Stepan Kasal <skasal(a)redhat.com> - 0.47-6
-- ExcludeArch: s390 s390x
-
-* Fri Jan 15 2010 Stepan Kasal <skasal(a)redhat.com> - 0.47-5
-- require perl(:MODULE_COMPAT_5.10.x) because the package requires libperl.so
-- the same for inkscape-view
-
-* Fri Jan 8 2010 Owen Taylor <otaylor(a)redhat.com> - 0.47-4
-- Remove loudmouth BuildRequires; there is no current usage of loudmouth in the code
-
-* Sun Dec 06 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-2
-- Fix Rawhide build.
-
-* Wed Nov 25 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-1
-- Stable release
-
-* Mon Nov 23 2009 Adam Jackson <ajax(a)redhat.com> 0.47-0.18.pre4.20091101svn
-- Fix RHEL6 build.
-
-* Mon Sep 07 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.17.pre4.20091101svn
-- Icon for main window (#532325)
-
-* Mon Sep 07 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.16.pre4.20091101svn
-- Move to a later snapshot
-- python-lxml and numpy seem to be rather popular, add them as hard deps
-
-* Mon Sep 07 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.16.pre3.20091017svn
-- Move to a later snapshot
-
-* Mon Sep 07 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.16.pre3.20090925svn
-- Move to a later snapshot
-- Drop debugging compiler flags, enable optimizations again
-- Make it build on everything since EL5 again
-
-* Mon Sep 07 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.16.pre2.20090907svn
-- Move inkview man page to -view subpackage (#515358)
-- Add license, etc. to main package
-
-* Mon Sep 07 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.15.pre2.20090907svn
-- Update to a post-pre2 snapshot
-
-* Mon Aug 10 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.15.pre1.20090629svn
-- Update to a post-pre1 snapshot
-- Drop upstreamed CRC32 fix
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.47-0.14.pre0.20090629svn
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Mon Jun 29 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.13.pre0.20090629svn
-- Update to a newer snapshot
-
-* Tue Jun 16 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.12.pre0.20090616svn
-- Update to post-pre0 snapshot
-
-* Tue Jun 02 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.11.20090602svn
-- More recent snapshot
-- Upstream removed rasterized icons again
-
-* Sat May 23 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.10.20090518svn
-- Rebuild for new poppler
-
-* Mon May 18 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.9.20090518svn
-- Update past upstream Beta release
-
-* Mon May 18 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.8.20090508svn
-- Fix ODG export
-
-* Fri May 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.7.20090508svn
-- Update to a post-alpha snapshot
-- Upstream applied our GCC 4.4 patch
-
-* Fri Apr 10 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.6.20090410svn
-- Update to newer snapshot
-- Fix doc/incview reversed subpackage content
-
-* Wed Mar 04 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.6.20090301svn
-- Rebuild for new ImageMagick
-
-* Wed Mar 04 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.5.20090301svn
-- Split documentation and inkview into subpackages
-
-* Mon Mar 02 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.4.20090301svn
-- Bump to later SVN snapshot to fix inkscape/+bug/331864
-- Fix a startup crash when compiled with GCC 4.4
-- It even runs now! :)
-
-* Fri Feb 27 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.4.20090227svn
-- Enable the test suite
-
-* Fri Feb 27 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.3.20090227svn
-- Past midnight! :)
-- More recent snapshot, our gcc44 fixes now upstream
-- One more gcc44 fix, it even compiles now
-- We install icons now, update icon cache
-- Disable inkboard, for it won't currently compile
-
-* Thu Feb 26 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.3.20090226svn
-- Later snapshot
-- Compile with GCC 4.4
-
-* Tue Jan 06 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.3.20090105svn
-- Update to newer SVN
-- Drop upstreamed patches
-- Enable WordPerfect Graphics support
-- Enable embedded Perl scripting
-- Enable Imagemagick support
-- Disable OpenSSL due to licensing issues
-
-* Thu Aug 14 2008 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.3.20080814svn
-- Update to today's SVN snapshot
-- Drop the upstreamed poppler patch
-
-* Wed Aug 13 2008 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.2.20080705svn
-- Rediff patches for zero fuzz
-- Use uniconvertor to handle CDR and WMF (#458845)
-
-* Wed Jul 09 2008 Lubomir Rintel <lkundrak(a)v3.sk> - 0.47-0.1.20080705svn
-- Subversion snapshot
-
-* Wed Jul 09 2008 Lubomir Rintel <lkundrak(a)v3.sk> - 0.46-4
-- Fix compile issues with newer gtk and poppler
-
-* Thu Jun 26 2008 Lubomir Rintel <lkundrak(a)v3.sk> - 0.46-3
-- Remove useless old hack, that triggered an assert after gtkfilechooser switched to gio
-
-* Fri Apr 11 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.46-2.1
-- More buildrequires more flexible, so that this builds on RHEL
-
-* Sat Apr 05 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.46-2
-- Fix LaTeX rendering, #441017
-
-* Tue Mar 25 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.46-1
-- 0.46 released
-
-* Sun Mar 23 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.46-0.3.pre3
-- Rebuild for newer Poppler
-
-* Wed Mar 12 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.46-0.2.pre3
-- Probably last prerelease?
-
-* Fri Feb 22 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.46-0.2.pre2
-- Panel icon sizes
-
-* Sun Feb 17 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.46-0.1.pre2
-- 0.46pre2
-- Dropping upstreamed patches
-
-* Sat Feb 16 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.45.1+0.46pre1-5
-- Attempt to fix the font selector (#432892)
-
-* Thu Feb 14 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.45.1+0.46pre1-4
-- Tolerate recoverable errors in OCAL feeds
-- Fix OCAL insecure temporary file usage (#432807)
-
-* Wed Feb 13 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.45.1+0.46pre1-3
-- Fix crash when adding text objects (#432220)
-
-* Thu Feb 07 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.45.1+0.46pre1-2
-- Build with gcc-4.3
-
-* Wed Feb 06 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.45.1+0.46pre1-1
-- 0.46 prerelease
-- Minor cosmetic changes to satisfy the QA script
-- Dependency on Boost
-- Inkboard is not optional
-- Merge from Denis Leroy's svn16571 snapshot:
-- Require specific gtkmm24-devel versions
-- enable-poppler-cairo
-- No longer BuildRequire libsigc++20-devel
-
-* Wed Dec 5 2007 Denis Leroy <denis(a)poolshark.org> - 0.45.1-5
-- Rebuild with new openssl
-
-* Sun Dec 02 2007 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.45.1-4
-- Added missing dependencies for modules (#301881)
-
-* Sun Dec 02 2007 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.45.1-3
-- Satisfy desktop-file-validate, so that Rawhide build won't break
-
-* Sat Dec 01 2007 Lubomir Kundrak <lkundrak(a)redhat.com> - 0.45.1-2
-- Use GTK print dialog
-- Added compressed SVG association (#245413)
-- popt headers went into popt-devel, post Fedora 7
-- Fix macro usage in changelog
-
-* Wed Mar 21 2007 Denis Leroy <denis(a)poolshark.org> - 0.45.1-1
-- Update to bugfix release 0.45.1
-- Added R to ImageMagick-perl (#231563)
-
-* Wed Feb 7 2007 Denis Leroy <denis(a)poolshark.org> - 0.45-1
-- Update to 0.45
-- Enabled inkboard, perl and python extensions
-- Added patch for correct python autodetection
-- LaTex patch integrated upstreamed, removed
-- Some rpmlint cleanups
-
-* Wed Dec 6 2006 Denis Leroy <denis(a)poolshark.org> - 0.44.1-2
-- Added patches to fix LaTex import (#217699)
-- Added patch to base postscript import on pstoedit plot-svg
-
-* Thu Sep 7 2006 Denis Leroy <denis(a)poolshark.org> - 0.44.1-1
-- Update to 0.44.1
-- Removed png export patch, integrated upstream
-- Some updated BRs
-
-* Mon Aug 28 2006 Denis Leroy <denis(a)poolshark.org> - 0.44-6
-- FE6 Rebuild
-
-* Tue Aug 22 2006 Denis Leroy <denis(a)poolshark.org> - 0.44-5
-- Removed skencil Require (bug 203229)
-
-* Thu Aug 10 2006 Denis Leroy <denis(a)poolshark.org> - 0.44-4
-- Added patch to fix png dpi export problem (#168406)
-
-* Wed Aug 9 2006 Denis Leroy <denis(a)poolshark.org> - 0.44-3
-- Bumping up release to fix upgrade path
-
-* Wed Jun 28 2006 Denis Leroy <denis(a)poolshark.org> - 0.44-2
-- Update to 0.44
-- Removed obsolete patches
-- Disabled experimental perl and python extensions
-- Added pstoedit, skencil, gtkspell and LittleCms support
-- Inkboard feature disabled pending further security tests
-
-* Tue Feb 28 2006 Denis Leroy <denis(a)poolshark.org> - 0.43-3
-- Rebuild
-
-* Mon Jan 16 2006 Denis Leroy <denis(a)poolshark.org> - 0.43-2
-- Updated GC patch, bug 171791
-
-* Sat Dec 17 2005 Denis Leroy <denis(a)poolshark.org> - 0.43-1
-- Update to 0.43
-- Added 2 patches to fix g++ 4.1 compilation issues
-- Enabled new jabber/loudmouth-based inkboard feature
-
-* Mon Sep 26 2005 Denis Leroy <denis(a)poolshark.org> - 0.42.2-2
-- rebuilt with newer glibmm
-
-* Thu Sep 1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.42.2-1
-- update to 0.42.2
-
-* Thu Aug 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.42-3
-- rebuilt
-- add patch to repair link-check of GC >= 6.5 (needs pthread and dl)
-
-* Fri Jul 29 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.42-2
-- Extend ngettext/dgettext patch for x86_64 build.
-
-* Tue Jul 26 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.42-1
-- update to 0.42 (also fixes #160326)
-- BR gnome-vfs2-devel
-- no files left in %%_libdir/inkscape
-- include French manual page
-- GCC4 patch obsolete, 64-bit patch obsolete, dgettext patch split off
-
-* Tue May 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.41-7
-- append another 64-bit related patch (dgettext configure check failed)
-
-* Tue May 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.41-6
-- remove explicit aclocal/autoconf calls in %%build as they create a
- bad Makefile for FC4/i386, which causes build to fail (#156228),
- and no comment explains where they were added/needed
-
-* Tue May 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.41-5
-- bump and rebuild as 0.41-4 failed in build system setup
-
-* Wed May 25 2005 Jeremy Katz <katzj(a)redhat.com> - 0.41-4
-- add patch for gcc4 problems (ignacio, #156228)
-- fix build on 64bit boxes. sizeof(int) != sizeof(void*)
-
-* Sun May 22 2005 Jeremy Katz <katzj(a)redhat.com> - 0.41-3
-- rebuild on all arches
-
-* Thu Apr 07 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
-
-* Wed Feb 09 2005 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.41-1
-- 0.41.
-- enable python.
-
-* Sat Dec 04 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.40-1
-- 0.40.
-
-* Tue Nov 16 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.40-0.pre3
-- 0.40pre3.
-
-* Thu Nov 11 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.39-0.fdr.2
-- post/postun for new mime system.
-- Dropped redundant BR XFree86-devel.
-
-* Sun Aug 29 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.39-0.fdr.1
-- 0.39.
-
-* Sat Apr 10 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.38.1-0.fdr.1
-- respin real fix for Provides/Requires for perl(SpSVG)
-
-* Fri Apr 9 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.38.1-0.fdr.0
-- respin with updated tarball with fix for postscript printing
-
-* Thu Apr 8 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.38-0.fdr.2
-- respin to fix provides
-
-* Thu Apr 8 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.38.0.fdr.1
-- version upgrade with many improvements and bug fixes
-
-* Fri Mar 19 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.7
-- repsin - sourceforge does not allow reloading files with same name
-* Tue Mar 16 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.6
-- fix typo in provides
-* Tue Mar 16 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.5
-- add %%{release} to provides perl(SpSVG) = %%{epoch}:%%{version}:%%{release} only
-* Tue Mar 16 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.4
-- add %%{release} to provides
-* Sun Mar 14 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.3
-- add arch dependent flags
-* Thu Mar 11 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.2
-- add libsigc++-devel instead of add libsigc++ - duh
-- add BuildRequires: perl-XML-Parser
-- fix package name to follow package naming guidelines
-* Mon Mar 1 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.1.fdr.1
-- disable static libs
-- enable inkjar
-* Tue Feb 10 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.1
-- pgp'd tarball from inkscape.org
-- clean out the cvs tweaks in spec file
-- enable gnome-print
-- add the new tutorial files
-- make sure .mo file gets packaged
-- add provides: perlSVG
-- submit to Fedora QA
-* Sat Feb 7 2004 P Linnell <scribusdocs at atlantictechsolutions.com>
-- rebuild of current cvs
-- tweaks to build cvs instead of dist tarball
-- add inkview
-* Sat Dec 20 2003 P Linnell <scribusdocs at atlantictechsolutions.com>
-- First crack at Fedora/RH spec file
-- nuke gnome print - it won't work (bug is filed already)
+%autochangelog
diff --git a/sources b/sources
index 6d6d3fc..e300e50 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (inkscape-1.3.tar.xz) = 1eb488105586bf98a51c7109ab2e23292f039e5f0e66de4d3684a73f0ab408d89ee55560517d3185370ad3f32b31cf03d149df02ba5c895fe386dd1581fcb2e8
+SHA512 (inkscape-1.3.1.tar.xz) = cb0f8984c2dd33708021400384eeb2cfe32af4ba34a2f371a767b100a000cfe35b8c4fe88eb294a8f6fc0795d9991d53552df5b152288130da91228066f68a26
+SHA512 (inkscape-1.3.1.tar.xz.sig) = b42735933ecfdec8a4a4023c51eb429fc9a811139c800c15d0e4f8339df320cdb3e45389a8d52bd98bbc04a913c6b662fc194be0cbdda16267e9586209576e59
commit c06c6747bc0641a3a627fab73ca8912de7c2a951
Author: Gwyn Ciesla <gwync(a)protonmail.com>
Date: Thu Nov 9 10:20:30 2023 -0600
Use system inkex
diff --git a/inkscape.spec b/inkscape.spec
index 92e7a78..bfbc6ef 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -10,7 +10,7 @@
Name: inkscape
Version: 1.3
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Vector-based drawing program using SVG
# Inkscape tags their releases with underscores and in ALLCAPS
@@ -97,6 +97,7 @@ Requires: python3-appdirs
Requires: python3-cssselect
Requires: python3-pillow
Requires: python3-requests
+Requires: python3-inkex
# Weak dependencies for the LaTeX plugin
Suggests: pstoedit
Suggests: tex(latex)
@@ -180,6 +181,9 @@ install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/inkscape/palettes/
rm -rf $RPM_BUILD_ROOT%{_datadir}/inkscape/doc
rm -f $RPM_BUILD_ROOT%{_datadir}/doc/inkscape/copyright
+# Use system inkex
+rm -rf $RPM_BUILD_ROOT%{_datadir}/inkscape/extensions/inkex
+ln -s %{python3_sitelib}/inkex $RPM_BUILD_ROOT%{_datadir}/inkscape/extensions/inkex
%check
# Validate appdata file
@@ -188,6 +192,24 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/*.appd
# Validate desktop file
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.inkscape.Inkscape.desktop
+%pretrans -p <lua>
+-- Remove directories that will become symlinks
+dirs = {"%{_datadir}/inkscape/extensions/inkex"}
+for i, path in ipairs(dirs) do
+ st = posix.stat(path)
+ if st and st.type == "directory" then
+ status = os.rename(path, path .. ".rpmmoved")
+ if not status then
+ suffix = 0
+ while not status do
+ suffix = suffix + 1
+ status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix)
+ end
+ os.rename(path, path .. ".rpmmoved")
+ end
+ end
+end
+
%files -f %{name}.lang
%{!?_licensedir:%global license %%doc}
@@ -219,6 +241,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.inkscape.Inksc
%{_datadir}/icons/hicolor/*/apps/*.png
%{_datadir}/icons/hicolor/*/apps/*.svg
%{_datadir}/bash-completion/completions/inkscape
+%ghost %{_datadir}/inkscape/extensions/inkex.removed
%files view
%{!?_licensedir:%global license %%doc}
@@ -236,6 +259,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.inkscape.Inksc
%changelog
+* Wed Nov 08 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1.3-7
+- Use system inkex
+
* Thu Aug 24 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1.3-6
- Use system lib2geom on f39+
commit 6ad442791379462556166621772691a62f167c0e
Author: Gwyn Ciesla <gwync(a)protonmail.com>
Date: Fri Aug 25 09:11:04 2023 -0500
Use system lib2geom
diff --git a/0001-Fix-build-with-GCC13.patch b/0001-Fix-build-with-GCC13.patch
deleted file mode 100644
index 8161f94..0000000
--- a/0001-Fix-build-with-GCC13.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From c68f5f9cade8a890efefcb4c2e0fc57762211286 Mon Sep 17 00:00:00 2001
-From: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
-Date: Fri, 24 Feb 2023 14:01:18 -0500
-Subject: [PATCH] Fix build with GCC13
-
-GCC 13 now complains about this line:
-```
-src/ui/widget/selected-style.cpp:111:6: error: statement-expressions are not allowed outside functions nor in template-argument lists
- 111 | {g_strdup("application/x-oswb-color"), 0, APP_OSWB_COLOR}
- | ^~~~~~~~
-```
-
-However, it is not necessary to strdup the string constant as the value
-just needs to exist indefinitely, and it will as a constant. While C
-doesn't mind the `const` difference, a simple cast will silence C++'s
-higher strictness.
-
-And in fact, the other use of `GtkTargetEntry` in
-`src/ui/drag-and-drop.cpp` does the same cast.
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
----
- src/ui/widget/selected-style.cpp | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
-index 68fe1fc426..7274f1b74c 100644
---- a/src/ui/widget/selected-style.cpp
-+++ b/src/ui/widget/selected-style.cpp
-@@ -100,14 +100,8 @@ enum ui_drop_target_info {
- APP_OSWB_COLOR
- };
-
--//TODO: warning: deprecated conversion from string constant to ‘gchar*’
--//
--//Turn out to be warnings that we should probably leave in place. The
--// pointers/types used need to be read-only. So until we correct the using
--// code, those warnings are actually desired. They say "Hey! Fix this". We
--// definitely don't want to hide/ignore them. --JonCruz
- static const GtkTargetEntry ui_drop_target_entries [] = {
-- {g_strdup("application/x-oswb-color"), 0, APP_OSWB_COLOR}
-+ {(gchar *)"application/x-oswb-color", 0, APP_OSWB_COLOR}
- };
-
- static guint nui_drop_target_entries = G_N_ELEMENTS(ui_drop_target_entries);
---
-2.39.2
-
diff --git a/inkscape.spec b/inkscape.spec
index a44848d..92e7a78 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -10,7 +10,7 @@
Name: inkscape
Version: 1.3
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Vector-based drawing program using SVG
# Inkscape tags their releases with underscores and in ALLCAPS
@@ -19,8 +19,6 @@ Summary: Vector-based drawing program using SVG
License: GPL-2.0-or-later AND CC-BY-3.0
URL: https://inkscape.org/
Source0: https://inkscape.org/release/inkscape-%{version}/source/archive/xz/dl/inksc…
-# https://gitlab.com/inkscape/inkscape/-/merge_requests/5108
-#Patch: 0001-Fix-build-with-GCC13.patch
# Fedora Color Palette, GIMP format, CC-BY 3.0
Source2: Fedora-Color-Palette.gpl
@@ -35,7 +33,6 @@ Provides: bundled(autotrace)
Provides: bundled(libdepixelize)
Provides: bundled(libuemf)
Provides: bundled(adaptagrams)
-Provides: bundled(lib2geom)
BuildRequires: gcc-c++
BuildRequires: hunspell-devel hunspell-en
@@ -59,6 +56,7 @@ BuildRequires: pkgconfig(GraphicsMagick++)
%endif
BuildRequires: intltool
BuildRequires: lcms2-devel
+BuildRequires: lib2geom-devel
BuildRequires: libpng-devel >= 1.2
BuildRequires: libwpg-devel
BuildRequires: libxml2-devel >= 2.6.11
@@ -78,6 +76,9 @@ BuildRequires: libjpeg-devel
BuildRequires: libsigc++20-devel
BuildRequires: libsoup-devel
BuildRequires: gspell-devel
+%if 0%{?fedora} >= 39
+BuildRequires: lib2geom-devel
+%endif
BuildRequires: make
# Disable all for now. TODO: Be smarter
@@ -102,6 +103,7 @@ Suggests: tex(latex)
Suggests: tex(dvips)
Suggests: texlive-amsmath
Suggests: texlive-amsfonts
+Suggests: texlive-standalone
%description
Inkscape is a vector graphics editor, with capabilities similar to
@@ -170,11 +172,6 @@ find $RPM_BUILD_ROOT -type f -name 'lib*.a' | xargs rm -f
# No skencil anymore
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/sk2svg.sh
-# Don't install development files for bundled libraries
-rm -r $RPM_BUILD_ROOT%{_includedir}/2geom-1.3.0/
-rm -r $RPM_BUILD_ROOT%{_libdir}/cmake/2Geom
-rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/2geom.pc
-
# Install Fedora Color Pallette
install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/inkscape/palettes/
@@ -239,6 +236,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.inkscape.Inksc
%changelog
+* Thu Aug 24 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1.3-6
+- Use system lib2geom on f39+
+
* Thu Aug 10 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1.3-5
- Bring back i686 on f39+
commit 6aa10117f87935be796f067ea7cd514ab5a0b9f7
Author: Gwyn Ciesla <gwync(a)protonmail.com>
Date: Thu Aug 10 10:09:37 2023 -0500
Restore i686
diff --git a/inkscape.spec b/inkscape.spec
index b8e16a9..a44848d 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -10,7 +10,7 @@
Name: inkscape
Version: 1.3
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Vector-based drawing program using SVG
# Inkscape tags their releases with underscores and in ALLCAPS
@@ -25,9 +25,10 @@ Source0: https://inkscape.org/release/inkscape-%{version}/source/archive/
# Fedora Color Palette, GIMP format, CC-BY 3.0
Source2: Fedora-Color-Palette.gpl
-%if 0%{?fedora} >= 39
-ExcludeArch: %{ix86}
-%endif
+# Don't drop i686 until at least texlive no longer needs it -GC, 2023-08-10
+#%%if 0%%{?fedora} >= 39
+#ExcludeArch: %%{ix86}
+#%%endif
Provides: bundled(libcroco)
Provides: bundled(autotrace)
@@ -238,6 +239,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.inkscape.Inksc
%changelog
+* Thu Aug 10 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1.3-5
+- Bring back i686 on f39+
+
* Wed Aug 02 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1.3-4
- No lto on i686
1
0
28 Nov '23
The package rpms/llvm.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/llvm.git/commit/?id=4be4b92cb18384c….
Change:
-%ifarch %{arm}
Thanks.
Full change:
============
commit dae42895a5fba5a916c7b0729164f213cd67b39b
Author: Tulio Magno Quites Machado Filho <tuliom(a)redhat.com>
Date: Tue Nov 28 14:37:32 2023 -0300
Update to LLVM 17.0.6
diff --git a/llvm.spec b/llvm.spec
index f534315..1d0a56e 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -36,7 +36,7 @@
%global maj_ver 17
%global min_ver 0
-%global patch_ver 5
+%global patch_ver 6
#global rc_ver 4
%if %{with snapshot_build}
@@ -592,6 +592,9 @@ fi
%changelog
%{?llvm_snapshot_changelog_entry}
+* Tue Nov 28 2023 Tulio Magno Quites Machado Filho <tuliom(a)redhat.com> - 17.0.6-1
+- Update to LLVM 17.0.6
+
* Tue Nov 14 2023 Tulio Magno Quites Machado Filho <tuliom(a)redhat.com> - 17.0.5-1
- Update to LLVM 17.0.5
diff --git a/sources b/sources
index 95c1d50..f4607c7 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
-SHA512 (llvm-17.0.5.src.tar.xz) = 4880da0f5aef95f978697b9b3f63b00c8131b1b62975426453dbfd746a76803c4c3624fff1289c4162d060dc406b951ff375d030ee76660793ca9d97427d2c70
-SHA512 (llvm-17.0.5.src.tar.xz.sig) = bbf4fa716d64611825e0eaebb290aa805db15c1c2737d80c593647795f042acf6136b01084b52bc2d4160cb921582d44db04e66518d42cdafa4c49bacd845813
-SHA512 (cmake-17.0.5.src.tar.xz) = 3ef19c40975e18ba38862d0e5cc5db15f269f7705b8a9f37e39467eda0424b56ee0e390f94809972be41513074aa4dac997c668280e94e6d7b1ada088f75d73e
-SHA512 (cmake-17.0.5.src.tar.xz.sig) = 11a2fba112cb25fb2bc5db3dfa12989209514be8e300d473d43711ff1e56bb70d46db32c7d7888f27f80fc823afcbb81f1726204c803bacdd8cf47710e573e9f
-SHA512 (third-party-17.0.5.src.tar.xz) = f9b715bdc428d2c6a14da237530d34330dcd6c285578a6ef3300541137878f4ad78ff8d6d589441672f737f1d694c6f3a0b1866ea64221681a84fce0ef28c32f
-SHA512 (third-party-17.0.5.src.tar.xz.sig) = 70fdb65729d94a881f05befd557cae3d6d415716030f997193898d30aea0f53dd7c8ec3be47b276a3644c13093665c653e29a2a6588dec92d9bb09ee3462a139
+SHA512 (llvm-17.0.6.src.tar.xz) = bf9b04d0d45c67168b195c550cd8326e3a01176f92776705846aad3956a494bcb7a053b0b0bde19abd68dc0068e5c97ef99dee7eadfdb727bc0d758b2684f3bd
+SHA512 (llvm-17.0.6.src.tar.xz.sig) = 904066c34ec0adf5b9e789af640329cadc7919b111aca77fa3ce26450696bace20e299e2592251f96ee33fb83da603423cc0ca63a67ad627916fcab0bed59689
+SHA512 (cmake-17.0.6.src.tar.xz) = b2c5e404ca36542d44e1a7f2801bbcecbcf5f1e8c63b793bb2308228483406bdfe002720aadb913c0228cd2bbe5998465eaadc4a49fad6a5eb6ff907fa5fd45a
+SHA512 (cmake-17.0.6.src.tar.xz.sig) = fad2d91fc3e499dbd1b8c4acbc48ef748c106a04f7529232ea95abf3d006c4494e495643f77e653b1c96f7a0b79fe0706c5cdedd4f7dc4cbbab0ee5cf749c8ce
+SHA512 (third-party-17.0.6.src.tar.xz) = 242dada4800c5e558f5f243e6aa0905d90ca3f82cc81baf14c60de543a7e737d4c2f3471122f2c641dc4f0724e4ebf5cf137761a231b34aab2a12f1cfc902c53
+SHA512 (third-party-17.0.6.src.tar.xz.sig) = 6b72379b70a359a77f4d7d0922b0e80ff2a44d65178389b25edbc4a72029a91d50b3eb39a1185fac50dbba0a1972572eaadc7d82bb8e87d26f4e42c2bf676b75
commit ceb6b17869a8bd93086c13fcc3f3cdefdaf17835
Author: Tulio Magno Quites Machado Filho <tuliom(a)redhat.com>
Date: Fri Nov 24 14:14:14 2023 -0300
Revert "[packit] 17.0.5 upstream release"
This reverts commit fe235bbf25f3e154035d90555a0498badfdc2ae7.
It was pushed by mistake.
diff --git a/README.packit b/README.packit
deleted file mode 100644
index ef95206..0000000
--- a/README.packit
+++ /dev/null
@@ -1,3 +0,0 @@
-This repository is maintained by packit.
-https://packit.dev/
-The file was generated using packit 0.87.0.
diff --git a/llvm.spec b/llvm.spec
index 6241da4..f534315 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -92,7 +92,7 @@
%undefine _py3_shebang_P
Name: %{pkg_name}
-Version: 17.0.5
+Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
Release: 1%{?dist}
Summary: The Low Level Virtual Machine
@@ -592,22 +592,6 @@ fi
%changelog
%{?llvm_snapshot_changelog_entry}
-* Fri Nov 24 2023 Tulio Magno Quites Machado Filho <tuliom(a)redhat.com> - 17.0.5-1
-- [BranchFolding] Remove dubious assert from operator< (#71639) (Nikita Popov)
-- [GlobalOpt] Cache whether CC is changeable (#71381) (Nikita Popov)
-- [libc++] Fix UB in <expected> related to "has value" flag (#68552) (#68733) (Jan Kokemüller)
-- [clang] fix test PR69717.cpp (#72134) (antoine moynault)
-- [clang] Run test on x86 only (Serge Pavlov)
-- [clang] Do not clear FP pragma stack when instantiating functions (#70646) (Serge Pavlov)
-- [SLP]Fix PR70004: Do not change insert point for reduction gather nodes. (Alexey Bataev)
-- [DAG] WidenVectorOperand - add basic handling for *_EXTEND_VECTOR_INREG nodes (Simon Pilgrim)
-- [Mips] In LowerShift*Parts, xor with bits-1 instead of -1. (#71149) (Craig Topper)
-- [clang-format] Correctly annotate keyword operator function name (#66904) (Owen Pan)
-- Bump version to 17.0.5 (Tobias Hieta)
-- [Driver] Fix linking with -lm on Solaris (#65632) (Rainer Orth)
-- [clang-repl] Fix BUILD_SHARED_LIBS symbols from libclangInterpreter on MinGW (#71393) (Martin Storsjö)
-- [CGExprConstant] stop calling into ConstExprEmitter for Reference type destinations (#70366) (Nick Desaulniers)
-
* Tue Nov 14 2023 Tulio Magno Quites Machado Filho <tuliom(a)redhat.com> - 17.0.5-1
- Update to LLVM 17.0.5
commit fe235bbf25f3e154035d90555a0498badfdc2ae7
Author: Tulio Magno Quites Machado Filho <tuliom(a)redhat.com>
Date: Fri Nov 24 14:10:14 2023 -0300
[packit] 17.0.5 upstream release
Upstream tag: llvmorg-17.0.5
Upstream commit: 98bfdac5
diff --git a/README.packit b/README.packit
new file mode 100644
index 0000000..ef95206
--- /dev/null
+++ b/README.packit
@@ -0,0 +1,3 @@
+This repository is maintained by packit.
+https://packit.dev/
+The file was generated using packit 0.87.0.
diff --git a/llvm.spec b/llvm.spec
index f534315..6241da4 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -92,7 +92,7 @@
%undefine _py3_shebang_P
Name: %{pkg_name}
-Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
+Version: 17.0.5
Release: 1%{?dist}
Summary: The Low Level Virtual Machine
@@ -592,6 +592,22 @@ fi
%changelog
%{?llvm_snapshot_changelog_entry}
+* Fri Nov 24 2023 Tulio Magno Quites Machado Filho <tuliom(a)redhat.com> - 17.0.5-1
+- [BranchFolding] Remove dubious assert from operator< (#71639) (Nikita Popov)
+- [GlobalOpt] Cache whether CC is changeable (#71381) (Nikita Popov)
+- [libc++] Fix UB in <expected> related to "has value" flag (#68552) (#68733) (Jan Kokemüller)
+- [clang] fix test PR69717.cpp (#72134) (antoine moynault)
+- [clang] Run test on x86 only (Serge Pavlov)
+- [clang] Do not clear FP pragma stack when instantiating functions (#70646) (Serge Pavlov)
+- [SLP]Fix PR70004: Do not change insert point for reduction gather nodes. (Alexey Bataev)
+- [DAG] WidenVectorOperand - add basic handling for *_EXTEND_VECTOR_INREG nodes (Simon Pilgrim)
+- [Mips] In LowerShift*Parts, xor with bits-1 instead of -1. (#71149) (Craig Topper)
+- [clang-format] Correctly annotate keyword operator function name (#66904) (Owen Pan)
+- Bump version to 17.0.5 (Tobias Hieta)
+- [Driver] Fix linking with -lm on Solaris (#65632) (Rainer Orth)
+- [clang-repl] Fix BUILD_SHARED_LIBS symbols from libclangInterpreter on MinGW (#71393) (Martin Storsjö)
+- [CGExprConstant] stop calling into ConstExprEmitter for Reference type destinations (#70366) (Nick Desaulniers)
+
* Tue Nov 14 2023 Tulio Magno Quites Machado Filho <tuliom(a)redhat.com> - 17.0.5-1
- Update to LLVM 17.0.5
commit 4be4b92cb18384c485ace5ae8ca8e38359aa8f69
Author: Nikita Popov <npopov(a)redhat.com>
Date: Wed Oct 4 10:20:54 2023 +0200
Remove 32-bit arm handling
diff --git a/llvm.spec b/llvm.spec
index 9aa3210..f534315 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -14,7 +14,7 @@
%undefine _include_frame_pointers
# Components enabled if supported by target architecture:
-%define gold_arches %{ix86} x86_64 %{arm} aarch64 %{power64} s390x
+%define gold_arches %{ix86} x86_64 aarch64 %{power64} s390x
%ifarch %{gold_arches}
%bcond_without gold
%else
@@ -84,13 +84,7 @@
%global _dwz_low_mem_die_limit_s390x 1
%global _dwz_max_die_limit_s390x 1000000
-%ifarch %{arm}
-# koji overrides the _gnu variable to be gnu, which is not correct for clang, so
-# we need to hard-code the correct triple here.
-%global llvm_triple armv7l-redhat-linux-gnueabihf
-%else
%global llvm_triple %{_target_platform}
-%endif
# https://fedoraproject.org/wiki/Changes/PythonSafePath#Opting_out
# Don't add -P to Python shebangs
@@ -271,7 +265,7 @@ mv %{third_party_srcdir} third-party
%global _lto_cflags %nil
%endif
-%ifarch s390 s390x %{arm} %ix86
+%ifarch s390 s390x %ix86
# Decrease debuginfo verbosity to reduce memory consumption during final library linking
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
%endif
@@ -286,7 +280,7 @@ export ASMFLAGS="%{build_cflags}"
-DLLVM_PARALLEL_LINK_JOBS=1 \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_SKIP_RPATH:BOOL=ON \
-%ifarch s390 %{arm} %ix86
+%ifarch s390 %ix86
-DCMAKE_C_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
%endif
@@ -466,14 +460,6 @@ mkdir -p %{buildroot}%{pkg_datadir}/llvm/cmake
cp -Rv ../cmake/* %{buildroot}%{pkg_datadir}/llvm/cmake
%check
-# Disable check section on arm due to some kind of memory related failure.
-# Possibly related to https://bugzilla.redhat.com/show_bug.cgi?id=1920183
-%ifnarch %{arm}
-
-# TODO: Fix the failures below
-%ifarch %{arm}
-rm test/tools/llvm-readobj/ELF/dependent-libraries.test
-%endif
# non reproducible errors
rm test/tools/dsymutil/X86/swift-interface.test
@@ -483,8 +469,6 @@ rm test/tools/dsymutil/X86/swift-interface.test
LD_LIBRARY_PATH=%{buildroot}/%{install_libdir} %{__ninja} check-all -C %{_vpath_builddir}
%endif
-%endif
-
%ldconfig_scriptlets libs
%post devel
commit ec966be7c4acc0ff9cacf90c816e91e509c128ac
Author: Nikita Popov <npopov(a)redhat.com>
Date: Wed Oct 4 10:18:16 2023 +0200
Remove redundant _lto_cflags define
ThinLTO is the default nowadays.
diff --git a/llvm.spec b/llvm.spec
index 0794607..9aa3210 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -49,7 +49,6 @@
%global llvm_srcdir llvm-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:rc%{rc_ver}}.src
%global cmake_srcdir cmake-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:rc%{rc_ver}}.src
%global third_party_srcdir third-party-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:rc%{rc_ver}}.src
-%global _lto_cflags -flto=thin
%if %{with compat_build}
%global pkg_name llvm%{maj_ver}
1
0
Architecture specific change in rpms/rust-bootupd.git
by githook-noreply＠fedoraproject.org 28 Nov '23
by githook-noreply＠fedoraproject.org 28 Nov '23
28 Nov '23
The package rpms/rust-bootupd.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-bootupd.git/commit/?id=76f2dcb….
Change:
-ExclusiveArch: x86_64 aarch64 ppc64le
Thanks.
Full change:
============
commit aa13ad95d468b9464241a5297b556586e8399716
Author: Colin Walters <walters(a)verbum.org>
Date: Tue Nov 28 13:53:08 2023 -0500
https://github.com/coreos/bootupd/releases/tag/v0.2.15
diff --git a/.gitignore b/.gitignore
index e326958..4db1064 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,5 @@
/bootupd-0.2.13-vendor.tar.zstd
/bootupd-0.2.14.crate
/bootupd-0.2.14-vendor.tar.zstd
+/bootupd-0.2.15.crate
+/bootupd-0.2.15-vendor.tar.zstd
diff --git a/rust-bootupd.spec b/rust-bootupd.spec
index ed5c194..a7b5363 100644
--- a/rust-bootupd.spec
+++ b/rust-bootupd.spec
@@ -3,7 +3,7 @@
%global crate bootupd
Name: rust-%{crate}
-Version: 0.2.14
+Version: 0.2.15
Release: 2%{?dist}
Summary: Bootloader updater
@@ -83,6 +83,9 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0)
%systemd_postun bootupd.service bootupd.socket
%changelog
+* Tue Nov 28 2023 Colin Walters <walters(a)verbum.org> - 0.2.15-2
+- https://github.com/coreos/bootupd/releases/tag/v0.2.15
+
* Mon Nov 20 2023 Colin Walters <walters(a)verbum.org> - 0.2.14-2
- https://github.com/coreos/bootupd/releases/tag/v0.2.14
diff --git a/sources b/sources
index ec72d8d..9e508e6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bootupd-0.2.14.crate) = bb4051a53368d18b6a1428c5d617306520a0f222dd75f6f41762fb8187ded68b850ca7d1e9e6811f4544beba3ad3157aba6b402ca500ed56b3f54e4225f68f9d
-SHA512 (bootupd-0.2.14-vendor.tar.zstd) = 8b7f0c5894667e44a4975fd33a914d183b173e2682cb9e24e902ee7094be6cbffc3a6e29c74f7f0e5873f1ebce3330b93e0ac2fa186f1b26c7324ccb2a9f80f1
+SHA512 (bootupd-0.2.15.crate) = 8b76f74aa08eb3da6156f9b9ee73e2c06e57040eccf3a6bdc88769cc0cc1c4cad5f00f55cc7192c5cd910809c9964d91b9c024ce825d880f0c378fba2e5da4de
+SHA512 (bootupd-0.2.15-vendor.tar.zstd) = 252bcbbba2883607f7e5ecbae030c74b7eaa52be38cf047d094c815ae62d5b422080e05f7c31fff33b60541cba824505dbc83d5390ed79fe504fa66d6fa2fec6
commit a9fae378a3b9ef5843be6b7978e6fb6a37b06158
Author: Colin Walters <walters(a)verbum.org>
Date: Mon Nov 20 10:03:29 2023 -0500
https://github.com/coreos/bootupd/releases/tag/v0.2.14
diff --git a/.gitignore b/.gitignore
index 2b57418..e326958 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,5 @@
/bootupd-0.2.12-vendor.tar.zstd
/bootupd-0.2.13.crate
/bootupd-0.2.13-vendor.tar.zstd
+/bootupd-0.2.14.crate
+/bootupd-0.2.14-vendor.tar.zstd
diff --git a/0001-grubconfigs-Ensure-grub2-dir-exists.patch b/0001-grubconfigs-Ensure-grub2-dir-exists.patch
deleted file mode 100644
index 22dd36e..0000000
--- a/0001-grubconfigs-Ensure-grub2-dir-exists.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From ece9120cb43b1834ff4b7268308886cd89a47e54 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters(a)verbum.org>
-Date: Thu, 9 Nov 2023 19:17:57 -0500
-Subject: [PATCH] grubconfigs: Ensure grub2 dir exists
-
-I hit this when testing `bootc install` in a loop, it seems like
-we could be implicitly depending on this directory already
-having been created.
----
- src/grubconfigs.rs | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/grubconfigs.rs b/src/grubconfigs.rs
-index 01f6b3e..dcdf986 100644
---- a/src/grubconfigs.rs
-+++ b/src/grubconfigs.rs
-@@ -62,6 +62,10 @@ pub(crate) fn install(target_root: &openat::Dir, efi: bool) -> Result<()> {
- config.push_str(post.as_str());
- }
-
-+ if !bootdir.exists(GRUB2DIR)? {
-+ bootdir.create_dir(GRUB2DIR, 0o700)?;
-+ }
-+
- bootdir
- .write_file_contents(format!("{GRUB2DIR}/grub.cfg"), 0o644, config.as_bytes())
- .context("Copying grub-static.cfg")?;
---
-2.41.0
-
diff --git a/rust-bootupd.spec b/rust-bootupd.spec
index e953eb0..ed5c194 100644
--- a/rust-bootupd.spec
+++ b/rust-bootupd.spec
@@ -3,8 +3,8 @@
%global crate bootupd
Name: rust-%{crate}
-Version: 0.2.13
-Release: 4%{?dist}
+Version: 0.2.14
+Release: 2%{?dist}
Summary: Bootloader updater
License: Apache-2.0
@@ -12,8 +12,6 @@ URL: https://github.com/coreos/bootupd
Source0: %{url}/releases/download/v%{version}/bootupd-%{version}.crate
Source1: %{url}/releases/download/v%{version}/bootupd-%{version}-vendor.tar.zstd
-Patch0: 0001-grubconfigs-Ensure-grub2-dir-exists.patch
-
# For now, see upstream
BuildRequires: make
BuildRequires: openssl-devel
@@ -85,6 +83,9 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0)
%systemd_postun bootupd.service bootupd.socket
%changelog
+* Mon Nov 20 2023 Colin Walters <walters(a)verbum.org> - 0.2.14-2
+- https://github.com/coreos/bootupd/releases/tag/v0.2.14
+
* Tue Nov 14 2023 Yaakov Selkowitz <yselkowi(a)redhat.com> - 0.2.13-4
- Fix RHEL build
diff --git a/sources b/sources
index 77d2f4c..ec72d8d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bootupd-0.2.13.crate) = 90986c102b9e0977e8d2d6141063e3f33b7b1ef732971703e01a03cf9a7cc20b295f969f84495e74e2594c501c95fb5b85d6cbc76c568871dfa765f1ed7fce0d
-SHA512 (bootupd-0.2.13-vendor.tar.zstd) = 76a6ee84374b68ca53fe44b6df2c07870045311d1ae6a01301c97e92753d407d2dc3b085ebdb502bafcc2206162262bb0268b1c8a48cc8582d666d031acc53da
+SHA512 (bootupd-0.2.14.crate) = bb4051a53368d18b6a1428c5d617306520a0f222dd75f6f41762fb8187ded68b850ca7d1e9e6811f4544beba3ad3157aba6b402ca500ed56b3f54e4225f68f9d
+SHA512 (bootupd-0.2.14-vendor.tar.zstd) = 8b7f0c5894667e44a4975fd33a914d183b173e2682cb9e24e902ee7094be6cbffc3a6e29c74f7f0e5873f1ebce3330b93e0ac2fa186f1b26c7324ccb2a9f80f1
commit 1d5cf86bfa9168e006ca0d338fce3d148f7ab225
Author: Yaakov Selkowitz <yselkowi(a)redhat.com>
Date: Tue Nov 14 11:23:25 2023 -0500
Fix RHEL build
The RHEL rust-toolset macros are currently way behind Fedora
rust-packaging. While work is underway to get them in sync, this
package still needs to be buildable in the meantime.
diff --git a/rust-bootupd.spec b/rust-bootupd.spec
index e0ae6dc..e953eb0 100644
--- a/rust-bootupd.spec
+++ b/rust-bootupd.spec
@@ -4,7 +4,7 @@
Name: rust-%{crate}
Version: 0.2.13
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Bootloader updater
License: Apache-2.0
@@ -17,7 +17,7 @@ Patch0: 0001-grubconfigs-Ensure-grub2-dir-exists.patch
# For now, see upstream
BuildRequires: make
BuildRequires: openssl-devel
-%if 0%{?rhel} && !0%{?eln}
+%if 0%{?rhel}
BuildRequires: rust-toolset
%else
BuildRequires: cargo-rpm-macros >= 25
@@ -45,8 +45,10 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0)
%files -n %{crate}
%license LICENSE
+%if !0%{?rhel}
%license LICENSE.dependencies
%license cargo-vendor.txt
+%endif
%doc README.md
%{_bindir}/bootupctl
%{_libexecdir}/bootupd
@@ -54,14 +56,20 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0)
%{_prefix}/lib/bootupd/grub2-static/
%prep
-%autosetup -n %{crate}-%{version} -p1 -a1
+%autosetup -n %{crate}-%{version} -p1 %{!?rhel:-a1}
+%if 0%{?rhel}
+%cargo_prep -V 1
+%else
%cargo_prep -v vendor
+%endif
%build
%cargo_build
+%if !0%{?rhel}
%cargo_vendor_manifest
%cargo_license_summary
%{cargo_license} > LICENSE.dependencies
+%endif
%install
%make_install INSTALL="install -p -c"
@@ -77,6 +85,9 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0)
%systemd_postun bootupd.service bootupd.socket
%changelog
+* Tue Nov 14 2023 Yaakov Selkowitz <yselkowi(a)redhat.com> - 0.2.13-4
+- Fix RHEL build
+
* Fri Nov 10 2023 Colin Walters <walters(a)verbum.org> - 0.2.13-3
- Backport patch for not having separate /boot
commit 32e71044803a0b6826098bcfda80150843300720
Author: Colin Walters <walters(a)verbum.org>
Date: Fri Nov 10 08:18:35 2023 -0500
Backport patch for not having separate /boot
diff --git a/0001-grubconfigs-Ensure-grub2-dir-exists.patch b/0001-grubconfigs-Ensure-grub2-dir-exists.patch
new file mode 100644
index 0000000..22dd36e
--- /dev/null
+++ b/0001-grubconfigs-Ensure-grub2-dir-exists.patch
@@ -0,0 +1,30 @@
+From ece9120cb43b1834ff4b7268308886cd89a47e54 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters(a)verbum.org>
+Date: Thu, 9 Nov 2023 19:17:57 -0500
+Subject: [PATCH] grubconfigs: Ensure grub2 dir exists
+
+I hit this when testing `bootc install` in a loop, it seems like
+we could be implicitly depending on this directory already
+having been created.
+---
+ src/grubconfigs.rs | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/grubconfigs.rs b/src/grubconfigs.rs
+index 01f6b3e..dcdf986 100644
+--- a/src/grubconfigs.rs
++++ b/src/grubconfigs.rs
+@@ -62,6 +62,10 @@ pub(crate) fn install(target_root: &openat::Dir, efi: bool) -> Result<()> {
+ config.push_str(post.as_str());
+ }
+
++ if !bootdir.exists(GRUB2DIR)? {
++ bootdir.create_dir(GRUB2DIR, 0o700)?;
++ }
++
+ bootdir
+ .write_file_contents(format!("{GRUB2DIR}/grub.cfg"), 0o644, config.as_bytes())
+ .context("Copying grub-static.cfg")?;
+--
+2.41.0
+
diff --git a/rust-bootupd.spec b/rust-bootupd.spec
index 67b7059..e0ae6dc 100644
--- a/rust-bootupd.spec
+++ b/rust-bootupd.spec
@@ -4,7 +4,7 @@
Name: rust-%{crate}
Version: 0.2.13
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Bootloader updater
License: Apache-2.0
@@ -12,6 +12,8 @@ URL: https://github.com/coreos/bootupd
Source0: %{url}/releases/download/v%{version}/bootupd-%{version}.crate
Source1: %{url}/releases/download/v%{version}/bootupd-%{version}-vendor.tar.zstd
+Patch0: 0001-grubconfigs-Ensure-grub2-dir-exists.patch
+
# For now, see upstream
BuildRequires: make
BuildRequires: openssl-devel
@@ -75,6 +77,9 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0)
%systemd_postun bootupd.service bootupd.socket
%changelog
+* Fri Nov 10 2023 Colin Walters <walters(a)verbum.org> - 0.2.13-3
+- Backport patch for not having separate /boot
+
* Thu Nov 02 2023 Colin Walters <walters(a)verbum.org> - 0.2.13-2
- Rebase to 0.2.13
commit 76f2dcba68b30db29ac34dd3f9179cd572937728
Author: Colin Walters <walters(a)verbum.org>
Date: Thu Nov 2 15:51:26 2023 -0400
Rebase to 0.2.13
diff --git a/.gitignore b/.gitignore
index 0847a28..2b57418 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,5 @@
/bootupd-0.2.11-vendor.tar.gz
/bootupd-0.2.12.crate
/bootupd-0.2.12-vendor.tar.zstd
+/bootupd-0.2.13.crate
+/bootupd-0.2.13-vendor.tar.zstd
diff --git a/rust-bootupd.spec b/rust-bootupd.spec
index 26d743b..67b7059 100644
--- a/rust-bootupd.spec
+++ b/rust-bootupd.spec
@@ -3,8 +3,8 @@
%global crate bootupd
Name: rust-%{crate}
-Version: 0.2.12
-Release: 4%{?dist}
+Version: 0.2.13
+Release: 2%{?dist}
Summary: Bootloader updater
License: Apache-2.0
@@ -13,7 +13,6 @@ Source0: %{url}/releases/download/v%{version}/bootupd-%{version}.crate
Source1: %{url}/releases/download/v%{version}/bootupd-%{version}-vendor.tar.zstd
# For now, see upstream
-ExclusiveArch: x86_64 aarch64 ppc64le
BuildRequires: make
BuildRequires: openssl-devel
%if 0%{?rhel} && !0%{?eln}
@@ -76,6 +75,9 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0)
%systemd_postun bootupd.service bootupd.socket
%changelog
+* Thu Nov 02 2023 Colin Walters <walters(a)verbum.org> - 0.2.13-2
+- Rebase to 0.2.13
+
* Mon Oct 23 2023 Colin Walters <walters(a)verbum.org> - 0.2.12-4
- Install static configs
diff --git a/sources b/sources
index ae50171..77d2f4c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bootupd-0.2.12.crate) = d84ec9f5ca1c0a1186f76fc9632dd854d49fd220e7b14fe8c4f10188133a63d9d655f967a3f3aa50dce15e0772628938a7f99c88099ddee63606763b5c276baf
-SHA512 (bootupd-0.2.12-vendor.tar.zstd) = 90c909a4563b4f180cf450aac4fa5fddaeb4a57492fdbe50e7b2c8646474aefd588f082ec2788ee2868a007cfaeab33a6a77795ead5bbe4dc503b910ba212350
+SHA512 (bootupd-0.2.13.crate) = 90986c102b9e0977e8d2d6141063e3f33b7b1ef732971703e01a03cf9a7cc20b295f969f84495e74e2594c501c95fb5b85d6cbc76c568871dfa765f1ed7fce0d
+SHA512 (bootupd-0.2.13-vendor.tar.zstd) = 76a6ee84374b68ca53fe44b6df2c07870045311d1ae6a01301c97e92753d407d2dc3b085ebdb502bafcc2206162262bb0268b1c8a48cc8582d666d031acc53da
commit 4bde19fb9636f5bc62fcf38d4a6f59fa054d50b1
Author: Colin Walters <walters(a)verbum.org>
Date: Mon Oct 23 15:31:42 2023 -0400
Install static configs
diff --git a/rust-bootupd.spec b/rust-bootupd.spec
index cab6404..26d743b 100644
--- a/rust-bootupd.spec
+++ b/rust-bootupd.spec
@@ -4,7 +4,7 @@
Name: rust-%{crate}
Version: 0.2.12
-Release: 2%{?dist}
+Release: 4%{?dist}
Summary: Bootloader updater
License: Apache-2.0
@@ -50,6 +50,7 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0)
%{_bindir}/bootupctl
%{_libexecdir}/bootupd
%{_unitdir}/*
+%{_prefix}/lib/bootupd/grub2-static/
%prep
%autosetup -n %{crate}-%{version} -p1 -a1
@@ -63,6 +64,7 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0)
%install
%make_install INSTALL="install -p -c"
+%{__make} install-grub-static DESTDIR=%{?buildroot} INSTALL="%{__install} -p"
%post -n %{crate}
%systemd_post bootupd.service bootupd.socket
@@ -74,6 +76,9 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0)
%systemd_postun bootupd.service bootupd.socket
%changelog
+* Mon Oct 23 2023 Colin Walters <walters(a)verbum.org> - 0.2.12-4
+- Install static configs
+
* Fri Oct 20 2023 Colin Walters <walters(a)verbum.org> - 0.2.12-2
- https://github.com/coreos/bootupd/releases/tag/v0.2.12
1
0
28 Nov '23
The package rpms/mame.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/mame.git/commit/?id=ed957fa7bef509a….
Change:
-%ifarch aarch64
Thanks.
Full change:
============
commit ed957fa7bef509ada6fe60c44a601475d7348437
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Tue Nov 28 20:24:19 2023 +0100
Update to 0.261 and go back to ld.bfd for rawhide
- Update to 0.261
- No longer use lld on rawhide now that ld.bfd is fixed
diff --git a/.gitignore b/.gitignore
index 3c99617..7f8b80b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -170,3 +170,5 @@
/whatsnew_0259.txt
/mame-mame0260.tar.gz
/whatsnew_0260.txt
+/mame-mame0261.tar.gz
+/whatsnew_0261.txt
diff --git a/mame.spec b/mame.spec
index 3e735ac..428df5e 100644
--- a/mame.spec
+++ b/mame.spec
@@ -1,7 +1,7 @@
#The debug build is disabled by default, please use # --with debug to override
%bcond_with debug
-%global baseversion 260
+%global baseversion 261
%undefine _auto_set_build_flags
@@ -39,12 +39,6 @@ BuildRequires: jack-audio-connection-kit
BuildRequires: libjpeg-turbo-devel
BuildRequires: libXi-devel
BuildRequires: libXinerama-devel
-# https://sourceware.org/bugzilla/show_bug.cgi?id=30930
-%if 0%{?fedora} >= 40
-%ifarch aarch64
-BuildRequires: lld
-%endif
-%endif
BuildRequires: lua-devel >= 5.3.0
BuildRequires: make
BuildRequires: portaudio-devel
@@ -250,11 +244,6 @@ RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed "s@ -Wp,-D_GLIBCXX_ASSERTIONS@@")
SDL_INI_PATH="%{_sysconfdir}/%{name};" \
TOOLS=1 \
LDOPTS="$RPM_LD_FLAGS" \
-%if 0%{?fedora} >= 40
-%ifarch aarch64
- LDOPTS+="-fuse-ld=lld" \
-%endif
-%endif
OPT_FLAGS="$RPM_OPT_FLAGS"
pushd docs
diff --git a/sources b/sources
index d5bedc2..3fb501a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (mame-mame0260.tar.gz) = 87b9d157d62456d1a3f4b751ff869d8366ea90566304f1e5ce5b1cef60d1879a249b9ca2c281355c8abb6c7e1cdba1f57b3fb7209e3cc2f11adf0c7f6f960b12
-SHA512 (whatsnew_0260.txt) = 9adc6a465981c67ff6397e1465495c9dab5f9316a50bb8ddaa6f1a517ca6867f82849782e9aaf0029af3101def4589d7e5d24baaa5e0dba895de01df118974d8
+SHA512 (mame-mame0261.tar.gz) = b0162ea51d424295b195b088f64ac1e73ab35fb85f2c795d37c227083b3cc5f5812d573660ff36ac219b72fc93275f089d5bb815f4ef7ecd08ff1b5916641382
+SHA512 (whatsnew_0261.txt) = edb0da37a5afe59e6ef365f605176dbfc1ebbc4add461c0d9ccffe8524eff984a449db6f28652245fbeb91f708f2e438cfe133af735e53b42f87e00d0a5c230d
1
0
New package excluding arches (2)
============================
- khelpcenter
ExclusiveArch: %{qt6_qtwebengine_arches}
- tokodon
ExclusiveArch: %{qt6_qtwebengine_arches}
List of packages currently excluding arches (1135)
===========================================
- 0ad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- 90-Second-Portraits
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- BareBonesBrowserLaunch
ExclusiveArch: %{java_arches} noarch
- CFR
ExclusiveArch: %{java_arches} noarch
- CardManager
ExclusiveArch: %{java_arches} noarch
- GAPDoc
ExclusiveArch: %{gap_arches} noarch
- GoldenCheetah
ExclusiveArch: %{qt5_qtwebengine_arches}
- GtkAda
ExclusiveArch: %{GPRbuild_arches}
- GtkAda3
ExclusiveArch: %{GPRbuild_arches}
- IPAddress
ExclusiveArch: %{java_arches} noarch
- Mars
ExclusiveArch: %{java_arches} noarch
- OpenColorIO
ExclusiveArch: x86_64 ppc64le
- OpenImageIO
ExclusiveArch: x86_64 ppc64le
- OpenMolcas
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- OpenStego
ExclusiveArch: %{java_arches} noarch
- PragmARC
ExclusiveArch: %{GPRbuild_arches}
- R-V8
ExclusiveArch: %{nodejs_arches}
- R-rJava
ExclusiveArch: %{java_arches}
- RdRand
ExclusiveArch: %{ix86} x86_64
- RediSearch
ExclusiveArch: x86_64
- SLOF
ExclusiveArch: ppc64le
- YafaRay
ExclusiveArch: %{ix86} x86_64
- aardvark-dns
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- accel-config
ExclusiveArch: %{ix86} x86_64
- acpid
ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64
- ahven
ExclusiveArch: %{GPRbuild_arches}
- algobox
ExclusiveArch: %{qt5_qtwebengine_arches}
- american-fuzzy-lop
ExclusiveArch: %{ix86} x86_64 s390x
- anet
ExclusiveArch: %{GPRbuild_arches}
- ant
ExclusiveArch: %{java_arches} noarch
- ant-antunit
ExclusiveArch: %{java_arches} noarch
- ant-contrib
ExclusiveArch: %{java_arches} noarch
- antlr
ExclusiveArch: %{java_arches}
- antlr3
ExclusiveArch: %{java_arches}
- antlr4-project
ExclusiveArch: %{java_arches}
- antlrworks
ExclusiveArch: %{java_arches} noarch
- aopalliance
ExclusiveArch: %{java_arches} noarch
- apache-commons-beanutils
ExclusiveArch: %{java_arches} noarch
- apache-commons-cli
ExclusiveArch: %{java_arches} noarch
- apache-commons-codec
ExclusiveArch: %{java_arches} noarch
- apache-commons-collections
ExclusiveArch: %{java_arches} noarch
- apache-commons-collections4
ExclusiveArch: %{java_arches} noarch
- apache-commons-compress
ExclusiveArch: %{java_arches} noarch
- apache-commons-configuration
ExclusiveArch: %{java_arches} noarch
- apache-commons-digester
ExclusiveArch: %{java_arches} noarch
- apache-commons-exec
ExclusiveArch: %{java_arches} noarch
- apache-commons-io
ExclusiveArch: %{java_arches} noarch
- apache-commons-jexl
ExclusiveArch: %{java_arches} noarch
- apache-commons-jxpath
ExclusiveArch: %{java_arches} noarch
- apache-commons-lang3
ExclusiveArch: %{java_arches} noarch
- apache-commons-logging
ExclusiveArch: %{java_arches} noarch
- apache-commons-math
ExclusiveArch: %{java_arches} noarch
- apache-commons-modeler
ExclusiveArch: %{java_arches} noarch
- apache-commons-net
ExclusiveArch: %{java_arches} noarch
- apache-commons-parent
ExclusiveArch: %{java_arches} noarch
- apache-commons-pool
ExclusiveArch: %{java_arches} noarch
- apache-commons-vfs
ExclusiveArch: %{java_arches} noarch
- apache-ivy
ExclusiveArch: %{java_arches} noarch
- apache-parent
ExclusiveArch: %{java_arches} noarch
- apache-resource-bundles
ExclusiveArch: %{java_arches} noarch
- apache-sshd
ExclusiveArch: %{java_arches} noarch
- apiguardian
ExclusiveArch: %{java_arches} noarch
- apmd
ExclusiveArch: %{ix86}
- appstream-generator
ExclusiveArch: %{ldc_arches}
- aqute-bnd
ExclusiveArch: %{java_arches} noarch
- args4j
ExclusiveArch: %{java_arches} noarch
- arianna
ExclusiveArch: %{qt6_qtwebengine_arches}
- arm-trusted-firmware
ExclusiveArch: aarch64
- asmjit
ExclusiveArch: aarch64 x86_64
- assertj-core
ExclusiveArch: %{java_arches} noarch
- atinject
ExclusiveArch: %{java_arches} noarch
- aunit
ExclusiveArch: %GPRbuild_arches
- auto
ExclusiveArch: %{java_arches} noarch
- autolink-java
ExclusiveArch: noarch %{java_arches}
- avgtime
ExclusiveArch: %{ldc_arches}
- aws
ExclusiveArch: %GPRbuild_arches
- azure-cli
ExclusiveArch: %{java_arches} noarch
- batik
ExclusiveArch: %{java_arches} noarch
- bcal
ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x
- bcc
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
- bcel
ExclusiveArch: %{java_arches} noarch
- bcm283x-firmware
ExclusiveArch: aarch64
- beansbinding
ExclusiveArch: %{java_arches} noarch
- berusky2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips}
- beust-jcommander
ExclusiveArch: %{java_arches} noarch
- bibletime
ExclusiveArch: %{java_arches}
- biosdevname
ExclusiveArch: %{ix86} x86_64
- bless
ExclusiveArch: %mono_arches
- bodhi-server
ExclusiveArch: %{golang_arches_future}
- bolzplatz2006
ExclusiveArch: %{java_arches}
- bouncycastle
ExclusiveArch: %{java_arches} noarch
- box64
ExclusiveArch: aarch64 ppc64le x86_64
- bpftrace
ExclusiveArch: x86_64 %{power64} aarch64 s390x
- brazil
ExclusiveArch: %{java_arches} noarch
- bsf
ExclusiveArch: %{java_arches} noarch
- bsh
ExclusiveArch: %{java_arches} noarch
- build-helper-maven-plugin
ExclusiveArch: %{java_arches} noarch
- buildah
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- byebyebios
ExclusiveArch: x86_64
- byte-buddy
ExclusiveArch: %{java_arches} noarch
- byteman
ExclusiveArch: %{java_arches} noarch
- cachelib
ExclusiveArch: x86_64 aarch64 ppc64le
- caddy
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: %{golang_arches}
- caffe
ExclusiveArch: x86_64 aarch64 ppc64le
- calamares
ExclusiveArch: %{ix86} x86_64 aarch64
- calibre
ExclusiveArch: aarch64 x86_64
- cambozola
ExclusiveArch: %{java_arches} noarch
- canl-java
ExclusiveArch: %{java_arches} noarch
- catatonit
ExclusiveArch: aarch64 ppc64le s390x x86_64
ExclusiveArch: %{golang_arches_future}
- ccdciel
ExclusiveArch: %{fpc_arches}
- cdcollect
ExclusiveArch: %{mono_arches}
- cdi-api
ExclusiveArch: %{java_arches} noarch
- ceph
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- cglib
ExclusiveArch: %{java_arches} noarch
- chromium
ExclusiveArch: x86_64
ExclusiveArch: x86_64 aarch64
- cjdns
ExclusiveArch: %{nodejs_arches}
- classloader-leak-test-framework
ExclusiveArch: %{java_arches} noarch
- classpathless-compiler
ExclusiveArch: %{java_arches} noarch
- clevis-pin-tpm2
ExclusiveArch: %{rust_arches}
- clojure
ExclusiveArch: %{java_arches} noarch
- clojure-core-specs-alpha
ExclusiveArch: %{java_arches} noarch
- clojure-maven-plugin
ExclusiveArch: %{java_arches} noarch
- clojure-spec-alpha
ExclusiveArch: %{java_arches} noarch
- cmospwd
ExclusiveArch: %{ix86} x86_64
- cmrt
ExclusiveArch: %{ix86} x86_64 ia64
- codehaus-parent
ExclusiveArch: %{java_arches} noarch
- colorful
ExclusiveArch: %{fpc_arches}
- colossus
ExclusiveArch: %{java_arches} noarch
- conmon
ExclusiveArch: %{golang_arches_future}
- console-image-viewer
ExclusiveArch: %{java_arches} noarch
- containernetworking-plugins
ExclusiveArch: %{golang_arches}
- coq
ExclusiveArch: %{ocaml_native_compiler}
- cortado
ExclusiveArch: %{java_arches} noarch
- cpu-x
ExclusiveArch: i686 x86_64
- cpufetch
ExclusiveArch: %{arm} aarch64 x86_64 ppc ppc64 ppc64le
- cpuid
ExclusiveArch: %{ix86} x86_64
- cpuinfo
ExclusiveArch: x86_64 aarch64
- cqrlog
ExclusiveArch: %{fpc_arches}
- crash
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- crash-gcore-command
ExclusiveArch: aarch64 ppc64le x86_64
- crash-trace-command
ExclusiveArch: aarch64 ppc64le s390x x86_64
- credentials-fetcher
ExclusiveArch: x86_64 aarch64 s390x
- cri-o
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- cri-tools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- criu
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- crun
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le riscv64 s390x x86_64
- cryptlib
ExclusiveArch: x86_64 aarch64 ppc64le
- crypto-policies
ExclusiveArch: %{java_arches} noarch
- cryptobone
ExclusiveArch: x86_64 ppc64le aarch64
- csslint
ExclusiveArch: %{nodejs_arches} noarch
- daq
ExclusiveArch: x86_64 aarch64
- dbus-sharp
ExclusiveArch: %mono_arches
- dbus-sharp-glib
ExclusiveArch: %mono_arches
- decentxml
ExclusiveArch: %{java_arches} noarch
- deepin-daemon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- deepin-desktop-schemas
ExclusiveArch: %{go_arches}
- directory-maven-plugin
ExclusiveArch: %{java_arches} noarch
- dirgra
ExclusiveArch: %{java_arches} noarch
- disruptor
ExclusiveArch: %{java_arches} noarch
- ditaa
ExclusiveArch: %{java_arches} noarch
- dlm
ExclusiveArch: i686 x86_64
- dmidecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- dmtcp
ExclusiveArch: x86_64
- docker-distribution
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- dogtag-pki
ExclusiveArch: %{java_arches}
- dolphin-emu
ExclusiveArch: x86_64 aarch64
- dom4j
ExclusiveArch: %{java_arches} noarch
- dotnet6.0
ExclusiveArch: aarch64 x86_64 s390x
ExclusiveArch: x86_64
- dotnet7.0
ExclusiveArch: aarch64 ppc64le s390x x86_64
ExclusiveArch: x86_64
- doublecmd
ExclusiveArch: %{ix86} x86_64
- dpdk
ExclusiveArch: x86_64 i686 aarch64 ppc64le
- dub
ExclusiveArch: %{ldc_arches}
- dxvk-native
ExclusiveArch: %{ix86} x86_64
- dyninst
ExclusiveArch: %{ix86} x86_64 ppc64le aarch64
- e3
ExclusiveArch: %{ix86} x86_64
- easymock
ExclusiveArch: %{java_arches} noarch
- ecj
ExclusiveArch: %{java_arches} noarch
- eclipse-swt
ExclusiveArch: %{java_arches}
- ed25519-java
ExclusiveArch: %{java_arches} noarch
- edk2
ExclusiveArch: x86_64 aarch64 riscv64
- efibootmgr
ExclusiveArch: %{efi}
- efifs
ExclusiveArch: %{efi}
- efitools
ExclusiveArch: %{efi}
- efivar
ExclusiveArch: %{efi}
- elk
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- emacs-slime
ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64
- embree
ExclusiveArch: aarch64 x86_64
- embree3
ExclusiveArch: aarch64 x86_64
- enjarify
ExclusiveArch: %{java_arches} noarch
- enki
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
- envytools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- eric
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
- erlang-corba
ExclusiveArch: %{java_arches}
- esmi_ib_library
ExclusiveArch: x86_64
- eth-tools
ExclusiveArch: x86_64
- exec-maven-plugin
ExclusiveArch: %{java_arches} noarch
- external-editor-revived
ExclusiveArch: %{rust_arches}
- extra-enforcer-rules
ExclusiveArch: %{java_arches} noarch
- fasterxml-oss-parent
ExclusiveArch: %{java_arches} noarch
- fb303
ExclusiveArch: x86_64 aarch64 ppc64le
- fbthrift
ExclusiveArch: x86_64 aarch64 ppc64le
- fcitx-libpinyin
ExclusiveArch: %{qt5_qtwebengine_arches}
- fedora-dockerfiles
ExclusiveArch: %{go_arches}
- felix-parent
ExclusiveArch: %{java_arches} noarch
- felix-utils
ExclusiveArch: %{java_arches} noarch
- fernflower
ExclusiveArch: %{java_arches} noarch
- fes
ExclusiveArch: %{ix86} x86_64
- filedrop
ExclusiveArch: %{java_arches} noarch
- firecracker
ExclusiveArch: aarch64 x86_64
- fishbowl
ExclusiveArch: %{java_arches} noarch
- fizz
ExclusiveArch: x86_64 aarch64 ppc64le
- flexmark-java
ExclusiveArch: noarch %{java_arches}
- flocq
ExclusiveArch: %{ocaml_native_compiler}
- florist
ExclusiveArch: %{GPRbuild_arches}
- fluent-bit
ExclusiveArch: x86_64 aarch64
- flute
ExclusiveArch: %{java_arches} noarch
- folly
ExclusiveArch: x86_64 aarch64 ppc64le
- fop
ExclusiveArch: %{java_arches} noarch
- forge-parent
ExclusiveArch: %{java_arches} noarch
- fpc
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc64le
- frama-c
ExclusiveArch: %{ocaml_native_compiler}
- freecol
ExclusiveArch: %{java_arches} noarch
- freemarker
ExclusiveArch: %{java_arches} noarch
- freerouting
ExclusiveArch: %{java_arches} noarch
- frescobaldi
ExclusiveArch: %{qt5_qtwebengine_arches}
- frysk
ExclusiveArch: x86_64 ppc64
- fuse-overlayfs
ExclusiveArch: %{arm64} ppc64le s390x x86_64
- fusesource-pom
ExclusiveArch: %{java_arches} noarch
- fwts
ExclusiveArch: x86_64 %{arm} aarch64 s390x riscv64 %{power64}
- fwupd-efi
ExclusiveArch: x86_64 aarch64
- ga
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- gap
ExclusiveArch: %{gap_arches}
- gap-pkg-ace
ExclusiveArch: %{gap_arches}
- gap-pkg-aclib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-alnuth
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-atlasrep
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-autodoc
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-automata
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-autpgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-browse
ExclusiveArch: %{gap_arches}
- gap-pkg-caratinterface
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-circle
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-cohomolo
ExclusiveArch: %{gap_arches}
- gap-pkg-congruence
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-corelg
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crime
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crisp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crypting
ExclusiveArch: %{gap_arches}
- gap-pkg-cryst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crystcat
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-ctbllib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-curlinterface
ExclusiveArch: %{gap_arches}
- gap-pkg-cvec
ExclusiveArch: %{gap_arches}
- gap-pkg-datastructures
ExclusiveArch: %{gap_arches}
- gap-pkg-design
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-digraphs
ExclusiveArch: %{gap_arches}
- gap-pkg-edim
ExclusiveArch: %{gap_arches}
- gap-pkg-factint
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-ferret
ExclusiveArch: %{gap_arches}
- gap-pkg-fga
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-fining
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-float
ExclusiveArch: %{gap_arches}
- gap-pkg-format
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-forms
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-fr
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-francy
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-gbnp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-genss
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-grape
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-groupoids
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-grpconst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-guava
ExclusiveArch: %{gap_arches}
- gap-pkg-hap
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-hapcryst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-hecke
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-images
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-io
ExclusiveArch: %{gap_arches}
- gap-pkg-irredsol
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-json
ExclusiveArch: %{gap_arches}
- gap-pkg-jupyterkernel
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-jupyterviz
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-laguna
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liealgdb
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liepring
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liering
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-loops
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-lpres
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-mapclass
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-nautytracesinterface
ExclusiveArch: %{gap_arches}
- gap-pkg-nq
ExclusiveArch: %{gap_arches}
- gap-pkg-openmath
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-orb
ExclusiveArch: %{gap_arches}
- gap-pkg-polenta
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-polycyclic
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-polymaking
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-primgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-profiling
ExclusiveArch: %{gap_arches}
- gap-pkg-qpa
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-quagroup
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-radiroot
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-recog
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-repsn
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-resclasses
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-scscp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-semigroups
ExclusiveArch: %{gap_arches}
- gap-pkg-singular
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sla
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-smallgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-smallsemi
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sonata
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sophus
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-spinsym
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-standardff
ExclusiveArch: %{gap_arches}
- gap-pkg-tomlib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-toric
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-transgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-utils
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-uuid
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-xmod
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-zeromqinterface
ExclusiveArch: %{gap_arches}
- gappalib-coq
ExclusiveArch: %{ocaml_native_compiler}
- gbrainy
ExclusiveArch: %mono_arches
- gdb
ExclusiveArch: %{ix86} x86_64
- gdb-exploitable
ExclusiveArch: x86_64 i386
ExclusiveArch: x86_64 noarch
- gearhead1
ExclusiveArch: %{fpc_arches}
- gearhead2
ExclusiveArch: %{fpc_arches}
- ghdl
ExclusiveArch: %{GNAT_arches}
- ghostwriter
ExclusiveArch: %{qt5_qtwebengine_arches}
- gio-sharp
ExclusiveArch: %mono_arches
- gir-to-d
ExclusiveArch: %{ldc_arches}
- git-octopus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- gitqlient
ExclusiveArch: %{qt5_qtwebengine_arches}
- giver
ExclusiveArch: %{mono_arches}
- gkeyfile-sharp
ExclusiveArch: %mono_arches
- glibc32
ExclusiveArch: x86_64
- glibd
ExclusiveArch: %{ldc_arches}
- gnatcoll
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-bindings
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-db
ExclusiveArch: %{GPRbuild_arches}
- gnome-boxes
ExclusiveArch: x86_64
- gnome-desktop-sharp
ExclusiveArch: %mono_arches
- gnome-do
ExclusiveArch: %mono_arches
- gnome-keyring-sharp
ExclusiveArch: %mono_arches
- gnome-rdp
ExclusiveArch: %{mono_arches}
- gnome-sharp
ExclusiveArch: %mono_arches
- gnome-subtitles
ExclusiveArch: %mono_arches
- gnu-efi
ExclusiveArch: %{efi}
- go-bindata
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- godep
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang
ExclusiveArch: %{golang_arches}
- google-gson
ExclusiveArch: %{java_arches} noarch
- google-guice
ExclusiveArch: %{java_arches} noarch
- gotun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: x86_64
- goverlay
ExclusiveArch: %{fpc_arches}
- gprbuild
ExclusiveArch: %{GPRbuild_arches}
- gprolog
ExclusiveArch: x86_64 %{ix86} ppc alpha aarch64
- grafana
ExclusiveArch: %{grafana_arches}
- grafana-pcp
ExclusiveArch: %{grafanapcp_arches}
- gtk-sharp-beans
ExclusiveArch: %mono_arches
- gtk-sharp2
ExclusiveArch: %mono_arches
- gtk-sharp3
ExclusiveArch: %{mono_arches}
- gtkd
ExclusiveArch: %{ldc_arches}
- guava
ExclusiveArch: %{java_arches} noarch
- gudev-sharp
ExclusiveArch: %mono_arches
- guestfs-tools
ExclusiveArch: %{kernel_arches}
- gvisor-tap-vsock
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- hamcrest
ExclusiveArch: %{java_arches} noarch
- harec
ExclusiveArch: x86_64 aarch64
- hawtjni
ExclusiveArch: %{java_arches} noarch
- hedgewars
ExclusiveArch: %{fpc_arches}
- hibernate-jpa-2.0-api
ExclusiveArch: %{java_arches} noarch
- hid4java
ExclusiveArch: %{java_arches} noarch
- hipblas
ExclusiveArch: x86_64
- hipcub
ExclusiveArch: x86_64
- hipify
ExclusiveArch: x86_64
- hsakmt
ExclusiveArch: x86_64 aarch64 ppc64le
- httpcomponents-client
ExclusiveArch: %{java_arches} noarch
- httpcomponents-core
ExclusiveArch: %{java_arches} noarch
- httpcomponents-project
ExclusiveArch: %{java_arches} noarch
- hyena
ExclusiveArch: %{mono_arches}
- hyperscan
ExclusiveArch: x86_64
- hyperv-daemons
ExclusiveArch: i686 x86_64 aarch64
- icaro
ExclusiveArch: %{ix86} x86_64 noarch
- icedtea-web
ExclusiveArch: %{java_arches}
- icu4j
ExclusiveArch: %{java_arches} noarch
- imagej
ExclusiveArch: %{java_arches} noarch
- imhex
ExclusiveArch: x86_64 %{arm64}
- imvirt
ExclusiveArch: %{ix86} x86_64 ia64
- indistarter
ExclusiveArch: %{fpc_arches}
- infinipath-psm
ExclusiveArch: x86_64
- intel-cm-compiler
ExclusiveArch: i686 x86_64
- intel-cmt-cat
ExclusiveArch: x86_64
- intel-compute-runtime
ExclusiveArch: x86_64
- intel-gmmlib
ExclusiveArch: x86_64 i686
- intel-igc
ExclusiveArch: x86_64
- intel-ipp-crypto-mb
ExclusiveArch: x86_64
- intel-ipsec-mb
ExclusiveArch: x86_64
- intel-mediasdk
ExclusiveArch: x86_64
- intel-undervolt
ExclusiveArch: i386 x86_64
- ioport
ExclusiveArch: %{ix86} x86_64
- ipmctl
ExclusiveArch: x86_64
- ispc
ExclusiveArch: x86_64 aarch64
- iucode-tool
ExclusiveArch: %{ix86} x86_64
- iyfct
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- jFormatString
ExclusiveArch: %{java_arches} noarch
- jackson-annotations
ExclusiveArch: %{java_arches} noarch
- jackson-bom
ExclusiveArch: %{java_arches} noarch
- jackson-core
ExclusiveArch: %{java_arches} noarch
- jackson-databind
ExclusiveArch: %{java_arches} noarch
- jackson-dataformats-binary
ExclusiveArch: %{java_arches} noarch
- jackson-dataformats-text
ExclusiveArch: %{java_arches} noarch
- jackson-jaxrs-providers
ExclusiveArch: %{java_arches} noarch
- jackson-modules-base
ExclusiveArch: %{java_arches} noarch
- jackson-parent
ExclusiveArch: %{java_arches} noarch
- jacoco
ExclusiveArch: %{java_arches} noarch
- jacop
ExclusiveArch: %{java_arches} noarch
- jakarta-activation
ExclusiveArch: %{java_arches} noarch
- jakarta-activation1
ExclusiveArch: %{java_arches} noarch
- jakarta-annotations
ExclusiveArch: %{java_arches} noarch
- jakarta-el
ExclusiveArch: %{java_arches} noarch
- jakarta-interceptors
ExclusiveArch: %{java_arches} noarch
- jakarta-json
ExclusiveArch: %{java_arches} noarch
- jakarta-mail
ExclusiveArch: %{java_arches} noarch
- jakarta-mail1
ExclusiveArch: %{java_arches} noarch
- jakarta-oro
ExclusiveArch: %{java_arches} noarch
- jakarta-saaj
ExclusiveArch: %{java_arches} noarch
- jakarta-server-pages
ExclusiveArch: %{java_arches} noarch
- jakarta-servlet
ExclusiveArch: %{java_arches} noarch
- jakarta-xml-ws
ExclusiveArch: %{java_arches} noarch
- janino
ExclusiveArch: %{java_arches} noarch
- jansi
ExclusiveArch: %{java_arches}
- jansi-native
ExclusiveArch: %{java_arches}
- jansi1
ExclusiveArch: %{java_arches} noarch
- java-1.8.0-openjdk
ExclusiveArch: %{java_arches}
- java-1.8.0-openjdk-aarch32
ExclusiveArch: %{arm}
- java-1.8.0-openjdk-portable
ExclusiveArch: %{java_arches}
- java-11-openjdk
ExclusiveArch: %{java_arches}
- java-11-openjdk-portable
ExclusiveArch: %{java_arches}
- java-17-openjdk
ExclusiveArch: %{java_arches}
- java-17-openjdk-portable
ExclusiveArch: %{java_arches}
- java-diff-utils
ExclusiveArch: %{java_arches} noarch
- java-dirq
ExclusiveArch: %{java_arches} noarch
- java-jd-decompiler
ExclusiveArch: %{java_arches} noarch
- java-latest-openjdk
ExclusiveArch: %{java_arches}
- java-latest-openjdk-portable
ExclusiveArch: %{java_arches}
- java-runtime-decompiler
ExclusiveArch: %{java_arches} noarch
- java-scrypt
ExclusiveArch: %{java_arches} noarch
- java_cup
ExclusiveArch: %{java_arches} noarch
- javacc
ExclusiveArch: %{java_arches} noarch
- javacc-maven-plugin
ExclusiveArch: %{java_arches} noarch
- javaewah
ExclusiveArch: %{java_arches} noarch
- javapackages-bootstrap
ExclusiveArch: %{java_arches}
- javaparser
ExclusiveArch: %{java_arches} noarch
- javapoet
ExclusiveArch: %{java_arches} noarch
- javassist
ExclusiveArch: %{java_arches} noarch
- jaxb
ExclusiveArch: %{java_arches} noarch
- jaxb-api
ExclusiveArch: %{java_arches} noarch
- jaxb-api2
ExclusiveArch: %{java_arches} noarch
- jaxb-dtd-parser
ExclusiveArch: %{java_arches} noarch
- jaxb-fi
ExclusiveArch: %{java_arches} noarch
- jaxb-istack-commons
ExclusiveArch: %{java_arches} noarch
- jaxb-stax-ex
ExclusiveArch: %{java_arches} noarch
- jaxen
ExclusiveArch: %{java_arches} noarch
- jboss-jaxrs-2.0-api
ExclusiveArch: %{java_arches} noarch
- jboss-logging
ExclusiveArch: %{java_arches} noarch
- jboss-logging-tools
ExclusiveArch: %{java_arches} noarch
- jboss-parent
ExclusiveArch: %{java_arches} noarch
- jchardet
ExclusiveArch: %{java_arches} noarch
- jcip-annotations
ExclusiveArch: %{java_arches} noarch
- jctools
ExclusiveArch: %{java_arches} noarch
- jcuber
ExclusiveArch: %{java_arches} noarch
- jdeparser
ExclusiveArch: %{java_arches} noarch
- jdepend
ExclusiveArch: %{java_arches} noarch
- jdependency
ExclusiveArch: %{java_arches} noarch
- jdom
ExclusiveArch: %{java_arches} noarch
- jdom2
ExclusiveArch: %{java_arches} noarch
- jedit
ExclusiveArch: %{java_arches} noarch
- jericho-html
ExclusiveArch: %{java_arches} noarch
- jetbrains-annotations
ExclusiveArch: noarch %{java_arches}
- jetty
ExclusiveArch: %{java_arches} noarch
- jflex
ExclusiveArch: %{java_arches} noarch
- jfreechart
ExclusiveArch: %{java_arches} noarch
- jgit
ExclusiveArch: %{java_arches} noarch
- jglobus
ExclusiveArch: %{java_arches} noarch
- jgoodies-common
ExclusiveArch: %{java_arches} noarch
- jgoodies-forms
ExclusiveArch: %{java_arches} noarch
- jgoodies-looks
ExclusiveArch: %{java_arches} noarch
- jigawatts
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- jline
ExclusiveArch: %{java_arches}
- jline2
ExclusiveArch: %{java_arches} noarch
- jmock
ExclusiveArch: %{java_arches} noarch
- jmol
ExclusiveArch: %{java_arches} noarch
- jna
ExclusiveArch: %{java_arches}
- jneuroml-core
ExclusiveArch: %{java_arches} noarch
- jni-inchi
ExclusiveArch: %{java_arches}
- jol
ExclusiveArch: %{java_arches} noarch
- jolokia-jvm-agent
ExclusiveArch: %{java_arches} noarch
- jopt-simple
ExclusiveArch: %{java_arches} noarch
- jorbis
ExclusiveArch: %{java_arches} noarch
- jowl
ExclusiveArch: %{nodejs_arches} noarch
- jpanoramamaker
ExclusiveArch: %{java_arches} noarch
- jsch
ExclusiveArch: %{java_arches} noarch
- jsch-agent-proxy
ExclusiveArch: %{java_arches} noarch
- json_simple
ExclusiveArch: %{java_arches} noarch
- jsoup
ExclusiveArch: %{java_arches} noarch
- jsr-305
ExclusiveArch: %{java_arches} noarch
- jss
ExclusiveArch: %{java_arches}
- jssc
ExclusiveArch: %{java_arches}
- jtidy
ExclusiveArch: %{java_arches} noarch
- julia
ExclusiveArch: x86_64
- junit
ExclusiveArch: %{java_arches} noarch
- junit5
ExclusiveArch: %{java_arches} noarch
- juniversalchardet
ExclusiveArch: %{java_arches} noarch
- jzlib
ExclusiveArch: %{java_arches} noarch
- kaidan
ExclusiveArch: %{qt5_qtwebengine_arches}
- kchmviewer
ExclusiveArch: %{qt5_qtwebengine_arches}
- kernel
ExclusiveArch: noarch x86_64 s390x aarch64 ppc64le
ExclusiveArch: noarch i386 i686 x86_64 s390x aarch64 ppc64le
- keylime-agent-rust
ExclusiveArch: %{rust_arches}
- keyring-ima-signer
ExclusiveArch: %{rust_arches}
- kf5-akonadi-search
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-audiocd-kio
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kblog
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarcore
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarutils
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kitinerary
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-ktnef
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-libkdcraw
ExclusiveArch: x86_64 ppc64le %{arm}
- khelpcenter
ExclusiveArch: %{qt6_qtwebengine_arches}
- kicad
ExclusiveArch: x86_64 aarch64 ppc64le
- kiwix-desktop
ExclusiveArch: %{qt5_qtwebengine_arches}
- knot-resolver
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- knotes
ExclusiveArch: x86_64 %{arm}
- kubernetes
ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm}
- laf-plugin
ExclusiveArch: %{java_arches} noarch
- lazarus
ExclusiveArch: %{fpc_arches}
- lazpaint
ExclusiveArch: %{fpc_arches}
- ldapjdk
ExclusiveArch: %{java_arches} noarch
- ldc
ExclusiveArch: %{ldc_arches} ppc64le
- ldc1.32
ExclusiveArch: %{ldc_arches} ppc64le
- libbase
ExclusiveArch: %{java_arches} noarch
- libclc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x
- libcxl
ExclusiveArch: %{power64}
- libdfp
ExclusiveArch: ppc ppc64 ppc64le s390 s390x x86_64
- libdispatch
ExclusiveArch: x86_64 aarch64 ppc64le
- libfonts
ExclusiveArch: %{java_arches} noarch
- libformula
ExclusiveArch: %{java_arches} noarch
- libguestfs
ExclusiveArch: %{kernel_arches}
- libica
ExclusiveArch: s390 s390x
- libipt
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- libkgapi
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- libkrun
ExclusiveArch: x86_64 aarch64
- libkrunfw
ExclusiveArch: x86_64 aarch64
- liblayout
ExclusiveArch: %{java_arches} noarch
- libloader
ExclusiveArch: %{java_arches} noarch
- libnxz
ExclusiveArch: ppc64le
- libocxl
ExclusiveArch: ppc64le
- libpsm2
ExclusiveArch: x86_64
- libquentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- libreoffice-TexMaths
ExclusiveArch: %{java_arches}
- librepository
ExclusiveArch: %{java_arches} noarch
- libretro-desmume2015
ExclusiveArch: i686 x86_64
- librtas
ExclusiveArch: %{power64}
- libserializer
ExclusiveArch: %{java_arches} noarch
- libservicelog
ExclusiveArch: ppc %{power64}
- libsmbios
ExclusiveArch: x86_64 %{ix86}
- libunicode
ExclusiveArch: x86_64 aarch64
- libunwind
ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64
- libva-nvidia-driver
ExclusiveArch: %{x86_64} %{ix86} %{arm64} ppc64le
- libvirt-java
ExclusiveArch: %{java_arches} noarch
- libvma
ExclusiveArch: x86_64 ppc64le ppc64 aarch64
- libvmi
ExclusiveArch: x86_64
- libvpd
ExclusiveArch: %{power64}
- libxsmm
ExclusiveArch: x86_64
- libzdnn
ExclusiveArch: s390x
- libzfcphbaapi
ExclusiveArch: s390 s390x
- libzpc
ExclusiveArch: s390x
- llhttp
ExclusiveArch: %{nodejs_arches}
- log4j
ExclusiveArch: %{java_arches} noarch
- log4net
ExclusiveArch: %mono_arches
- lrmi
ExclusiveArch: %{ix86}
- lsvpd
ExclusiveArch: %{power64}
- luajit
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- lucene
ExclusiveArch: %{java_arches} noarch
- lujavrite
ExclusiveArch: %{java_arches}
- luxcorerender
ExclusiveArch: x86_64
- mactel-boot
ExclusiveArch: x86_64
- magicmirror
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-airnow
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-onthisday
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-singlestock
ExclusiveArch: %{nodejs_arches} noarch
- manifest-tool
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- mariadb-java-client
ExclusiveArch: %{java_arches} noarch
- marked
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- matrix-synapse
ExclusiveArch: %{rust_arches}
- maui-mauikit
ExclusiveArch: %{ix86} s390x aarch64 x86_64
- maven
ExclusiveArch: %{java_arches} noarch
- maven-antrun-plugin
ExclusiveArch: %{java_arches} noarch
- maven-archetype
ExclusiveArch: %{java_arches} noarch
- maven-archiver
ExclusiveArch: %{java_arches} noarch
- maven-artifact-transfer
ExclusiveArch: %{java_arches} noarch
- maven-assembly-plugin
ExclusiveArch: %{java_arches} noarch
- maven-bundle-plugin
ExclusiveArch: %{java_arches} noarch
- maven-clean-plugin
ExclusiveArch: %{java_arches} noarch
- maven-common-artifact-filters
ExclusiveArch: %{java_arches} noarch
- maven-compiler-plugin
ExclusiveArch: %{java_arches} noarch
- maven-dependency-analyzer
ExclusiveArch: %{java_arches} noarch
- maven-dependency-plugin
ExclusiveArch: %{java_arches} noarch
- maven-dependency-tree
ExclusiveArch: %{java_arches} noarch
- maven-doxia
ExclusiveArch: %{java_arches} noarch
- maven-doxia-sitetools
ExclusiveArch: %{java_arches} noarch
- maven-enforcer
ExclusiveArch: %{java_arches} noarch
- maven-file-management
ExclusiveArch: %{java_arches} noarch
- maven-filtering
ExclusiveArch: %{java_arches} noarch
- maven-invoker
ExclusiveArch: %{java_arches} noarch
- maven-invoker-plugin
ExclusiveArch: %{java_arches} noarch
- maven-jar-plugin
ExclusiveArch: %{java_arches} noarch
- maven-mapping
ExclusiveArch: %{java_arches} noarch
- maven-native
ExclusiveArch: %{java_arches} noarch
- maven-parent
ExclusiveArch: %{java_arches} noarch
- maven-patch-plugin
ExclusiveArch: %{java_arches} noarch
- maven-plugin-testing
ExclusiveArch: %{java_arches} noarch
- maven-plugin-tools
ExclusiveArch: %{java_arches} noarch
- maven-remote-resources-plugin
ExclusiveArch: %{java_arches} noarch
- maven-reporting-api
ExclusiveArch: %{java_arches} noarch
- maven-reporting-impl
ExclusiveArch: %{java_arches} noarch
- maven-resolver
ExclusiveArch: %{java_arches} noarch
- maven-resources-plugin
ExclusiveArch: %{java_arches} noarch
- maven-script-interpreter
ExclusiveArch: %{java_arches} noarch
- maven-shade-plugin
ExclusiveArch: %{java_arches} noarch
- maven-shared-incremental
ExclusiveArch: %{java_arches} noarch
- maven-shared-io
ExclusiveArch: %{java_arches} noarch
- maven-shared-utils
ExclusiveArch: %{java_arches} noarch
- maven-source-plugin
ExclusiveArch: %{java_arches} noarch
- maven-surefire
ExclusiveArch: %{java_arches} noarch
- maven-verifier
ExclusiveArch: %{java_arches} noarch
- maven-verifier-plugin
ExclusiveArch: %{java_arches} noarch
- maven-wagon
ExclusiveArch: %{java_arches} noarch
- maxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- mbpfan
ExclusiveArch: x86_64
- mcelog
ExclusiveArch: i686 x86_64
- mcrouter
ExclusiveArch: x86_64 aarch64 ppc64le
- mecab-java
ExclusiveArch: %java_arches
- mediaconch
ExclusiveArch: %{qt5_qtwebengine_arches}
- mellowplayer
ExclusiveArch: %{qt5_qtwebengine_arches}
- memkind
ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64
- memtest86+
ExclusiveArch: x86_64 %{ix86}
- merkuro
ExclusiveArch: %{qt5_qtwebengine_arches}
- microcode_ctl
ExclusiveArch: %{ix86} x86_64
- micropython
ExclusiveArch: %{arm} x86_64 riscv64
- miglayout
ExclusiveArch: %{java_arches} noarch
- mine_detector
ExclusiveArch: %{GPRbuild_arches}
- minetest
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mingw-libidn2
ExclusiveArch: %{ix86} x86_64 %{arm}
- mingw-wine-gecko
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- mkbootdisk
ExclusiveArch: %{ix86} sparc sparc64 x86_64
- moby-engine
ExclusiveArch: %{golang_arches}
- mockito
ExclusiveArch: %{java_arches} noarch
- mod_mono
ExclusiveArch: %mono_arches
- modello
ExclusiveArch: %{java_arches} noarch
- moditect
ExclusiveArch: %{java_arches} noarch
- module-build-service
ExclusiveArch: %{ix86} x86_64 noarch
- modulemaker-maven-plugin
ExclusiveArch: %{java_arches} noarch
- mojo-executor
ExclusiveArch: %{java_arches} noarch
- mojo-parent
ExclusiveArch: %{java_arches} noarch
- mokutil
ExclusiveArch: %{ix86} x86_64 aarch64 %{arm}
- mono
ExclusiveArch: %mono_arches
- mono-addins
ExclusiveArch: %mono_arches
- mono-basic
ExclusiveArch: %{mono_arches}
- mono-bouncycastle
ExclusiveArch: %mono_arches
- mono-cecil
ExclusiveArch: %mono_arches
- mono-cecil-flowanalysis
ExclusiveArch: %mono_arches
- mono-reflection
ExclusiveArch: %mono_arches
- mono-tools
ExclusiveArch: %mono_arches
- mono-zeroconf
ExclusiveArch: %mono_arches
- monodevelop
ExclusiveArch: %mono_arches
- monodevelop-debugger-gdb
ExclusiveArch: %{mono_arches}
- mrrescue
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- msr-tools
ExclusiveArch: %{ix86} x86_64
- msv
ExclusiveArch: %{java_arches} noarch
- mvfst
ExclusiveArch: x86_64 aarch64 ppc64le
- mxparser
ExclusiveArch: %{java_arches} noarch
- mysql-connector-java
ExclusiveArch: %{java_arches} noarch
- mysql-connector-net
ExclusiveArch: %{mono_arches}
- naev
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- naga
ExclusiveArch: %{java_arches} noarch
- nant
ExclusiveArch: %mono_arches
- nativejit
ExclusiveArch: x86_64
- nbc
ExclusiveArch: %{fpc_arches}
- nbdkit
ExclusiveArch: x86_64
- ndesk-dbus
ExclusiveArch: %{mono_arches}
- ndesk-dbus-glib
ExclusiveArch: %{mono_arches}
- nekohtml
ExclusiveArch: %{java_arches} noarch
- netavark
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- newtonsoft-json
ExclusiveArch: %{mono_arches}
- nodejs-acorn-object-spread
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-backbone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bash-language-server
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buble
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cjs-module-lexer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-generic-pool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-less
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-linefix
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nodemon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-packaging
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-replace-require-self
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-underscore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-undici
ExclusiveArch: %{nodejs_arches} noarch
- nodejs18
ExclusiveArch: %{nodejs_arches}
- nodejs20
ExclusiveArch: %{nodejs_arches}
- nom-tam-fits
ExclusiveArch: %{java_arches} noarch
- notify-sharp
ExclusiveArch: %{mono_arches}
- notify-sharp3
ExclusiveArch: %{mono_arches}
- nuget
ExclusiveArch: %{mono_arches}
- numatop
ExclusiveArch: x86_64 ppc64le
- nunit
ExclusiveArch: %{mono_arches}
- nunit2
ExclusiveArch: %{mono_arches}
- nvml
ExclusiveArch: x86_64 ppc64le
- objectweb-asm
ExclusiveArch: %{java_arches} noarch
- objenesis
ExclusiveArch: %{java_arches} noarch
- obs-service-rust2rpm
ExclusiveArch: %{rust_arches} noarch
- oci-seccomp-bpf-hook
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
ExclusiveArch: %{golang_arches_future}
- oidn
ExclusiveArch: x86_64
- olpc-utils
ExclusiveArch: %{ix86} %{arm}
- oneVPL
ExclusiveArch: x86_64
- oneVPL-intel-gpu
ExclusiveArch: x86_64
- oneapi-level-zero
ExclusiveArch: x86_64
- onednn
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- onedrive
ExclusiveArch: %{ldc_arches}
- ongres-scram
ExclusiveArch: %{java_arches} noarch
- ongres-stringprep
ExclusiveArch: %{java_arches} noarch
- opae
ExclusiveArch: x86_64
- opal-prd
ExclusiveArch: ppc64le
- open-vm-tools
ExclusiveArch: x86_64 aarch64
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: x86_64
- openblas
ExclusiveArch: %{openblas_arches}
- openjdk-asmtools
ExclusiveArch: %{java_arches} noarch
- openjdk-asmtools7
ExclusiveArch: %{java_arches} noarch
- openjfx
ExclusiveArch: %{java_arches}
- openjfx8
ExclusiveArch: x86_64
- openlibm
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64}
- openms
ExclusiveArch: %{qt5_qtwebengine_arches}
- openni
ExclusiveArch: x86_64 %{arm}
- openni-primesense
ExclusiveArch: %{ix86} x86_64 %{arm}
- openoffice.org-diafilter
ExclusiveArch: %{java_arches}
- openpgl
ExclusiveArch: aarch64 x86_64
- openssl-ibmca
ExclusiveArch: s390 s390x
- openstack-java-sdk
ExclusiveArch: %{java_arches} noarch
- opentest4j
ExclusiveArch: %{java_arches} noarch
- openvkl
ExclusiveArch: aarch64 x86_64
- optee_client
ExclusiveArch: aarch64
- optee_os
ExclusiveArch: aarch64
- options
ExclusiveArch: %{java_arches} noarch
- orthorobot
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- osgi-annotation
ExclusiveArch: %{java_arches} noarch
- osgi-compendium
ExclusiveArch: %{java_arches} noarch
- osgi-core
ExclusiveArch: %{java_arches} noarch
- pacemaker
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64 %{arm}
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- pageedit
ExclusiveArch: %{qt5_qtwebengine_arches}
- parserng
ExclusiveArch: %{java_arches} noarch
- pasdoc
ExclusiveArch: %{fpc_arches}
- pcc
ExclusiveArch: %{ix86} x86_64
- pcfi
ExclusiveArch: %{java_arches} noarch
- pcm
ExclusiveArch: %{ix86} x86_64
- pcmciautils
ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm}
- pdbg
ExclusiveArch: ppc64le
- pdfbox
ExclusiveArch: %{java_arches} noarch
- pdfmod
ExclusiveArch: %mono_arches
- pdftk-java
ExclusiveArch: %{java_arches} noarch
- pentaho-libxml
ExclusiveArch: %{java_arches} noarch
- pentaho-reporting-flow-engine
ExclusiveArch: %{java_arches} noarch
- perl-Dumbbench
ExclusiveArch: %{ix86} x86_64 noarch
- perl-Parse-DMIDecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- pesign
ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm}
- pesign-test-app
ExclusiveArch: x86_64
- picocli
ExclusiveArch: %{java_arches} noarch
- pinta
ExclusiveArch: %mono_arches
- pioneer
ExclusiveArch: %{ix86} x86_64
- plantuml
ExclusiveArch: %{java_arches} noarch
- plasma-dialer
ExclusiveArch: %{java_arches}
- playonlinux
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- plexus-archiver
ExclusiveArch: %{java_arches} noarch
- plexus-build-api
ExclusiveArch: %{java_arches} noarch
- plexus-build-api0
ExclusiveArch: %{java_arches} noarch
- plexus-cipher
ExclusiveArch: %{java_arches} noarch
- plexus-classworlds
ExclusiveArch: %{java_arches} noarch
- plexus-compiler
ExclusiveArch: %{java_arches} noarch
- plexus-component-api
ExclusiveArch: %{java_arches} noarch
- plexus-components-pom
ExclusiveArch: %{java_arches} noarch
- plexus-containers
ExclusiveArch: %{java_arches} noarch
- plexus-i18n
ExclusiveArch: %{java_arches} noarch
- plexus-interpolation
ExclusiveArch: %{java_arches} noarch
- plexus-io
ExclusiveArch: %{java_arches} noarch
- plexus-languages
ExclusiveArch: %{java_arches} noarch
- plexus-pom
ExclusiveArch: %{java_arches} noarch
- plexus-resources
ExclusiveArch: %{java_arches} noarch
- plexus-sec-dispatcher
ExclusiveArch: %{java_arches} noarch
- plexus-utils
ExclusiveArch: %{java_arches} noarch
- plexus-velocity
ExclusiveArch: %{java_arches} noarch
- podman
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- poppler-sharp
ExclusiveArch: %mono_arches
- popub
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- postgresql-jdbc
ExclusiveArch: %{java_arches} noarch
- powerpc-utils
ExclusiveArch: ppc %{power64}
- powerstat
ExclusiveArch: %{ix86} x86_64
- ppc64-diag
ExclusiveArch: ppc %{power64}
- procyon
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
- proguard
ExclusiveArch: %{java_arches} noarch
- prometheus-jmx-exporter
ExclusiveArch: %{java_arches} noarch
- prometheus-simpleclient-java
ExclusiveArch: %{java_arches} noarch
- proxygen
ExclusiveArch: x86_64 aarch64 ppc64le
- pveclib
ExclusiveArch: ppc %{power64}
- pyqtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- python-ast-monitor
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
- python-cryptography
ExclusiveArch: %{rust_arches}
- python-damo
ExclusiveArch: x86_64 aarch64 ppc64le s390x noarch
- python-etcd
ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- python-javaobj
ExclusiveArch: %{java_arches} noarch
- python-jnius
ExclusiveArch: %{java_arches}
- python-jupyter-polymake
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- python-openoffice
ExclusiveArch: noarch x86_64
- python-pyahocorasick
ExclusiveArch: x86_64 %{arm64} ppc64le
- python-pymoc
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-pyqt6-webengine
ExclusiveArch: aarch64 x86_64
- q4wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- qatengine
ExclusiveArch: x86_64
- qatzip
ExclusiveArch: x86_64
- qbe
ExclusiveArch: x86_64 aarch64
- qcint
ExclusiveArch: x86_64
- qclib
ExclusiveArch: s390 s390x
- qdox
ExclusiveArch: %{java_arches} noarch
- qemu-sanity-check
ExclusiveArch: %{kernel_arches}
- qevercloud
ExclusiveArch: %{qt5_qtwebengine_arches}
- qmapshack
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt4pas
ExclusiveArch: %{fpc_arches}
- qt5-qtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt6-qtwebengine
ExclusiveArch: aarch64 x86_64
- qt6-qtwebview
ExclusiveArch: aarch64 x86_64
- quantum-espresso
ExclusiveArch: x86_64 %{ix86} aarch64 %{power64}
- quentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- rEFInd
ExclusiveArch: %{efi}
- rachota
ExclusiveArch: %{java_arches} noarch
- rear
ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64
- reflections
ExclusiveArch: %{java_arches} noarch
- reg
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- regexp
ExclusiveArch: %{java_arches} noarch
- relaxng-datatype-java
ExclusiveArch: %{java_arches} noarch
- replacer
ExclusiveArch: %{java_arches} noarch
- reptyr
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- rescene
ExclusiveArch: %{mono_arches}
- resteasy
ExclusiveArch: %{java_arches} noarch
- restool
ExclusiveArch: aarch64
- restsharp
ExclusiveArch: %{mono_arches}
- retsnoop
ExclusiveArch: %{rust_arches}
- rhino
ExclusiveArch: %{java_arches} noarch
- river
ExclusiveArch: %{zig_arches}
- rkcommon
ExclusiveArch: x86_64 aarch64
- rocalution
ExclusiveArch: x86_64
- rocblas
ExclusiveArch: x86_64
- rocclr
ExclusiveArch: x86_64
- rocm-compilersupport
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-device-libs
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-rpm-macros
ExclusiveArch: x86_64
- rocm-runtime
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-smi
ExclusiveArch: x86_64 aarch64 ppc64le
- rocminfo
ExclusiveArch: x86_64 aarch64 ppc64le
- rocprim
ExclusiveArch: x86_64
- rocrand
ExclusiveArch: x86_64
- rocsparse
ExclusiveArch: x86_64
- rocthrust
ExclusiveArch: x86_64
- rpm-ostree
ExclusiveArch: %{rust_arches}
- rr
ExclusiveArch: %{ix86} x86_64 aarch64
- rssguard
ExclusiveArch: %{qt6_qtwebengine_arches}
- rstudio
ExclusiveArch: %{java_arches}
- rsyntaxtextarea
ExclusiveArch: %{java_arches} noarch
- rubygem-childprocess
ExclusiveArch: %{ix86} x86_64 noarch
- runc
ExclusiveArch: %{golang_arches_future}
- rundoc
ExclusiveArch: %{java_arches} noarch
- rust
ExclusiveArch: %{rust_arches}
- rust-brotli
ExclusiveArch: %{rust_arches}
- rust-compress-tools
ExclusiveArch: %{rust_arches}
- rust-coreos-installer
ExclusiveArch: %{rust_arches}
- rust-ctr
ExclusiveArch: %{rust_arches}
- rust-dashmap4
ExclusiveArch: %{rust_arches}
- rust-deflate
ExclusiveArch: %{rust_arches}
- rust-deflate0.8
ExclusiveArch: %{rust_arches}
- rust-drg
ExclusiveArch: %{rust_arches}
- rust-epoll
ExclusiveArch: %{rust_arches}
- rust-getch
ExclusiveArch: %{rust_arches}
- rust-gzip-header
ExclusiveArch: %{rust_arches}
- rust-hamming
ExclusiveArch: %{rust_arches}
- rust-hidapi
ExclusiveArch: %{rust_arches}
- rust-httparse
ExclusiveArch: %{rust_arches}
- rust-humantime-serde
ExclusiveArch: %{rust_arches}
- rust-hyperlocal
ExclusiveArch: %{rust_arches}
- rust-image0.23
ExclusiveArch: %{rust_arches}
- rust-inflate
ExclusiveArch: %{rust_arches}
- rust-jpeg-decoder0.1
ExclusiveArch: %{rust_arches}
- rust-k9
ExclusiveArch: %{rust_arches}
- rust-krunvm
ExclusiveArch: x86_64 aarch64
- rust-kstring
ExclusiveArch: %{rust_arches}
- rust-kvm-ioctls
ExclusiveArch: x86_64 aarch64
- rust-lebe
ExclusiveArch: %{rust_arches}
- rust-libslirp-sys
ExclusiveArch: %{rust_arches}
- rust-msru
ExclusiveArch: x86_64
- rust-nanorand
ExclusiveArch: %{rust_arches}
- rust-netstat2
ExclusiveArch: %{rust_arches}
- rust-onig
ExclusiveArch: %{rust_arches}
- rust-openat-ext
ExclusiveArch: %{rust_arches}
- rust-os_type
ExclusiveArch: %{rust_arches}
- rust-pager
ExclusiveArch: %{rust_arches}
- rust-pathsearch
ExclusiveArch: %{rust_arches}
- rust-pretty-bytes
ExclusiveArch: %{rust_arches}
- rust-pretty-hex
ExclusiveArch: %{rust_arches}
- rust-primal-bit
ExclusiveArch: %{rust_arches}
- rust-primal-check
ExclusiveArch: %{rust_arches}
- rust-primal-estimate
ExclusiveArch: %{rust_arches}
- rust-procfs0.9
ExclusiveArch: %{rust_arches}
- rust-psl-types
ExclusiveArch: %{rust_arches}
- rust-psm
ExclusiveArch: %{rust_arches}
- rust-pwd
ExclusiveArch: %{rust_arches}
- rust-rand_core
ExclusiveArch: %{rust_arches}
- rust-schemafy_core
ExclusiveArch: %{rust_arches}
- rust-schemafy_lib
ExclusiveArch: %{rust_arches}
- rust-seahash
ExclusiveArch: %{rust_arches}
- rust-serde-big-array
ExclusiveArch: %{rust_arches}
- rust-serde_qs
ExclusiveArch: %{rust_arches}
- rust-serde_yaml0.8
ExclusiveArch: %{rust_arches}
- rust-sev
ExclusiveArch: x86_64
- rust-sevctl
ExclusiveArch: x86_64
- rust-silver
ExclusiveArch: %{rust_arches}
- rust-sinit
ExclusiveArch: %{rust_arches}
- rust-snphost
ExclusiveArch: x86_64
- rust-ssh-key-dir
ExclusiveArch: %{rust_arches}
- rust-stacker
ExclusiveArch: %{rust_arches}
- rust-structopt
ExclusiveArch: %{rust_arches}
- rust-tiff0.6
ExclusiveArch: %{rust_arches}
- rust-totp-lite
ExclusiveArch: %{rust_arches}
- rust-tower-layer
ExclusiveArch: %{rust_arches}
- rust-tpm2-policy
ExclusiveArch: %{rust_arches}
- rust-unicode-normalization
ExclusiveArch: %{rust_arches}
- rust-unicode-xid
ExclusiveArch: %{rust_arches}
- rust-uriparse
ExclusiveArch: %{rust_arches}
- rust-uucore
ExclusiveArch: %{rust_arches}
- rust-varlink_generator
ExclusiveArch: %{rust_arches}
- rust-varlink_parser
ExclusiveArch: %{rust_arches}
- rust-virtio-bindings
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-vmm-sys-util
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-vtparse
ExclusiveArch: %{rust_arches}
- rust-web-ext-native-messaging
ExclusiveArch: %{rust_arches}
- rust-wezterm-color-types
ExclusiveArch: %{rust_arches}
- rust-wezterm-dynamic
ExclusiveArch: %{rust_arches}
- rust-wezterm-dynamic-derive
ExclusiveArch: %{rust_arches}
- rust-zbus1
ExclusiveArch: %{rust_arches}
- rust-zbus_macros1
ExclusiveArch: %{rust_arches}
- rust-zvariant2
ExclusiveArch: %{rust_arches}
- rust-zvariant_derive2
ExclusiveArch: %{rust_arches}
- rutabaga-gfx-ffi
ExclusiveArch: x86_64 aarch64
- sac
ExclusiveArch: %{java_arches} noarch
- safetyblanket
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- sat4j
ExclusiveArch: %{java_arches} noarch
- sbcl
ExclusiveArch: %{ix86} x86_64 aarch64 %{power64}
- sbd
ExclusiveArch: i686 x86_64 s390x aarch64 ppc64le
- sblim-cim-client
ExclusiveArch: %{java_arches} noarch
- sblim-cim-client2
ExclusiveArch: %{java_arches} noarch
- sbsigntools
ExclusiveArch: x86_64 aarch64 %{arm} %{ix86}
- scala
ExclusiveArch: %{java_arches} noarch
- scannotation
ExclusiveArch: %{java_arches} noarch
- sdljava
ExclusiveArch: %{java_arches}
- sdrangel
ExclusiveArch: %{qt5_qtwebengine_arches}
- sdsl-lite
ExclusiveArch: %{power64} x86_64 aarch64
- sdubby
ExclusiveArch: %{efi}
- seabios
ExclusiveArch: x86_64
- seadrive-gui
ExclusiveArch: %{qt5_qtwebengine_arches}
- seafile-client
ExclusiveArch: %{qt5_qtwebengine_arches}
- seamonkey
ExclusiveArch: x86_64
- seqan3
ExclusiveArch: %{power64} x86_64 aarch64
- sequence-library
ExclusiveArch: %{java_arches} noarch
- servicelog
ExclusiveArch: ppc %{power64}
- shaman
ExclusiveArch: %{java_arches} noarch
- sharpfont
ExclusiveArch: %mono_arches
- sharpziplib
ExclusiveArch: %{mono_arches}
- shim
ExclusiveArch: %{efi}
- shim-unsigned-aarch64
ExclusiveArch: aarch64
- shim-unsigned-x64
ExclusiveArch: x86_64
- sigil
ExclusiveArch: %{qt5_qtwebengine_arches}
- sigul
ExclusiveArch: x86_64
- singularity-ce
ExclusiveArch: %{go_arches}
- sisu
ExclusiveArch: %{java_arches} noarch
- sisu-mojos
ExclusiveArch: %{java_arches} noarch
- skopeo
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- skychart
ExclusiveArch: %{fpc_arches}
- slf4j
ExclusiveArch: %{java_arches} noarch
- slirp4netns
ExclusiveArch: %{golang_arches_future}
- snakeyaml
ExclusiveArch: %{java_arches} noarch
- snapd
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x}
- snip
ExclusiveArch: %{java_arches} noarch
- softnet-stat
ExclusiveArch: %{rust_arches}
- soup-sharp
ExclusiveArch: %{mono_arches}
- spacebar
ExclusiveArch: %{java_arches}
- sparkleshare
ExclusiveArch: %{mono_arches}
- spec-version-maven-plugin
ExclusiveArch: %{java_arches} noarch
- spicctrl
ExclusiveArch: %{ix86} x86_64
- spice
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- spice-parent
ExclusiveArch: %{java_arches} noarch
- springlobby
ExclusiveArch: %{ix86} x86_64
- spyder
ExclusiveArch: %{qt5_qtwebengine_arches}
- sqljet
ExclusiveArch: %{java_arches} noarch
- squeekboard
ExclusiveArch: %{rust_arches}
- startdde
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- stats-collect
ExclusiveArch: %{ix86} x86_64 noarch
- statsd
ExclusiveArch: %{nodejs_arches} noarch
- stratis-cli
ExclusiveArch: %{rust_arches} noarch
- stratisd
ExclusiveArch: %{rust_arches}
ExclusiveArch: %{rust_arches}
ExclusiveArch: %{rust_arches}
- string-template-maven-plugin
ExclusiveArch: %{java_arches} noarch
- stringtemplate
ExclusiveArch: %{java_arches} noarch
- stringtemplate4
ExclusiveArch: %{java_arches} noarch
- stripesnoop
ExclusiveArch: %{ix86} x86_64
- subscription-manager-cockpit
ExclusiveArch: %{nodejs_arches} noarch
- supercollider
ExclusiveArch: %{qt5_qtwebengine_arches}
- supermin
ExclusiveArch: %{kernel_arches}
- svnkit
ExclusiveArch: %{java_arches} noarch
- svt-vp9
ExclusiveArch: x86_64
- swift-lang
ExclusiveArch: x86_64 aarch64
- swiftlint
ExclusiveArch: x86_64 aarch64
- swing-layout
ExclusiveArch: %{java_arches} noarch
- sysbench
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64le s390x
- syslinux
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- system-rules
ExclusiveArch: %{java_arches} noarch
- systemd-boot
ExclusiveArch: %efi
- t-digest
ExclusiveArch: %{java_arches} noarch
- taglib-sharp
ExclusiveArch: %{mono_arches}
- tagsoup
ExclusiveArch: %{java_arches} noarch
- tarantool
ExclusiveArch: %{ix86} x86_64
- tboot
ExclusiveArch: %{ix86} x86_64
- tdlib
ExclusiveArch: x86_64 aarch64
- templates_parser
ExclusiveArch: %GPRbuild_arches
- ternimal
ExclusiveArch: %{rust_arches}
- testcloud
ExclusiveArch: %{kernel_arches} noarch
- testng
ExclusiveArch: %{java_arches} noarch
- texlive
ExclusiveArch: %{java_arches} noarch
- thermald
ExclusiveArch: %{ix86} x86_64
- tilix
ExclusiveArch: %{ldc_arches}
- tokodon
ExclusiveArch: %{qt6_qtwebengine_arches}
- tomboy
ExclusiveArch: %{mono_arches}
- tomcat
ExclusiveArch: %{java_arches} noarch
- tomcat-native
ExclusiveArch: %{java_arches}
- tomcat-taglibs-parent
ExclusiveArch: %{java_arches} noarch
- tomcatjss
ExclusiveArch: %{java_arches} noarch
- torbrowser-launcher
ExclusiveArch: %{ix86} x86_64
- treelayout
ExclusiveArch: %{java_arches} noarch
- trilead-ssh2
ExclusiveArch: %{java_arches} noarch
- truth
ExclusiveArch: %{java_arches} noarch
- tuned-profiles-nfv-host-bin
ExclusiveArch: %{ix86} x86_64
- typescript
ExclusiveArch: %{nodejs_arches} noarch
- uClibc
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
- ucx
ExclusiveArch: aarch64 ppc64le x86_64
- uglify-js
ExclusiveArch: %{nodejs_arches} noarch
- umr
ExclusiveArch: x86_64 aarch64 ppc64le
- unetbootin
ExclusiveArch: %{ix86} x86_64
- univocity-parsers
ExclusiveArch: %{java_arches} noarch
- ursa-major
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- usd
ExclusiveArch: aarch64 x86_64
- v8-314
ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64
- vakzination
ExclusiveArch: %{java_arches}
- valgrind
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
- vboot-utils
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- vecmath1.2
ExclusiveArch: %{java_arches} noarch
- velocity
ExclusiveArch: %{java_arches} noarch
- vim-go
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}}
- vim-syntastic
ExclusiveArch: %{java_arches} noarch
- virt-p2v
ExclusiveArch: x86_64
- virt-v2v
ExclusiveArch: x86_64
- virtiofsd
ExclusiveArch: %{rust_arches}
- virtualbox-guest-additions
ExclusiveArch: i686 x86_64
- vkd3d
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- vmaf
ExclusiveArch: x86_64
- voms-api-java
ExclusiveArch: %{java_arches} noarch
- voms-clients-java
ExclusiveArch: %{java_arches} noarch
- vrq
ExclusiveArch: %{ix86} x86_64
- wangle
ExclusiveArch: x86_64 aarch64 ppc64le
- warsow
ExclusiveArch: %{ix86} x86_64 %{arm}
- warsow-data
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{ix86} x86_64 %{arm}
- wasmedge
ExclusiveArch: x86_64 aarch64
- watchman
ExclusiveArch: x86_64 aarch64 ppc64le
- wdt
ExclusiveArch: x86_64 aarch64 ppc64le
- webkit2-sharp
ExclusiveArch: %mono_arches
- weld-parent
ExclusiveArch: %{java_arches} noarch
- why3
ExclusiveArch: %{ocaml_native_compiler}
- widevine-installer
ExclusiveArch: aarch64
- wine
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86}
- wine-dxvk
ExclusiveArch: %{ix86} x86_64
- winetricks
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- ws-commons-util
ExclusiveArch: %{java_arches} noarch
- wsdl4j
ExclusiveArch: %{java_arches} noarch
- wult
ExclusiveArch: x86_64
- wxMaxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
- x2goclient
ExclusiveArch: x86_64
- x86-simd-sort
ExclusiveArch: x86_64
- xalan-j2
ExclusiveArch: %{java_arches} noarch
- xbean
ExclusiveArch: %{java_arches} noarch
- xbyak
ExclusiveArch: x86_64
- xbyak_aarch64
ExclusiveArch: aarch64
- xe-guest-utilities-latest
ExclusiveArch: %{ix86} x86_64
- xen
ExclusiveArch: x86_64 aarch64
- xerces-j2
ExclusiveArch: %{java_arches} noarch
- xgap
ExclusiveArch: %{gap_arches}
- xml-commons-apis
ExclusiveArch: %{java_arches} noarch
- xml-commons-resolver
ExclusiveArch: %{java_arches} noarch
- xml-maven-plugin
ExclusiveArch: %{java_arches} noarch
- xmlada
ExclusiveArch: %{GPRbuild_arches}
- xmlgraphics-commons
ExclusiveArch: %{java_arches} noarch
- xmlpull
ExclusiveArch: %{java_arches} noarch
- xmlstreambuffer
ExclusiveArch: %{java_arches} noarch
- xmlunit
ExclusiveArch: %{java_arches} noarch
- xmvn
ExclusiveArch: %{java_arches} noarch
- xmvn-connector-ivy
ExclusiveArch: %{java_arches} noarch
- xmvn-generator
ExclusiveArch: %{java_arches}
- xnnpack
ExclusiveArch: x86_64 aarch64
- xorg-x11-drv-armsoc
ExclusiveArch: %{arm} aarch64
- xorg-x11-drv-intel
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-openchrome
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vesa
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vmware
ExclusiveArch: %{ix86} x86_64 ia64
- xsp
ExclusiveArch: %mono_arches
- xstream
ExclusiveArch: %{java_arches} noarch
- xz-java
ExclusiveArch: %{java_arches} noarch
- yarnpkg
ExclusiveArch: %{nodejs_arches} noarch
- zcfan
ExclusiveArch: x86_64
- zeal
ExclusiveArch: aarch64 x86_64
- zenon
ExclusiveArch: %{ocaml_native_compiler}
- zeromq-ada
ExclusiveArch: %{GPRbuild_arches}
- zig
ExclusiveArch: %{zig_arches}
- zlib-ada
ExclusiveArch: %{GPRbuild_arches}
- zlib-ng
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- zola
ExclusiveArch: %{rust_arches}
1
0
Architecture specific change in rpms/rust-euclid.git
by githook-noreply＠fedoraproject.org 27 Nov '23
by githook-noreply＠fedoraproject.org 27 Nov '23
27 Nov '23
The package rpms/rust-euclid.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-euclid.git/commit/?id=f757700e…
https://src.fedoraproject.org/cgit/rpms/rust-euclid.git/commit/?id=c9deb28e…
https://src.fedoraproject.org/cgit/rpms/rust-euclid.git/commit/?id=88a42744…
https://src.fedoraproject.org/cgit/rpms/rust-euclid.git/commit/?id=af584059….
Change:
-ExclusiveArch: %{rust_arches}
+ExclusiveArch: %{rust_arches}
-ExclusiveArch: %{rust_arches}
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit f757700ed075000178e2e780a68b6c063d166bf3
Author: Leo Puvilland <leo(a)craftcat.dev>
Date: Mon Nov 27 09:04:00 2023 -0800
Initial import (fedora#2250466).
diff --git a/.gitignore b/.gitignore
index ea1dfb8..dfd90af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/euclid-0.22.4.crate
/euclid-0.22.5.crate
/euclid-0.22.6.crate
+/euclid-0.22.9.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 55c1f18..c7ca444 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -1,25 +1,20 @@
-# Generated by rust2rpm 17
+# Generated by rust2rpm 25
%bcond_without check
%global debug_package %{nil}
%global crate euclid
-Name: rust-%{crate}
-Version: 0.22.6
-Release: 3%{?dist}
+Name: rust-euclid
+Version: 0.22.9
+Release: %autorelease
Summary: Geometry primitives
# Upstream license specification: MIT / Apache-2.0
-License: MIT or ASL 2.0
+License: MIT OR Apache-2.0
URL: https://crates.io/crates/euclid
Source: %{crates_source}
-ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
-
-BuildRequires: rust-packaging
+BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
Geometry primitives.}
@@ -32,13 +27,15 @@ BuildArch: noarch
%description devel %{_description}
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
%files devel
-%license LICENSE-APACHE LICENSE-MIT COPYRIGHT
-%doc README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/COPYRIGHT
+%license %{crate_instdir}/LICENSE-APACHE
+%license %{crate_instdir}/LICENSE-MIT
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -46,11 +43,11 @@ BuildArch: noarch
%description -n %{name}+default-devel %{_description}
-This package contains library source intended for building other packages
-which use "default" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+arbitrary-devel
Summary: %{summary}
@@ -58,11 +55,23 @@ BuildArch: noarch
%description -n %{name}+arbitrary-devel %{_description}
-This package contains library source intended for building other packages
-which use "arbitrary" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "arbitrary" feature of the "%{crate}" crate.
%files -n %{name}+arbitrary-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+bytemuck-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+bytemuck-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "bytemuck" feature of the "%{crate}" crate.
+
+%files -n %{name}+bytemuck-devel
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+libm-devel
Summary: %{summary}
@@ -70,11 +79,11 @@ BuildArch: noarch
%description -n %{name}+libm-devel %{_description}
-This package contains library source intended for building other packages
-which use "libm" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "libm" feature of the "%{crate}" crate.
%files -n %{name}+libm-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+mint-devel
Summary: %{summary}
@@ -82,11 +91,11 @@ BuildArch: noarch
%description -n %{name}+mint-devel %{_description}
-This package contains library source intended for building other packages
-which use "mint" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "mint" feature of the "%{crate}" crate.
%files -n %{name}+mint-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+serde-devel
Summary: %{summary}
@@ -94,11 +103,11 @@ BuildArch: noarch
%description -n %{name}+serde-devel %{_description}
-This package contains library source intended for building other packages
-which use "serde" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "serde" feature of the "%{crate}" crate.
%files -n %{name}+serde-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+std-devel
Summary: %{summary}
@@ -106,11 +115,11 @@ BuildArch: noarch
%description -n %{name}+std-devel %{_description}
-This package contains library source intended for building other packages
-which use "std" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "std" feature of the "%{crate}" crate.
%files -n %{name}+std-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+unstable-devel
Summary: %{summary}
@@ -118,14 +127,14 @@ BuildArch: noarch
%description -n %{name}+unstable-devel %{_description}
-This package contains library source intended for building other packages
-which use "unstable" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "unstable" feature of the "%{crate}" crate.
%files -n %{name}+unstable-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
%cargo_prep
%generate_buildrequires
@@ -143,49 +152,4 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
-* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-2
-- Second attempt - Rebuilt for
- https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jun 22 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.6-1
-- Update to version 0.22.6.
-- Fixes RHBZ#1966179
-
-* Sun May 30 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.5-1
-- Update to version 0.22.5.
-- Fixes RHBZ#1965637
-
-* Wed May 19 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.4-1
-- Update to version 0.22.4.
-- Fixes RHBZ#1961810
-
-* Wed Apr 21 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.3-1
-- Update to version 0.22.3.
-
-* Tue Mar 02 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.2-1
-- Update to version 0.22.1.
-- Fixes RHBZ#1932496
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Aug 21 2020 returntrip <stefano(a)figura.im> - 0.22.1-1
-- Update to 0.22.1
-
-* Sat Aug 01 2020 returntrip <stefano(a)figura.im> - 0.22.0-1
-- Update to 0.22.0
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.20.14-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Josh Stone <jistone(a)redhat.com> - 0.20.14-1
-- Update to 0.20.14
-
-* Tue Jun 09 15:52:00 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.13-1
-- Upgrade to 0.20.13
-
-* Sat May 23 17:19:51 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.12-1
-- Initial package
+%autochangelog
diff --git a/sources b/sources
index 95a8aa3..b14960c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.22.6.crate) = 401147afa8bc0a8b247b3a515ce6e2a63727d668d2b13cf43e9bfc81104e97b66131a1c0efb8b3330721adc81cca26cb2d87328c2b392f79b583aa3e9a176640
+SHA512 (euclid-0.22.9.crate) = 19fa3756085051c86a58c4ea00cf459b43a6326c9b916e17e15160b43813dfd3edf113379dfdf5f345b7c96d294a75f1ca96f1065f5bac9e44cf340434a2dc33
commit c9deb28e8e6784afefdc2fe63074f645681ec3fc
Author: Tomas Hrcka <thrcka(a)redhat.com>
Date: Mon Nov 27 12:17:14 2023 +0100
Unretirement request: https://pagure.io/releng/issue/11809
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ea1dfb8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+/euclid-0.20.13.crate
+/euclid-0.20.14.crate
+/euclid-0.22.0.crate
+/euclid-0.22.1.crate
+/euclid-0.22.2.crate
+/euclid-0.22.3.crate
+/euclid-0.22.4.crate
+/euclid-0.22.5.crate
+/euclid-0.22.6.crate
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..e009c06
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# rust-euclid
+
+The rust-euclid package
\ No newline at end of file
diff --git a/dead.package b/dead.package
deleted file mode 100644
index c7912ba..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-no longer needed
diff --git a/rust-euclid.spec b/rust-euclid.spec
new file mode 100644
index 0000000..55c1f18
--- /dev/null
+++ b/rust-euclid.spec
@@ -0,0 +1,191 @@
+# Generated by rust2rpm 17
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate euclid
+
+Name: rust-%{crate}
+Version: 0.22.6
+Release: 3%{?dist}
+Summary: Geometry primitives
+
+# Upstream license specification: MIT / Apache-2.0
+License: MIT or ASL 2.0
+URL: https://crates.io/crates/euclid
+Source: %{crates_source}
+
+ExclusiveArch: %{rust_arches}
+%if %{__cargo_skip_build}
+BuildArch: noarch
+%endif
+
+BuildRequires: rust-packaging
+
+%global _description %{expand:
+Geometry primitives.}
+
+%description %{_description}
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel %{_description}
+
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
+
+%files devel
+%license LICENSE-APACHE LICENSE-MIT COPYRIGHT
+%doc README.md
+%{cargo_registry}/%{crate}-%{version_no_tilde}/
+
+%package -n %{name}+default-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "default" feature of "%{crate}" crate.
+
+%files -n %{name}+default-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+arbitrary-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+arbitrary-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "arbitrary" feature of "%{crate}" crate.
+
+%files -n %{name}+arbitrary-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+libm-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+libm-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "libm" feature of "%{crate}" crate.
+
+%files -n %{name}+libm-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+mint-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+mint-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "mint" feature of "%{crate}" crate.
+
+%files -n %{name}+mint-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+serde-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+serde-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "serde" feature of "%{crate}" crate.
+
+%files -n %{name}+serde-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+std-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+std-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "std" feature of "%{crate}" crate.
+
+%files -n %{name}+std-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+unstable-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+unstable-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "unstable" feature of "%{crate}" crate.
+
+%files -n %{name}+unstable-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%prep
+%autosetup -n %{crate}-%{version_no_tilde} -p1
+%cargo_prep
+
+%generate_buildrequires
+%cargo_generate_buildrequires
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%changelog
+* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-2
+- Second attempt - Rebuilt for
+ https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jun 22 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.6-1
+- Update to version 0.22.6.
+- Fixes RHBZ#1966179
+
+* Sun May 30 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.5-1
+- Update to version 0.22.5.
+- Fixes RHBZ#1965637
+
+* Wed May 19 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.4-1
+- Update to version 0.22.4.
+- Fixes RHBZ#1961810
+
+* Wed Apr 21 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.3-1
+- Update to version 0.22.3.
+
+* Tue Mar 02 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.2-1
+- Update to version 0.22.1.
+- Fixes RHBZ#1932496
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Aug 21 2020 returntrip <stefano(a)figura.im> - 0.22.1-1
+- Update to 0.22.1
+
+* Sat Aug 01 2020 returntrip <stefano(a)figura.im> - 0.22.0-1
+- Update to 0.22.0
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.20.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Josh Stone <jistone(a)redhat.com> - 0.20.14-1
+- Update to 0.20.14
+
+* Tue Jun 09 15:52:00 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.13-1
+- Upgrade to 0.20.13
+
+* Sat May 23 17:19:51 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.12-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..95a8aa3
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (euclid-0.22.6.crate) = 401147afa8bc0a8b247b3a515ce6e2a63727d668d2b13cf43e9bfc81104e97b66131a1c0efb8b3330721adc81cca26cb2d87328c2b392f79b583aa3e9a176640
commit 88a427440ded8c437dff08ffc2a102127deefed2
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Mon May 2 16:46:29 2022 +0200
no longer needed
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index ea1dfb8..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-/euclid-0.20.13.crate
-/euclid-0.20.14.crate
-/euclid-0.22.0.crate
-/euclid-0.22.1.crate
-/euclid-0.22.2.crate
-/euclid-0.22.3.crate
-/euclid-0.22.4.crate
-/euclid-0.22.5.crate
-/euclid-0.22.6.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index e009c06..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-euclid
-
-The rust-euclid package
\ No newline at end of file
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..c7912ba
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+no longer needed
diff --git a/rust-euclid.spec b/rust-euclid.spec
deleted file mode 100644
index 55c1f18..0000000
--- a/rust-euclid.spec
+++ /dev/null
@@ -1,191 +0,0 @@
-# Generated by rust2rpm 17
-%bcond_without check
-%global debug_package %{nil}
-
-%global crate euclid
-
-Name: rust-%{crate}
-Version: 0.22.6
-Release: 3%{?dist}
-Summary: Geometry primitives
-
-# Upstream license specification: MIT / Apache-2.0
-License: MIT or ASL 2.0
-URL: https://crates.io/crates/euclid
-Source: %{crates_source}
-
-ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
-
-BuildRequires: rust-packaging
-
-%global _description %{expand:
-Geometry primitives.}
-
-%description %{_description}
-
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description devel %{_description}
-
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
-
-%files devel
-%license LICENSE-APACHE LICENSE-MIT COPYRIGHT
-%doc README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
-
-%package -n %{name}+default-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+default-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "default" feature of "%{crate}" crate.
-
-%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+arbitrary-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+arbitrary-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "arbitrary" feature of "%{crate}" crate.
-
-%files -n %{name}+arbitrary-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+libm-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+libm-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "libm" feature of "%{crate}" crate.
-
-%files -n %{name}+libm-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+mint-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+mint-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "mint" feature of "%{crate}" crate.
-
-%files -n %{name}+mint-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+serde-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+serde-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "serde" feature of "%{crate}" crate.
-
-%files -n %{name}+serde-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+std-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+std-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "std" feature of "%{crate}" crate.
-
-%files -n %{name}+std-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+unstable-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+unstable-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "unstable" feature of "%{crate}" crate.
-
-%files -n %{name}+unstable-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
-%cargo_prep
-
-%generate_buildrequires
-%cargo_generate_buildrequires
-
-%build
-%cargo_build
-
-%install
-%cargo_install
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%changelog
-* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-2
-- Second attempt - Rebuilt for
- https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jun 22 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.6-1
-- Update to version 0.22.6.
-- Fixes RHBZ#1966179
-
-* Sun May 30 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.5-1
-- Update to version 0.22.5.
-- Fixes RHBZ#1965637
-
-* Wed May 19 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.4-1
-- Update to version 0.22.4.
-- Fixes RHBZ#1961810
-
-* Wed Apr 21 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.3-1
-- Update to version 0.22.3.
-
-* Tue Mar 02 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.2-1
-- Update to version 0.22.1.
-- Fixes RHBZ#1932496
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Aug 21 2020 returntrip <stefano(a)figura.im> - 0.22.1-1
-- Update to 0.22.1
-
-* Sat Aug 01 2020 returntrip <stefano(a)figura.im> - 0.22.0-1
-- Update to 0.22.0
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.20.14-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Josh Stone <jistone(a)redhat.com> - 0.20.14-1
-- Update to 0.20.14
-
-* Tue Jun 09 15:52:00 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.13-1
-- Upgrade to 0.20.13
-
-* Sat May 23 17:19:51 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.12-1
-- Initial package
diff --git a/sources b/sources
deleted file mode 100644
index 95a8aa3..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (euclid-0.22.6.crate) = 401147afa8bc0a8b247b3a515ce6e2a63727d668d2b13cf43e9bfc81104e97b66131a1c0efb8b3330721adc81cca26cb2d87328c2b392f79b583aa3e9a176640
commit 710645d14d098b597367e8fa423a0499c86653ae
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 21 20:48:59 2022 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 94bb8c4..55c1f18 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.22.6
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Geometry primitives
# Upstream license specification: MIT / Apache-2.0
@@ -143,6 +143,9 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-2
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
commit 5d296839b2e56d8452976f8396d779c07e8fa9d8
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jul 27 08:55:38 2021 +0000
- Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 447d3ff..94bb8c4 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.22.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Geometry primitives
# Upstream license specification: MIT / Apache-2.0
@@ -143,6 +143,10 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-2
+- Second attempt - Rebuilt for
+ https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
* Tue Jun 22 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.6-1
- Update to version 0.22.6.
- Fixes RHBZ#1966179
commit e6c7b2a17c07e52362de86a9331b81264d4f5882
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Tue Jun 22 12:48:29 2021 +0200
update to version 0.22.6
diff --git a/.gitignore b/.gitignore
index b75ee10..ea1dfb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/euclid-0.22.3.crate
/euclid-0.22.4.crate
/euclid-0.22.5.crate
+/euclid-0.22.6.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 7389659..447d3ff 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -5,7 +5,7 @@
%global crate euclid
Name: rust-%{crate}
-Version: 0.22.5
+Version: 0.22.6
Release: 1%{?dist}
Summary: Geometry primitives
@@ -143,6 +143,10 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Tue Jun 22 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.6-1
+- Update to version 0.22.6.
+- Fixes RHBZ#1966179
+
* Sun May 30 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.5-1
- Update to version 0.22.5.
- Fixes RHBZ#1965637
diff --git a/sources b/sources
index 5137765..95a8aa3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.22.5.crate) = f36bef15a5a10b4b7656369896b348fbd77d229b2ad635a679d4df1e90eef73f879010251459fcfb49ec45730f37632f752c2884c88ea82fe7f20c788396193a
+SHA512 (euclid-0.22.6.crate) = 401147afa8bc0a8b247b3a515ce6e2a63727d668d2b13cf43e9bfc81104e97b66131a1c0efb8b3330721adc81cca26cb2d87328c2b392f79b583aa3e9a176640
commit dd7bcbbcc49ee58ad95ef406d194ae1526ad3b47
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Sun May 30 11:24:29 2021 +0200
update to version 0.22.5
diff --git a/.gitignore b/.gitignore
index 77c296f..b75ee10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/euclid-0.22.2.crate
/euclid-0.22.3.crate
/euclid-0.22.4.crate
+/euclid-0.22.5.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 9c8fc3f..7389659 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -5,7 +5,7 @@
%global crate euclid
Name: rust-%{crate}
-Version: 0.22.4
+Version: 0.22.5
Release: 1%{?dist}
Summary: Geometry primitives
@@ -143,6 +143,10 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Sun May 30 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.5-1
+- Update to version 0.22.5.
+- Fixes RHBZ#1965637
+
* Wed May 19 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.4-1
- Update to version 0.22.4.
- Fixes RHBZ#1961810
diff --git a/sources b/sources
index 9e4afc9..5137765 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.22.4.crate) = 01de9fd4494c7b5e8234fd26344236e87da4898d8a60178986d4d533c8c4795bb69f9c6b5abbf4236b3e0d8b87cd5e2cb6a8704a774eda60d11c98a11c7ce40b
+SHA512 (euclid-0.22.5.crate) = f36bef15a5a10b4b7656369896b348fbd77d229b2ad635a679d4df1e90eef73f879010251459fcfb49ec45730f37632f752c2884c88ea82fe7f20c788396193a
commit 66e3e0de4e513a7c8f390200359c74ce62181189
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Wed May 19 13:49:23 2021 +0200
update to version 0.22.4
diff --git a/.gitignore b/.gitignore
index 117c3c4..77c296f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/euclid-0.22.1.crate
/euclid-0.22.2.crate
/euclid-0.22.3.crate
+/euclid-0.22.4.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 07a7b96..9c8fc3f 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -5,7 +5,7 @@
%global crate euclid
Name: rust-%{crate}
-Version: 0.22.3
+Version: 0.22.4
Release: 1%{?dist}
Summary: Geometry primitives
@@ -143,6 +143,10 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Wed May 19 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.4-1
+- Update to version 0.22.4.
+- Fixes RHBZ#1961810
+
* Wed Apr 21 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.3-1
- Update to version 0.22.3.
diff --git a/sources b/sources
index d3af0fa..9e4afc9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.22.3.crate) = cb8a02854ae22c38e367c9a85f89ba7bca682f76c6fd366195ade836751a27894610198e1b90eb6cfde16a9c2003ef0a17a6ef1d9a26f143080de61bd81b63d9
+SHA512 (euclid-0.22.4.crate) = 01de9fd4494c7b5e8234fd26344236e87da4898d8a60178986d4d533c8c4795bb69f9c6b5abbf4236b3e0d8b87cd5e2cb6a8704a774eda60d11c98a11c7ce40b
commit c2e141432373aef198b54aaff22b8a733cd96749
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Wed Apr 21 23:58:30 2021 +0200
update to version 0.22.3
diff --git a/.gitignore b/.gitignore
index 40f074f..117c3c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/euclid-0.22.0.crate
/euclid-0.22.1.crate
/euclid-0.22.2.crate
+/euclid-0.22.3.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 73b4ade..07a7b96 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 16
+# Generated by rust2rpm 17
%bcond_without check
%global debug_package %{nil}
%global crate euclid
Name: rust-%{crate}
-Version: 0.22.2
+Version: 0.22.3
Release: 1%{?dist}
Summary: Geometry primitives
@@ -36,8 +36,8 @@ This package contains library source intended for building other packages
which use "%{crate}" crate.
%files devel
-%doc README.md
%license LICENSE-APACHE LICENSE-MIT COPYRIGHT
+%doc README.md
%{cargo_registry}/%{crate}-%{version_no_tilde}/
%package -n %{name}+default-devel
@@ -52,6 +52,18 @@ which use "default" feature of "%{crate}" crate.
%files -n %{name}+default-devel
%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%package -n %{name}+arbitrary-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+arbitrary-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "arbitrary" feature of "%{crate}" crate.
+
+%files -n %{name}+arbitrary-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
%package -n %{name}+libm-devel
Summary: %{summary}
BuildArch: noarch
@@ -131,6 +143,9 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Wed Apr 21 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.3-1
+- Update to version 0.22.3.
+
* Tue Mar 02 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.2-1
- Update to version 0.22.1.
- Fixes RHBZ#1932496
diff --git a/sources b/sources
index 2dbe82b..d3af0fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.22.2.crate) = c1da244883c770e987102e42e15b9126f920aa39ebc08549680b61205268e948ef0055cfefbda34ea9a6ce659d5c76489b960801e89615ede11dad4955d0445e
+SHA512 (euclid-0.22.3.crate) = cb8a02854ae22c38e367c9a85f89ba7bca682f76c6fd366195ade836751a27894610198e1b90eb6cfde16a9c2003ef0a17a6ef1d9a26f143080de61bd81b63d9
commit 8ed0baaadd438e10be6798daaf6f26e7af2d8d1c
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Tue Mar 2 01:21:10 2021 +0100
update to version 0.22.2
diff --git a/.gitignore b/.gitignore
index db872dd..40f074f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/euclid-0.20.14.crate
/euclid-0.22.0.crate
/euclid-0.22.1.crate
+/euclid-0.22.2.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 049f1f1..73b4ade 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -1,12 +1,12 @@
-# Generated by rust2rpm 13
+# Generated by rust2rpm 16
%bcond_without check
%global debug_package %{nil}
%global crate euclid
Name: rust-%{crate}
-Version: 0.22.1
-Release: 2%{?dist}
+Version: 0.22.2
+Release: 1%{?dist}
Summary: Geometry primitives
# Upstream license specification: MIT / Apache-2.0
@@ -131,6 +131,10 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Tue Mar 02 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.2-1
+- Update to version 0.22.1.
+- Fixes RHBZ#1932496
+
* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index e5cb2f1..2dbe82b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.22.1.crate) = 8392b023b3b97e89bc46d50eff0697794a905c8624184fc6240b721d223e7bc1dd6600156bf0733f7409a4da77f0c29973b11b9689e3663b28cd88954b39afe3
+SHA512 (euclid-0.22.2.crate) = c1da244883c770e987102e42e15b9126f920aa39ebc08549680b61205268e948ef0055cfefbda34ea9a6ce659d5c76489b960801e89615ede11dad4955d0445e
commit bc010a633f5a4f373e535057c586b1ef82dc2d91
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jan 27 17:31:10 2021 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 517ad88..049f1f1 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.22.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Geometry primitives
# Upstream license specification: MIT / Apache-2.0
@@ -131,6 +131,9 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Fri Aug 21 2020 returntrip <stefano(a)figura.im> - 0.22.1-1
- Update to 0.22.1
commit 508b6dad7a56a8a4f0c1de725137af2675bb7d85
Author: returntrip <stefano(a)figura.im>
Date: Fri Aug 21 21:25:18 2020 +0200
Update to 0.22.1
diff --git a/.gitignore b/.gitignore
index bf3d509..db872dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/euclid-0.20.13.crate
/euclid-0.20.14.crate
/euclid-0.22.0.crate
+/euclid-0.22.1.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index bb02b1b..517ad88 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -5,7 +5,7 @@
%global crate euclid
Name: rust-%{crate}
-Version: 0.22.0
+Version: 0.22.1
Release: 1%{?dist}
Summary: Geometry primitives
@@ -131,6 +131,9 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Fri Aug 21 2020 returntrip <stefano(a)figura.im> - 0.22.1-1
+- Update to 0.22.1
+
* Sat Aug 01 2020 returntrip <stefano(a)figura.im> - 0.22.0-1
- Update to 0.22.0
diff --git a/sources b/sources
index fe49703..e5cb2f1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.22.0.crate) = bf90e0a0e896ab14d302f681ba3be417d6abf18869a61d3f8cf02ee03b46ea7e23c28d17d54aff5faf837a7fefd784b668028c3c51e2fae889dd30d8ecfa2ae6
+SHA512 (euclid-0.22.1.crate) = 8392b023b3b97e89bc46d50eff0697794a905c8624184fc6240b721d223e7bc1dd6600156bf0733f7409a4da77f0c29973b11b9689e3663b28cd88954b39afe3
commit c966a92d9a2fd84f9d75353700b24572bb42b033
Author: returntrip <stefano(a)figura.im>
Date: Sat Aug 1 18:12:43 2020 +0200
Update to 0.22.0
diff --git a/.gitignore b/.gitignore
index 0c335c4..bf3d509 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/euclid-0.20.13.crate
/euclid-0.20.14.crate
+/euclid-0.22.0.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 5fe0b0b..bb02b1b 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -5,8 +5,8 @@
%global crate euclid
Name: rust-%{crate}
-Version: 0.20.14
-Release: 2%{?dist}
+Version: 0.22.0
+Release: 1%{?dist}
Summary: Geometry primitives
# Upstream license specification: MIT / Apache-2.0
@@ -131,6 +131,9 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Sat Aug 01 2020 returntrip <stefano(a)figura.im> - 0.22.0-1
+- Update to 0.22.0
+
* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.20.14-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index 641c10b..fe49703 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.20.14.crate) = ee6dea3a8bcf1f69212f528cf4196a038ae553c885710df49d6fed61bde946eac6bda880bef496ec3ec46ce1a1ca38e03849e4375965a99c6004f7c772f82262
+SHA512 (euclid-0.22.0.crate) = bf90e0a0e896ab14d302f681ba3be417d6abf18869a61d3f8cf02ee03b46ea7e23c28d17d54aff5faf837a7fefd784b668028c3c51e2fae889dd30d8ecfa2ae6
commit 03c3e654e213a4245522e2b97c6f6b85afa55cf1
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 29 08:01:21 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-euclid.spec b/rust-euclid.spec
index fe92c26..5fe0b0b 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.20.14
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Geometry primitives
# Upstream license specification: MIT / Apache-2.0
@@ -131,6 +131,9 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.20.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Fri Jul 10 2020 Josh Stone <jistone(a)redhat.com> - 0.20.14-1
- Update to 0.20.14
commit eeef9905956ca56d85c1a89e22f423f7279f54f7
Author: Josh Stone <jistone(a)redhat.com>
Date: Fri Jul 10 10:39:00 2020 -0700
Update to 0.20.14
diff --git a/.gitignore b/.gitignore
index 07f9c11..0c335c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/euclid-0.20.13.crate
+/euclid-0.20.14.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 5902099..fe92c26 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -5,7 +5,7 @@
%global crate euclid
Name: rust-%{crate}
-Version: 0.20.13
+Version: 0.20.14
Release: 1%{?dist}
Summary: Geometry primitives
@@ -131,6 +131,9 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Fri Jul 10 2020 Josh Stone <jistone(a)redhat.com> - 0.20.14-1
+- Update to 0.20.14
+
* Tue Jun 09 15:52:00 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.13-1
- Upgrade to 0.20.13
diff --git a/sources b/sources
index 7bc7ded..641c10b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.20.13.crate) = d7d63d1a899f05968ae7444ea3d852815272bfac93010a04001ff66455f3558b42ef9772660cc214f1078cc799dd1c3c9a8ed4b7da10548f86212d8077d6c50d
+SHA512 (euclid-0.20.14.crate) = ee6dea3a8bcf1f69212f528cf4196a038ae553c885710df49d6fed61bde946eac6bda880bef496ec3ec46ce1a1ca38e03849e4375965a99c6004f7c772f82262
commit af584059b4b38c5bbd8b11d4c941dcd57e9abf03
Author: returntrip <stefano(a)figura.im>
Date: Sat Jun 13 15:38:59 2020 +0200
Initial import (#1840179)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..07f9c11
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/euclid-0.20.13.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
new file mode 100644
index 0000000..5902099
--- /dev/null
+++ b/rust-euclid.spec
@@ -0,0 +1,138 @@
+# Generated by rust2rpm 13
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate euclid
+
+Name: rust-%{crate}
+Version: 0.20.13
+Release: 1%{?dist}
+Summary: Geometry primitives
+
+# Upstream license specification: MIT / Apache-2.0
+License: MIT or ASL 2.0
+URL: https://crates.io/crates/euclid
+Source: %{crates_source}
+
+ExclusiveArch: %{rust_arches}
+%if %{__cargo_skip_build}
+BuildArch: noarch
+%endif
+
+BuildRequires: rust-packaging
+
+%global _description %{expand:
+Geometry primitives.}
+
+%description %{_description}
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel %{_description}
+
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
+
+%files devel
+%doc README.md
+%license LICENSE-APACHE LICENSE-MIT COPYRIGHT
+%{cargo_registry}/%{crate}-%{version_no_tilde}/
+
+%package -n %{name}+default-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "default" feature of "%{crate}" crate.
+
+%files -n %{name}+default-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+libm-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+libm-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "libm" feature of "%{crate}" crate.
+
+%files -n %{name}+libm-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+mint-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+mint-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "mint" feature of "%{crate}" crate.
+
+%files -n %{name}+mint-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+serde-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+serde-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "serde" feature of "%{crate}" crate.
+
+%files -n %{name}+serde-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+std-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+std-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "std" feature of "%{crate}" crate.
+
+%files -n %{name}+std-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+unstable-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+unstable-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "unstable" feature of "%{crate}" crate.
+
+%files -n %{name}+unstable-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%prep
+%autosetup -n %{crate}-%{version_no_tilde} -p1
+%cargo_prep
+
+%generate_buildrequires
+%cargo_generate_buildrequires
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%changelog
+* Tue Jun 09 15:52:00 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.13-1
+- Upgrade to 0.20.13
+
+* Sat May 23 17:19:51 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.12-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..7bc7ded
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (euclid-0.20.13.crate) = d7d63d1a899f05968ae7444ea3d852815272bfac93010a04001ff66455f3558b42ef9772660cc214f1078cc799dd1c3c9a8ed4b7da10548f86212d8077d6c50d
1
0
Architecture specific change in rpms/rust-euclid.git
by githook-noreply＠fedoraproject.org 27 Nov '23
by githook-noreply＠fedoraproject.org 27 Nov '23
27 Nov '23
The package rpms/rust-euclid.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-euclid.git/commit/?id=f757700e…
https://src.fedoraproject.org/cgit/rpms/rust-euclid.git/commit/?id=c9deb28e…
https://src.fedoraproject.org/cgit/rpms/rust-euclid.git/commit/?id=88a42744…
https://src.fedoraproject.org/cgit/rpms/rust-euclid.git/commit/?id=af584059….
Change:
-ExclusiveArch: %{rust_arches}
+ExclusiveArch: %{rust_arches}
-ExclusiveArch: %{rust_arches}
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit f757700ed075000178e2e780a68b6c063d166bf3
Author: Leo Puvilland <leo(a)craftcat.dev>
Date: Mon Nov 27 09:04:00 2023 -0800
Initial import (fedora#2250466).
diff --git a/.gitignore b/.gitignore
index ea1dfb8..dfd90af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/euclid-0.22.4.crate
/euclid-0.22.5.crate
/euclid-0.22.6.crate
+/euclid-0.22.9.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 55c1f18..c7ca444 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -1,25 +1,20 @@
-# Generated by rust2rpm 17
+# Generated by rust2rpm 25
%bcond_without check
%global debug_package %{nil}
%global crate euclid
-Name: rust-%{crate}
-Version: 0.22.6
-Release: 3%{?dist}
+Name: rust-euclid
+Version: 0.22.9
+Release: %autorelease
Summary: Geometry primitives
# Upstream license specification: MIT / Apache-2.0
-License: MIT or ASL 2.0
+License: MIT OR Apache-2.0
URL: https://crates.io/crates/euclid
Source: %{crates_source}
-ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
-
-BuildRequires: rust-packaging
+BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
Geometry primitives.}
@@ -32,13 +27,15 @@ BuildArch: noarch
%description devel %{_description}
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
%files devel
-%license LICENSE-APACHE LICENSE-MIT COPYRIGHT
-%doc README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/COPYRIGHT
+%license %{crate_instdir}/LICENSE-APACHE
+%license %{crate_instdir}/LICENSE-MIT
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -46,11 +43,11 @@ BuildArch: noarch
%description -n %{name}+default-devel %{_description}
-This package contains library source intended for building other packages
-which use "default" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+arbitrary-devel
Summary: %{summary}
@@ -58,11 +55,23 @@ BuildArch: noarch
%description -n %{name}+arbitrary-devel %{_description}
-This package contains library source intended for building other packages
-which use "arbitrary" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "arbitrary" feature of the "%{crate}" crate.
%files -n %{name}+arbitrary-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+bytemuck-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+bytemuck-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "bytemuck" feature of the "%{crate}" crate.
+
+%files -n %{name}+bytemuck-devel
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+libm-devel
Summary: %{summary}
@@ -70,11 +79,11 @@ BuildArch: noarch
%description -n %{name}+libm-devel %{_description}
-This package contains library source intended for building other packages
-which use "libm" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "libm" feature of the "%{crate}" crate.
%files -n %{name}+libm-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+mint-devel
Summary: %{summary}
@@ -82,11 +91,11 @@ BuildArch: noarch
%description -n %{name}+mint-devel %{_description}
-This package contains library source intended for building other packages
-which use "mint" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "mint" feature of the "%{crate}" crate.
%files -n %{name}+mint-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+serde-devel
Summary: %{summary}
@@ -94,11 +103,11 @@ BuildArch: noarch
%description -n %{name}+serde-devel %{_description}
-This package contains library source intended for building other packages
-which use "serde" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "serde" feature of the "%{crate}" crate.
%files -n %{name}+serde-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+std-devel
Summary: %{summary}
@@ -106,11 +115,11 @@ BuildArch: noarch
%description -n %{name}+std-devel %{_description}
-This package contains library source intended for building other packages
-which use "std" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "std" feature of the "%{crate}" crate.
%files -n %{name}+std-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+unstable-devel
Summary: %{summary}
@@ -118,14 +127,14 @@ BuildArch: noarch
%description -n %{name}+unstable-devel %{_description}
-This package contains library source intended for building other packages
-which use "unstable" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "unstable" feature of the "%{crate}" crate.
%files -n %{name}+unstable-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
%cargo_prep
%generate_buildrequires
@@ -143,49 +152,4 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
-* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-2
-- Second attempt - Rebuilt for
- https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jun 22 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.6-1
-- Update to version 0.22.6.
-- Fixes RHBZ#1966179
-
-* Sun May 30 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.5-1
-- Update to version 0.22.5.
-- Fixes RHBZ#1965637
-
-* Wed May 19 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.4-1
-- Update to version 0.22.4.
-- Fixes RHBZ#1961810
-
-* Wed Apr 21 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.3-1
-- Update to version 0.22.3.
-
-* Tue Mar 02 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.2-1
-- Update to version 0.22.1.
-- Fixes RHBZ#1932496
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Aug 21 2020 returntrip <stefano(a)figura.im> - 0.22.1-1
-- Update to 0.22.1
-
-* Sat Aug 01 2020 returntrip <stefano(a)figura.im> - 0.22.0-1
-- Update to 0.22.0
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.20.14-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Josh Stone <jistone(a)redhat.com> - 0.20.14-1
-- Update to 0.20.14
-
-* Tue Jun 09 15:52:00 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.13-1
-- Upgrade to 0.20.13
-
-* Sat May 23 17:19:51 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.12-1
-- Initial package
+%autochangelog
diff --git a/sources b/sources
index 95a8aa3..b14960c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.22.6.crate) = 401147afa8bc0a8b247b3a515ce6e2a63727d668d2b13cf43e9bfc81104e97b66131a1c0efb8b3330721adc81cca26cb2d87328c2b392f79b583aa3e9a176640
+SHA512 (euclid-0.22.9.crate) = 19fa3756085051c86a58c4ea00cf459b43a6326c9b916e17e15160b43813dfd3edf113379dfdf5f345b7c96d294a75f1ca96f1065f5bac9e44cf340434a2dc33
commit c9deb28e8e6784afefdc2fe63074f645681ec3fc
Author: Tomas Hrcka <thrcka(a)redhat.com>
Date: Mon Nov 27 12:17:14 2023 +0100
Unretirement request: https://pagure.io/releng/issue/11809
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ea1dfb8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+/euclid-0.20.13.crate
+/euclid-0.20.14.crate
+/euclid-0.22.0.crate
+/euclid-0.22.1.crate
+/euclid-0.22.2.crate
+/euclid-0.22.3.crate
+/euclid-0.22.4.crate
+/euclid-0.22.5.crate
+/euclid-0.22.6.crate
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..e009c06
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# rust-euclid
+
+The rust-euclid package
\ No newline at end of file
diff --git a/dead.package b/dead.package
deleted file mode 100644
index c7912ba..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-no longer needed
diff --git a/rust-euclid.spec b/rust-euclid.spec
new file mode 100644
index 0000000..55c1f18
--- /dev/null
+++ b/rust-euclid.spec
@@ -0,0 +1,191 @@
+# Generated by rust2rpm 17
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate euclid
+
+Name: rust-%{crate}
+Version: 0.22.6
+Release: 3%{?dist}
+Summary: Geometry primitives
+
+# Upstream license specification: MIT / Apache-2.0
+License: MIT or ASL 2.0
+URL: https://crates.io/crates/euclid
+Source: %{crates_source}
+
+ExclusiveArch: %{rust_arches}
+%if %{__cargo_skip_build}
+BuildArch: noarch
+%endif
+
+BuildRequires: rust-packaging
+
+%global _description %{expand:
+Geometry primitives.}
+
+%description %{_description}
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel %{_description}
+
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
+
+%files devel
+%license LICENSE-APACHE LICENSE-MIT COPYRIGHT
+%doc README.md
+%{cargo_registry}/%{crate}-%{version_no_tilde}/
+
+%package -n %{name}+default-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "default" feature of "%{crate}" crate.
+
+%files -n %{name}+default-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+arbitrary-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+arbitrary-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "arbitrary" feature of "%{crate}" crate.
+
+%files -n %{name}+arbitrary-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+libm-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+libm-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "libm" feature of "%{crate}" crate.
+
+%files -n %{name}+libm-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+mint-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+mint-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "mint" feature of "%{crate}" crate.
+
+%files -n %{name}+mint-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+serde-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+serde-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "serde" feature of "%{crate}" crate.
+
+%files -n %{name}+serde-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+std-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+std-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "std" feature of "%{crate}" crate.
+
+%files -n %{name}+std-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+unstable-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+unstable-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "unstable" feature of "%{crate}" crate.
+
+%files -n %{name}+unstable-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%prep
+%autosetup -n %{crate}-%{version_no_tilde} -p1
+%cargo_prep
+
+%generate_buildrequires
+%cargo_generate_buildrequires
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%changelog
+* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-2
+- Second attempt - Rebuilt for
+ https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jun 22 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.6-1
+- Update to version 0.22.6.
+- Fixes RHBZ#1966179
+
+* Sun May 30 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.5-1
+- Update to version 0.22.5.
+- Fixes RHBZ#1965637
+
+* Wed May 19 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.4-1
+- Update to version 0.22.4.
+- Fixes RHBZ#1961810
+
+* Wed Apr 21 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.3-1
+- Update to version 0.22.3.
+
+* Tue Mar 02 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.2-1
+- Update to version 0.22.1.
+- Fixes RHBZ#1932496
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Aug 21 2020 returntrip <stefano(a)figura.im> - 0.22.1-1
+- Update to 0.22.1
+
+* Sat Aug 01 2020 returntrip <stefano(a)figura.im> - 0.22.0-1
+- Update to 0.22.0
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.20.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Josh Stone <jistone(a)redhat.com> - 0.20.14-1
+- Update to 0.20.14
+
+* Tue Jun 09 15:52:00 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.13-1
+- Upgrade to 0.20.13
+
+* Sat May 23 17:19:51 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.12-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..95a8aa3
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (euclid-0.22.6.crate) = 401147afa8bc0a8b247b3a515ce6e2a63727d668d2b13cf43e9bfc81104e97b66131a1c0efb8b3330721adc81cca26cb2d87328c2b392f79b583aa3e9a176640
commit 88a427440ded8c437dff08ffc2a102127deefed2
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Mon May 2 16:46:29 2022 +0200
no longer needed
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index ea1dfb8..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-/euclid-0.20.13.crate
-/euclid-0.20.14.crate
-/euclid-0.22.0.crate
-/euclid-0.22.1.crate
-/euclid-0.22.2.crate
-/euclid-0.22.3.crate
-/euclid-0.22.4.crate
-/euclid-0.22.5.crate
-/euclid-0.22.6.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index e009c06..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-euclid
-
-The rust-euclid package
\ No newline at end of file
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..c7912ba
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+no longer needed
diff --git a/rust-euclid.spec b/rust-euclid.spec
deleted file mode 100644
index 55c1f18..0000000
--- a/rust-euclid.spec
+++ /dev/null
@@ -1,191 +0,0 @@
-# Generated by rust2rpm 17
-%bcond_without check
-%global debug_package %{nil}
-
-%global crate euclid
-
-Name: rust-%{crate}
-Version: 0.22.6
-Release: 3%{?dist}
-Summary: Geometry primitives
-
-# Upstream license specification: MIT / Apache-2.0
-License: MIT or ASL 2.0
-URL: https://crates.io/crates/euclid
-Source: %{crates_source}
-
-ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
-
-BuildRequires: rust-packaging
-
-%global _description %{expand:
-Geometry primitives.}
-
-%description %{_description}
-
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description devel %{_description}
-
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
-
-%files devel
-%license LICENSE-APACHE LICENSE-MIT COPYRIGHT
-%doc README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
-
-%package -n %{name}+default-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+default-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "default" feature of "%{crate}" crate.
-
-%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+arbitrary-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+arbitrary-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "arbitrary" feature of "%{crate}" crate.
-
-%files -n %{name}+arbitrary-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+libm-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+libm-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "libm" feature of "%{crate}" crate.
-
-%files -n %{name}+libm-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+mint-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+mint-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "mint" feature of "%{crate}" crate.
-
-%files -n %{name}+mint-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+serde-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+serde-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "serde" feature of "%{crate}" crate.
-
-%files -n %{name}+serde-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+std-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+std-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "std" feature of "%{crate}" crate.
-
-%files -n %{name}+std-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+unstable-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+unstable-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "unstable" feature of "%{crate}" crate.
-
-%files -n %{name}+unstable-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
-%cargo_prep
-
-%generate_buildrequires
-%cargo_generate_buildrequires
-
-%build
-%cargo_build
-
-%install
-%cargo_install
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%changelog
-* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-2
-- Second attempt - Rebuilt for
- https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jun 22 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.6-1
-- Update to version 0.22.6.
-- Fixes RHBZ#1966179
-
-* Sun May 30 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.5-1
-- Update to version 0.22.5.
-- Fixes RHBZ#1965637
-
-* Wed May 19 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.4-1
-- Update to version 0.22.4.
-- Fixes RHBZ#1961810
-
-* Wed Apr 21 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.3-1
-- Update to version 0.22.3.
-
-* Tue Mar 02 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.2-1
-- Update to version 0.22.1.
-- Fixes RHBZ#1932496
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Aug 21 2020 returntrip <stefano(a)figura.im> - 0.22.1-1
-- Update to 0.22.1
-
-* Sat Aug 01 2020 returntrip <stefano(a)figura.im> - 0.22.0-1
-- Update to 0.22.0
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.20.14-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Josh Stone <jistone(a)redhat.com> - 0.20.14-1
-- Update to 0.20.14
-
-* Tue Jun 09 15:52:00 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.13-1
-- Upgrade to 0.20.13
-
-* Sat May 23 17:19:51 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.12-1
-- Initial package
diff --git a/sources b/sources
deleted file mode 100644
index 95a8aa3..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (euclid-0.22.6.crate) = 401147afa8bc0a8b247b3a515ce6e2a63727d668d2b13cf43e9bfc81104e97b66131a1c0efb8b3330721adc81cca26cb2d87328c2b392f79b583aa3e9a176640
commit 710645d14d098b597367e8fa423a0499c86653ae
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 21 20:48:59 2022 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 94bb8c4..55c1f18 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.22.6
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Geometry primitives
# Upstream license specification: MIT / Apache-2.0
@@ -143,6 +143,9 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-2
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
commit 5d296839b2e56d8452976f8396d779c07e8fa9d8
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jul 27 08:55:38 2021 +0000
- Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 447d3ff..94bb8c4 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.22.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Geometry primitives
# Upstream license specification: MIT / Apache-2.0
@@ -143,6 +143,10 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-2
+- Second attempt - Rebuilt for
+ https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
* Tue Jun 22 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.6-1
- Update to version 0.22.6.
- Fixes RHBZ#1966179
commit e6c7b2a17c07e52362de86a9331b81264d4f5882
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Tue Jun 22 12:48:29 2021 +0200
update to version 0.22.6
diff --git a/.gitignore b/.gitignore
index b75ee10..ea1dfb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/euclid-0.22.3.crate
/euclid-0.22.4.crate
/euclid-0.22.5.crate
+/euclid-0.22.6.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 7389659..447d3ff 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -5,7 +5,7 @@
%global crate euclid
Name: rust-%{crate}
-Version: 0.22.5
+Version: 0.22.6
Release: 1%{?dist}
Summary: Geometry primitives
@@ -143,6 +143,10 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Tue Jun 22 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.6-1
+- Update to version 0.22.6.
+- Fixes RHBZ#1966179
+
* Sun May 30 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.5-1
- Update to version 0.22.5.
- Fixes RHBZ#1965637
diff --git a/sources b/sources
index 5137765..95a8aa3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.22.5.crate) = f36bef15a5a10b4b7656369896b348fbd77d229b2ad635a679d4df1e90eef73f879010251459fcfb49ec45730f37632f752c2884c88ea82fe7f20c788396193a
+SHA512 (euclid-0.22.6.crate) = 401147afa8bc0a8b247b3a515ce6e2a63727d668d2b13cf43e9bfc81104e97b66131a1c0efb8b3330721adc81cca26cb2d87328c2b392f79b583aa3e9a176640
commit dd7bcbbcc49ee58ad95ef406d194ae1526ad3b47
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Sun May 30 11:24:29 2021 +0200
update to version 0.22.5
diff --git a/.gitignore b/.gitignore
index 77c296f..b75ee10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/euclid-0.22.2.crate
/euclid-0.22.3.crate
/euclid-0.22.4.crate
+/euclid-0.22.5.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 9c8fc3f..7389659 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -5,7 +5,7 @@
%global crate euclid
Name: rust-%{crate}
-Version: 0.22.4
+Version: 0.22.5
Release: 1%{?dist}
Summary: Geometry primitives
@@ -143,6 +143,10 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Sun May 30 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.5-1
+- Update to version 0.22.5.
+- Fixes RHBZ#1965637
+
* Wed May 19 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.4-1
- Update to version 0.22.4.
- Fixes RHBZ#1961810
diff --git a/sources b/sources
index 9e4afc9..5137765 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.22.4.crate) = 01de9fd4494c7b5e8234fd26344236e87da4898d8a60178986d4d533c8c4795bb69f9c6b5abbf4236b3e0d8b87cd5e2cb6a8704a774eda60d11c98a11c7ce40b
+SHA512 (euclid-0.22.5.crate) = f36bef15a5a10b4b7656369896b348fbd77d229b2ad635a679d4df1e90eef73f879010251459fcfb49ec45730f37632f752c2884c88ea82fe7f20c788396193a
commit 66e3e0de4e513a7c8f390200359c74ce62181189
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Wed May 19 13:49:23 2021 +0200
update to version 0.22.4
diff --git a/.gitignore b/.gitignore
index 117c3c4..77c296f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/euclid-0.22.1.crate
/euclid-0.22.2.crate
/euclid-0.22.3.crate
+/euclid-0.22.4.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 07a7b96..9c8fc3f 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -5,7 +5,7 @@
%global crate euclid
Name: rust-%{crate}
-Version: 0.22.3
+Version: 0.22.4
Release: 1%{?dist}
Summary: Geometry primitives
@@ -143,6 +143,10 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Wed May 19 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.4-1
+- Update to version 0.22.4.
+- Fixes RHBZ#1961810
+
* Wed Apr 21 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.3-1
- Update to version 0.22.3.
diff --git a/sources b/sources
index d3af0fa..9e4afc9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.22.3.crate) = cb8a02854ae22c38e367c9a85f89ba7bca682f76c6fd366195ade836751a27894610198e1b90eb6cfde16a9c2003ef0a17a6ef1d9a26f143080de61bd81b63d9
+SHA512 (euclid-0.22.4.crate) = 01de9fd4494c7b5e8234fd26344236e87da4898d8a60178986d4d533c8c4795bb69f9c6b5abbf4236b3e0d8b87cd5e2cb6a8704a774eda60d11c98a11c7ce40b
commit c2e141432373aef198b54aaff22b8a733cd96749
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Wed Apr 21 23:58:30 2021 +0200
update to version 0.22.3
diff --git a/.gitignore b/.gitignore
index 40f074f..117c3c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/euclid-0.22.0.crate
/euclid-0.22.1.crate
/euclid-0.22.2.crate
+/euclid-0.22.3.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 73b4ade..07a7b96 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 16
+# Generated by rust2rpm 17
%bcond_without check
%global debug_package %{nil}
%global crate euclid
Name: rust-%{crate}
-Version: 0.22.2
+Version: 0.22.3
Release: 1%{?dist}
Summary: Geometry primitives
@@ -36,8 +36,8 @@ This package contains library source intended for building other packages
which use "%{crate}" crate.
%files devel
-%doc README.md
%license LICENSE-APACHE LICENSE-MIT COPYRIGHT
+%doc README.md
%{cargo_registry}/%{crate}-%{version_no_tilde}/
%package -n %{name}+default-devel
@@ -52,6 +52,18 @@ which use "default" feature of "%{crate}" crate.
%files -n %{name}+default-devel
%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%package -n %{name}+arbitrary-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+arbitrary-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "arbitrary" feature of "%{crate}" crate.
+
+%files -n %{name}+arbitrary-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
%package -n %{name}+libm-devel
Summary: %{summary}
BuildArch: noarch
@@ -131,6 +143,9 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Wed Apr 21 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.3-1
+- Update to version 0.22.3.
+
* Tue Mar 02 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.2-1
- Update to version 0.22.1.
- Fixes RHBZ#1932496
diff --git a/sources b/sources
index 2dbe82b..d3af0fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.22.2.crate) = c1da244883c770e987102e42e15b9126f920aa39ebc08549680b61205268e948ef0055cfefbda34ea9a6ce659d5c76489b960801e89615ede11dad4955d0445e
+SHA512 (euclid-0.22.3.crate) = cb8a02854ae22c38e367c9a85f89ba7bca682f76c6fd366195ade836751a27894610198e1b90eb6cfde16a9c2003ef0a17a6ef1d9a26f143080de61bd81b63d9
commit 8ed0baaadd438e10be6798daaf6f26e7af2d8d1c
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Tue Mar 2 01:21:10 2021 +0100
update to version 0.22.2
diff --git a/.gitignore b/.gitignore
index db872dd..40f074f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/euclid-0.20.14.crate
/euclid-0.22.0.crate
/euclid-0.22.1.crate
+/euclid-0.22.2.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 049f1f1..73b4ade 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -1,12 +1,12 @@
-# Generated by rust2rpm 13
+# Generated by rust2rpm 16
%bcond_without check
%global debug_package %{nil}
%global crate euclid
Name: rust-%{crate}
-Version: 0.22.1
-Release: 2%{?dist}
+Version: 0.22.2
+Release: 1%{?dist}
Summary: Geometry primitives
# Upstream license specification: MIT / Apache-2.0
@@ -131,6 +131,10 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Tue Mar 02 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.2-1
+- Update to version 0.22.1.
+- Fixes RHBZ#1932496
+
* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index e5cb2f1..2dbe82b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.22.1.crate) = 8392b023b3b97e89bc46d50eff0697794a905c8624184fc6240b721d223e7bc1dd6600156bf0733f7409a4da77f0c29973b11b9689e3663b28cd88954b39afe3
+SHA512 (euclid-0.22.2.crate) = c1da244883c770e987102e42e15b9126f920aa39ebc08549680b61205268e948ef0055cfefbda34ea9a6ce659d5c76489b960801e89615ede11dad4955d0445e
commit bc010a633f5a4f373e535057c586b1ef82dc2d91
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jan 27 17:31:10 2021 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 517ad88..049f1f1 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.22.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Geometry primitives
# Upstream license specification: MIT / Apache-2.0
@@ -131,6 +131,9 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Fri Aug 21 2020 returntrip <stefano(a)figura.im> - 0.22.1-1
- Update to 0.22.1
commit 508b6dad7a56a8a4f0c1de725137af2675bb7d85
Author: returntrip <stefano(a)figura.im>
Date: Fri Aug 21 21:25:18 2020 +0200
Update to 0.22.1
diff --git a/.gitignore b/.gitignore
index bf3d509..db872dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/euclid-0.20.13.crate
/euclid-0.20.14.crate
/euclid-0.22.0.crate
+/euclid-0.22.1.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index bb02b1b..517ad88 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -5,7 +5,7 @@
%global crate euclid
Name: rust-%{crate}
-Version: 0.22.0
+Version: 0.22.1
Release: 1%{?dist}
Summary: Geometry primitives
@@ -131,6 +131,9 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Fri Aug 21 2020 returntrip <stefano(a)figura.im> - 0.22.1-1
+- Update to 0.22.1
+
* Sat Aug 01 2020 returntrip <stefano(a)figura.im> - 0.22.0-1
- Update to 0.22.0
diff --git a/sources b/sources
index fe49703..e5cb2f1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.22.0.crate) = bf90e0a0e896ab14d302f681ba3be417d6abf18869a61d3f8cf02ee03b46ea7e23c28d17d54aff5faf837a7fefd784b668028c3c51e2fae889dd30d8ecfa2ae6
+SHA512 (euclid-0.22.1.crate) = 8392b023b3b97e89bc46d50eff0697794a905c8624184fc6240b721d223e7bc1dd6600156bf0733f7409a4da77f0c29973b11b9689e3663b28cd88954b39afe3
commit c966a92d9a2fd84f9d75353700b24572bb42b033
Author: returntrip <stefano(a)figura.im>
Date: Sat Aug 1 18:12:43 2020 +0200
Update to 0.22.0
diff --git a/.gitignore b/.gitignore
index 0c335c4..bf3d509 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/euclid-0.20.13.crate
/euclid-0.20.14.crate
+/euclid-0.22.0.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 5fe0b0b..bb02b1b 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -5,8 +5,8 @@
%global crate euclid
Name: rust-%{crate}
-Version: 0.20.14
-Release: 2%{?dist}
+Version: 0.22.0
+Release: 1%{?dist}
Summary: Geometry primitives
# Upstream license specification: MIT / Apache-2.0
@@ -131,6 +131,9 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Sat Aug 01 2020 returntrip <stefano(a)figura.im> - 0.22.0-1
+- Update to 0.22.0
+
* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.20.14-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index 641c10b..fe49703 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.20.14.crate) = ee6dea3a8bcf1f69212f528cf4196a038ae553c885710df49d6fed61bde946eac6bda880bef496ec3ec46ce1a1ca38e03849e4375965a99c6004f7c772f82262
+SHA512 (euclid-0.22.0.crate) = bf90e0a0e896ab14d302f681ba3be417d6abf18869a61d3f8cf02ee03b46ea7e23c28d17d54aff5faf837a7fefd784b668028c3c51e2fae889dd30d8ecfa2ae6
commit 03c3e654e213a4245522e2b97c6f6b85afa55cf1
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 29 08:01:21 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-euclid.spec b/rust-euclid.spec
index fe92c26..5fe0b0b 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.20.14
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Geometry primitives
# Upstream license specification: MIT / Apache-2.0
@@ -131,6 +131,9 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.20.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Fri Jul 10 2020 Josh Stone <jistone(a)redhat.com> - 0.20.14-1
- Update to 0.20.14
commit eeef9905956ca56d85c1a89e22f423f7279f54f7
Author: Josh Stone <jistone(a)redhat.com>
Date: Fri Jul 10 10:39:00 2020 -0700
Update to 0.20.14
diff --git a/.gitignore b/.gitignore
index 07f9c11..0c335c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/euclid-0.20.13.crate
+/euclid-0.20.14.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 5902099..fe92c26 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -5,7 +5,7 @@
%global crate euclid
Name: rust-%{crate}
-Version: 0.20.13
+Version: 0.20.14
Release: 1%{?dist}
Summary: Geometry primitives
@@ -131,6 +131,9 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Fri Jul 10 2020 Josh Stone <jistone(a)redhat.com> - 0.20.14-1
+- Update to 0.20.14
+
* Tue Jun 09 15:52:00 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.13-1
- Upgrade to 0.20.13
diff --git a/sources b/sources
index 7bc7ded..641c10b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.20.13.crate) = d7d63d1a899f05968ae7444ea3d852815272bfac93010a04001ff66455f3558b42ef9772660cc214f1078cc799dd1c3c9a8ed4b7da10548f86212d8077d6c50d
+SHA512 (euclid-0.20.14.crate) = ee6dea3a8bcf1f69212f528cf4196a038ae553c885710df49d6fed61bde946eac6bda880bef496ec3ec46ce1a1ca38e03849e4375965a99c6004f7c772f82262
commit af584059b4b38c5bbd8b11d4c941dcd57e9abf03
Author: returntrip <stefano(a)figura.im>
Date: Sat Jun 13 15:38:59 2020 +0200
Initial import (#1840179)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..07f9c11
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/euclid-0.20.13.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
new file mode 100644
index 0000000..5902099
--- /dev/null
+++ b/rust-euclid.spec
@@ -0,0 +1,138 @@
+# Generated by rust2rpm 13
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate euclid
+
+Name: rust-%{crate}
+Version: 0.20.13
+Release: 1%{?dist}
+Summary: Geometry primitives
+
+# Upstream license specification: MIT / Apache-2.0
+License: MIT or ASL 2.0
+URL: https://crates.io/crates/euclid
+Source: %{crates_source}
+
+ExclusiveArch: %{rust_arches}
+%if %{__cargo_skip_build}
+BuildArch: noarch
+%endif
+
+BuildRequires: rust-packaging
+
+%global _description %{expand:
+Geometry primitives.}
+
+%description %{_description}
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel %{_description}
+
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
+
+%files devel
+%doc README.md
+%license LICENSE-APACHE LICENSE-MIT COPYRIGHT
+%{cargo_registry}/%{crate}-%{version_no_tilde}/
+
+%package -n %{name}+default-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "default" feature of "%{crate}" crate.
+
+%files -n %{name}+default-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+libm-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+libm-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "libm" feature of "%{crate}" crate.
+
+%files -n %{name}+libm-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+mint-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+mint-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "mint" feature of "%{crate}" crate.
+
+%files -n %{name}+mint-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+serde-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+serde-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "serde" feature of "%{crate}" crate.
+
+%files -n %{name}+serde-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+std-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+std-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "std" feature of "%{crate}" crate.
+
+%files -n %{name}+std-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+unstable-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+unstable-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "unstable" feature of "%{crate}" crate.
+
+%files -n %{name}+unstable-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%prep
+%autosetup -n %{crate}-%{version_no_tilde} -p1
+%cargo_prep
+
+%generate_buildrequires
+%cargo_generate_buildrequires
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%changelog
+* Tue Jun 09 15:52:00 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.13-1
+- Upgrade to 0.20.13
+
+* Sat May 23 17:19:51 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.12-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..7bc7ded
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (euclid-0.20.13.crate) = d7d63d1a899f05968ae7444ea3d852815272bfac93010a04001ff66455f3558b42ef9772660cc214f1078cc799dd1c3c9a8ed4b7da10548f86212d8077d6c50d
1
0
Architecture specific change in rpms/rust-euclid.git
by githook-noreply＠fedoraproject.org 27 Nov '23
by githook-noreply＠fedoraproject.org 27 Nov '23
27 Nov '23
The package rpms/rust-euclid.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-euclid.git/commit/?id=f757700e…
https://src.fedoraproject.org/cgit/rpms/rust-euclid.git/commit/?id=c9deb28e…
https://src.fedoraproject.org/cgit/rpms/rust-euclid.git/commit/?id=88a42744…
https://src.fedoraproject.org/cgit/rpms/rust-euclid.git/commit/?id=af584059….
Change:
-ExclusiveArch: %{rust_arches}
+ExclusiveArch: %{rust_arches}
-ExclusiveArch: %{rust_arches}
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit f757700ed075000178e2e780a68b6c063d166bf3
Author: Leo Puvilland <leo(a)craftcat.dev>
Date: Mon Nov 27 09:04:00 2023 -0800
Initial import (fedora#2250466).
diff --git a/.gitignore b/.gitignore
index ea1dfb8..dfd90af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/euclid-0.22.4.crate
/euclid-0.22.5.crate
/euclid-0.22.6.crate
+/euclid-0.22.9.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 55c1f18..c7ca444 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -1,25 +1,20 @@
-# Generated by rust2rpm 17
+# Generated by rust2rpm 25
%bcond_without check
%global debug_package %{nil}
%global crate euclid
-Name: rust-%{crate}
-Version: 0.22.6
-Release: 3%{?dist}
+Name: rust-euclid
+Version: 0.22.9
+Release: %autorelease
Summary: Geometry primitives
# Upstream license specification: MIT / Apache-2.0
-License: MIT or ASL 2.0
+License: MIT OR Apache-2.0
URL: https://crates.io/crates/euclid
Source: %{crates_source}
-ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
-
-BuildRequires: rust-packaging
+BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
Geometry primitives.}
@@ -32,13 +27,15 @@ BuildArch: noarch
%description devel %{_description}
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
%files devel
-%license LICENSE-APACHE LICENSE-MIT COPYRIGHT
-%doc README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/COPYRIGHT
+%license %{crate_instdir}/LICENSE-APACHE
+%license %{crate_instdir}/LICENSE-MIT
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -46,11 +43,11 @@ BuildArch: noarch
%description -n %{name}+default-devel %{_description}
-This package contains library source intended for building other packages
-which use "default" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+arbitrary-devel
Summary: %{summary}
@@ -58,11 +55,23 @@ BuildArch: noarch
%description -n %{name}+arbitrary-devel %{_description}
-This package contains library source intended for building other packages
-which use "arbitrary" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "arbitrary" feature of the "%{crate}" crate.
%files -n %{name}+arbitrary-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+bytemuck-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+bytemuck-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "bytemuck" feature of the "%{crate}" crate.
+
+%files -n %{name}+bytemuck-devel
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+libm-devel
Summary: %{summary}
@@ -70,11 +79,11 @@ BuildArch: noarch
%description -n %{name}+libm-devel %{_description}
-This package contains library source intended for building other packages
-which use "libm" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "libm" feature of the "%{crate}" crate.
%files -n %{name}+libm-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+mint-devel
Summary: %{summary}
@@ -82,11 +91,11 @@ BuildArch: noarch
%description -n %{name}+mint-devel %{_description}
-This package contains library source intended for building other packages
-which use "mint" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "mint" feature of the "%{crate}" crate.
%files -n %{name}+mint-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+serde-devel
Summary: %{summary}
@@ -94,11 +103,11 @@ BuildArch: noarch
%description -n %{name}+serde-devel %{_description}
-This package contains library source intended for building other packages
-which use "serde" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "serde" feature of the "%{crate}" crate.
%files -n %{name}+serde-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+std-devel
Summary: %{summary}
@@ -106,11 +115,11 @@ BuildArch: noarch
%description -n %{name}+std-devel %{_description}
-This package contains library source intended for building other packages
-which use "std" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "std" feature of the "%{crate}" crate.
%files -n %{name}+std-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+unstable-devel
Summary: %{summary}
@@ -118,14 +127,14 @@ BuildArch: noarch
%description -n %{name}+unstable-devel %{_description}
-This package contains library source intended for building other packages
-which use "unstable" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "unstable" feature of the "%{crate}" crate.
%files -n %{name}+unstable-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
%cargo_prep
%generate_buildrequires
@@ -143,49 +152,4 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
-* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-2
-- Second attempt - Rebuilt for
- https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jun 22 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.6-1
-- Update to version 0.22.6.
-- Fixes RHBZ#1966179
-
-* Sun May 30 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.5-1
-- Update to version 0.22.5.
-- Fixes RHBZ#1965637
-
-* Wed May 19 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.4-1
-- Update to version 0.22.4.
-- Fixes RHBZ#1961810
-
-* Wed Apr 21 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.3-1
-- Update to version 0.22.3.
-
-* Tue Mar 02 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.2-1
-- Update to version 0.22.1.
-- Fixes RHBZ#1932496
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Aug 21 2020 returntrip <stefano(a)figura.im> - 0.22.1-1
-- Update to 0.22.1
-
-* Sat Aug 01 2020 returntrip <stefano(a)figura.im> - 0.22.0-1
-- Update to 0.22.0
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.20.14-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Josh Stone <jistone(a)redhat.com> - 0.20.14-1
-- Update to 0.20.14
-
-* Tue Jun 09 15:52:00 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.13-1
-- Upgrade to 0.20.13
-
-* Sat May 23 17:19:51 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.12-1
-- Initial package
+%autochangelog
diff --git a/sources b/sources
index 95a8aa3..b14960c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.22.6.crate) = 401147afa8bc0a8b247b3a515ce6e2a63727d668d2b13cf43e9bfc81104e97b66131a1c0efb8b3330721adc81cca26cb2d87328c2b392f79b583aa3e9a176640
+SHA512 (euclid-0.22.9.crate) = 19fa3756085051c86a58c4ea00cf459b43a6326c9b916e17e15160b43813dfd3edf113379dfdf5f345b7c96d294a75f1ca96f1065f5bac9e44cf340434a2dc33
commit c9deb28e8e6784afefdc2fe63074f645681ec3fc
Author: Tomas Hrcka <thrcka(a)redhat.com>
Date: Mon Nov 27 12:17:14 2023 +0100
Unretirement request: https://pagure.io/releng/issue/11809
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ea1dfb8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+/euclid-0.20.13.crate
+/euclid-0.20.14.crate
+/euclid-0.22.0.crate
+/euclid-0.22.1.crate
+/euclid-0.22.2.crate
+/euclid-0.22.3.crate
+/euclid-0.22.4.crate
+/euclid-0.22.5.crate
+/euclid-0.22.6.crate
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..e009c06
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# rust-euclid
+
+The rust-euclid package
\ No newline at end of file
diff --git a/dead.package b/dead.package
deleted file mode 100644
index c7912ba..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-no longer needed
diff --git a/rust-euclid.spec b/rust-euclid.spec
new file mode 100644
index 0000000..55c1f18
--- /dev/null
+++ b/rust-euclid.spec
@@ -0,0 +1,191 @@
+# Generated by rust2rpm 17
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate euclid
+
+Name: rust-%{crate}
+Version: 0.22.6
+Release: 3%{?dist}
+Summary: Geometry primitives
+
+# Upstream license specification: MIT / Apache-2.0
+License: MIT or ASL 2.0
+URL: https://crates.io/crates/euclid
+Source: %{crates_source}
+
+ExclusiveArch: %{rust_arches}
+%if %{__cargo_skip_build}
+BuildArch: noarch
+%endif
+
+BuildRequires: rust-packaging
+
+%global _description %{expand:
+Geometry primitives.}
+
+%description %{_description}
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel %{_description}
+
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
+
+%files devel
+%license LICENSE-APACHE LICENSE-MIT COPYRIGHT
+%doc README.md
+%{cargo_registry}/%{crate}-%{version_no_tilde}/
+
+%package -n %{name}+default-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "default" feature of "%{crate}" crate.
+
+%files -n %{name}+default-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+arbitrary-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+arbitrary-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "arbitrary" feature of "%{crate}" crate.
+
+%files -n %{name}+arbitrary-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+libm-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+libm-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "libm" feature of "%{crate}" crate.
+
+%files -n %{name}+libm-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+mint-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+mint-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "mint" feature of "%{crate}" crate.
+
+%files -n %{name}+mint-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+serde-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+serde-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "serde" feature of "%{crate}" crate.
+
+%files -n %{name}+serde-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+std-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+std-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "std" feature of "%{crate}" crate.
+
+%files -n %{name}+std-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+unstable-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+unstable-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "unstable" feature of "%{crate}" crate.
+
+%files -n %{name}+unstable-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%prep
+%autosetup -n %{crate}-%{version_no_tilde} -p1
+%cargo_prep
+
+%generate_buildrequires
+%cargo_generate_buildrequires
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%changelog
+* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-2
+- Second attempt - Rebuilt for
+ https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jun 22 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.6-1
+- Update to version 0.22.6.
+- Fixes RHBZ#1966179
+
+* Sun May 30 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.5-1
+- Update to version 0.22.5.
+- Fixes RHBZ#1965637
+
+* Wed May 19 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.4-1
+- Update to version 0.22.4.
+- Fixes RHBZ#1961810
+
+* Wed Apr 21 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.3-1
+- Update to version 0.22.3.
+
+* Tue Mar 02 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.2-1
+- Update to version 0.22.1.
+- Fixes RHBZ#1932496
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Aug 21 2020 returntrip <stefano(a)figura.im> - 0.22.1-1
+- Update to 0.22.1
+
+* Sat Aug 01 2020 returntrip <stefano(a)figura.im> - 0.22.0-1
+- Update to 0.22.0
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.20.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Josh Stone <jistone(a)redhat.com> - 0.20.14-1
+- Update to 0.20.14
+
+* Tue Jun 09 15:52:00 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.13-1
+- Upgrade to 0.20.13
+
+* Sat May 23 17:19:51 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.12-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..95a8aa3
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (euclid-0.22.6.crate) = 401147afa8bc0a8b247b3a515ce6e2a63727d668d2b13cf43e9bfc81104e97b66131a1c0efb8b3330721adc81cca26cb2d87328c2b392f79b583aa3e9a176640
commit 88a427440ded8c437dff08ffc2a102127deefed2
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Mon May 2 16:46:29 2022 +0200
no longer needed
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index ea1dfb8..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-/euclid-0.20.13.crate
-/euclid-0.20.14.crate
-/euclid-0.22.0.crate
-/euclid-0.22.1.crate
-/euclid-0.22.2.crate
-/euclid-0.22.3.crate
-/euclid-0.22.4.crate
-/euclid-0.22.5.crate
-/euclid-0.22.6.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index e009c06..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-euclid
-
-The rust-euclid package
\ No newline at end of file
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..c7912ba
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+no longer needed
diff --git a/rust-euclid.spec b/rust-euclid.spec
deleted file mode 100644
index 55c1f18..0000000
--- a/rust-euclid.spec
+++ /dev/null
@@ -1,191 +0,0 @@
-# Generated by rust2rpm 17
-%bcond_without check
-%global debug_package %{nil}
-
-%global crate euclid
-
-Name: rust-%{crate}
-Version: 0.22.6
-Release: 3%{?dist}
-Summary: Geometry primitives
-
-# Upstream license specification: MIT / Apache-2.0
-License: MIT or ASL 2.0
-URL: https://crates.io/crates/euclid
-Source: %{crates_source}
-
-ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
-
-BuildRequires: rust-packaging
-
-%global _description %{expand:
-Geometry primitives.}
-
-%description %{_description}
-
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description devel %{_description}
-
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
-
-%files devel
-%license LICENSE-APACHE LICENSE-MIT COPYRIGHT
-%doc README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
-
-%package -n %{name}+default-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+default-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "default" feature of "%{crate}" crate.
-
-%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+arbitrary-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+arbitrary-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "arbitrary" feature of "%{crate}" crate.
-
-%files -n %{name}+arbitrary-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+libm-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+libm-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "libm" feature of "%{crate}" crate.
-
-%files -n %{name}+libm-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+mint-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+mint-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "mint" feature of "%{crate}" crate.
-
-%files -n %{name}+mint-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+serde-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+serde-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "serde" feature of "%{crate}" crate.
-
-%files -n %{name}+serde-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+std-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+std-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "std" feature of "%{crate}" crate.
-
-%files -n %{name}+std-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package -n %{name}+unstable-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+unstable-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "unstable" feature of "%{crate}" crate.
-
-%files -n %{name}+unstable-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
-%cargo_prep
-
-%generate_buildrequires
-%cargo_generate_buildrequires
-
-%build
-%cargo_build
-
-%install
-%cargo_install
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%changelog
-* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-2
-- Second attempt - Rebuilt for
- https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jun 22 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.6-1
-- Update to version 0.22.6.
-- Fixes RHBZ#1966179
-
-* Sun May 30 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.5-1
-- Update to version 0.22.5.
-- Fixes RHBZ#1965637
-
-* Wed May 19 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.4-1
-- Update to version 0.22.4.
-- Fixes RHBZ#1961810
-
-* Wed Apr 21 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.3-1
-- Update to version 0.22.3.
-
-* Tue Mar 02 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.2-1
-- Update to version 0.22.1.
-- Fixes RHBZ#1932496
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Aug 21 2020 returntrip <stefano(a)figura.im> - 0.22.1-1
-- Update to 0.22.1
-
-* Sat Aug 01 2020 returntrip <stefano(a)figura.im> - 0.22.0-1
-- Update to 0.22.0
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.20.14-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Josh Stone <jistone(a)redhat.com> - 0.20.14-1
-- Update to 0.20.14
-
-* Tue Jun 09 15:52:00 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.13-1
-- Upgrade to 0.20.13
-
-* Sat May 23 17:19:51 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.12-1
-- Initial package
diff --git a/sources b/sources
deleted file mode 100644
index 95a8aa3..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (euclid-0.22.6.crate) = 401147afa8bc0a8b247b3a515ce6e2a63727d668d2b13cf43e9bfc81104e97b66131a1c0efb8b3330721adc81cca26cb2d87328c2b392f79b583aa3e9a176640
commit 710645d14d098b597367e8fa423a0499c86653ae
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 21 20:48:59 2022 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 94bb8c4..55c1f18 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.22.6
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Geometry primitives
# Upstream license specification: MIT / Apache-2.0
@@ -143,6 +143,9 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-2
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
commit 5d296839b2e56d8452976f8396d779c07e8fa9d8
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jul 27 08:55:38 2021 +0000
- Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 447d3ff..94bb8c4 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.22.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Geometry primitives
# Upstream license specification: MIT / Apache-2.0
@@ -143,6 +143,10 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.6-2
+- Second attempt - Rebuilt for
+ https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
* Tue Jun 22 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.6-1
- Update to version 0.22.6.
- Fixes RHBZ#1966179
commit e6c7b2a17c07e52362de86a9331b81264d4f5882
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Tue Jun 22 12:48:29 2021 +0200
update to version 0.22.6
diff --git a/.gitignore b/.gitignore
index b75ee10..ea1dfb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/euclid-0.22.3.crate
/euclid-0.22.4.crate
/euclid-0.22.5.crate
+/euclid-0.22.6.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 7389659..447d3ff 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -5,7 +5,7 @@
%global crate euclid
Name: rust-%{crate}
-Version: 0.22.5
+Version: 0.22.6
Release: 1%{?dist}
Summary: Geometry primitives
@@ -143,6 +143,10 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Tue Jun 22 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.6-1
+- Update to version 0.22.6.
+- Fixes RHBZ#1966179
+
* Sun May 30 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.5-1
- Update to version 0.22.5.
- Fixes RHBZ#1965637
diff --git a/sources b/sources
index 5137765..95a8aa3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.22.5.crate) = f36bef15a5a10b4b7656369896b348fbd77d229b2ad635a679d4df1e90eef73f879010251459fcfb49ec45730f37632f752c2884c88ea82fe7f20c788396193a
+SHA512 (euclid-0.22.6.crate) = 401147afa8bc0a8b247b3a515ce6e2a63727d668d2b13cf43e9bfc81104e97b66131a1c0efb8b3330721adc81cca26cb2d87328c2b392f79b583aa3e9a176640
commit dd7bcbbcc49ee58ad95ef406d194ae1526ad3b47
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Sun May 30 11:24:29 2021 +0200
update to version 0.22.5
diff --git a/.gitignore b/.gitignore
index 77c296f..b75ee10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/euclid-0.22.2.crate
/euclid-0.22.3.crate
/euclid-0.22.4.crate
+/euclid-0.22.5.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 9c8fc3f..7389659 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -5,7 +5,7 @@
%global crate euclid
Name: rust-%{crate}
-Version: 0.22.4
+Version: 0.22.5
Release: 1%{?dist}
Summary: Geometry primitives
@@ -143,6 +143,10 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Sun May 30 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.5-1
+- Update to version 0.22.5.
+- Fixes RHBZ#1965637
+
* Wed May 19 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.4-1
- Update to version 0.22.4.
- Fixes RHBZ#1961810
diff --git a/sources b/sources
index 9e4afc9..5137765 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.22.4.crate) = 01de9fd4494c7b5e8234fd26344236e87da4898d8a60178986d4d533c8c4795bb69f9c6b5abbf4236b3e0d8b87cd5e2cb6a8704a774eda60d11c98a11c7ce40b
+SHA512 (euclid-0.22.5.crate) = f36bef15a5a10b4b7656369896b348fbd77d229b2ad635a679d4df1e90eef73f879010251459fcfb49ec45730f37632f752c2884c88ea82fe7f20c788396193a
commit 66e3e0de4e513a7c8f390200359c74ce62181189
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Wed May 19 13:49:23 2021 +0200
update to version 0.22.4
diff --git a/.gitignore b/.gitignore
index 117c3c4..77c296f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/euclid-0.22.1.crate
/euclid-0.22.2.crate
/euclid-0.22.3.crate
+/euclid-0.22.4.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 07a7b96..9c8fc3f 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -5,7 +5,7 @@
%global crate euclid
Name: rust-%{crate}
-Version: 0.22.3
+Version: 0.22.4
Release: 1%{?dist}
Summary: Geometry primitives
@@ -143,6 +143,10 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Wed May 19 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.4-1
+- Update to version 0.22.4.
+- Fixes RHBZ#1961810
+
* Wed Apr 21 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.3-1
- Update to version 0.22.3.
diff --git a/sources b/sources
index d3af0fa..9e4afc9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.22.3.crate) = cb8a02854ae22c38e367c9a85f89ba7bca682f76c6fd366195ade836751a27894610198e1b90eb6cfde16a9c2003ef0a17a6ef1d9a26f143080de61bd81b63d9
+SHA512 (euclid-0.22.4.crate) = 01de9fd4494c7b5e8234fd26344236e87da4898d8a60178986d4d533c8c4795bb69f9c6b5abbf4236b3e0d8b87cd5e2cb6a8704a774eda60d11c98a11c7ce40b
commit c2e141432373aef198b54aaff22b8a733cd96749
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Wed Apr 21 23:58:30 2021 +0200
update to version 0.22.3
diff --git a/.gitignore b/.gitignore
index 40f074f..117c3c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/euclid-0.22.0.crate
/euclid-0.22.1.crate
/euclid-0.22.2.crate
+/euclid-0.22.3.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 73b4ade..07a7b96 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 16
+# Generated by rust2rpm 17
%bcond_without check
%global debug_package %{nil}
%global crate euclid
Name: rust-%{crate}
-Version: 0.22.2
+Version: 0.22.3
Release: 1%{?dist}
Summary: Geometry primitives
@@ -36,8 +36,8 @@ This package contains library source intended for building other packages
which use "%{crate}" crate.
%files devel
-%doc README.md
%license LICENSE-APACHE LICENSE-MIT COPYRIGHT
+%doc README.md
%{cargo_registry}/%{crate}-%{version_no_tilde}/
%package -n %{name}+default-devel
@@ -52,6 +52,18 @@ which use "default" feature of "%{crate}" crate.
%files -n %{name}+default-devel
%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%package -n %{name}+arbitrary-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+arbitrary-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "arbitrary" feature of "%{crate}" crate.
+
+%files -n %{name}+arbitrary-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
%package -n %{name}+libm-devel
Summary: %{summary}
BuildArch: noarch
@@ -131,6 +143,9 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Wed Apr 21 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.3-1
+- Update to version 0.22.3.
+
* Tue Mar 02 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.2-1
- Update to version 0.22.1.
- Fixes RHBZ#1932496
diff --git a/sources b/sources
index 2dbe82b..d3af0fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.22.2.crate) = c1da244883c770e987102e42e15b9126f920aa39ebc08549680b61205268e948ef0055cfefbda34ea9a6ce659d5c76489b960801e89615ede11dad4955d0445e
+SHA512 (euclid-0.22.3.crate) = cb8a02854ae22c38e367c9a85f89ba7bca682f76c6fd366195ade836751a27894610198e1b90eb6cfde16a9c2003ef0a17a6ef1d9a26f143080de61bd81b63d9
commit 8ed0baaadd438e10be6798daaf6f26e7af2d8d1c
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Tue Mar 2 01:21:10 2021 +0100
update to version 0.22.2
diff --git a/.gitignore b/.gitignore
index db872dd..40f074f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/euclid-0.20.14.crate
/euclid-0.22.0.crate
/euclid-0.22.1.crate
+/euclid-0.22.2.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 049f1f1..73b4ade 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -1,12 +1,12 @@
-# Generated by rust2rpm 13
+# Generated by rust2rpm 16
%bcond_without check
%global debug_package %{nil}
%global crate euclid
Name: rust-%{crate}
-Version: 0.22.1
-Release: 2%{?dist}
+Version: 0.22.2
+Release: 1%{?dist}
Summary: Geometry primitives
# Upstream license specification: MIT / Apache-2.0
@@ -131,6 +131,10 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Tue Mar 02 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.22.2-1
+- Update to version 0.22.1.
+- Fixes RHBZ#1932496
+
* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index e5cb2f1..2dbe82b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.22.1.crate) = 8392b023b3b97e89bc46d50eff0697794a905c8624184fc6240b721d223e7bc1dd6600156bf0733f7409a4da77f0c29973b11b9689e3663b28cd88954b39afe3
+SHA512 (euclid-0.22.2.crate) = c1da244883c770e987102e42e15b9126f920aa39ebc08549680b61205268e948ef0055cfefbda34ea9a6ce659d5c76489b960801e89615ede11dad4955d0445e
commit bc010a633f5a4f373e535057c586b1ef82dc2d91
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jan 27 17:31:10 2021 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 517ad88..049f1f1 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.22.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Geometry primitives
# Upstream license specification: MIT / Apache-2.0
@@ -131,6 +131,9 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Fri Aug 21 2020 returntrip <stefano(a)figura.im> - 0.22.1-1
- Update to 0.22.1
commit 508b6dad7a56a8a4f0c1de725137af2675bb7d85
Author: returntrip <stefano(a)figura.im>
Date: Fri Aug 21 21:25:18 2020 +0200
Update to 0.22.1
diff --git a/.gitignore b/.gitignore
index bf3d509..db872dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/euclid-0.20.13.crate
/euclid-0.20.14.crate
/euclid-0.22.0.crate
+/euclid-0.22.1.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index bb02b1b..517ad88 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -5,7 +5,7 @@
%global crate euclid
Name: rust-%{crate}
-Version: 0.22.0
+Version: 0.22.1
Release: 1%{?dist}
Summary: Geometry primitives
@@ -131,6 +131,9 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Fri Aug 21 2020 returntrip <stefano(a)figura.im> - 0.22.1-1
+- Update to 0.22.1
+
* Sat Aug 01 2020 returntrip <stefano(a)figura.im> - 0.22.0-1
- Update to 0.22.0
diff --git a/sources b/sources
index fe49703..e5cb2f1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.22.0.crate) = bf90e0a0e896ab14d302f681ba3be417d6abf18869a61d3f8cf02ee03b46ea7e23c28d17d54aff5faf837a7fefd784b668028c3c51e2fae889dd30d8ecfa2ae6
+SHA512 (euclid-0.22.1.crate) = 8392b023b3b97e89bc46d50eff0697794a905c8624184fc6240b721d223e7bc1dd6600156bf0733f7409a4da77f0c29973b11b9689e3663b28cd88954b39afe3
commit c966a92d9a2fd84f9d75353700b24572bb42b033
Author: returntrip <stefano(a)figura.im>
Date: Sat Aug 1 18:12:43 2020 +0200
Update to 0.22.0
diff --git a/.gitignore b/.gitignore
index 0c335c4..bf3d509 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/euclid-0.20.13.crate
/euclid-0.20.14.crate
+/euclid-0.22.0.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 5fe0b0b..bb02b1b 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -5,8 +5,8 @@
%global crate euclid
Name: rust-%{crate}
-Version: 0.20.14
-Release: 2%{?dist}
+Version: 0.22.0
+Release: 1%{?dist}
Summary: Geometry primitives
# Upstream license specification: MIT / Apache-2.0
@@ -131,6 +131,9 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Sat Aug 01 2020 returntrip <stefano(a)figura.im> - 0.22.0-1
+- Update to 0.22.0
+
* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.20.14-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index 641c10b..fe49703 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.20.14.crate) = ee6dea3a8bcf1f69212f528cf4196a038ae553c885710df49d6fed61bde946eac6bda880bef496ec3ec46ce1a1ca38e03849e4375965a99c6004f7c772f82262
+SHA512 (euclid-0.22.0.crate) = bf90e0a0e896ab14d302f681ba3be417d6abf18869a61d3f8cf02ee03b46ea7e23c28d17d54aff5faf837a7fefd784b668028c3c51e2fae889dd30d8ecfa2ae6
commit 03c3e654e213a4245522e2b97c6f6b85afa55cf1
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 29 08:01:21 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-euclid.spec b/rust-euclid.spec
index fe92c26..5fe0b0b 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.20.14
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Geometry primitives
# Upstream license specification: MIT / Apache-2.0
@@ -131,6 +131,9 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.20.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Fri Jul 10 2020 Josh Stone <jistone(a)redhat.com> - 0.20.14-1
- Update to 0.20.14
commit eeef9905956ca56d85c1a89e22f423f7279f54f7
Author: Josh Stone <jistone(a)redhat.com>
Date: Fri Jul 10 10:39:00 2020 -0700
Update to 0.20.14
diff --git a/.gitignore b/.gitignore
index 07f9c11..0c335c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/euclid-0.20.13.crate
+/euclid-0.20.14.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
index 5902099..fe92c26 100644
--- a/rust-euclid.spec
+++ b/rust-euclid.spec
@@ -5,7 +5,7 @@
%global crate euclid
Name: rust-%{crate}
-Version: 0.20.13
+Version: 0.20.14
Release: 1%{?dist}
Summary: Geometry primitives
@@ -131,6 +131,9 @@ which use "unstable" feature of "%{crate}" crate.
%endif
%changelog
+* Fri Jul 10 2020 Josh Stone <jistone(a)redhat.com> - 0.20.14-1
+- Update to 0.20.14
+
* Tue Jun 09 15:52:00 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.13-1
- Upgrade to 0.20.13
diff --git a/sources b/sources
index 7bc7ded..641c10b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (euclid-0.20.13.crate) = d7d63d1a899f05968ae7444ea3d852815272bfac93010a04001ff66455f3558b42ef9772660cc214f1078cc799dd1c3c9a8ed4b7da10548f86212d8077d6c50d
+SHA512 (euclid-0.20.14.crate) = ee6dea3a8bcf1f69212f528cf4196a038ae553c885710df49d6fed61bde946eac6bda880bef496ec3ec46ce1a1ca38e03849e4375965a99c6004f7c772f82262
commit af584059b4b38c5bbd8b11d4c941dcd57e9abf03
Author: returntrip <stefano(a)figura.im>
Date: Sat Jun 13 15:38:59 2020 +0200
Initial import (#1840179)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..07f9c11
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/euclid-0.20.13.crate
diff --git a/rust-euclid.spec b/rust-euclid.spec
new file mode 100644
index 0000000..5902099
--- /dev/null
+++ b/rust-euclid.spec
@@ -0,0 +1,138 @@
+# Generated by rust2rpm 13
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate euclid
+
+Name: rust-%{crate}
+Version: 0.20.13
+Release: 1%{?dist}
+Summary: Geometry primitives
+
+# Upstream license specification: MIT / Apache-2.0
+License: MIT or ASL 2.0
+URL: https://crates.io/crates/euclid
+Source: %{crates_source}
+
+ExclusiveArch: %{rust_arches}
+%if %{__cargo_skip_build}
+BuildArch: noarch
+%endif
+
+BuildRequires: rust-packaging
+
+%global _description %{expand:
+Geometry primitives.}
+
+%description %{_description}
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel %{_description}
+
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
+
+%files devel
+%doc README.md
+%license LICENSE-APACHE LICENSE-MIT COPYRIGHT
+%{cargo_registry}/%{crate}-%{version_no_tilde}/
+
+%package -n %{name}+default-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "default" feature of "%{crate}" crate.
+
+%files -n %{name}+default-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+libm-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+libm-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "libm" feature of "%{crate}" crate.
+
+%files -n %{name}+libm-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+mint-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+mint-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "mint" feature of "%{crate}" crate.
+
+%files -n %{name}+mint-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+serde-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+serde-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "serde" feature of "%{crate}" crate.
+
+%files -n %{name}+serde-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+std-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+std-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "std" feature of "%{crate}" crate.
+
+%files -n %{name}+std-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package -n %{name}+unstable-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+unstable-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "unstable" feature of "%{crate}" crate.
+
+%files -n %{name}+unstable-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%prep
+%autosetup -n %{crate}-%{version_no_tilde} -p1
+%cargo_prep
+
+%generate_buildrequires
+%cargo_generate_buildrequires
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%changelog
+* Tue Jun 09 15:52:00 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.13-1
+- Upgrade to 0.20.13
+
+* Sat May 23 17:19:51 CEST 2020 returntrip <stefano(a)figura.im> - 0.20.12-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..7bc7ded
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (euclid-0.20.13.crate) = d7d63d1a899f05968ae7444ea3d852815272bfac93010a04001ff66455f3558b42ef9772660cc214f1078cc799dd1c3c9a8ed4b7da10548f86212d8077d6c50d
1
0
Architecture specific change in rpms/fapolicy-analyzer.git
by githook-noreply＠fedoraproject.org 27 Nov '23
by githook-noreply＠fedoraproject.org 27 Nov '23
27 Nov '23
The package rpms/fapolicy-analyzer.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/fapolicy-analyzer.git/commit/?id=00….
Change:
-ExcludeArch: s390x %{power64} %{ix86}
Thanks.
Full change:
============
commit 00a1232f065dd6eca7c55391ef386e7920302f36
Author: John Wass <jwass3(a)gmail.com>
Date: Tue Nov 14 03:38:32 2023 +0000
Update to v1.2.1
diff --git a/.gitignore b/.gitignore
index ab91dcd..77468a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
-/fapolicy-analyzer-1.1.0.tar.gz
-/vendor-docs-1.1.0.tar.gz
-/fapolicy-analyzer-1.2.0.tar.gz
-/vendor-docs-1.2.0.tar.gz
+/fapolicy-analyzer-1.2.1.tar.gz
+/vendor-docs-1.2.1.tar.gz
diff --git a/fapolicy-analyzer.spec b/fapolicy-analyzer.spec
index 87a360b..3cfb89b 100644
--- a/fapolicy-analyzer.spec
+++ b/fapolicy-analyzer.spec
@@ -2,7 +2,7 @@
Summary: File Access Policy Analyzer
Name: fapolicy-analyzer
-Version: 1.2.0
+Version: 1.2.1
Release: 1%{?dist}
SourceLicense: GPL-3.0-or-later
@@ -58,11 +58,6 @@ Requires: gnome-icon-theme
Requires: webkit2gtk3
Requires: mesa-dri-drivers
-# https://github.com/ctc-oss/fapolicy-analyzer/issues/947
-# rust-ring-devel does not support s390x and ppc64le:
-# https://bugzilla.redhat.com/show_bug.cgi?id=1869980
-ExcludeArch: s390x %{power64} %{ix86}
-
%global module fapolicy_analyzer
# pep440 versions handle dev and rc differently, so we call them out explicitly here
%global module_version %{lua: v = string.gsub(rpm.expand("%{?version}"), "~dev", ".dev"); \
@@ -133,6 +128,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
%ghost %attr(640,root,root) %verify(not md5 size mtime) %{_localstatedir}/log/%{name}/%{name}.log
%changelog
+* Fri Nov 17 2023 John Wass <jwass3(a)gmail.com> 1.2.1-1
+- Update to 1.2.1
+
* Mon Nov 06 2023 John Wass <jwass3(a)gmail.com> 1.2.0-1
- Release 1.2.0
diff --git a/sources b/sources
index 41b8b55..4dc22d2 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,2 @@
-SHA512 (fapolicy-analyzer-1.1.0.tar.gz) = 290276545e5288c820a0fa9d3041f993c7e759f55d1963da73d6af95b22932f8f102600217a63586f5b321753f7795cb63e892ba4c9e28b201d35f3841278a98
-SHA512 (fapolicy-analyzer-1.2.0.tar.gz) = 133055934c37c8163babe06a8ce8eb49b85613958505c3dddec78a1cc55cbe43f3b0acb37e80979a3f9be795d13d0843268c900c1a7012ac5cf832699a8e7810
-SHA512 (vendor-docs-1.1.0.tar.gz) = 5337bcc8bff99c168cf6736fb7763d45d9e30ea62b48d58758cac9e6e0cd1ef0ee937ccf18736d59999337cf0e50278ed564093e911957b10b960b09b366333f
-SHA512 (vendor-docs-1.2.0.tar.gz) = b8fc052b0deb2711e6880ad8382afca4aae4b408a31b2063c2a1d1deb10b8948dbc9fdc3f2a9f664a5ff1cfaeb2540d5645987cffd5472ca67c1ee112dd62971
+SHA512 (fapolicy-analyzer-1.2.1.tar.gz) = 6efb713faf7f41b1467c96e366d8f519e685ac929fb5d3d4863654011dc994e552294baec5002b4457c6748f130661e4f88c305a0fde6904edb428832dad9688
+SHA512 (vendor-docs-1.2.1.tar.gz) = f27b37dfd32e5a58113caeb37e2fbb9c269fcd3ba63cf4ee9b341dce03d0b770ebeefd5fc028633a370d6d80da1e4f0306bc482f678e153021f659cf2f55170e
1
0
Architecture specific change in rpms/java-17-openjdk.git
by githook-noreply＠fedoraproject.org 27 Nov '23
by githook-noreply＠fedoraproject.org 27 Nov '23
27 Nov '23
The package rpms/java-17-openjdk.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-17-openjdk.git/commit/?id=b82a….
Change:
+%ifarch %{jit_arches}
Thanks.
Full change:
============
commit 9ad2fbb190ae1b83eaf81eaccbfc80fcc3da830a
Merge: 15b4cc6 2bd0a29
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Mon Nov 27 11:58:48 2023 +0100
Merge branch 'f38' into f37
commit 2bd0a29943f3d04c88a7b2f6762bc417bea091d4
Merge: 9fb789b b82a5a9
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Mon Nov 27 11:58:17 2023 +0100
Merge branch 'f39' into f38
commit b82a5a9bf238f95ad82ef22fd28b51949c173116
Author: Jiri <jvanek(a)redhat.com>
Date: Sun Nov 26 21:52:48 2023 +0100
updated to OpenJDK 17.0.9 (2023-10-17)
diff --git a/.gitignore b/.gitignore
index 4663d5a..29ee5dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,37 +1,2 @@
-/jdk-jdk12-jdk-12+33.tar.xz
/systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
-/jdk-updates-jdk12u-jdk-12.0.1+12.tar.xz
-/jdk-jdk13-jdk-13+27.tar.xz
-/jdk-jdk13-jdk-13+28.tar.xz
-/jdk-jdk13-jdk-13+33.tar.xz
-/jdk-updates-jdk13u-jdk-13.0.1+9.tar.xz
-/jdk-updates-jdk13u-jdk-13.0.2+8.tar.xz
-/jdk-jdk14-jdk-14+36.tar.xz
-/jdk-updates-jdk14u-jdk-14.0.1+7.tar.xz
-/jdk-updates-jdk14u-jdk-14.0.2+12.tar.xz
-/jdk-jdk15-jdk-15+36.tar.xz
-/jdk-updates-jdk15u-jdk-15.0.1+9.tar.xz
-/tapsets-icedtea-3.15.0.tar.xz
-/jdk-updates-jdk15u-jdk-15.0.2+7.tar.xz
-/openjdk-jdk16-jdk-16+36.tar.xz
-/openjdk-jdk16u-jdk-16.0.1+9.tar.xz
-/openjdk-jdk17-jdk-17+26.tar.xz
-/openjdk-jdk17-jdk-17+33.tar.xz
-/openjdk-jdk17-jdk-17+35.tar.xz
-/openjdk-jdk17u-jdk-17.0.1+12.tar.xz
/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
-/openjdk-jdk17u-jdk-17.0.2+8.tar.xz
-/openjdk-jdk17u-jdk-17.0.3+1.tar.xz
-/openjdk-jdk17u-jdk-17.0.3+5.tar.xz
-/openjdk-jdk17u-17usec.17.0.3+5-220408.tar.xz
-/openjdk-jdk17u-jdk-17.0.3+7.tar.xz
-/openjdk-jdk17u-jdk-17.0.4+1.tar.xz
-/openjdk-jdk17u-jdk-17.0.4+7.tar.xz
-/openjdk-jdk17u-jdk-17.0.4+8.tar.xz
-/openjdk-jdk17u-jdk-17.0.4.1+1.tar.xz
-/openjdk-jdk17u-jdk-17.0.5+1.tar.xz
-/openjdk-jdk17u-jdk-17.0.5+7.tar.xz
-/openjdk-jdk17u-jdk-17.0.5+8.tar.xz
-/openjdk-jdk17u-jdk-17.0.6+1.tar.xz
-/openjdk-jdk17u-jdk-17.0.6+9.tar.xz
-/openjdk-jdk17u-jdk-17.0.6+10.tar.xz
diff --git a/README.md b/README.md
index 3bfd7d2..1504e68 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ OpenJDK 17 is the latest Long-Term Support (LTS) release of the Java platform.
* https://fedoraproject.org/wiki/Changes/Java17
-For a list of major changes from OpenJDK 11 (java-11-openjdk), see the upstream
+For a list of major changes from OpenJDK 17 (java-17-openjdk), see the upstream
release page for OpenJDK 17 and the preceding interim releases:
* 12: https://openjdk.java.net/projects/jdk/12/
diff --git a/TestTranslations.java b/TestTranslations.java
index d87647a..f6a4fe2 100644
--- a/TestTranslations.java
+++ b/TestTranslations.java
@@ -52,7 +52,7 @@ public class TestTranslations {
map.put(Locale.FRANCE, new String[] { "heure normale des Rocheuses", "UTC\u221207:00", "MST",
"heure d\u2019\u00e9t\u00e9 des Rocheuses", "UTC\u221206:00", "MDT",
"heure des Rocheuses", "UTC\u221207:00", "MT"});
- map.put(Locale.GERMANY, new String[] { "Rocky Mountain-Normalzeit", "GMT-07:00", "MST",
+ map.put(Locale.GERMANY, new String[] { "Rocky-Mountain-Normalzeit", "GMT-07:00", "MST",
"Rocky-Mountain-Sommerzeit", "GMT-06:00", "MDT",
"Rocky-Mountain-Zeit", "GMT-07:00", "MT"});
CIUDAD_JUAREZ = Collections.unmodifiableMap(map);
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
new file mode 100755
index 0000000..c53abdc
--- /dev/null
+++ b/generate_source_tarball.sh
@@ -0,0 +1 @@
+## This file is intentionally left blank
diff --git a/icedtea_sync.sh b/icedtea_sync.sh
index e5c54f3..c53abdc 100755
--- a/icedtea_sync.sh
+++ b/icedtea_sync.sh
@@ -1,192 +1 @@
-#!/bin/bash
-
-# Copyright (C) 2019 Red Hat, Inc.
-# Written by Andrew John Hughes <gnu.andrew(a)redhat.com>.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-ICEDTEA_USE_VCS=true
-
-ICEDTEA_VERSION=3.15.0
-ICEDTEA_URL=https://icedtea.classpath.org/download/source
-ICEDTEA_SIGNING_KEY=CFDA0F9B35964222
-
-ICEDTEA_HG_URL=https://icedtea.classpath.org/hg/icedtea11
-
-set -e
-
-RPM_DIR=${PWD}
-if [ ! -f ${RPM_DIR}/jconsole.desktop.in ] ; then
- echo "Not in RPM source tree.";
- exit 1;
-fi
-
-if test "x${TMPDIR}" = "x"; then
- TMPDIR=/tmp;
-fi
-WORKDIR=${TMPDIR}/it.sync
-
-echo "Using working directory ${WORKDIR}"
-mkdir ${WORKDIR}
-pushd ${WORKDIR}
-
-if test "x${WGET}" = "x"; then
- WGET=$(which wget);
- if test "x${WGET}" = "x"; then
- echo "wget not found";
- exit 1;
- fi
-fi
-
-if test "x${TAR}" = "x"; then
- TAR=$(which tar)
- if test "x${TAR}" = "x"; then
- echo "tar not found";
- exit 2;
- fi
-fi
-
-echo "Dependencies:";
-echo -e "\tWGET: ${WGET}";
-echo -e "\tTAR: ${TAR}\n";
-
-if test "x${ICEDTEA_USE_VCS}" = "xtrue"; then
- echo "Mode: Using VCS";
-
- if test "x${GREP}" = "x"; then
- GREP=$(which grep);
- if test "x${GREP}" = "x"; then
- echo "grep not found";
- exit 3;
- fi
- fi
-
- if test "x${CUT}" = "x"; then
- CUT=$(which cut);
- if test "x${CUT}" = "x"; then
- echo "cut not found";
- exit 4;
- fi
- fi
-
- if test "x${TR}" = "x"; then
- TR=$(which tr);
- if test "x${TR}" = "x"; then
- echo "tr not found";
- exit 5;
- fi
- fi
-
- if test "x${HG}" = "x"; then
- HG=$(which hg);
- if test "x${HG}" = "x"; then
- echo "hg not found";
- exit 6;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tGREP: ${GREP}";
- echo -e "\tCUT: ${CUT}";
- echo -e "\tTR: ${TR}";
- echo -e "\tHG: ${HG}";
-
- echo "Checking out repository from VCS...";
- ${HG} clone ${ICEDTEA_HG_URL} icedtea
-
- echo "Obtaining version from configure.ac...";
- ROOT_VER=$(${GREP} '^AC_INIT' icedtea/configure.ac|${CUT} -d ',' -f 2|${TR} -d '[][:space:]')
- echo "Root version from configure: ${ROOT_VER}";
-
- VCS_REV=$(${HG} log -R icedtea --template '{node|short}' -r tip)
- echo "VCS revision: ${VCS_REV}";
-
- ICEDTEA_VERSION="${ROOT_VER}-${VCS_REV}"
- echo "Creating icedtea-${ICEDTEA_VERSION}";
- mkdir icedtea-${ICEDTEA_VERSION}
- echo "Copying required files from checkout to icedtea-${ICEDTEA_VERSION}";
- # Commented out for now as IcedTea 6's jconsole.desktop.in is outdated
- #cp -a icedtea/jconsole.desktop.in ../icedtea-${ICEDTEA_VERSION}
- cp -a ${RPM_DIR}/jconsole.desktop.in icedtea-${ICEDTEA_VERSION}
- cp -a icedtea/tapset icedtea-${ICEDTEA_VERSION}
-
- rm -rf icedtea
-else
- echo "Mode: Using tarball";
-
- if test "x${ICEDTEA_VERSION}" = "x"; then
- echo "No IcedTea version specified for tarball download.";
- exit 3;
- fi
-
- if test "x${CHECKSUM}" = "x"; then
- CHECKSUM=$(which sha256sum)
- if test "x${CHECKSUM}" = "x"; then
- echo "sha256sum not found";
- exit 4;
- fi
- fi
-
- if test "x${PGP}" = "x"; then
- PGP=$(which gpg)
- if test "x${PGP}" = "x"; then
- echo "gpg not found";
- exit 5;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tCHECKSUM: ${CHECKSUM}";
- echo -e "\tPGP: ${PGP}\n";
-
- echo "Checking for IcedTea signing key ${ICEDTEA_SIGNING_KEY}...";
- if ! gpg --list-keys ${ICEDTEA_SIGNING_KEY}; then
- echo "IcedTea signing key ${ICEDTEA_SIGNING_KEY} not installed.";
- exit 6;
- fi
-
- echo "Downloading IcedTea release tarball...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz
- echo "Downloading IcedTea tarball signature...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- echo "Downloading IcedTea tarball checksums...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Verifying checksums...";
- ${CHECKSUM} --check --ignore-missing icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Checking signature...";
- ${PGP} --verify icedtea-${ICEDTEA_VERSION}.tar.xz.sig
-
- echo "Extracting files...";
- ${TAR} xJf icedtea-${ICEDTEA_VERSION}.tar.xz \
- icedtea-${ICEDTEA_VERSION}/tapset \
- icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in
-
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- rm -vf icedtea-${ICEDTEA_VERSION}.sha256
-fi
-
-echo "Replacing desktop files...";
-mv -v icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in ${RPM_DIR}
-
-echo "Creating new tapset tarball...";
-mv -v icedtea-${ICEDTEA_VERSION} openjdk
-${TAR} cJf ${RPM_DIR}/tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz openjdk
-
-rm -rvf openjdk
-
-popd
-rm -rf ${WORKDIR}
+## This file is intentionally left blank
diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec
index 61cc9fc..4a70a27 100644
--- a/java-17-openjdk.spec
+++ b/java-17-openjdk.spec
@@ -113,7 +113,9 @@
%global aot_arches x86_64 %{aarch64}
# Set of architectures which support the serviceability agent
%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm}
-%global share_arches %{ix86} %{power64} x86_64 sparcv9 sparc64 %{aarch64} %{arm} s390x
+# As of JDK-8005165 in OpenJDK 10, class sharing is not arch-specific
+# However, it does segfault on the Zero assembler port, so currently JIT only
+%global share_arches %{jit_arches}
# Set of architectures for which we build the Shenandoah garbage collector
%global shenandoah_arches x86_64 %{aarch64}
# Set of architectures for which we build the Z garbage collector
@@ -123,7 +125,12 @@
# Set of architectures for which java has short vector math library (libsvml.so)
%global svml_arches x86_64
# Set of architectures where we verify backtraces with gdb
+# s390x fails on RHEL 7 so we exclude it there
+%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
+%global gdb_arches %{arm} %{aarch64} %{ix86} %{power64} sparcv9 sparc64 x86_64 %{zero_arches}
+%else
%global gdb_arches %{jit_arches} %{zero_arches}
+%endif
# By default, we build a debug build during main build on JIT architectures
%if %{with slowdebug}
@@ -271,16 +278,17 @@
# New Version-String scheme-style defines
%global featurever 17
%global interimver 0
-%global updatever 8
+%global updatever 9
%global patchver 0
+
# We don't add any LTS designator for STS packages (Fedora and EPEL).
# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
%if 0%{?rhel} && !0%{?epel}
%global lts_designator "LTS"
%global lts_designator_zip -%{lts_designator}
%else
- %global lts_designator ""
- %global lts_designator_zip ""
+ %global lts_designator ""
+ %global lts_designator_zip ""
%endif
# Define vendor information used by OpenJDK
@@ -296,7 +304,7 @@
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{name}&…
%else
%if 0%{?rhel}
-%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20…
+%global oj_vendor_bug_url https://access.redhat.com/support/cases/
%else
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi
%endif
@@ -306,14 +314,21 @@
# Define IcedTea version used for SystemTap tapsets and desktop file
%global icedteaver 6.0.0pre00-c848b93a8598
+# Define JDK versions
+%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
+%global javaver %{featurever}
+# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
+%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
+# The tag used to create the OpenJDK tarball
+%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Standard JPackage naming and versioning defines
%global origin openjdk
%global origin_nice OpenJDK
%global top_level_dir_name %{origin}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
-%global buildver 7
-%global rpmrelease 2
+%global buildver 9
+%global rpmrelease 1
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -326,14 +341,6 @@
# for techpreview, using 1, so slowdebugs can have 0
%global priority %( printf '%08d' 1 )
%endif
-%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
-%global javaver %{featurever}
-
-# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
-%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
-
-# The tag used to create the OpenJDK tarball
-%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Define milestone (EA for pre-releases, GA for releases)
# Release will be (where N is usually a number starting at 1):
@@ -343,7 +350,7 @@
%if %{is_ga}
%global build_type GA
%global ea_designator ""
-%global ea_designator_zip ""
+%global ea_designator_zip %{nil}
%global extraver %{nil}
%global eaprefix %{nil}
%else
@@ -509,12 +516,15 @@ alternatives \\
--install %{_bindir}/java $key %{jrebindir -- %{?1}}/java $PRIORITY --family %{family} \\
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{sdkdir -- %{?1}} \\
--slave %{_bindir}/%{alt_java_name} %{alt_java_name} %{jrebindir -- %{?1}}/%{alt_java_name} \\
+ --slave %{_bindir}/jcmd jcmd %{sdkbindir -- %{?1}}/jcmd \\
--slave %{_bindir}/keytool keytool %{jrebindir -- %{?1}}/keytool \\
--slave %{_bindir}/rmiregistry rmiregistry %{jrebindir -- %{?1}}/rmiregistry \\
--slave %{_mandir}/man1/java.1$ext java.1$ext \\
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/%{alt_java_name}.1$ext %{alt_java_name}.1$ext \\
%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1$ext \\
+ --slave %{_mandir}/man1/jcmd.1$ext jcmd.1$ext \\
+ %{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \\
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/rmiregistry.1$ext rmiregistry.1$ext \\
@@ -599,7 +609,6 @@ alternatives \\
--slave %{_bindir}/jarsigner jarsigner %{sdkbindir -- %{?1}}/jarsigner \\
--slave %{_bindir}/javadoc javadoc %{sdkbindir -- %{?1}}/javadoc \\
--slave %{_bindir}/javap javap %{sdkbindir -- %{?1}}/javap \\
- --slave %{_bindir}/jcmd jcmd %{sdkbindir -- %{?1}}/jcmd \\
--slave %{_bindir}/jconsole jconsole %{sdkbindir -- %{?1}}/jconsole \\
--slave %{_bindir}/jdb jdb %{sdkbindir -- %{?1}}/jdb \\
--slave %{_bindir}/jdeps jdeps %{sdkbindir -- %{?1}}/jdeps \\
@@ -626,8 +635,6 @@ alternatives \\
%{_mandir}/man1/javadoc-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/javap.1$ext javap.1$ext \\
%{_mandir}/man1/javap-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/jcmd.1$ext jcmd.1$ext \\
- %{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/jconsole.1$ext jconsole.1$ext \\
%{_mandir}/man1/jconsole-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/jdb.1$ext jdb.1$ext \\
@@ -790,10 +797,11 @@ exit 0
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/bin
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/java
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/%{alt_java_name}
+%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jcmd
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/keytool
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmiregistry
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib
-%ifarch %{share_arches}
+%ifarch %{jit_arches}
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/classlist
%endif
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jexec
@@ -851,7 +859,8 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/default.jfc
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/profile.jfc
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1*
-#%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1* #TODO, resolve alt-java man page
+%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1*
+%{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{?1}}.1*
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/%{vm_variant}/
@@ -900,8 +909,9 @@ exit 0
%if %is_system_jdk
%if %{is_release_build -- %{?1}}
%ghost %{_bindir}/java
-%ghost %{_bindir}/%{alt_java_name}
%ghost %{_jvmdir}/jre
+%ghost %{_bindir}/%{alt_java_name}
+%ghost %{_bindir}/jcmd
%ghost %{_bindir}/keytool
%ghost %{_bindir}/pack200
%ghost %{_bindir}/rmid
@@ -926,7 +936,6 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javadoc
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javap
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jconsole
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jcmd
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdb
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeps
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeprscan
@@ -999,7 +1008,6 @@ exit 0
%ghost %{_bindir}/jarsigner
%ghost %{_bindir}/javadoc
%ghost %{_bindir}/javap
-%ghost %{_bindir}/jcmd
%ghost %{_bindir}/jconsole
%ghost %{_bindir}/jdb
%ghost %{_bindir}/jdeps
@@ -1028,7 +1036,6 @@ exit 0
%define files_demo() %{expand:
%license %{_jvmdir}/%{sdkdir -- %{?1}}/legal
%{_jvmdir}/%{sdkdir -- %{?1}}/demo
-%{_jvmdir}/%{sdkdir -- %{?1}}/sample
}
%define files_src() %{expand:
@@ -1231,7 +1238,7 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
%global portable_name %{name}-portable
# the version must match, but sometmes we need to more precise, so including release
-%global portable_version %{version}-3
+%global portable_version %{version}-1
Name: java-%{javaver}-%{origin}
Version: %{newjavaver}.%{buildver}
@@ -1294,23 +1301,22 @@ Source16: CheckVendor.java
Source18: TestTranslations.java
BuildRequires: %{portable_name}-sources >= %{portable_version}
+BuildRequires: %{portable_name}-misc >= %{portable_version}
+BuildRequires: %{portable_name}-docs >= %{portable_version}
%if %{include_normal_build}
-BuildRequires: %{portable_name} >= %{portable_version}
-BuildRequires: %{portable_name}-devel >= %{portable_version}
+BuildRequires: %{portable_name}-unstripped >= %{portable_version}
%if %{include_staticlibs}
BuildRequires: %{portable_name}-static-libs >= %{portable_version}
%endif
%endif
%if %{include_fastdebug_build}
-BuildRequires: %{portable_name}-fastdebug >= %{portable_version}
BuildRequires: %{portable_name}-devel-fastdebug >= %{portable_version}
%if %{include_staticlibs}
BuildRequires: %{portable_name}-static-libs-fastdebug >= %{portable_version}
%endif
%endif
%if %{include_debug_build}
-BuildRequires: %{portable_name}-slowdebug >= %{portable_version}
BuildRequires: %{portable_name}-devel-slowdebug >= %{portable_version}
%if %{include_staticlibs}
BuildRequires: %{portable_name}-static-libs-slowdebug >= %{portable_version}
@@ -1695,23 +1701,23 @@ if [ $prioritylength -ne 8 ] ; then
fi
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.sources.noarch.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable*.misc.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable*.docs.%{_arch}.tar.xz
+
%if %{include_normal_build}
-tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.jdk.%{_arch}.tar.xz
-#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.jre.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.unstripped.jdk.%{_arch}.tar.xz
%if %{include_staticlibs}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.static-libs.%{_arch}.tar.xz
%endif
%endif
%if %{include_fastdebug_build}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jdk.%{_arch}.tar.xz
-#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.static-libs.%{_arch}.tar.xz
%endif
%endif
%if %{include_debug_build}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jdk.%{_arch}.tar.xz
-#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.static-libs.%{_arch}.tar.xz
%endif
@@ -1945,6 +1951,8 @@ for suffix in %{build_loop} ; do
%endif
jdk_image=${top_dir_abs_main_build_path}
src_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.sources.noarch/"`
+ misc_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.misc.%{_arch}/"`
+ docs_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.docs.%{_arch}/"`
# Install the jdk
mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
@@ -1952,7 +1960,7 @@ mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
# Install icons
for s in 16 24 32 48 ; do
install -D -p -m 644 \
- ${src_image}/openjdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png \
+ ${src_image}/%{vcstag}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/java-%{javaver}-%{origin}.png
done
@@ -2006,11 +2014,11 @@ if ! echo $suffix | grep -q "debug" ; then
# Install Javadoc documentation
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
- built_doc_archive=javadocs.zip
- cp -a ${top_dir_abs_main_build_path}/${built_doc_archive} \
- $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip || ls -l ${top_dir_abs_main_build_path}
+ built_doc_archive=$(basename $(ls ${docs_image}/jdk*docs.zip))
+ cp -a ${docs_image}/${built_doc_archive} \
+ $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
pushd $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
- unzip ${top_dir_abs_main_build_path}/${built_doc_archive}
+ unzip ${docs_image}/${built_doc_archive}
popd
fi
@@ -2031,7 +2039,6 @@ done
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/.java/.systemPrefs
# copy samples next to demos; samples are mostly js files
-cp -r ${src_image}/%{top_level_dir_name}/src/sample $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/
# moving config files to /etc
mkdir -p $RPM_BUILD_ROOT/%{etcjavadir -- $suffix}
@@ -2052,9 +2059,6 @@ find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -name "*.so" -exec chmod 7
find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -type d -exec chmod 755 {} \; ;
find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/legal -type f -exec chmod 644 {} \; ;
-if [ "x$suffix" = "x" ] ; then
- rm $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/javadocs.zip #is in subpackages, 1 renamed, 2nd unpacked
-fi
# end, dual install
done
@@ -2093,10 +2097,11 @@ $JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=tru
if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
# Check alt-java launcher has SSB mitigation on supported architectures
+# set_speculation function exists in both cases, so check for prctl call
%ifarch %{ssbd_arches}
-nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation
+nm $JAVA_HOME/bin/%{alt_java_name} | grep prctl
%else
-if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi
+if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep prctl ; then true ; else false; fi
%endif
# Check correct vendor values have been set
@@ -2113,8 +2118,8 @@ $JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|
%if %{include_staticlibs}
# Check debug symbols in static libraries (smoke test)
export STATIC_LIBS_HOME=${JAVA_HOME}/%{static_libs_install_dir}
-readelf --debug-dump $STATIC_LIBS_HOME/libfdlibm.a | grep w_remainder.c
-readelf --debug-dump $STATIC_LIBS_HOME/libfdlibm.a | grep e_remainder.c
+readelf --debug-dump $STATIC_LIBS_HOME/libnet.a | grep Inet4AddressImpl.c
+readelf --debug-dump $STATIC_LIBS_HOME/libnet.a | grep Inet6AddressImpl.c
%endif
# Check src.zip has all sources. See RHBZ#1130490
@@ -2377,6 +2382,9 @@ cjc.mainProgram(args)
%endif
%changelog
+* Wed Nov 22 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:17.0.9.0.9-1
+- updated to OpenJDK 17.0.9 (2023-10-17)
+
* Fri Sep 29 2023 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:17.0.8.0.7-2
- Fix flatpak build
commit efb675a1006c24a4f1e96021d1a785f37c237da9
Author: Yaakov Selkowitz <yselkowi(a)redhat.com>
Date: Mon Sep 11 16:13:18 2023 -0400
Fix flatpak build
java-X-openjdk-portable must not be rebuilt for flatpaks, nor do we want
to rebuild tzdata for tzdata-java, so it will be added to the runtimes.
Therefore, we need to take into account the possibility of different
prefixes for those compared to java-X-openjdk.
diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec
index 45aa8e9..61cc9fc 100644
--- a/java-17-openjdk.spec
+++ b/java-17-openjdk.spec
@@ -313,7 +313,7 @@
%global top_level_dir_name %{origin}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 7
-%global rpmrelease 1
+%global rpmrelease 2
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -404,12 +404,16 @@
%global rpm_state_dir %{_localstatedir}/lib/rpm-state/
-# For flatpack builds hard-code /usr/sbin/alternatives,
-# otherwise use %%{_sbindir} relative path.
+# For flatpack builds hard-code dependency paths,
+# otherwise use relative paths.
%if 0%{?flatpak}
%global alternatives_requires /usr/sbin/alternatives
+%global javazidir /usr/share/javazi-1.8
+%global portablejvmdir /usr/lib/jvm
%else
%global alternatives_requires %{_sbindir}/alternatives
+%global javazidir %{_datadir}/javazi-1.8
+%global portablejvmdir %{_jvmdir}
%endif
%global family %{name}.%{_arch}
@@ -1690,26 +1694,26 @@ if [ $prioritylength -ne 8 ] ; then
exit 14
fi
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.sources.noarch.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.sources.noarch.tar.xz
%if %{include_normal_build}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.jdk.%{_arch}.tar.xz
-#tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.jre.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.jdk.%{_arch}.tar.xz
+#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.static-libs.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.static-libs.%{_arch}.tar.xz
%endif
%endif
%if %{include_fastdebug_build}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jdk.%{_arch}.tar.xz
-#tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jre.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jdk.%{_arch}.tar.xz
+#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.fastdebug.static-libs.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.static-libs.%{_arch}.tar.xz
%endif
%endif
%if %{include_debug_build}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jdk.%{_arch}.tar.xz
-#tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jre.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jdk.%{_arch}.tar.xz
+#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.slowdebug.static-libs.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.static-libs.%{_arch}.tar.xz
%endif
%endif
@@ -1787,7 +1791,7 @@ function installjdk() {
# Use system-wide tzdata
mv ${imagepath}/lib/tzdb.dat{,.upstream}
- ln -sv %{_datadir}/javazi-1.8/tzdb.dat ${imagepath}/lib/tzdb.dat
+ ln -sv %{javazidir}/tzdb.dat ${imagepath}/lib/tzdb.dat
# Rename OpenJDK cacerts database
mv ${imagepath}/lib/security/cacerts{,.upstream}
@@ -2100,15 +2104,11 @@ $JAVA_HOME/bin/javac -d . %{SOURCE16}
#TODO skipped vendor check. It now points to PORTABLE version of jdk.
#$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
-%if ! 0%{?flatpak}
-# Check translations are available for new timezones (during flatpak builds, the
-# tzdb.dat used by this test is not where the test expects it, so this is
-# disabled for flatpak builds)
+# Check translations are available for new timezones
$JAVA_HOME/bin/javac -d . %{SOURCE18}
#TODO doublecheck tzdata handling
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE || echo "TZDATA no longer can be synced with system, because we repack"
$JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR || echo "TZDATA no longer can be synced with system, because we repack"
-%endif
%if %{include_staticlibs}
# Check debug symbols in static libraries (smoke test)
@@ -2377,7 +2377,10 @@ cjc.mainProgram(args)
%endif
%changelog
-* Thu Aug 08 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:17.0.8.0.7-1
+* Fri Sep 29 2023 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:17.0.8.0.7-2
+- Fix flatpak build
+
+* Tue Aug 08 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:17.0.8.0.7-1
- updated to security 17.0.8.0.7
* Thu Jul 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:17.0.7.0.7-5.1
1
0
Architecture specific change in rpms/java-17-openjdk.git
by githook-noreply＠fedoraproject.org 27 Nov '23
by githook-noreply＠fedoraproject.org 27 Nov '23
27 Nov '23
The package rpms/java-17-openjdk.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-17-openjdk.git/commit/?id=b82a….
Change:
+%ifarch %{jit_arches}
Thanks.
Full change:
============
commit 2bd0a29943f3d04c88a7b2f6762bc417bea091d4
Merge: 9fb789b b82a5a9
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Mon Nov 27 11:58:17 2023 +0100
Merge branch 'f39' into f38
commit b82a5a9bf238f95ad82ef22fd28b51949c173116
Author: Jiri <jvanek(a)redhat.com>
Date: Sun Nov 26 21:52:48 2023 +0100
updated to OpenJDK 17.0.9 (2023-10-17)
diff --git a/.gitignore b/.gitignore
index 4663d5a..29ee5dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,37 +1,2 @@
-/jdk-jdk12-jdk-12+33.tar.xz
/systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
-/jdk-updates-jdk12u-jdk-12.0.1+12.tar.xz
-/jdk-jdk13-jdk-13+27.tar.xz
-/jdk-jdk13-jdk-13+28.tar.xz
-/jdk-jdk13-jdk-13+33.tar.xz
-/jdk-updates-jdk13u-jdk-13.0.1+9.tar.xz
-/jdk-updates-jdk13u-jdk-13.0.2+8.tar.xz
-/jdk-jdk14-jdk-14+36.tar.xz
-/jdk-updates-jdk14u-jdk-14.0.1+7.tar.xz
-/jdk-updates-jdk14u-jdk-14.0.2+12.tar.xz
-/jdk-jdk15-jdk-15+36.tar.xz
-/jdk-updates-jdk15u-jdk-15.0.1+9.tar.xz
-/tapsets-icedtea-3.15.0.tar.xz
-/jdk-updates-jdk15u-jdk-15.0.2+7.tar.xz
-/openjdk-jdk16-jdk-16+36.tar.xz
-/openjdk-jdk16u-jdk-16.0.1+9.tar.xz
-/openjdk-jdk17-jdk-17+26.tar.xz
-/openjdk-jdk17-jdk-17+33.tar.xz
-/openjdk-jdk17-jdk-17+35.tar.xz
-/openjdk-jdk17u-jdk-17.0.1+12.tar.xz
/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
-/openjdk-jdk17u-jdk-17.0.2+8.tar.xz
-/openjdk-jdk17u-jdk-17.0.3+1.tar.xz
-/openjdk-jdk17u-jdk-17.0.3+5.tar.xz
-/openjdk-jdk17u-17usec.17.0.3+5-220408.tar.xz
-/openjdk-jdk17u-jdk-17.0.3+7.tar.xz
-/openjdk-jdk17u-jdk-17.0.4+1.tar.xz
-/openjdk-jdk17u-jdk-17.0.4+7.tar.xz
-/openjdk-jdk17u-jdk-17.0.4+8.tar.xz
-/openjdk-jdk17u-jdk-17.0.4.1+1.tar.xz
-/openjdk-jdk17u-jdk-17.0.5+1.tar.xz
-/openjdk-jdk17u-jdk-17.0.5+7.tar.xz
-/openjdk-jdk17u-jdk-17.0.5+8.tar.xz
-/openjdk-jdk17u-jdk-17.0.6+1.tar.xz
-/openjdk-jdk17u-jdk-17.0.6+9.tar.xz
-/openjdk-jdk17u-jdk-17.0.6+10.tar.xz
diff --git a/README.md b/README.md
index 3bfd7d2..1504e68 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ OpenJDK 17 is the latest Long-Term Support (LTS) release of the Java platform.
* https://fedoraproject.org/wiki/Changes/Java17
-For a list of major changes from OpenJDK 11 (java-11-openjdk), see the upstream
+For a list of major changes from OpenJDK 17 (java-17-openjdk), see the upstream
release page for OpenJDK 17 and the preceding interim releases:
* 12: https://openjdk.java.net/projects/jdk/12/
diff --git a/TestTranslations.java b/TestTranslations.java
index d87647a..f6a4fe2 100644
--- a/TestTranslations.java
+++ b/TestTranslations.java
@@ -52,7 +52,7 @@ public class TestTranslations {
map.put(Locale.FRANCE, new String[] { "heure normale des Rocheuses", "UTC\u221207:00", "MST",
"heure d\u2019\u00e9t\u00e9 des Rocheuses", "UTC\u221206:00", "MDT",
"heure des Rocheuses", "UTC\u221207:00", "MT"});
- map.put(Locale.GERMANY, new String[] { "Rocky Mountain-Normalzeit", "GMT-07:00", "MST",
+ map.put(Locale.GERMANY, new String[] { "Rocky-Mountain-Normalzeit", "GMT-07:00", "MST",
"Rocky-Mountain-Sommerzeit", "GMT-06:00", "MDT",
"Rocky-Mountain-Zeit", "GMT-07:00", "MT"});
CIUDAD_JUAREZ = Collections.unmodifiableMap(map);
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
new file mode 100755
index 0000000..c53abdc
--- /dev/null
+++ b/generate_source_tarball.sh
@@ -0,0 +1 @@
+## This file is intentionally left blank
diff --git a/icedtea_sync.sh b/icedtea_sync.sh
index e5c54f3..c53abdc 100755
--- a/icedtea_sync.sh
+++ b/icedtea_sync.sh
@@ -1,192 +1 @@
-#!/bin/bash
-
-# Copyright (C) 2019 Red Hat, Inc.
-# Written by Andrew John Hughes <gnu.andrew(a)redhat.com>.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-ICEDTEA_USE_VCS=true
-
-ICEDTEA_VERSION=3.15.0
-ICEDTEA_URL=https://icedtea.classpath.org/download/source
-ICEDTEA_SIGNING_KEY=CFDA0F9B35964222
-
-ICEDTEA_HG_URL=https://icedtea.classpath.org/hg/icedtea11
-
-set -e
-
-RPM_DIR=${PWD}
-if [ ! -f ${RPM_DIR}/jconsole.desktop.in ] ; then
- echo "Not in RPM source tree.";
- exit 1;
-fi
-
-if test "x${TMPDIR}" = "x"; then
- TMPDIR=/tmp;
-fi
-WORKDIR=${TMPDIR}/it.sync
-
-echo "Using working directory ${WORKDIR}"
-mkdir ${WORKDIR}
-pushd ${WORKDIR}
-
-if test "x${WGET}" = "x"; then
- WGET=$(which wget);
- if test "x${WGET}" = "x"; then
- echo "wget not found";
- exit 1;
- fi
-fi
-
-if test "x${TAR}" = "x"; then
- TAR=$(which tar)
- if test "x${TAR}" = "x"; then
- echo "tar not found";
- exit 2;
- fi
-fi
-
-echo "Dependencies:";
-echo -e "\tWGET: ${WGET}";
-echo -e "\tTAR: ${TAR}\n";
-
-if test "x${ICEDTEA_USE_VCS}" = "xtrue"; then
- echo "Mode: Using VCS";
-
- if test "x${GREP}" = "x"; then
- GREP=$(which grep);
- if test "x${GREP}" = "x"; then
- echo "grep not found";
- exit 3;
- fi
- fi
-
- if test "x${CUT}" = "x"; then
- CUT=$(which cut);
- if test "x${CUT}" = "x"; then
- echo "cut not found";
- exit 4;
- fi
- fi
-
- if test "x${TR}" = "x"; then
- TR=$(which tr);
- if test "x${TR}" = "x"; then
- echo "tr not found";
- exit 5;
- fi
- fi
-
- if test "x${HG}" = "x"; then
- HG=$(which hg);
- if test "x${HG}" = "x"; then
- echo "hg not found";
- exit 6;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tGREP: ${GREP}";
- echo -e "\tCUT: ${CUT}";
- echo -e "\tTR: ${TR}";
- echo -e "\tHG: ${HG}";
-
- echo "Checking out repository from VCS...";
- ${HG} clone ${ICEDTEA_HG_URL} icedtea
-
- echo "Obtaining version from configure.ac...";
- ROOT_VER=$(${GREP} '^AC_INIT' icedtea/configure.ac|${CUT} -d ',' -f 2|${TR} -d '[][:space:]')
- echo "Root version from configure: ${ROOT_VER}";
-
- VCS_REV=$(${HG} log -R icedtea --template '{node|short}' -r tip)
- echo "VCS revision: ${VCS_REV}";
-
- ICEDTEA_VERSION="${ROOT_VER}-${VCS_REV}"
- echo "Creating icedtea-${ICEDTEA_VERSION}";
- mkdir icedtea-${ICEDTEA_VERSION}
- echo "Copying required files from checkout to icedtea-${ICEDTEA_VERSION}";
- # Commented out for now as IcedTea 6's jconsole.desktop.in is outdated
- #cp -a icedtea/jconsole.desktop.in ../icedtea-${ICEDTEA_VERSION}
- cp -a ${RPM_DIR}/jconsole.desktop.in icedtea-${ICEDTEA_VERSION}
- cp -a icedtea/tapset icedtea-${ICEDTEA_VERSION}
-
- rm -rf icedtea
-else
- echo "Mode: Using tarball";
-
- if test "x${ICEDTEA_VERSION}" = "x"; then
- echo "No IcedTea version specified for tarball download.";
- exit 3;
- fi
-
- if test "x${CHECKSUM}" = "x"; then
- CHECKSUM=$(which sha256sum)
- if test "x${CHECKSUM}" = "x"; then
- echo "sha256sum not found";
- exit 4;
- fi
- fi
-
- if test "x${PGP}" = "x"; then
- PGP=$(which gpg)
- if test "x${PGP}" = "x"; then
- echo "gpg not found";
- exit 5;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tCHECKSUM: ${CHECKSUM}";
- echo -e "\tPGP: ${PGP}\n";
-
- echo "Checking for IcedTea signing key ${ICEDTEA_SIGNING_KEY}...";
- if ! gpg --list-keys ${ICEDTEA_SIGNING_KEY}; then
- echo "IcedTea signing key ${ICEDTEA_SIGNING_KEY} not installed.";
- exit 6;
- fi
-
- echo "Downloading IcedTea release tarball...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz
- echo "Downloading IcedTea tarball signature...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- echo "Downloading IcedTea tarball checksums...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Verifying checksums...";
- ${CHECKSUM} --check --ignore-missing icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Checking signature...";
- ${PGP} --verify icedtea-${ICEDTEA_VERSION}.tar.xz.sig
-
- echo "Extracting files...";
- ${TAR} xJf icedtea-${ICEDTEA_VERSION}.tar.xz \
- icedtea-${ICEDTEA_VERSION}/tapset \
- icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in
-
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- rm -vf icedtea-${ICEDTEA_VERSION}.sha256
-fi
-
-echo "Replacing desktop files...";
-mv -v icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in ${RPM_DIR}
-
-echo "Creating new tapset tarball...";
-mv -v icedtea-${ICEDTEA_VERSION} openjdk
-${TAR} cJf ${RPM_DIR}/tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz openjdk
-
-rm -rvf openjdk
-
-popd
-rm -rf ${WORKDIR}
+## This file is intentionally left blank
diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec
index 61cc9fc..4a70a27 100644
--- a/java-17-openjdk.spec
+++ b/java-17-openjdk.spec
@@ -113,7 +113,9 @@
%global aot_arches x86_64 %{aarch64}
# Set of architectures which support the serviceability agent
%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm}
-%global share_arches %{ix86} %{power64} x86_64 sparcv9 sparc64 %{aarch64} %{arm} s390x
+# As of JDK-8005165 in OpenJDK 10, class sharing is not arch-specific
+# However, it does segfault on the Zero assembler port, so currently JIT only
+%global share_arches %{jit_arches}
# Set of architectures for which we build the Shenandoah garbage collector
%global shenandoah_arches x86_64 %{aarch64}
# Set of architectures for which we build the Z garbage collector
@@ -123,7 +125,12 @@
# Set of architectures for which java has short vector math library (libsvml.so)
%global svml_arches x86_64
# Set of architectures where we verify backtraces with gdb
+# s390x fails on RHEL 7 so we exclude it there
+%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
+%global gdb_arches %{arm} %{aarch64} %{ix86} %{power64} sparcv9 sparc64 x86_64 %{zero_arches}
+%else
%global gdb_arches %{jit_arches} %{zero_arches}
+%endif
# By default, we build a debug build during main build on JIT architectures
%if %{with slowdebug}
@@ -271,16 +278,17 @@
# New Version-String scheme-style defines
%global featurever 17
%global interimver 0
-%global updatever 8
+%global updatever 9
%global patchver 0
+
# We don't add any LTS designator for STS packages (Fedora and EPEL).
# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
%if 0%{?rhel} && !0%{?epel}
%global lts_designator "LTS"
%global lts_designator_zip -%{lts_designator}
%else
- %global lts_designator ""
- %global lts_designator_zip ""
+ %global lts_designator ""
+ %global lts_designator_zip ""
%endif
# Define vendor information used by OpenJDK
@@ -296,7 +304,7 @@
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{name}&…
%else
%if 0%{?rhel}
-%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20…
+%global oj_vendor_bug_url https://access.redhat.com/support/cases/
%else
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi
%endif
@@ -306,14 +314,21 @@
# Define IcedTea version used for SystemTap tapsets and desktop file
%global icedteaver 6.0.0pre00-c848b93a8598
+# Define JDK versions
+%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
+%global javaver %{featurever}
+# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
+%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
+# The tag used to create the OpenJDK tarball
+%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Standard JPackage naming and versioning defines
%global origin openjdk
%global origin_nice OpenJDK
%global top_level_dir_name %{origin}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
-%global buildver 7
-%global rpmrelease 2
+%global buildver 9
+%global rpmrelease 1
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -326,14 +341,6 @@
# for techpreview, using 1, so slowdebugs can have 0
%global priority %( printf '%08d' 1 )
%endif
-%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
-%global javaver %{featurever}
-
-# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
-%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
-
-# The tag used to create the OpenJDK tarball
-%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Define milestone (EA for pre-releases, GA for releases)
# Release will be (where N is usually a number starting at 1):
@@ -343,7 +350,7 @@
%if %{is_ga}
%global build_type GA
%global ea_designator ""
-%global ea_designator_zip ""
+%global ea_designator_zip %{nil}
%global extraver %{nil}
%global eaprefix %{nil}
%else
@@ -509,12 +516,15 @@ alternatives \\
--install %{_bindir}/java $key %{jrebindir -- %{?1}}/java $PRIORITY --family %{family} \\
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{sdkdir -- %{?1}} \\
--slave %{_bindir}/%{alt_java_name} %{alt_java_name} %{jrebindir -- %{?1}}/%{alt_java_name} \\
+ --slave %{_bindir}/jcmd jcmd %{sdkbindir -- %{?1}}/jcmd \\
--slave %{_bindir}/keytool keytool %{jrebindir -- %{?1}}/keytool \\
--slave %{_bindir}/rmiregistry rmiregistry %{jrebindir -- %{?1}}/rmiregistry \\
--slave %{_mandir}/man1/java.1$ext java.1$ext \\
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/%{alt_java_name}.1$ext %{alt_java_name}.1$ext \\
%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1$ext \\
+ --slave %{_mandir}/man1/jcmd.1$ext jcmd.1$ext \\
+ %{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \\
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/rmiregistry.1$ext rmiregistry.1$ext \\
@@ -599,7 +609,6 @@ alternatives \\
--slave %{_bindir}/jarsigner jarsigner %{sdkbindir -- %{?1}}/jarsigner \\
--slave %{_bindir}/javadoc javadoc %{sdkbindir -- %{?1}}/javadoc \\
--slave %{_bindir}/javap javap %{sdkbindir -- %{?1}}/javap \\
- --slave %{_bindir}/jcmd jcmd %{sdkbindir -- %{?1}}/jcmd \\
--slave %{_bindir}/jconsole jconsole %{sdkbindir -- %{?1}}/jconsole \\
--slave %{_bindir}/jdb jdb %{sdkbindir -- %{?1}}/jdb \\
--slave %{_bindir}/jdeps jdeps %{sdkbindir -- %{?1}}/jdeps \\
@@ -626,8 +635,6 @@ alternatives \\
%{_mandir}/man1/javadoc-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/javap.1$ext javap.1$ext \\
%{_mandir}/man1/javap-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/jcmd.1$ext jcmd.1$ext \\
- %{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/jconsole.1$ext jconsole.1$ext \\
%{_mandir}/man1/jconsole-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/jdb.1$ext jdb.1$ext \\
@@ -790,10 +797,11 @@ exit 0
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/bin
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/java
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/%{alt_java_name}
+%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jcmd
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/keytool
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmiregistry
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib
-%ifarch %{share_arches}
+%ifarch %{jit_arches}
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/classlist
%endif
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jexec
@@ -851,7 +859,8 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/default.jfc
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/profile.jfc
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1*
-#%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1* #TODO, resolve alt-java man page
+%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1*
+%{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{?1}}.1*
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/%{vm_variant}/
@@ -900,8 +909,9 @@ exit 0
%if %is_system_jdk
%if %{is_release_build -- %{?1}}
%ghost %{_bindir}/java
-%ghost %{_bindir}/%{alt_java_name}
%ghost %{_jvmdir}/jre
+%ghost %{_bindir}/%{alt_java_name}
+%ghost %{_bindir}/jcmd
%ghost %{_bindir}/keytool
%ghost %{_bindir}/pack200
%ghost %{_bindir}/rmid
@@ -926,7 +936,6 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javadoc
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javap
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jconsole
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jcmd
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdb
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeps
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeprscan
@@ -999,7 +1008,6 @@ exit 0
%ghost %{_bindir}/jarsigner
%ghost %{_bindir}/javadoc
%ghost %{_bindir}/javap
-%ghost %{_bindir}/jcmd
%ghost %{_bindir}/jconsole
%ghost %{_bindir}/jdb
%ghost %{_bindir}/jdeps
@@ -1028,7 +1036,6 @@ exit 0
%define files_demo() %{expand:
%license %{_jvmdir}/%{sdkdir -- %{?1}}/legal
%{_jvmdir}/%{sdkdir -- %{?1}}/demo
-%{_jvmdir}/%{sdkdir -- %{?1}}/sample
}
%define files_src() %{expand:
@@ -1231,7 +1238,7 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
%global portable_name %{name}-portable
# the version must match, but sometmes we need to more precise, so including release
-%global portable_version %{version}-3
+%global portable_version %{version}-1
Name: java-%{javaver}-%{origin}
Version: %{newjavaver}.%{buildver}
@@ -1294,23 +1301,22 @@ Source16: CheckVendor.java
Source18: TestTranslations.java
BuildRequires: %{portable_name}-sources >= %{portable_version}
+BuildRequires: %{portable_name}-misc >= %{portable_version}
+BuildRequires: %{portable_name}-docs >= %{portable_version}
%if %{include_normal_build}
-BuildRequires: %{portable_name} >= %{portable_version}
-BuildRequires: %{portable_name}-devel >= %{portable_version}
+BuildRequires: %{portable_name}-unstripped >= %{portable_version}
%if %{include_staticlibs}
BuildRequires: %{portable_name}-static-libs >= %{portable_version}
%endif
%endif
%if %{include_fastdebug_build}
-BuildRequires: %{portable_name}-fastdebug >= %{portable_version}
BuildRequires: %{portable_name}-devel-fastdebug >= %{portable_version}
%if %{include_staticlibs}
BuildRequires: %{portable_name}-static-libs-fastdebug >= %{portable_version}
%endif
%endif
%if %{include_debug_build}
-BuildRequires: %{portable_name}-slowdebug >= %{portable_version}
BuildRequires: %{portable_name}-devel-slowdebug >= %{portable_version}
%if %{include_staticlibs}
BuildRequires: %{portable_name}-static-libs-slowdebug >= %{portable_version}
@@ -1695,23 +1701,23 @@ if [ $prioritylength -ne 8 ] ; then
fi
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.sources.noarch.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable*.misc.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable*.docs.%{_arch}.tar.xz
+
%if %{include_normal_build}
-tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.jdk.%{_arch}.tar.xz
-#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.jre.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.unstripped.jdk.%{_arch}.tar.xz
%if %{include_staticlibs}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.static-libs.%{_arch}.tar.xz
%endif
%endif
%if %{include_fastdebug_build}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jdk.%{_arch}.tar.xz
-#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.static-libs.%{_arch}.tar.xz
%endif
%endif
%if %{include_debug_build}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jdk.%{_arch}.tar.xz
-#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.static-libs.%{_arch}.tar.xz
%endif
@@ -1945,6 +1951,8 @@ for suffix in %{build_loop} ; do
%endif
jdk_image=${top_dir_abs_main_build_path}
src_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.sources.noarch/"`
+ misc_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.misc.%{_arch}/"`
+ docs_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.docs.%{_arch}/"`
# Install the jdk
mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
@@ -1952,7 +1960,7 @@ mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
# Install icons
for s in 16 24 32 48 ; do
install -D -p -m 644 \
- ${src_image}/openjdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png \
+ ${src_image}/%{vcstag}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/java-%{javaver}-%{origin}.png
done
@@ -2006,11 +2014,11 @@ if ! echo $suffix | grep -q "debug" ; then
# Install Javadoc documentation
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
- built_doc_archive=javadocs.zip
- cp -a ${top_dir_abs_main_build_path}/${built_doc_archive} \
- $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip || ls -l ${top_dir_abs_main_build_path}
+ built_doc_archive=$(basename $(ls ${docs_image}/jdk*docs.zip))
+ cp -a ${docs_image}/${built_doc_archive} \
+ $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
pushd $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
- unzip ${top_dir_abs_main_build_path}/${built_doc_archive}
+ unzip ${docs_image}/${built_doc_archive}
popd
fi
@@ -2031,7 +2039,6 @@ done
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/.java/.systemPrefs
# copy samples next to demos; samples are mostly js files
-cp -r ${src_image}/%{top_level_dir_name}/src/sample $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/
# moving config files to /etc
mkdir -p $RPM_BUILD_ROOT/%{etcjavadir -- $suffix}
@@ -2052,9 +2059,6 @@ find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -name "*.so" -exec chmod 7
find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -type d -exec chmod 755 {} \; ;
find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/legal -type f -exec chmod 644 {} \; ;
-if [ "x$suffix" = "x" ] ; then
- rm $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/javadocs.zip #is in subpackages, 1 renamed, 2nd unpacked
-fi
# end, dual install
done
@@ -2093,10 +2097,11 @@ $JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=tru
if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
# Check alt-java launcher has SSB mitigation on supported architectures
+# set_speculation function exists in both cases, so check for prctl call
%ifarch %{ssbd_arches}
-nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation
+nm $JAVA_HOME/bin/%{alt_java_name} | grep prctl
%else
-if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi
+if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep prctl ; then true ; else false; fi
%endif
# Check correct vendor values have been set
@@ -2113,8 +2118,8 @@ $JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|
%if %{include_staticlibs}
# Check debug symbols in static libraries (smoke test)
export STATIC_LIBS_HOME=${JAVA_HOME}/%{static_libs_install_dir}
-readelf --debug-dump $STATIC_LIBS_HOME/libfdlibm.a | grep w_remainder.c
-readelf --debug-dump $STATIC_LIBS_HOME/libfdlibm.a | grep e_remainder.c
+readelf --debug-dump $STATIC_LIBS_HOME/libnet.a | grep Inet4AddressImpl.c
+readelf --debug-dump $STATIC_LIBS_HOME/libnet.a | grep Inet6AddressImpl.c
%endif
# Check src.zip has all sources. See RHBZ#1130490
@@ -2377,6 +2382,9 @@ cjc.mainProgram(args)
%endif
%changelog
+* Wed Nov 22 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:17.0.9.0.9-1
+- updated to OpenJDK 17.0.9 (2023-10-17)
+
* Fri Sep 29 2023 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:17.0.8.0.7-2
- Fix flatpak build
commit efb675a1006c24a4f1e96021d1a785f37c237da9
Author: Yaakov Selkowitz <yselkowi(a)redhat.com>
Date: Mon Sep 11 16:13:18 2023 -0400
Fix flatpak build
java-X-openjdk-portable must not be rebuilt for flatpaks, nor do we want
to rebuild tzdata for tzdata-java, so it will be added to the runtimes.
Therefore, we need to take into account the possibility of different
prefixes for those compared to java-X-openjdk.
diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec
index 45aa8e9..61cc9fc 100644
--- a/java-17-openjdk.spec
+++ b/java-17-openjdk.spec
@@ -313,7 +313,7 @@
%global top_level_dir_name %{origin}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 7
-%global rpmrelease 1
+%global rpmrelease 2
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -404,12 +404,16 @@
%global rpm_state_dir %{_localstatedir}/lib/rpm-state/
-# For flatpack builds hard-code /usr/sbin/alternatives,
-# otherwise use %%{_sbindir} relative path.
+# For flatpack builds hard-code dependency paths,
+# otherwise use relative paths.
%if 0%{?flatpak}
%global alternatives_requires /usr/sbin/alternatives
+%global javazidir /usr/share/javazi-1.8
+%global portablejvmdir /usr/lib/jvm
%else
%global alternatives_requires %{_sbindir}/alternatives
+%global javazidir %{_datadir}/javazi-1.8
+%global portablejvmdir %{_jvmdir}
%endif
%global family %{name}.%{_arch}
@@ -1690,26 +1694,26 @@ if [ $prioritylength -ne 8 ] ; then
exit 14
fi
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.sources.noarch.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.sources.noarch.tar.xz
%if %{include_normal_build}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.jdk.%{_arch}.tar.xz
-#tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.jre.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.jdk.%{_arch}.tar.xz
+#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.static-libs.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.static-libs.%{_arch}.tar.xz
%endif
%endif
%if %{include_fastdebug_build}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jdk.%{_arch}.tar.xz
-#tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jre.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jdk.%{_arch}.tar.xz
+#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.fastdebug.static-libs.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.static-libs.%{_arch}.tar.xz
%endif
%endif
%if %{include_debug_build}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jdk.%{_arch}.tar.xz
-#tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jre.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jdk.%{_arch}.tar.xz
+#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.slowdebug.static-libs.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.static-libs.%{_arch}.tar.xz
%endif
%endif
@@ -1787,7 +1791,7 @@ function installjdk() {
# Use system-wide tzdata
mv ${imagepath}/lib/tzdb.dat{,.upstream}
- ln -sv %{_datadir}/javazi-1.8/tzdb.dat ${imagepath}/lib/tzdb.dat
+ ln -sv %{javazidir}/tzdb.dat ${imagepath}/lib/tzdb.dat
# Rename OpenJDK cacerts database
mv ${imagepath}/lib/security/cacerts{,.upstream}
@@ -2100,15 +2104,11 @@ $JAVA_HOME/bin/javac -d . %{SOURCE16}
#TODO skipped vendor check. It now points to PORTABLE version of jdk.
#$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
-%if ! 0%{?flatpak}
-# Check translations are available for new timezones (during flatpak builds, the
-# tzdb.dat used by this test is not where the test expects it, so this is
-# disabled for flatpak builds)
+# Check translations are available for new timezones
$JAVA_HOME/bin/javac -d . %{SOURCE18}
#TODO doublecheck tzdata handling
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE || echo "TZDATA no longer can be synced with system, because we repack"
$JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR || echo "TZDATA no longer can be synced with system, because we repack"
-%endif
%if %{include_staticlibs}
# Check debug symbols in static libraries (smoke test)
@@ -2377,7 +2377,10 @@ cjc.mainProgram(args)
%endif
%changelog
-* Thu Aug 08 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:17.0.8.0.7-1
+* Fri Sep 29 2023 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:17.0.8.0.7-2
+- Fix flatpak build
+
+* Tue Aug 08 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:17.0.8.0.7-1
- updated to security 17.0.8.0.7
* Thu Jul 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:17.0.7.0.7-5.1
1
0
Architecture specific change in rpms/java-17-openjdk.git
by githook-noreply＠fedoraproject.org 27 Nov '23
by githook-noreply＠fedoraproject.org 27 Nov '23
27 Nov '23
The package rpms/java-17-openjdk.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-17-openjdk.git/commit/?id=b82a….
Change:
+%ifarch %{jit_arches}
Thanks.
Full change:
============
commit b82a5a9bf238f95ad82ef22fd28b51949c173116
Author: Jiri <jvanek(a)redhat.com>
Date: Sun Nov 26 21:52:48 2023 +0100
updated to OpenJDK 17.0.9 (2023-10-17)
diff --git a/.gitignore b/.gitignore
index 4663d5a..29ee5dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,37 +1,2 @@
-/jdk-jdk12-jdk-12+33.tar.xz
/systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
-/jdk-updates-jdk12u-jdk-12.0.1+12.tar.xz
-/jdk-jdk13-jdk-13+27.tar.xz
-/jdk-jdk13-jdk-13+28.tar.xz
-/jdk-jdk13-jdk-13+33.tar.xz
-/jdk-updates-jdk13u-jdk-13.0.1+9.tar.xz
-/jdk-updates-jdk13u-jdk-13.0.2+8.tar.xz
-/jdk-jdk14-jdk-14+36.tar.xz
-/jdk-updates-jdk14u-jdk-14.0.1+7.tar.xz
-/jdk-updates-jdk14u-jdk-14.0.2+12.tar.xz
-/jdk-jdk15-jdk-15+36.tar.xz
-/jdk-updates-jdk15u-jdk-15.0.1+9.tar.xz
-/tapsets-icedtea-3.15.0.tar.xz
-/jdk-updates-jdk15u-jdk-15.0.2+7.tar.xz
-/openjdk-jdk16-jdk-16+36.tar.xz
-/openjdk-jdk16u-jdk-16.0.1+9.tar.xz
-/openjdk-jdk17-jdk-17+26.tar.xz
-/openjdk-jdk17-jdk-17+33.tar.xz
-/openjdk-jdk17-jdk-17+35.tar.xz
-/openjdk-jdk17u-jdk-17.0.1+12.tar.xz
/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
-/openjdk-jdk17u-jdk-17.0.2+8.tar.xz
-/openjdk-jdk17u-jdk-17.0.3+1.tar.xz
-/openjdk-jdk17u-jdk-17.0.3+5.tar.xz
-/openjdk-jdk17u-17usec.17.0.3+5-220408.tar.xz
-/openjdk-jdk17u-jdk-17.0.3+7.tar.xz
-/openjdk-jdk17u-jdk-17.0.4+1.tar.xz
-/openjdk-jdk17u-jdk-17.0.4+7.tar.xz
-/openjdk-jdk17u-jdk-17.0.4+8.tar.xz
-/openjdk-jdk17u-jdk-17.0.4.1+1.tar.xz
-/openjdk-jdk17u-jdk-17.0.5+1.tar.xz
-/openjdk-jdk17u-jdk-17.0.5+7.tar.xz
-/openjdk-jdk17u-jdk-17.0.5+8.tar.xz
-/openjdk-jdk17u-jdk-17.0.6+1.tar.xz
-/openjdk-jdk17u-jdk-17.0.6+9.tar.xz
-/openjdk-jdk17u-jdk-17.0.6+10.tar.xz
diff --git a/README.md b/README.md
index 3bfd7d2..1504e68 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ OpenJDK 17 is the latest Long-Term Support (LTS) release of the Java platform.
* https://fedoraproject.org/wiki/Changes/Java17
-For a list of major changes from OpenJDK 11 (java-11-openjdk), see the upstream
+For a list of major changes from OpenJDK 17 (java-17-openjdk), see the upstream
release page for OpenJDK 17 and the preceding interim releases:
* 12: https://openjdk.java.net/projects/jdk/12/
diff --git a/TestTranslations.java b/TestTranslations.java
index d87647a..f6a4fe2 100644
--- a/TestTranslations.java
+++ b/TestTranslations.java
@@ -52,7 +52,7 @@ public class TestTranslations {
map.put(Locale.FRANCE, new String[] { "heure normale des Rocheuses", "UTC\u221207:00", "MST",
"heure d\u2019\u00e9t\u00e9 des Rocheuses", "UTC\u221206:00", "MDT",
"heure des Rocheuses", "UTC\u221207:00", "MT"});
- map.put(Locale.GERMANY, new String[] { "Rocky Mountain-Normalzeit", "GMT-07:00", "MST",
+ map.put(Locale.GERMANY, new String[] { "Rocky-Mountain-Normalzeit", "GMT-07:00", "MST",
"Rocky-Mountain-Sommerzeit", "GMT-06:00", "MDT",
"Rocky-Mountain-Zeit", "GMT-07:00", "MT"});
CIUDAD_JUAREZ = Collections.unmodifiableMap(map);
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
new file mode 100755
index 0000000..c53abdc
--- /dev/null
+++ b/generate_source_tarball.sh
@@ -0,0 +1 @@
+## This file is intentionally left blank
diff --git a/icedtea_sync.sh b/icedtea_sync.sh
index e5c54f3..c53abdc 100755
--- a/icedtea_sync.sh
+++ b/icedtea_sync.sh
@@ -1,192 +1 @@
-#!/bin/bash
-
-# Copyright (C) 2019 Red Hat, Inc.
-# Written by Andrew John Hughes <gnu.andrew(a)redhat.com>.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-ICEDTEA_USE_VCS=true
-
-ICEDTEA_VERSION=3.15.0
-ICEDTEA_URL=https://icedtea.classpath.org/download/source
-ICEDTEA_SIGNING_KEY=CFDA0F9B35964222
-
-ICEDTEA_HG_URL=https://icedtea.classpath.org/hg/icedtea11
-
-set -e
-
-RPM_DIR=${PWD}
-if [ ! -f ${RPM_DIR}/jconsole.desktop.in ] ; then
- echo "Not in RPM source tree.";
- exit 1;
-fi
-
-if test "x${TMPDIR}" = "x"; then
- TMPDIR=/tmp;
-fi
-WORKDIR=${TMPDIR}/it.sync
-
-echo "Using working directory ${WORKDIR}"
-mkdir ${WORKDIR}
-pushd ${WORKDIR}
-
-if test "x${WGET}" = "x"; then
- WGET=$(which wget);
- if test "x${WGET}" = "x"; then
- echo "wget not found";
- exit 1;
- fi
-fi
-
-if test "x${TAR}" = "x"; then
- TAR=$(which tar)
- if test "x${TAR}" = "x"; then
- echo "tar not found";
- exit 2;
- fi
-fi
-
-echo "Dependencies:";
-echo -e "\tWGET: ${WGET}";
-echo -e "\tTAR: ${TAR}\n";
-
-if test "x${ICEDTEA_USE_VCS}" = "xtrue"; then
- echo "Mode: Using VCS";
-
- if test "x${GREP}" = "x"; then
- GREP=$(which grep);
- if test "x${GREP}" = "x"; then
- echo "grep not found";
- exit 3;
- fi
- fi
-
- if test "x${CUT}" = "x"; then
- CUT=$(which cut);
- if test "x${CUT}" = "x"; then
- echo "cut not found";
- exit 4;
- fi
- fi
-
- if test "x${TR}" = "x"; then
- TR=$(which tr);
- if test "x${TR}" = "x"; then
- echo "tr not found";
- exit 5;
- fi
- fi
-
- if test "x${HG}" = "x"; then
- HG=$(which hg);
- if test "x${HG}" = "x"; then
- echo "hg not found";
- exit 6;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tGREP: ${GREP}";
- echo -e "\tCUT: ${CUT}";
- echo -e "\tTR: ${TR}";
- echo -e "\tHG: ${HG}";
-
- echo "Checking out repository from VCS...";
- ${HG} clone ${ICEDTEA_HG_URL} icedtea
-
- echo "Obtaining version from configure.ac...";
- ROOT_VER=$(${GREP} '^AC_INIT' icedtea/configure.ac|${CUT} -d ',' -f 2|${TR} -d '[][:space:]')
- echo "Root version from configure: ${ROOT_VER}";
-
- VCS_REV=$(${HG} log -R icedtea --template '{node|short}' -r tip)
- echo "VCS revision: ${VCS_REV}";
-
- ICEDTEA_VERSION="${ROOT_VER}-${VCS_REV}"
- echo "Creating icedtea-${ICEDTEA_VERSION}";
- mkdir icedtea-${ICEDTEA_VERSION}
- echo "Copying required files from checkout to icedtea-${ICEDTEA_VERSION}";
- # Commented out for now as IcedTea 6's jconsole.desktop.in is outdated
- #cp -a icedtea/jconsole.desktop.in ../icedtea-${ICEDTEA_VERSION}
- cp -a ${RPM_DIR}/jconsole.desktop.in icedtea-${ICEDTEA_VERSION}
- cp -a icedtea/tapset icedtea-${ICEDTEA_VERSION}
-
- rm -rf icedtea
-else
- echo "Mode: Using tarball";
-
- if test "x${ICEDTEA_VERSION}" = "x"; then
- echo "No IcedTea version specified for tarball download.";
- exit 3;
- fi
-
- if test "x${CHECKSUM}" = "x"; then
- CHECKSUM=$(which sha256sum)
- if test "x${CHECKSUM}" = "x"; then
- echo "sha256sum not found";
- exit 4;
- fi
- fi
-
- if test "x${PGP}" = "x"; then
- PGP=$(which gpg)
- if test "x${PGP}" = "x"; then
- echo "gpg not found";
- exit 5;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tCHECKSUM: ${CHECKSUM}";
- echo -e "\tPGP: ${PGP}\n";
-
- echo "Checking for IcedTea signing key ${ICEDTEA_SIGNING_KEY}...";
- if ! gpg --list-keys ${ICEDTEA_SIGNING_KEY}; then
- echo "IcedTea signing key ${ICEDTEA_SIGNING_KEY} not installed.";
- exit 6;
- fi
-
- echo "Downloading IcedTea release tarball...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz
- echo "Downloading IcedTea tarball signature...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- echo "Downloading IcedTea tarball checksums...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Verifying checksums...";
- ${CHECKSUM} --check --ignore-missing icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Checking signature...";
- ${PGP} --verify icedtea-${ICEDTEA_VERSION}.tar.xz.sig
-
- echo "Extracting files...";
- ${TAR} xJf icedtea-${ICEDTEA_VERSION}.tar.xz \
- icedtea-${ICEDTEA_VERSION}/tapset \
- icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in
-
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- rm -vf icedtea-${ICEDTEA_VERSION}.sha256
-fi
-
-echo "Replacing desktop files...";
-mv -v icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in ${RPM_DIR}
-
-echo "Creating new tapset tarball...";
-mv -v icedtea-${ICEDTEA_VERSION} openjdk
-${TAR} cJf ${RPM_DIR}/tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz openjdk
-
-rm -rvf openjdk
-
-popd
-rm -rf ${WORKDIR}
+## This file is intentionally left blank
diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec
index 61cc9fc..4a70a27 100644
--- a/java-17-openjdk.spec
+++ b/java-17-openjdk.spec
@@ -113,7 +113,9 @@
%global aot_arches x86_64 %{aarch64}
# Set of architectures which support the serviceability agent
%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm}
-%global share_arches %{ix86} %{power64} x86_64 sparcv9 sparc64 %{aarch64} %{arm} s390x
+# As of JDK-8005165 in OpenJDK 10, class sharing is not arch-specific
+# However, it does segfault on the Zero assembler port, so currently JIT only
+%global share_arches %{jit_arches}
# Set of architectures for which we build the Shenandoah garbage collector
%global shenandoah_arches x86_64 %{aarch64}
# Set of architectures for which we build the Z garbage collector
@@ -123,7 +125,12 @@
# Set of architectures for which java has short vector math library (libsvml.so)
%global svml_arches x86_64
# Set of architectures where we verify backtraces with gdb
+# s390x fails on RHEL 7 so we exclude it there
+%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
+%global gdb_arches %{arm} %{aarch64} %{ix86} %{power64} sparcv9 sparc64 x86_64 %{zero_arches}
+%else
%global gdb_arches %{jit_arches} %{zero_arches}
+%endif
# By default, we build a debug build during main build on JIT architectures
%if %{with slowdebug}
@@ -271,16 +278,17 @@
# New Version-String scheme-style defines
%global featurever 17
%global interimver 0
-%global updatever 8
+%global updatever 9
%global patchver 0
+
# We don't add any LTS designator for STS packages (Fedora and EPEL).
# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
%if 0%{?rhel} && !0%{?epel}
%global lts_designator "LTS"
%global lts_designator_zip -%{lts_designator}
%else
- %global lts_designator ""
- %global lts_designator_zip ""
+ %global lts_designator ""
+ %global lts_designator_zip ""
%endif
# Define vendor information used by OpenJDK
@@ -296,7 +304,7 @@
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{name}&…
%else
%if 0%{?rhel}
-%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20…
+%global oj_vendor_bug_url https://access.redhat.com/support/cases/
%else
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi
%endif
@@ -306,14 +314,21 @@
# Define IcedTea version used for SystemTap tapsets and desktop file
%global icedteaver 6.0.0pre00-c848b93a8598
+# Define JDK versions
+%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
+%global javaver %{featurever}
+# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
+%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
+# The tag used to create the OpenJDK tarball
+%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Standard JPackage naming and versioning defines
%global origin openjdk
%global origin_nice OpenJDK
%global top_level_dir_name %{origin}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
-%global buildver 7
-%global rpmrelease 2
+%global buildver 9
+%global rpmrelease 1
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -326,14 +341,6 @@
# for techpreview, using 1, so slowdebugs can have 0
%global priority %( printf '%08d' 1 )
%endif
-%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
-%global javaver %{featurever}
-
-# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
-%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
-
-# The tag used to create the OpenJDK tarball
-%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Define milestone (EA for pre-releases, GA for releases)
# Release will be (where N is usually a number starting at 1):
@@ -343,7 +350,7 @@
%if %{is_ga}
%global build_type GA
%global ea_designator ""
-%global ea_designator_zip ""
+%global ea_designator_zip %{nil}
%global extraver %{nil}
%global eaprefix %{nil}
%else
@@ -509,12 +516,15 @@ alternatives \\
--install %{_bindir}/java $key %{jrebindir -- %{?1}}/java $PRIORITY --family %{family} \\
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{sdkdir -- %{?1}} \\
--slave %{_bindir}/%{alt_java_name} %{alt_java_name} %{jrebindir -- %{?1}}/%{alt_java_name} \\
+ --slave %{_bindir}/jcmd jcmd %{sdkbindir -- %{?1}}/jcmd \\
--slave %{_bindir}/keytool keytool %{jrebindir -- %{?1}}/keytool \\
--slave %{_bindir}/rmiregistry rmiregistry %{jrebindir -- %{?1}}/rmiregistry \\
--slave %{_mandir}/man1/java.1$ext java.1$ext \\
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/%{alt_java_name}.1$ext %{alt_java_name}.1$ext \\
%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1$ext \\
+ --slave %{_mandir}/man1/jcmd.1$ext jcmd.1$ext \\
+ %{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \\
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/rmiregistry.1$ext rmiregistry.1$ext \\
@@ -599,7 +609,6 @@ alternatives \\
--slave %{_bindir}/jarsigner jarsigner %{sdkbindir -- %{?1}}/jarsigner \\
--slave %{_bindir}/javadoc javadoc %{sdkbindir -- %{?1}}/javadoc \\
--slave %{_bindir}/javap javap %{sdkbindir -- %{?1}}/javap \\
- --slave %{_bindir}/jcmd jcmd %{sdkbindir -- %{?1}}/jcmd \\
--slave %{_bindir}/jconsole jconsole %{sdkbindir -- %{?1}}/jconsole \\
--slave %{_bindir}/jdb jdb %{sdkbindir -- %{?1}}/jdb \\
--slave %{_bindir}/jdeps jdeps %{sdkbindir -- %{?1}}/jdeps \\
@@ -626,8 +635,6 @@ alternatives \\
%{_mandir}/man1/javadoc-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/javap.1$ext javap.1$ext \\
%{_mandir}/man1/javap-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/jcmd.1$ext jcmd.1$ext \\
- %{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/jconsole.1$ext jconsole.1$ext \\
%{_mandir}/man1/jconsole-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/jdb.1$ext jdb.1$ext \\
@@ -790,10 +797,11 @@ exit 0
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/bin
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/java
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/%{alt_java_name}
+%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jcmd
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/keytool
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmiregistry
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib
-%ifarch %{share_arches}
+%ifarch %{jit_arches}
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/classlist
%endif
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jexec
@@ -851,7 +859,8 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/default.jfc
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/profile.jfc
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1*
-#%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1* #TODO, resolve alt-java man page
+%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1*
+%{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{?1}}.1*
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/%{vm_variant}/
@@ -900,8 +909,9 @@ exit 0
%if %is_system_jdk
%if %{is_release_build -- %{?1}}
%ghost %{_bindir}/java
-%ghost %{_bindir}/%{alt_java_name}
%ghost %{_jvmdir}/jre
+%ghost %{_bindir}/%{alt_java_name}
+%ghost %{_bindir}/jcmd
%ghost %{_bindir}/keytool
%ghost %{_bindir}/pack200
%ghost %{_bindir}/rmid
@@ -926,7 +936,6 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javadoc
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javap
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jconsole
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jcmd
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdb
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeps
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeprscan
@@ -999,7 +1008,6 @@ exit 0
%ghost %{_bindir}/jarsigner
%ghost %{_bindir}/javadoc
%ghost %{_bindir}/javap
-%ghost %{_bindir}/jcmd
%ghost %{_bindir}/jconsole
%ghost %{_bindir}/jdb
%ghost %{_bindir}/jdeps
@@ -1028,7 +1036,6 @@ exit 0
%define files_demo() %{expand:
%license %{_jvmdir}/%{sdkdir -- %{?1}}/legal
%{_jvmdir}/%{sdkdir -- %{?1}}/demo
-%{_jvmdir}/%{sdkdir -- %{?1}}/sample
}
%define files_src() %{expand:
@@ -1231,7 +1238,7 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
%global portable_name %{name}-portable
# the version must match, but sometmes we need to more precise, so including release
-%global portable_version %{version}-3
+%global portable_version %{version}-1
Name: java-%{javaver}-%{origin}
Version: %{newjavaver}.%{buildver}
@@ -1294,23 +1301,22 @@ Source16: CheckVendor.java
Source18: TestTranslations.java
BuildRequires: %{portable_name}-sources >= %{portable_version}
+BuildRequires: %{portable_name}-misc >= %{portable_version}
+BuildRequires: %{portable_name}-docs >= %{portable_version}
%if %{include_normal_build}
-BuildRequires: %{portable_name} >= %{portable_version}
-BuildRequires: %{portable_name}-devel >= %{portable_version}
+BuildRequires: %{portable_name}-unstripped >= %{portable_version}
%if %{include_staticlibs}
BuildRequires: %{portable_name}-static-libs >= %{portable_version}
%endif
%endif
%if %{include_fastdebug_build}
-BuildRequires: %{portable_name}-fastdebug >= %{portable_version}
BuildRequires: %{portable_name}-devel-fastdebug >= %{portable_version}
%if %{include_staticlibs}
BuildRequires: %{portable_name}-static-libs-fastdebug >= %{portable_version}
%endif
%endif
%if %{include_debug_build}
-BuildRequires: %{portable_name}-slowdebug >= %{portable_version}
BuildRequires: %{portable_name}-devel-slowdebug >= %{portable_version}
%if %{include_staticlibs}
BuildRequires: %{portable_name}-static-libs-slowdebug >= %{portable_version}
@@ -1695,23 +1701,23 @@ if [ $prioritylength -ne 8 ] ; then
fi
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.sources.noarch.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable*.misc.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable*.docs.%{_arch}.tar.xz
+
%if %{include_normal_build}
-tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.jdk.%{_arch}.tar.xz
-#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.jre.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.unstripped.jdk.%{_arch}.tar.xz
%if %{include_staticlibs}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.static-libs.%{_arch}.tar.xz
%endif
%endif
%if %{include_fastdebug_build}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jdk.%{_arch}.tar.xz
-#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.static-libs.%{_arch}.tar.xz
%endif
%endif
%if %{include_debug_build}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jdk.%{_arch}.tar.xz
-#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.static-libs.%{_arch}.tar.xz
%endif
@@ -1945,6 +1951,8 @@ for suffix in %{build_loop} ; do
%endif
jdk_image=${top_dir_abs_main_build_path}
src_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.sources.noarch/"`
+ misc_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.misc.%{_arch}/"`
+ docs_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.docs.%{_arch}/"`
# Install the jdk
mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
@@ -1952,7 +1960,7 @@ mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
# Install icons
for s in 16 24 32 48 ; do
install -D -p -m 644 \
- ${src_image}/openjdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png \
+ ${src_image}/%{vcstag}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/java-%{javaver}-%{origin}.png
done
@@ -2006,11 +2014,11 @@ if ! echo $suffix | grep -q "debug" ; then
# Install Javadoc documentation
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
- built_doc_archive=javadocs.zip
- cp -a ${top_dir_abs_main_build_path}/${built_doc_archive} \
- $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip || ls -l ${top_dir_abs_main_build_path}
+ built_doc_archive=$(basename $(ls ${docs_image}/jdk*docs.zip))
+ cp -a ${docs_image}/${built_doc_archive} \
+ $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
pushd $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
- unzip ${top_dir_abs_main_build_path}/${built_doc_archive}
+ unzip ${docs_image}/${built_doc_archive}
popd
fi
@@ -2031,7 +2039,6 @@ done
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/.java/.systemPrefs
# copy samples next to demos; samples are mostly js files
-cp -r ${src_image}/%{top_level_dir_name}/src/sample $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/
# moving config files to /etc
mkdir -p $RPM_BUILD_ROOT/%{etcjavadir -- $suffix}
@@ -2052,9 +2059,6 @@ find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -name "*.so" -exec chmod 7
find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -type d -exec chmod 755 {} \; ;
find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/legal -type f -exec chmod 644 {} \; ;
-if [ "x$suffix" = "x" ] ; then
- rm $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/javadocs.zip #is in subpackages, 1 renamed, 2nd unpacked
-fi
# end, dual install
done
@@ -2093,10 +2097,11 @@ $JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=tru
if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
# Check alt-java launcher has SSB mitigation on supported architectures
+# set_speculation function exists in both cases, so check for prctl call
%ifarch %{ssbd_arches}
-nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation
+nm $JAVA_HOME/bin/%{alt_java_name} | grep prctl
%else
-if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi
+if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep prctl ; then true ; else false; fi
%endif
# Check correct vendor values have been set
@@ -2113,8 +2118,8 @@ $JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|
%if %{include_staticlibs}
# Check debug symbols in static libraries (smoke test)
export STATIC_LIBS_HOME=${JAVA_HOME}/%{static_libs_install_dir}
-readelf --debug-dump $STATIC_LIBS_HOME/libfdlibm.a | grep w_remainder.c
-readelf --debug-dump $STATIC_LIBS_HOME/libfdlibm.a | grep e_remainder.c
+readelf --debug-dump $STATIC_LIBS_HOME/libnet.a | grep Inet4AddressImpl.c
+readelf --debug-dump $STATIC_LIBS_HOME/libnet.a | grep Inet6AddressImpl.c
%endif
# Check src.zip has all sources. See RHBZ#1130490
@@ -2377,6 +2382,9 @@ cjc.mainProgram(args)
%endif
%changelog
+* Wed Nov 22 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:17.0.9.0.9-1
+- updated to OpenJDK 17.0.9 (2023-10-17)
+
* Fri Sep 29 2023 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:17.0.8.0.7-2
- Fix flatpak build
commit efb675a1006c24a4f1e96021d1a785f37c237da9
Author: Yaakov Selkowitz <yselkowi(a)redhat.com>
Date: Mon Sep 11 16:13:18 2023 -0400
Fix flatpak build
java-X-openjdk-portable must not be rebuilt for flatpaks, nor do we want
to rebuild tzdata for tzdata-java, so it will be added to the runtimes.
Therefore, we need to take into account the possibility of different
prefixes for those compared to java-X-openjdk.
diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec
index 45aa8e9..61cc9fc 100644
--- a/java-17-openjdk.spec
+++ b/java-17-openjdk.spec
@@ -313,7 +313,7 @@
%global top_level_dir_name %{origin}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 7
-%global rpmrelease 1
+%global rpmrelease 2
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -404,12 +404,16 @@
%global rpm_state_dir %{_localstatedir}/lib/rpm-state/
-# For flatpack builds hard-code /usr/sbin/alternatives,
-# otherwise use %%{_sbindir} relative path.
+# For flatpack builds hard-code dependency paths,
+# otherwise use relative paths.
%if 0%{?flatpak}
%global alternatives_requires /usr/sbin/alternatives
+%global javazidir /usr/share/javazi-1.8
+%global portablejvmdir /usr/lib/jvm
%else
%global alternatives_requires %{_sbindir}/alternatives
+%global javazidir %{_datadir}/javazi-1.8
+%global portablejvmdir %{_jvmdir}
%endif
%global family %{name}.%{_arch}
@@ -1690,26 +1694,26 @@ if [ $prioritylength -ne 8 ] ; then
exit 14
fi
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.sources.noarch.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.sources.noarch.tar.xz
%if %{include_normal_build}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.jdk.%{_arch}.tar.xz
-#tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.jre.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.jdk.%{_arch}.tar.xz
+#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.static-libs.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.static-libs.%{_arch}.tar.xz
%endif
%endif
%if %{include_fastdebug_build}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jdk.%{_arch}.tar.xz
-#tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jre.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jdk.%{_arch}.tar.xz
+#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.fastdebug.static-libs.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.static-libs.%{_arch}.tar.xz
%endif
%endif
%if %{include_debug_build}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jdk.%{_arch}.tar.xz
-#tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jre.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jdk.%{_arch}.tar.xz
+#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.slowdebug.static-libs.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.static-libs.%{_arch}.tar.xz
%endif
%endif
@@ -1787,7 +1791,7 @@ function installjdk() {
# Use system-wide tzdata
mv ${imagepath}/lib/tzdb.dat{,.upstream}
- ln -sv %{_datadir}/javazi-1.8/tzdb.dat ${imagepath}/lib/tzdb.dat
+ ln -sv %{javazidir}/tzdb.dat ${imagepath}/lib/tzdb.dat
# Rename OpenJDK cacerts database
mv ${imagepath}/lib/security/cacerts{,.upstream}
@@ -2100,15 +2104,11 @@ $JAVA_HOME/bin/javac -d . %{SOURCE16}
#TODO skipped vendor check. It now points to PORTABLE version of jdk.
#$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
-%if ! 0%{?flatpak}
-# Check translations are available for new timezones (during flatpak builds, the
-# tzdb.dat used by this test is not where the test expects it, so this is
-# disabled for flatpak builds)
+# Check translations are available for new timezones
$JAVA_HOME/bin/javac -d . %{SOURCE18}
#TODO doublecheck tzdata handling
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE || echo "TZDATA no longer can be synced with system, because we repack"
$JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR || echo "TZDATA no longer can be synced with system, because we repack"
-%endif
%if %{include_staticlibs}
# Check debug symbols in static libraries (smoke test)
@@ -2377,7 +2377,10 @@ cjc.mainProgram(args)
%endif
%changelog
-* Thu Aug 08 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:17.0.8.0.7-1
+* Fri Sep 29 2023 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:17.0.8.0.7-2
+- Fix flatpak build
+
+* Tue Aug 08 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:17.0.8.0.7-1
- updated to security 17.0.8.0.7
* Thu Jul 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:17.0.7.0.7-5.1
1
0
List of packages currently excluding arches (1133)
===========================================
- 0ad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- 90-Second-Portraits
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- BareBonesBrowserLaunch
ExclusiveArch: %{java_arches} noarch
- CFR
ExclusiveArch: %{java_arches} noarch
- CardManager
ExclusiveArch: %{java_arches} noarch
- GAPDoc
ExclusiveArch: %{gap_arches} noarch
- GoldenCheetah
ExclusiveArch: %{qt5_qtwebengine_arches}
- GtkAda
ExclusiveArch: %{GPRbuild_arches}
- GtkAda3
ExclusiveArch: %{GPRbuild_arches}
- IPAddress
ExclusiveArch: %{java_arches} noarch
- Mars
ExclusiveArch: %{java_arches} noarch
- OpenColorIO
ExclusiveArch: x86_64 ppc64le
- OpenImageIO
ExclusiveArch: x86_64 ppc64le
- OpenMolcas
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- OpenStego
ExclusiveArch: %{java_arches} noarch
- PragmARC
ExclusiveArch: %{GPRbuild_arches}
- R-V8
ExclusiveArch: %{nodejs_arches}
- R-rJava
ExclusiveArch: %{java_arches}
- RdRand
ExclusiveArch: %{ix86} x86_64
- RediSearch
ExclusiveArch: x86_64
- SLOF
ExclusiveArch: ppc64le
- YafaRay
ExclusiveArch: %{ix86} x86_64
- aardvark-dns
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- accel-config
ExclusiveArch: %{ix86} x86_64
- acpid
ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64
- ahven
ExclusiveArch: %{GPRbuild_arches}
- algobox
ExclusiveArch: %{qt5_qtwebengine_arches}
- american-fuzzy-lop
ExclusiveArch: %{ix86} x86_64 s390x
- anet
ExclusiveArch: %{GPRbuild_arches}
- ant
ExclusiveArch: %{java_arches} noarch
- ant-antunit
ExclusiveArch: %{java_arches} noarch
- ant-contrib
ExclusiveArch: %{java_arches} noarch
- antlr
ExclusiveArch: %{java_arches}
- antlr3
ExclusiveArch: %{java_arches}
- antlr4-project
ExclusiveArch: %{java_arches}
- antlrworks
ExclusiveArch: %{java_arches} noarch
- aopalliance
ExclusiveArch: %{java_arches} noarch
- apache-commons-beanutils
ExclusiveArch: %{java_arches} noarch
- apache-commons-cli
ExclusiveArch: %{java_arches} noarch
- apache-commons-codec
ExclusiveArch: %{java_arches} noarch
- apache-commons-collections
ExclusiveArch: %{java_arches} noarch
- apache-commons-collections4
ExclusiveArch: %{java_arches} noarch
- apache-commons-compress
ExclusiveArch: %{java_arches} noarch
- apache-commons-configuration
ExclusiveArch: %{java_arches} noarch
- apache-commons-digester
ExclusiveArch: %{java_arches} noarch
- apache-commons-exec
ExclusiveArch: %{java_arches} noarch
- apache-commons-io
ExclusiveArch: %{java_arches} noarch
- apache-commons-jexl
ExclusiveArch: %{java_arches} noarch
- apache-commons-jxpath
ExclusiveArch: %{java_arches} noarch
- apache-commons-lang3
ExclusiveArch: %{java_arches} noarch
- apache-commons-logging
ExclusiveArch: %{java_arches} noarch
- apache-commons-math
ExclusiveArch: %{java_arches} noarch
- apache-commons-modeler
ExclusiveArch: %{java_arches} noarch
- apache-commons-net
ExclusiveArch: %{java_arches} noarch
- apache-commons-parent
ExclusiveArch: %{java_arches} noarch
- apache-commons-pool
ExclusiveArch: %{java_arches} noarch
- apache-commons-vfs
ExclusiveArch: %{java_arches} noarch
- apache-ivy
ExclusiveArch: %{java_arches} noarch
- apache-parent
ExclusiveArch: %{java_arches} noarch
- apache-resource-bundles
ExclusiveArch: %{java_arches} noarch
- apache-sshd
ExclusiveArch: %{java_arches} noarch
- apiguardian
ExclusiveArch: %{java_arches} noarch
- apmd
ExclusiveArch: %{ix86}
- appstream-generator
ExclusiveArch: %{ldc_arches}
- aqute-bnd
ExclusiveArch: %{java_arches} noarch
- args4j
ExclusiveArch: %{java_arches} noarch
- arianna
ExclusiveArch: %{qt6_qtwebengine_arches}
- arm-trusted-firmware
ExclusiveArch: aarch64
- asmjit
ExclusiveArch: aarch64 x86_64
- assertj-core
ExclusiveArch: %{java_arches} noarch
- atinject
ExclusiveArch: %{java_arches} noarch
- aunit
ExclusiveArch: %GPRbuild_arches
- auto
ExclusiveArch: %{java_arches} noarch
- autolink-java
ExclusiveArch: noarch %{java_arches}
- avgtime
ExclusiveArch: %{ldc_arches}
- aws
ExclusiveArch: %GPRbuild_arches
- azure-cli
ExclusiveArch: %{java_arches} noarch
- batik
ExclusiveArch: %{java_arches} noarch
- bcal
ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x
- bcc
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
- bcel
ExclusiveArch: %{java_arches} noarch
- bcm283x-firmware
ExclusiveArch: aarch64
- beansbinding
ExclusiveArch: %{java_arches} noarch
- berusky2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips}
- beust-jcommander
ExclusiveArch: %{java_arches} noarch
- bibletime
ExclusiveArch: %{java_arches}
- biosdevname
ExclusiveArch: %{ix86} x86_64
- bless
ExclusiveArch: %mono_arches
- bodhi-server
ExclusiveArch: %{golang_arches_future}
- bolzplatz2006
ExclusiveArch: %{java_arches}
- bouncycastle
ExclusiveArch: %{java_arches} noarch
- box64
ExclusiveArch: aarch64 ppc64le x86_64
- bpftrace
ExclusiveArch: x86_64 %{power64} aarch64 s390x
- brazil
ExclusiveArch: %{java_arches} noarch
- bsf
ExclusiveArch: %{java_arches} noarch
- bsh
ExclusiveArch: %{java_arches} noarch
- build-helper-maven-plugin
ExclusiveArch: %{java_arches} noarch
- buildah
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- byebyebios
ExclusiveArch: x86_64
- byte-buddy
ExclusiveArch: %{java_arches} noarch
- byteman
ExclusiveArch: %{java_arches} noarch
- cachelib
ExclusiveArch: x86_64 aarch64 ppc64le
- caddy
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: %{golang_arches}
- caffe
ExclusiveArch: x86_64 aarch64 ppc64le
- calamares
ExclusiveArch: %{ix86} x86_64 aarch64
- calibre
ExclusiveArch: aarch64 x86_64
- cambozola
ExclusiveArch: %{java_arches} noarch
- canl-java
ExclusiveArch: %{java_arches} noarch
- catatonit
ExclusiveArch: aarch64 ppc64le s390x x86_64
ExclusiveArch: %{golang_arches_future}
- ccdciel
ExclusiveArch: %{fpc_arches}
- cdcollect
ExclusiveArch: %{mono_arches}
- cdi-api
ExclusiveArch: %{java_arches} noarch
- ceph
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- cglib
ExclusiveArch: %{java_arches} noarch
- chromium
ExclusiveArch: x86_64
ExclusiveArch: x86_64 aarch64
- cjdns
ExclusiveArch: %{nodejs_arches}
- classloader-leak-test-framework
ExclusiveArch: %{java_arches} noarch
- classpathless-compiler
ExclusiveArch: %{java_arches} noarch
- clevis-pin-tpm2
ExclusiveArch: %{rust_arches}
- clojure
ExclusiveArch: %{java_arches} noarch
- clojure-core-specs-alpha
ExclusiveArch: %{java_arches} noarch
- clojure-maven-plugin
ExclusiveArch: %{java_arches} noarch
- clojure-spec-alpha
ExclusiveArch: %{java_arches} noarch
- cmospwd
ExclusiveArch: %{ix86} x86_64
- cmrt
ExclusiveArch: %{ix86} x86_64 ia64
- codehaus-parent
ExclusiveArch: %{java_arches} noarch
- colorful
ExclusiveArch: %{fpc_arches}
- colossus
ExclusiveArch: %{java_arches} noarch
- conmon
ExclusiveArch: %{golang_arches_future}
- console-image-viewer
ExclusiveArch: %{java_arches} noarch
- containernetworking-plugins
ExclusiveArch: %{golang_arches}
- coq
ExclusiveArch: %{ocaml_native_compiler}
- cortado
ExclusiveArch: %{java_arches} noarch
- cpu-x
ExclusiveArch: i686 x86_64
- cpufetch
ExclusiveArch: %{arm} aarch64 x86_64 ppc ppc64 ppc64le
- cpuid
ExclusiveArch: %{ix86} x86_64
- cpuinfo
ExclusiveArch: x86_64 aarch64
- cqrlog
ExclusiveArch: %{fpc_arches}
- crash
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- crash-gcore-command
ExclusiveArch: aarch64 ppc64le x86_64
- crash-trace-command
ExclusiveArch: aarch64 ppc64le s390x x86_64
- credentials-fetcher
ExclusiveArch: x86_64 aarch64 s390x
- cri-o
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- cri-tools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- criu
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- crun
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le riscv64 s390x x86_64
- cryptlib
ExclusiveArch: x86_64 aarch64 ppc64le
- crypto-policies
ExclusiveArch: %{java_arches} noarch
- cryptobone
ExclusiveArch: x86_64 ppc64le aarch64
- csslint
ExclusiveArch: %{nodejs_arches} noarch
- daq
ExclusiveArch: x86_64 aarch64
- dbus-sharp
ExclusiveArch: %mono_arches
- dbus-sharp-glib
ExclusiveArch: %mono_arches
- decentxml
ExclusiveArch: %{java_arches} noarch
- deepin-daemon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- deepin-desktop-schemas
ExclusiveArch: %{go_arches}
- directory-maven-plugin
ExclusiveArch: %{java_arches} noarch
- dirgra
ExclusiveArch: %{java_arches} noarch
- disruptor
ExclusiveArch: %{java_arches} noarch
- ditaa
ExclusiveArch: %{java_arches} noarch
- dlm
ExclusiveArch: i686 x86_64
- dmidecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- dmtcp
ExclusiveArch: x86_64
- docker-distribution
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- dogtag-pki
ExclusiveArch: %{java_arches}
- dolphin-emu
ExclusiveArch: x86_64 aarch64
- dom4j
ExclusiveArch: %{java_arches} noarch
- dotnet6.0
ExclusiveArch: aarch64 x86_64 s390x
ExclusiveArch: x86_64
- dotnet7.0
ExclusiveArch: aarch64 ppc64le s390x x86_64
ExclusiveArch: x86_64
- doublecmd
ExclusiveArch: %{ix86} x86_64
- dpdk
ExclusiveArch: x86_64 i686 aarch64 ppc64le
- dub
ExclusiveArch: %{ldc_arches}
- dxvk-native
ExclusiveArch: %{ix86} x86_64
- dyninst
ExclusiveArch: %{ix86} x86_64 ppc64le aarch64
- e3
ExclusiveArch: %{ix86} x86_64
- easymock
ExclusiveArch: %{java_arches} noarch
- ecj
ExclusiveArch: %{java_arches} noarch
- eclipse-swt
ExclusiveArch: %{java_arches}
- ed25519-java
ExclusiveArch: %{java_arches} noarch
- edk2
ExclusiveArch: x86_64 aarch64 riscv64
- efibootmgr
ExclusiveArch: %{efi}
- efifs
ExclusiveArch: %{efi}
- efitools
ExclusiveArch: %{efi}
- efivar
ExclusiveArch: %{efi}
- elk
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- emacs-slime
ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64
- embree
ExclusiveArch: aarch64 x86_64
- embree3
ExclusiveArch: aarch64 x86_64
- enjarify
ExclusiveArch: %{java_arches} noarch
- enki
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
- envytools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- eric
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
- erlang-corba
ExclusiveArch: %{java_arches}
- esmi_ib_library
ExclusiveArch: x86_64
- eth-tools
ExclusiveArch: x86_64
- exec-maven-plugin
ExclusiveArch: %{java_arches} noarch
- external-editor-revived
ExclusiveArch: %{rust_arches}
- extra-enforcer-rules
ExclusiveArch: %{java_arches} noarch
- fasterxml-oss-parent
ExclusiveArch: %{java_arches} noarch
- fb303
ExclusiveArch: x86_64 aarch64 ppc64le
- fbthrift
ExclusiveArch: x86_64 aarch64 ppc64le
- fcitx-libpinyin
ExclusiveArch: %{qt5_qtwebengine_arches}
- fedora-dockerfiles
ExclusiveArch: %{go_arches}
- felix-parent
ExclusiveArch: %{java_arches} noarch
- felix-utils
ExclusiveArch: %{java_arches} noarch
- fernflower
ExclusiveArch: %{java_arches} noarch
- fes
ExclusiveArch: %{ix86} x86_64
- filedrop
ExclusiveArch: %{java_arches} noarch
- firecracker
ExclusiveArch: aarch64 x86_64
- fishbowl
ExclusiveArch: %{java_arches} noarch
- fizz
ExclusiveArch: x86_64 aarch64 ppc64le
- flexmark-java
ExclusiveArch: noarch %{java_arches}
- flocq
ExclusiveArch: %{ocaml_native_compiler}
- florist
ExclusiveArch: %{GPRbuild_arches}
- fluent-bit
ExclusiveArch: x86_64 aarch64
- flute
ExclusiveArch: %{java_arches} noarch
- folly
ExclusiveArch: x86_64 aarch64 ppc64le
- fop
ExclusiveArch: %{java_arches} noarch
- forge-parent
ExclusiveArch: %{java_arches} noarch
- fpc
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc64le
- frama-c
ExclusiveArch: %{ocaml_native_compiler}
- freecol
ExclusiveArch: %{java_arches} noarch
- freemarker
ExclusiveArch: %{java_arches} noarch
- freerouting
ExclusiveArch: %{java_arches} noarch
- frescobaldi
ExclusiveArch: %{qt5_qtwebengine_arches}
- frysk
ExclusiveArch: x86_64 ppc64
- fuse-overlayfs
ExclusiveArch: %{arm64} ppc64le s390x x86_64
- fusesource-pom
ExclusiveArch: %{java_arches} noarch
- fwts
ExclusiveArch: x86_64 %{arm} aarch64 s390x riscv64 %{power64}
- fwupd-efi
ExclusiveArch: x86_64 aarch64
- ga
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- gap
ExclusiveArch: %{gap_arches}
- gap-pkg-ace
ExclusiveArch: %{gap_arches}
- gap-pkg-aclib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-alnuth
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-atlasrep
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-autodoc
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-automata
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-autpgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-browse
ExclusiveArch: %{gap_arches}
- gap-pkg-caratinterface
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-circle
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-cohomolo
ExclusiveArch: %{gap_arches}
- gap-pkg-congruence
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-corelg
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crime
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crisp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crypting
ExclusiveArch: %{gap_arches}
- gap-pkg-cryst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crystcat
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-ctbllib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-curlinterface
ExclusiveArch: %{gap_arches}
- gap-pkg-cvec
ExclusiveArch: %{gap_arches}
- gap-pkg-datastructures
ExclusiveArch: %{gap_arches}
- gap-pkg-design
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-digraphs
ExclusiveArch: %{gap_arches}
- gap-pkg-edim
ExclusiveArch: %{gap_arches}
- gap-pkg-factint
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-ferret
ExclusiveArch: %{gap_arches}
- gap-pkg-fga
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-fining
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-float
ExclusiveArch: %{gap_arches}
- gap-pkg-format
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-forms
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-fr
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-francy
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-gbnp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-genss
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-grape
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-groupoids
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-grpconst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-guava
ExclusiveArch: %{gap_arches}
- gap-pkg-hap
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-hapcryst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-hecke
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-images
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-io
ExclusiveArch: %{gap_arches}
- gap-pkg-irredsol
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-json
ExclusiveArch: %{gap_arches}
- gap-pkg-jupyterkernel
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-jupyterviz
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-laguna
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liealgdb
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liepring
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liering
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-loops
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-lpres
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-mapclass
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-nautytracesinterface
ExclusiveArch: %{gap_arches}
- gap-pkg-nq
ExclusiveArch: %{gap_arches}
- gap-pkg-openmath
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-orb
ExclusiveArch: %{gap_arches}
- gap-pkg-polenta
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-polycyclic
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-polymaking
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-primgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-profiling
ExclusiveArch: %{gap_arches}
- gap-pkg-qpa
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-quagroup
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-radiroot
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-recog
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-repsn
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-resclasses
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-scscp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-semigroups
ExclusiveArch: %{gap_arches}
- gap-pkg-singular
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sla
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-smallgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-smallsemi
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sonata
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sophus
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-spinsym
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-standardff
ExclusiveArch: %{gap_arches}
- gap-pkg-tomlib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-toric
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-transgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-utils
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-uuid
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-xmod
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-zeromqinterface
ExclusiveArch: %{gap_arches}
- gappalib-coq
ExclusiveArch: %{ocaml_native_compiler}
- gbrainy
ExclusiveArch: %mono_arches
- gdb
ExclusiveArch: %{ix86} x86_64
- gdb-exploitable
ExclusiveArch: x86_64 i386
ExclusiveArch: x86_64 noarch
- gearhead1
ExclusiveArch: %{fpc_arches}
- gearhead2
ExclusiveArch: %{fpc_arches}
- ghdl
ExclusiveArch: %{GNAT_arches}
- ghostwriter
ExclusiveArch: %{qt5_qtwebengine_arches}
- gio-sharp
ExclusiveArch: %mono_arches
- gir-to-d
ExclusiveArch: %{ldc_arches}
- git-octopus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- gitqlient
ExclusiveArch: %{qt5_qtwebengine_arches}
- giver
ExclusiveArch: %{mono_arches}
- gkeyfile-sharp
ExclusiveArch: %mono_arches
- glibc32
ExclusiveArch: x86_64
- glibd
ExclusiveArch: %{ldc_arches}
- gnatcoll
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-bindings
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-db
ExclusiveArch: %{GPRbuild_arches}
- gnome-boxes
ExclusiveArch: x86_64
- gnome-desktop-sharp
ExclusiveArch: %mono_arches
- gnome-do
ExclusiveArch: %mono_arches
- gnome-keyring-sharp
ExclusiveArch: %mono_arches
- gnome-rdp
ExclusiveArch: %{mono_arches}
- gnome-sharp
ExclusiveArch: %mono_arches
- gnome-subtitles
ExclusiveArch: %mono_arches
- gnu-efi
ExclusiveArch: %{efi}
- go-bindata
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- godep
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang
ExclusiveArch: %{golang_arches}
- google-gson
ExclusiveArch: %{java_arches} noarch
- google-guice
ExclusiveArch: %{java_arches} noarch
- gotun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: x86_64
- goverlay
ExclusiveArch: %{fpc_arches}
- gprbuild
ExclusiveArch: %{GPRbuild_arches}
- gprolog
ExclusiveArch: x86_64 %{ix86} ppc alpha aarch64
- grafana
ExclusiveArch: %{grafana_arches}
- grafana-pcp
ExclusiveArch: %{grafanapcp_arches}
- gtk-sharp-beans
ExclusiveArch: %mono_arches
- gtk-sharp2
ExclusiveArch: %mono_arches
- gtk-sharp3
ExclusiveArch: %{mono_arches}
- gtkd
ExclusiveArch: %{ldc_arches}
- guava
ExclusiveArch: %{java_arches} noarch
- gudev-sharp
ExclusiveArch: %mono_arches
- guestfs-tools
ExclusiveArch: %{kernel_arches}
- gvisor-tap-vsock
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- hamcrest
ExclusiveArch: %{java_arches} noarch
- harec
ExclusiveArch: x86_64 aarch64
- hawtjni
ExclusiveArch: %{java_arches} noarch
- hedgewars
ExclusiveArch: %{fpc_arches}
- hibernate-jpa-2.0-api
ExclusiveArch: %{java_arches} noarch
- hid4java
ExclusiveArch: %{java_arches} noarch
- hipblas
ExclusiveArch: x86_64
- hipcub
ExclusiveArch: x86_64
- hipify
ExclusiveArch: x86_64
- hsakmt
ExclusiveArch: x86_64 aarch64 ppc64le
- httpcomponents-client
ExclusiveArch: %{java_arches} noarch
- httpcomponents-core
ExclusiveArch: %{java_arches} noarch
- httpcomponents-project
ExclusiveArch: %{java_arches} noarch
- hyena
ExclusiveArch: %{mono_arches}
- hyperscan
ExclusiveArch: x86_64
- hyperv-daemons
ExclusiveArch: i686 x86_64 aarch64
- icaro
ExclusiveArch: %{ix86} x86_64 noarch
- icedtea-web
ExclusiveArch: %{java_arches}
- icu4j
ExclusiveArch: %{java_arches} noarch
- imagej
ExclusiveArch: %{java_arches} noarch
- imhex
ExclusiveArch: x86_64 %{arm64}
- imvirt
ExclusiveArch: %{ix86} x86_64 ia64
- indistarter
ExclusiveArch: %{fpc_arches}
- infinipath-psm
ExclusiveArch: x86_64
- intel-cm-compiler
ExclusiveArch: i686 x86_64
- intel-cmt-cat
ExclusiveArch: x86_64
- intel-compute-runtime
ExclusiveArch: x86_64
- intel-gmmlib
ExclusiveArch: x86_64 i686
- intel-igc
ExclusiveArch: x86_64
- intel-ipp-crypto-mb
ExclusiveArch: x86_64
- intel-ipsec-mb
ExclusiveArch: x86_64
- intel-mediasdk
ExclusiveArch: x86_64
- intel-undervolt
ExclusiveArch: i386 x86_64
- ioport
ExclusiveArch: %{ix86} x86_64
- ipmctl
ExclusiveArch: x86_64
- ispc
ExclusiveArch: x86_64 aarch64
- iucode-tool
ExclusiveArch: %{ix86} x86_64
- iyfct
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- jFormatString
ExclusiveArch: %{java_arches} noarch
- jackson-annotations
ExclusiveArch: %{java_arches} noarch
- jackson-bom
ExclusiveArch: %{java_arches} noarch
- jackson-core
ExclusiveArch: %{java_arches} noarch
- jackson-databind
ExclusiveArch: %{java_arches} noarch
- jackson-dataformats-binary
ExclusiveArch: %{java_arches} noarch
- jackson-dataformats-text
ExclusiveArch: %{java_arches} noarch
- jackson-jaxrs-providers
ExclusiveArch: %{java_arches} noarch
- jackson-modules-base
ExclusiveArch: %{java_arches} noarch
- jackson-parent
ExclusiveArch: %{java_arches} noarch
- jacoco
ExclusiveArch: %{java_arches} noarch
- jacop
ExclusiveArch: %{java_arches} noarch
- jakarta-activation
ExclusiveArch: %{java_arches} noarch
- jakarta-activation1
ExclusiveArch: %{java_arches} noarch
- jakarta-annotations
ExclusiveArch: %{java_arches} noarch
- jakarta-el
ExclusiveArch: %{java_arches} noarch
- jakarta-interceptors
ExclusiveArch: %{java_arches} noarch
- jakarta-json
ExclusiveArch: %{java_arches} noarch
- jakarta-mail
ExclusiveArch: %{java_arches} noarch
- jakarta-mail1
ExclusiveArch: %{java_arches} noarch
- jakarta-oro
ExclusiveArch: %{java_arches} noarch
- jakarta-saaj
ExclusiveArch: %{java_arches} noarch
- jakarta-server-pages
ExclusiveArch: %{java_arches} noarch
- jakarta-servlet
ExclusiveArch: %{java_arches} noarch
- jakarta-xml-ws
ExclusiveArch: %{java_arches} noarch
- janino
ExclusiveArch: %{java_arches} noarch
- jansi
ExclusiveArch: %{java_arches}
- jansi-native
ExclusiveArch: %{java_arches}
- jansi1
ExclusiveArch: %{java_arches} noarch
- java-1.8.0-openjdk
ExclusiveArch: %{java_arches}
- java-1.8.0-openjdk-aarch32
ExclusiveArch: %{arm}
- java-1.8.0-openjdk-portable
ExclusiveArch: %{java_arches}
- java-11-openjdk
ExclusiveArch: %{java_arches}
- java-11-openjdk-portable
ExclusiveArch: %{java_arches}
- java-17-openjdk
ExclusiveArch: %{java_arches}
- java-17-openjdk-portable
ExclusiveArch: %{java_arches}
- java-diff-utils
ExclusiveArch: %{java_arches} noarch
- java-dirq
ExclusiveArch: %{java_arches} noarch
- java-jd-decompiler
ExclusiveArch: %{java_arches} noarch
- java-latest-openjdk
ExclusiveArch: %{java_arches}
- java-latest-openjdk-portable
ExclusiveArch: %{java_arches}
- java-runtime-decompiler
ExclusiveArch: %{java_arches} noarch
- java-scrypt
ExclusiveArch: %{java_arches} noarch
- java_cup
ExclusiveArch: %{java_arches} noarch
- javacc
ExclusiveArch: %{java_arches} noarch
- javacc-maven-plugin
ExclusiveArch: %{java_arches} noarch
- javaewah
ExclusiveArch: %{java_arches} noarch
- javapackages-bootstrap
ExclusiveArch: %{java_arches}
- javaparser
ExclusiveArch: %{java_arches} noarch
- javapoet
ExclusiveArch: %{java_arches} noarch
- javassist
ExclusiveArch: %{java_arches} noarch
- jaxb
ExclusiveArch: %{java_arches} noarch
- jaxb-api
ExclusiveArch: %{java_arches} noarch
- jaxb-api2
ExclusiveArch: %{java_arches} noarch
- jaxb-dtd-parser
ExclusiveArch: %{java_arches} noarch
- jaxb-fi
ExclusiveArch: %{java_arches} noarch
- jaxb-istack-commons
ExclusiveArch: %{java_arches} noarch
- jaxb-stax-ex
ExclusiveArch: %{java_arches} noarch
- jaxen
ExclusiveArch: %{java_arches} noarch
- jboss-jaxrs-2.0-api
ExclusiveArch: %{java_arches} noarch
- jboss-logging
ExclusiveArch: %{java_arches} noarch
- jboss-logging-tools
ExclusiveArch: %{java_arches} noarch
- jboss-parent
ExclusiveArch: %{java_arches} noarch
- jchardet
ExclusiveArch: %{java_arches} noarch
- jcip-annotations
ExclusiveArch: %{java_arches} noarch
- jctools
ExclusiveArch: %{java_arches} noarch
- jcuber
ExclusiveArch: %{java_arches} noarch
- jdeparser
ExclusiveArch: %{java_arches} noarch
- jdepend
ExclusiveArch: %{java_arches} noarch
- jdependency
ExclusiveArch: %{java_arches} noarch
- jdom
ExclusiveArch: %{java_arches} noarch
- jdom2
ExclusiveArch: %{java_arches} noarch
- jedit
ExclusiveArch: %{java_arches} noarch
- jericho-html
ExclusiveArch: %{java_arches} noarch
- jetbrains-annotations
ExclusiveArch: noarch %{java_arches}
- jetty
ExclusiveArch: %{java_arches} noarch
- jflex
ExclusiveArch: %{java_arches} noarch
- jfreechart
ExclusiveArch: %{java_arches} noarch
- jgit
ExclusiveArch: %{java_arches} noarch
- jglobus
ExclusiveArch: %{java_arches} noarch
- jgoodies-common
ExclusiveArch: %{java_arches} noarch
- jgoodies-forms
ExclusiveArch: %{java_arches} noarch
- jgoodies-looks
ExclusiveArch: %{java_arches} noarch
- jigawatts
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- jline
ExclusiveArch: %{java_arches}
- jline2
ExclusiveArch: %{java_arches} noarch
- jmock
ExclusiveArch: %{java_arches} noarch
- jmol
ExclusiveArch: %{java_arches} noarch
- jna
ExclusiveArch: %{java_arches}
- jneuroml-core
ExclusiveArch: %{java_arches} noarch
- jni-inchi
ExclusiveArch: %{java_arches}
- jol
ExclusiveArch: %{java_arches} noarch
- jolokia-jvm-agent
ExclusiveArch: %{java_arches} noarch
- jopt-simple
ExclusiveArch: %{java_arches} noarch
- jorbis
ExclusiveArch: %{java_arches} noarch
- jowl
ExclusiveArch: %{nodejs_arches} noarch
- jpanoramamaker
ExclusiveArch: %{java_arches} noarch
- jsch
ExclusiveArch: %{java_arches} noarch
- jsch-agent-proxy
ExclusiveArch: %{java_arches} noarch
- json_simple
ExclusiveArch: %{java_arches} noarch
- jsoup
ExclusiveArch: %{java_arches} noarch
- jsr-305
ExclusiveArch: %{java_arches} noarch
- jss
ExclusiveArch: %{java_arches}
- jssc
ExclusiveArch: %{java_arches}
- jtidy
ExclusiveArch: %{java_arches} noarch
- julia
ExclusiveArch: x86_64
- junit
ExclusiveArch: %{java_arches} noarch
- junit5
ExclusiveArch: %{java_arches} noarch
- juniversalchardet
ExclusiveArch: %{java_arches} noarch
- jzlib
ExclusiveArch: %{java_arches} noarch
- kaidan
ExclusiveArch: %{qt5_qtwebengine_arches}
- kchmviewer
ExclusiveArch: %{qt5_qtwebengine_arches}
- kernel
ExclusiveArch: noarch x86_64 s390x aarch64 ppc64le
ExclusiveArch: noarch i386 i686 x86_64 s390x aarch64 ppc64le
- keylime-agent-rust
ExclusiveArch: %{rust_arches}
- keyring-ima-signer
ExclusiveArch: %{rust_arches}
- kf5-akonadi-search
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-audiocd-kio
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kblog
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarcore
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarutils
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kitinerary
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-ktnef
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-libkdcraw
ExclusiveArch: x86_64 ppc64le %{arm}
- kicad
ExclusiveArch: x86_64 aarch64 ppc64le
- kiwix-desktop
ExclusiveArch: %{qt5_qtwebengine_arches}
- knot-resolver
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- knotes
ExclusiveArch: x86_64 %{arm}
- kubernetes
ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm}
- laf-plugin
ExclusiveArch: %{java_arches} noarch
- lazarus
ExclusiveArch: %{fpc_arches}
- lazpaint
ExclusiveArch: %{fpc_arches}
- ldapjdk
ExclusiveArch: %{java_arches} noarch
- ldc
ExclusiveArch: %{ldc_arches} ppc64le
- ldc1.32
ExclusiveArch: %{ldc_arches} ppc64le
- libbase
ExclusiveArch: %{java_arches} noarch
- libclc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x
- libcxl
ExclusiveArch: %{power64}
- libdfp
ExclusiveArch: ppc ppc64 ppc64le s390 s390x x86_64
- libdispatch
ExclusiveArch: x86_64 aarch64 ppc64le
- libfonts
ExclusiveArch: %{java_arches} noarch
- libformula
ExclusiveArch: %{java_arches} noarch
- libguestfs
ExclusiveArch: %{kernel_arches}
- libica
ExclusiveArch: s390 s390x
- libipt
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- libkgapi
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- libkrun
ExclusiveArch: x86_64 aarch64
- libkrunfw
ExclusiveArch: x86_64 aarch64
- liblayout
ExclusiveArch: %{java_arches} noarch
- libloader
ExclusiveArch: %{java_arches} noarch
- libnxz
ExclusiveArch: ppc64le
- libocxl
ExclusiveArch: ppc64le
- libpsm2
ExclusiveArch: x86_64
- libquentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- libreoffice-TexMaths
ExclusiveArch: %{java_arches}
- librepository
ExclusiveArch: %{java_arches} noarch
- libretro-desmume2015
ExclusiveArch: i686 x86_64
- librtas
ExclusiveArch: %{power64}
- libserializer
ExclusiveArch: %{java_arches} noarch
- libservicelog
ExclusiveArch: ppc %{power64}
- libsmbios
ExclusiveArch: x86_64 %{ix86}
- libunicode
ExclusiveArch: x86_64 aarch64
- libunwind
ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64
- libva-nvidia-driver
ExclusiveArch: %{x86_64} %{ix86} %{arm64} ppc64le
- libvirt-java
ExclusiveArch: %{java_arches} noarch
- libvma
ExclusiveArch: x86_64 ppc64le ppc64 aarch64
- libvmi
ExclusiveArch: x86_64
- libvpd
ExclusiveArch: %{power64}
- libxsmm
ExclusiveArch: x86_64
- libzdnn
ExclusiveArch: s390x
- libzfcphbaapi
ExclusiveArch: s390 s390x
- libzpc
ExclusiveArch: s390x
- llhttp
ExclusiveArch: %{nodejs_arches}
- log4j
ExclusiveArch: %{java_arches} noarch
- log4net
ExclusiveArch: %mono_arches
- lrmi
ExclusiveArch: %{ix86}
- lsvpd
ExclusiveArch: %{power64}
- luajit
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- lucene
ExclusiveArch: %{java_arches} noarch
- lujavrite
ExclusiveArch: %{java_arches}
- luxcorerender
ExclusiveArch: x86_64
- mactel-boot
ExclusiveArch: x86_64
- magicmirror
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-airnow
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-onthisday
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-singlestock
ExclusiveArch: %{nodejs_arches} noarch
- manifest-tool
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- mariadb-java-client
ExclusiveArch: %{java_arches} noarch
- marked
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- matrix-synapse
ExclusiveArch: %{rust_arches}
- maui-mauikit
ExclusiveArch: %{ix86} s390x aarch64 x86_64
- maven
ExclusiveArch: %{java_arches} noarch
- maven-antrun-plugin
ExclusiveArch: %{java_arches} noarch
- maven-archetype
ExclusiveArch: %{java_arches} noarch
- maven-archiver
ExclusiveArch: %{java_arches} noarch
- maven-artifact-transfer
ExclusiveArch: %{java_arches} noarch
- maven-assembly-plugin
ExclusiveArch: %{java_arches} noarch
- maven-bundle-plugin
ExclusiveArch: %{java_arches} noarch
- maven-clean-plugin
ExclusiveArch: %{java_arches} noarch
- maven-common-artifact-filters
ExclusiveArch: %{java_arches} noarch
- maven-compiler-plugin
ExclusiveArch: %{java_arches} noarch
- maven-dependency-analyzer
ExclusiveArch: %{java_arches} noarch
- maven-dependency-plugin
ExclusiveArch: %{java_arches} noarch
- maven-dependency-tree
ExclusiveArch: %{java_arches} noarch
- maven-doxia
ExclusiveArch: %{java_arches} noarch
- maven-doxia-sitetools
ExclusiveArch: %{java_arches} noarch
- maven-enforcer
ExclusiveArch: %{java_arches} noarch
- maven-file-management
ExclusiveArch: %{java_arches} noarch
- maven-filtering
ExclusiveArch: %{java_arches} noarch
- maven-invoker
ExclusiveArch: %{java_arches} noarch
- maven-invoker-plugin
ExclusiveArch: %{java_arches} noarch
- maven-jar-plugin
ExclusiveArch: %{java_arches} noarch
- maven-mapping
ExclusiveArch: %{java_arches} noarch
- maven-native
ExclusiveArch: %{java_arches} noarch
- maven-parent
ExclusiveArch: %{java_arches} noarch
- maven-patch-plugin
ExclusiveArch: %{java_arches} noarch
- maven-plugin-testing
ExclusiveArch: %{java_arches} noarch
- maven-plugin-tools
ExclusiveArch: %{java_arches} noarch
- maven-remote-resources-plugin
ExclusiveArch: %{java_arches} noarch
- maven-reporting-api
ExclusiveArch: %{java_arches} noarch
- maven-reporting-impl
ExclusiveArch: %{java_arches} noarch
- maven-resolver
ExclusiveArch: %{java_arches} noarch
- maven-resources-plugin
ExclusiveArch: %{java_arches} noarch
- maven-script-interpreter
ExclusiveArch: %{java_arches} noarch
- maven-shade-plugin
ExclusiveArch: %{java_arches} noarch
- maven-shared-incremental
ExclusiveArch: %{java_arches} noarch
- maven-shared-io
ExclusiveArch: %{java_arches} noarch
- maven-shared-utils
ExclusiveArch: %{java_arches} noarch
- maven-source-plugin
ExclusiveArch: %{java_arches} noarch
- maven-surefire
ExclusiveArch: %{java_arches} noarch
- maven-verifier
ExclusiveArch: %{java_arches} noarch
- maven-verifier-plugin
ExclusiveArch: %{java_arches} noarch
- maven-wagon
ExclusiveArch: %{java_arches} noarch
- maxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- mbpfan
ExclusiveArch: x86_64
- mcelog
ExclusiveArch: i686 x86_64
- mcrouter
ExclusiveArch: x86_64 aarch64 ppc64le
- mecab-java
ExclusiveArch: %java_arches
- mediaconch
ExclusiveArch: %{qt5_qtwebengine_arches}
- mellowplayer
ExclusiveArch: %{qt5_qtwebengine_arches}
- memkind
ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64
- memtest86+
ExclusiveArch: x86_64 %{ix86}
- merkuro
ExclusiveArch: %{qt5_qtwebengine_arches}
- microcode_ctl
ExclusiveArch: %{ix86} x86_64
- micropython
ExclusiveArch: %{arm} x86_64 riscv64
- miglayout
ExclusiveArch: %{java_arches} noarch
- mine_detector
ExclusiveArch: %{GPRbuild_arches}
- minetest
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mingw-libidn2
ExclusiveArch: %{ix86} x86_64 %{arm}
- mingw-wine-gecko
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- mkbootdisk
ExclusiveArch: %{ix86} sparc sparc64 x86_64
- moby-engine
ExclusiveArch: %{golang_arches}
- mockito
ExclusiveArch: %{java_arches} noarch
- mod_mono
ExclusiveArch: %mono_arches
- modello
ExclusiveArch: %{java_arches} noarch
- moditect
ExclusiveArch: %{java_arches} noarch
- module-build-service
ExclusiveArch: %{ix86} x86_64 noarch
- modulemaker-maven-plugin
ExclusiveArch: %{java_arches} noarch
- mojo-executor
ExclusiveArch: %{java_arches} noarch
- mojo-parent
ExclusiveArch: %{java_arches} noarch
- mokutil
ExclusiveArch: %{ix86} x86_64 aarch64 %{arm}
- mono
ExclusiveArch: %mono_arches
- mono-addins
ExclusiveArch: %mono_arches
- mono-basic
ExclusiveArch: %{mono_arches}
- mono-bouncycastle
ExclusiveArch: %mono_arches
- mono-cecil
ExclusiveArch: %mono_arches
- mono-cecil-flowanalysis
ExclusiveArch: %mono_arches
- mono-reflection
ExclusiveArch: %mono_arches
- mono-tools
ExclusiveArch: %mono_arches
- mono-zeroconf
ExclusiveArch: %mono_arches
- monodevelop
ExclusiveArch: %mono_arches
- monodevelop-debugger-gdb
ExclusiveArch: %{mono_arches}
- mrrescue
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- msr-tools
ExclusiveArch: %{ix86} x86_64
- msv
ExclusiveArch: %{java_arches} noarch
- mvfst
ExclusiveArch: x86_64 aarch64 ppc64le
- mxparser
ExclusiveArch: %{java_arches} noarch
- mysql-connector-java
ExclusiveArch: %{java_arches} noarch
- mysql-connector-net
ExclusiveArch: %{mono_arches}
- naev
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- naga
ExclusiveArch: %{java_arches} noarch
- nant
ExclusiveArch: %mono_arches
- nativejit
ExclusiveArch: x86_64
- nbc
ExclusiveArch: %{fpc_arches}
- nbdkit
ExclusiveArch: x86_64
- ndesk-dbus
ExclusiveArch: %{mono_arches}
- ndesk-dbus-glib
ExclusiveArch: %{mono_arches}
- nekohtml
ExclusiveArch: %{java_arches} noarch
- netavark
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- newtonsoft-json
ExclusiveArch: %{mono_arches}
- nodejs-acorn-object-spread
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-backbone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bash-language-server
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buble
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cjs-module-lexer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-generic-pool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-less
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-linefix
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nodemon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-packaging
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-replace-require-self
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-underscore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-undici
ExclusiveArch: %{nodejs_arches} noarch
- nodejs18
ExclusiveArch: %{nodejs_arches}
- nodejs20
ExclusiveArch: %{nodejs_arches}
- nom-tam-fits
ExclusiveArch: %{java_arches} noarch
- notify-sharp
ExclusiveArch: %{mono_arches}
- notify-sharp3
ExclusiveArch: %{mono_arches}
- nuget
ExclusiveArch: %{mono_arches}
- numatop
ExclusiveArch: x86_64 ppc64le
- nunit
ExclusiveArch: %{mono_arches}
- nunit2
ExclusiveArch: %{mono_arches}
- nvml
ExclusiveArch: x86_64 ppc64le
- objectweb-asm
ExclusiveArch: %{java_arches} noarch
- objenesis
ExclusiveArch: %{java_arches} noarch
- obs-service-rust2rpm
ExclusiveArch: %{rust_arches} noarch
- oci-seccomp-bpf-hook
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
ExclusiveArch: %{golang_arches_future}
- oidn
ExclusiveArch: x86_64
- olpc-utils
ExclusiveArch: %{ix86} %{arm}
- oneVPL
ExclusiveArch: x86_64
- oneVPL-intel-gpu
ExclusiveArch: x86_64
- oneapi-level-zero
ExclusiveArch: x86_64
- onednn
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- onedrive
ExclusiveArch: %{ldc_arches}
- ongres-scram
ExclusiveArch: %{java_arches} noarch
- ongres-stringprep
ExclusiveArch: %{java_arches} noarch
- opae
ExclusiveArch: x86_64
- opal-prd
ExclusiveArch: ppc64le
- open-vm-tools
ExclusiveArch: x86_64 aarch64
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: x86_64
- openblas
ExclusiveArch: %{openblas_arches}
- openjdk-asmtools
ExclusiveArch: %{java_arches} noarch
- openjdk-asmtools7
ExclusiveArch: %{java_arches} noarch
- openjfx
ExclusiveArch: %{java_arches}
- openjfx8
ExclusiveArch: x86_64
- openlibm
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64}
- openms
ExclusiveArch: %{qt5_qtwebengine_arches}
- openni
ExclusiveArch: x86_64 %{arm}
- openni-primesense
ExclusiveArch: %{ix86} x86_64 %{arm}
- openoffice.org-diafilter
ExclusiveArch: %{java_arches}
- openpgl
ExclusiveArch: aarch64 x86_64
- openssl-ibmca
ExclusiveArch: s390 s390x
- openstack-java-sdk
ExclusiveArch: %{java_arches} noarch
- opentest4j
ExclusiveArch: %{java_arches} noarch
- openvkl
ExclusiveArch: aarch64 x86_64
- optee_client
ExclusiveArch: aarch64
- optee_os
ExclusiveArch: aarch64
- options
ExclusiveArch: %{java_arches} noarch
- orthorobot
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- osgi-annotation
ExclusiveArch: %{java_arches} noarch
- osgi-compendium
ExclusiveArch: %{java_arches} noarch
- osgi-core
ExclusiveArch: %{java_arches} noarch
- pacemaker
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64 %{arm}
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- pageedit
ExclusiveArch: %{qt5_qtwebengine_arches}
- parserng
ExclusiveArch: %{java_arches} noarch
- pasdoc
ExclusiveArch: %{fpc_arches}
- pcc
ExclusiveArch: %{ix86} x86_64
- pcfi
ExclusiveArch: %{java_arches} noarch
- pcm
ExclusiveArch: %{ix86} x86_64
- pcmciautils
ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm}
- pdbg
ExclusiveArch: ppc64le
- pdfbox
ExclusiveArch: %{java_arches} noarch
- pdfmod
ExclusiveArch: %mono_arches
- pdftk-java
ExclusiveArch: %{java_arches} noarch
- pentaho-libxml
ExclusiveArch: %{java_arches} noarch
- pentaho-reporting-flow-engine
ExclusiveArch: %{java_arches} noarch
- perl-Dumbbench
ExclusiveArch: %{ix86} x86_64 noarch
- perl-Parse-DMIDecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- pesign
ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm}
- pesign-test-app
ExclusiveArch: x86_64
- picocli
ExclusiveArch: %{java_arches} noarch
- pinta
ExclusiveArch: %mono_arches
- pioneer
ExclusiveArch: %{ix86} x86_64
- plantuml
ExclusiveArch: %{java_arches} noarch
- plasma-dialer
ExclusiveArch: %{java_arches}
- playonlinux
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- plexus-archiver
ExclusiveArch: %{java_arches} noarch
- plexus-build-api
ExclusiveArch: %{java_arches} noarch
- plexus-build-api0
ExclusiveArch: %{java_arches} noarch
- plexus-cipher
ExclusiveArch: %{java_arches} noarch
- plexus-classworlds
ExclusiveArch: %{java_arches} noarch
- plexus-compiler
ExclusiveArch: %{java_arches} noarch
- plexus-component-api
ExclusiveArch: %{java_arches} noarch
- plexus-components-pom
ExclusiveArch: %{java_arches} noarch
- plexus-containers
ExclusiveArch: %{java_arches} noarch
- plexus-i18n
ExclusiveArch: %{java_arches} noarch
- plexus-interpolation
ExclusiveArch: %{java_arches} noarch
- plexus-io
ExclusiveArch: %{java_arches} noarch
- plexus-languages
ExclusiveArch: %{java_arches} noarch
- plexus-pom
ExclusiveArch: %{java_arches} noarch
- plexus-resources
ExclusiveArch: %{java_arches} noarch
- plexus-sec-dispatcher
ExclusiveArch: %{java_arches} noarch
- plexus-utils
ExclusiveArch: %{java_arches} noarch
- plexus-velocity
ExclusiveArch: %{java_arches} noarch
- podman
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- poppler-sharp
ExclusiveArch: %mono_arches
- popub
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- postgresql-jdbc
ExclusiveArch: %{java_arches} noarch
- powerpc-utils
ExclusiveArch: ppc %{power64}
- powerstat
ExclusiveArch: %{ix86} x86_64
- ppc64-diag
ExclusiveArch: ppc %{power64}
- procyon
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
- proguard
ExclusiveArch: %{java_arches} noarch
- prometheus-jmx-exporter
ExclusiveArch: %{java_arches} noarch
- prometheus-simpleclient-java
ExclusiveArch: %{java_arches} noarch
- proxygen
ExclusiveArch: x86_64 aarch64 ppc64le
- pveclib
ExclusiveArch: ppc %{power64}
- pyqtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- python-ast-monitor
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
- python-cryptography
ExclusiveArch: %{rust_arches}
- python-damo
ExclusiveArch: x86_64 aarch64 ppc64le s390x noarch
- python-etcd
ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- python-javaobj
ExclusiveArch: %{java_arches} noarch
- python-jnius
ExclusiveArch: %{java_arches}
- python-jupyter-polymake
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- python-openoffice
ExclusiveArch: noarch x86_64
- python-pyahocorasick
ExclusiveArch: x86_64 %{arm64} ppc64le
- python-pymoc
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-pyqt6-webengine
ExclusiveArch: aarch64 x86_64
- q4wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- qatengine
ExclusiveArch: x86_64
- qatzip
ExclusiveArch: x86_64
- qbe
ExclusiveArch: x86_64 aarch64
- qcint
ExclusiveArch: x86_64
- qclib
ExclusiveArch: s390 s390x
- qdox
ExclusiveArch: %{java_arches} noarch
- qemu-sanity-check
ExclusiveArch: %{kernel_arches}
- qevercloud
ExclusiveArch: %{qt5_qtwebengine_arches}
- qmapshack
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt4pas
ExclusiveArch: %{fpc_arches}
- qt5-qtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt6-qtwebengine
ExclusiveArch: aarch64 x86_64
- qt6-qtwebview
ExclusiveArch: aarch64 x86_64
- quantum-espresso
ExclusiveArch: x86_64 %{ix86} aarch64 %{power64}
- quentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- rEFInd
ExclusiveArch: %{efi}
- rachota
ExclusiveArch: %{java_arches} noarch
- rear
ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64
- reflections
ExclusiveArch: %{java_arches} noarch
- reg
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- regexp
ExclusiveArch: %{java_arches} noarch
- relaxng-datatype-java
ExclusiveArch: %{java_arches} noarch
- replacer
ExclusiveArch: %{java_arches} noarch
- reptyr
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- rescene
ExclusiveArch: %{mono_arches}
- resteasy
ExclusiveArch: %{java_arches} noarch
- restool
ExclusiveArch: aarch64
- restsharp
ExclusiveArch: %{mono_arches}
- retsnoop
ExclusiveArch: %{rust_arches}
- rhino
ExclusiveArch: %{java_arches} noarch
- river
ExclusiveArch: %{zig_arches}
- rkcommon
ExclusiveArch: x86_64 aarch64
- rocalution
ExclusiveArch: x86_64
- rocblas
ExclusiveArch: x86_64
- rocclr
ExclusiveArch: x86_64
- rocm-compilersupport
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-device-libs
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-rpm-macros
ExclusiveArch: x86_64
- rocm-runtime
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-smi
ExclusiveArch: x86_64 aarch64 ppc64le
- rocminfo
ExclusiveArch: x86_64 aarch64 ppc64le
- rocprim
ExclusiveArch: x86_64
- rocrand
ExclusiveArch: x86_64
- rocsparse
ExclusiveArch: x86_64
- rocthrust
ExclusiveArch: x86_64
- rpm-ostree
ExclusiveArch: %{rust_arches}
- rr
ExclusiveArch: %{ix86} x86_64 aarch64
- rssguard
ExclusiveArch: %{qt6_qtwebengine_arches}
- rstudio
ExclusiveArch: %{java_arches}
- rsyntaxtextarea
ExclusiveArch: %{java_arches} noarch
- rubygem-childprocess
ExclusiveArch: %{ix86} x86_64 noarch
- runc
ExclusiveArch: %{golang_arches_future}
- rundoc
ExclusiveArch: %{java_arches} noarch
- rust
ExclusiveArch: %{rust_arches}
- rust-brotli
ExclusiveArch: %{rust_arches}
- rust-compress-tools
ExclusiveArch: %{rust_arches}
- rust-coreos-installer
ExclusiveArch: %{rust_arches}
- rust-ctr
ExclusiveArch: %{rust_arches}
- rust-dashmap4
ExclusiveArch: %{rust_arches}
- rust-deflate
ExclusiveArch: %{rust_arches}
- rust-deflate0.8
ExclusiveArch: %{rust_arches}
- rust-drg
ExclusiveArch: %{rust_arches}
- rust-epoll
ExclusiveArch: %{rust_arches}
- rust-getch
ExclusiveArch: %{rust_arches}
- rust-gzip-header
ExclusiveArch: %{rust_arches}
- rust-hamming
ExclusiveArch: %{rust_arches}
- rust-hidapi
ExclusiveArch: %{rust_arches}
- rust-httparse
ExclusiveArch: %{rust_arches}
- rust-humantime-serde
ExclusiveArch: %{rust_arches}
- rust-hyperlocal
ExclusiveArch: %{rust_arches}
- rust-image0.23
ExclusiveArch: %{rust_arches}
- rust-inflate
ExclusiveArch: %{rust_arches}
- rust-jpeg-decoder0.1
ExclusiveArch: %{rust_arches}
- rust-k9
ExclusiveArch: %{rust_arches}
- rust-krunvm
ExclusiveArch: x86_64 aarch64
- rust-kstring
ExclusiveArch: %{rust_arches}
- rust-kvm-ioctls
ExclusiveArch: x86_64 aarch64
- rust-lebe
ExclusiveArch: %{rust_arches}
- rust-libslirp-sys
ExclusiveArch: %{rust_arches}
- rust-msru
ExclusiveArch: x86_64
- rust-nanorand
ExclusiveArch: %{rust_arches}
- rust-netstat2
ExclusiveArch: %{rust_arches}
- rust-onig
ExclusiveArch: %{rust_arches}
- rust-openat-ext
ExclusiveArch: %{rust_arches}
- rust-os_type
ExclusiveArch: %{rust_arches}
- rust-pager
ExclusiveArch: %{rust_arches}
- rust-pathsearch
ExclusiveArch: %{rust_arches}
- rust-pretty-bytes
ExclusiveArch: %{rust_arches}
- rust-pretty-hex
ExclusiveArch: %{rust_arches}
- rust-primal-bit
ExclusiveArch: %{rust_arches}
- rust-primal-check
ExclusiveArch: %{rust_arches}
- rust-primal-estimate
ExclusiveArch: %{rust_arches}
- rust-procfs0.9
ExclusiveArch: %{rust_arches}
- rust-psl-types
ExclusiveArch: %{rust_arches}
- rust-psm
ExclusiveArch: %{rust_arches}
- rust-pwd
ExclusiveArch: %{rust_arches}
- rust-rand_core
ExclusiveArch: %{rust_arches}
- rust-schemafy_core
ExclusiveArch: %{rust_arches}
- rust-schemafy_lib
ExclusiveArch: %{rust_arches}
- rust-seahash
ExclusiveArch: %{rust_arches}
- rust-serde-big-array
ExclusiveArch: %{rust_arches}
- rust-serde_qs
ExclusiveArch: %{rust_arches}
- rust-serde_yaml0.8
ExclusiveArch: %{rust_arches}
- rust-sev
ExclusiveArch: x86_64
- rust-sevctl
ExclusiveArch: x86_64
- rust-silver
ExclusiveArch: %{rust_arches}
- rust-sinit
ExclusiveArch: %{rust_arches}
- rust-snphost
ExclusiveArch: x86_64
- rust-ssh-key-dir
ExclusiveArch: %{rust_arches}
- rust-stacker
ExclusiveArch: %{rust_arches}
- rust-structopt
ExclusiveArch: %{rust_arches}
- rust-tiff0.6
ExclusiveArch: %{rust_arches}
- rust-totp-lite
ExclusiveArch: %{rust_arches}
- rust-tower-layer
ExclusiveArch: %{rust_arches}
- rust-tpm2-policy
ExclusiveArch: %{rust_arches}
- rust-unicode-normalization
ExclusiveArch: %{rust_arches}
- rust-unicode-xid
ExclusiveArch: %{rust_arches}
- rust-uriparse
ExclusiveArch: %{rust_arches}
- rust-uucore
ExclusiveArch: %{rust_arches}
- rust-varlink_generator
ExclusiveArch: %{rust_arches}
- rust-varlink_parser
ExclusiveArch: %{rust_arches}
- rust-virtio-bindings
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-vmm-sys-util
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-vtparse
ExclusiveArch: %{rust_arches}
- rust-web-ext-native-messaging
ExclusiveArch: %{rust_arches}
- rust-wezterm-color-types
ExclusiveArch: %{rust_arches}
- rust-wezterm-dynamic
ExclusiveArch: %{rust_arches}
- rust-wezterm-dynamic-derive
ExclusiveArch: %{rust_arches}
- rust-zbus1
ExclusiveArch: %{rust_arches}
- rust-zbus_macros1
ExclusiveArch: %{rust_arches}
- rust-zvariant2
ExclusiveArch: %{rust_arches}
- rust-zvariant_derive2
ExclusiveArch: %{rust_arches}
- rutabaga-gfx-ffi
ExclusiveArch: x86_64 aarch64
- sac
ExclusiveArch: %{java_arches} noarch
- safetyblanket
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- sat4j
ExclusiveArch: %{java_arches} noarch
- sbcl
ExclusiveArch: %{ix86} x86_64 aarch64 %{power64}
- sbd
ExclusiveArch: i686 x86_64 s390x aarch64 ppc64le
- sblim-cim-client
ExclusiveArch: %{java_arches} noarch
- sblim-cim-client2
ExclusiveArch: %{java_arches} noarch
- sbsigntools
ExclusiveArch: x86_64 aarch64 %{arm} %{ix86}
- scala
ExclusiveArch: %{java_arches} noarch
- scannotation
ExclusiveArch: %{java_arches} noarch
- sdljava
ExclusiveArch: %{java_arches}
- sdrangel
ExclusiveArch: %{qt5_qtwebengine_arches}
- sdsl-lite
ExclusiveArch: %{power64} x86_64 aarch64
- sdubby
ExclusiveArch: %{efi}
- seabios
ExclusiveArch: x86_64
- seadrive-gui
ExclusiveArch: %{qt5_qtwebengine_arches}
- seafile-client
ExclusiveArch: %{qt5_qtwebengine_arches}
- seamonkey
ExclusiveArch: x86_64
- seqan3
ExclusiveArch: %{power64} x86_64 aarch64
- sequence-library
ExclusiveArch: %{java_arches} noarch
- servicelog
ExclusiveArch: ppc %{power64}
- shaman
ExclusiveArch: %{java_arches} noarch
- sharpfont
ExclusiveArch: %mono_arches
- sharpziplib
ExclusiveArch: %{mono_arches}
- shim
ExclusiveArch: %{efi}
- shim-unsigned-aarch64
ExclusiveArch: aarch64
- shim-unsigned-x64
ExclusiveArch: x86_64
- sigil
ExclusiveArch: %{qt5_qtwebengine_arches}
- sigul
ExclusiveArch: x86_64
- singularity-ce
ExclusiveArch: %{go_arches}
- sisu
ExclusiveArch: %{java_arches} noarch
- sisu-mojos
ExclusiveArch: %{java_arches} noarch
- skopeo
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- skychart
ExclusiveArch: %{fpc_arches}
- slf4j
ExclusiveArch: %{java_arches} noarch
- slirp4netns
ExclusiveArch: %{golang_arches_future}
- snakeyaml
ExclusiveArch: %{java_arches} noarch
- snapd
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x}
- snip
ExclusiveArch: %{java_arches} noarch
- softnet-stat
ExclusiveArch: %{rust_arches}
- soup-sharp
ExclusiveArch: %{mono_arches}
- spacebar
ExclusiveArch: %{java_arches}
- sparkleshare
ExclusiveArch: %{mono_arches}
- spec-version-maven-plugin
ExclusiveArch: %{java_arches} noarch
- spicctrl
ExclusiveArch: %{ix86} x86_64
- spice
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- spice-parent
ExclusiveArch: %{java_arches} noarch
- springlobby
ExclusiveArch: %{ix86} x86_64
- spyder
ExclusiveArch: %{qt5_qtwebengine_arches}
- sqljet
ExclusiveArch: %{java_arches} noarch
- squeekboard
ExclusiveArch: %{rust_arches}
- startdde
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- stats-collect
ExclusiveArch: %{ix86} x86_64 noarch
- statsd
ExclusiveArch: %{nodejs_arches} noarch
- stratis-cli
ExclusiveArch: %{rust_arches} noarch
- stratisd
ExclusiveArch: %{rust_arches}
ExclusiveArch: %{rust_arches}
ExclusiveArch: %{rust_arches}
- string-template-maven-plugin
ExclusiveArch: %{java_arches} noarch
- stringtemplate
ExclusiveArch: %{java_arches} noarch
- stringtemplate4
ExclusiveArch: %{java_arches} noarch
- stripesnoop
ExclusiveArch: %{ix86} x86_64
- subscription-manager-cockpit
ExclusiveArch: %{nodejs_arches} noarch
- supercollider
ExclusiveArch: %{qt5_qtwebengine_arches}
- supermin
ExclusiveArch: %{kernel_arches}
- svnkit
ExclusiveArch: %{java_arches} noarch
- svt-vp9
ExclusiveArch: x86_64
- swift-lang
ExclusiveArch: x86_64 aarch64
- swiftlint
ExclusiveArch: x86_64 aarch64
- swing-layout
ExclusiveArch: %{java_arches} noarch
- sysbench
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64le s390x
- syslinux
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- system-rules
ExclusiveArch: %{java_arches} noarch
- systemd-boot
ExclusiveArch: %efi
- t-digest
ExclusiveArch: %{java_arches} noarch
- taglib-sharp
ExclusiveArch: %{mono_arches}
- tagsoup
ExclusiveArch: %{java_arches} noarch
- tarantool
ExclusiveArch: %{ix86} x86_64
- tboot
ExclusiveArch: %{ix86} x86_64
- tdlib
ExclusiveArch: x86_64 aarch64
- templates_parser
ExclusiveArch: %GPRbuild_arches
- ternimal
ExclusiveArch: %{rust_arches}
- testcloud
ExclusiveArch: %{kernel_arches} noarch
- testng
ExclusiveArch: %{java_arches} noarch
- texlive
ExclusiveArch: %{java_arches} noarch
- thermald
ExclusiveArch: %{ix86} x86_64
- tilix
ExclusiveArch: %{ldc_arches}
- tomboy
ExclusiveArch: %{mono_arches}
- tomcat
ExclusiveArch: %{java_arches} noarch
- tomcat-native
ExclusiveArch: %{java_arches}
- tomcat-taglibs-parent
ExclusiveArch: %{java_arches} noarch
- tomcatjss
ExclusiveArch: %{java_arches} noarch
- torbrowser-launcher
ExclusiveArch: %{ix86} x86_64
- treelayout
ExclusiveArch: %{java_arches} noarch
- trilead-ssh2
ExclusiveArch: %{java_arches} noarch
- truth
ExclusiveArch: %{java_arches} noarch
- tuned-profiles-nfv-host-bin
ExclusiveArch: %{ix86} x86_64
- typescript
ExclusiveArch: %{nodejs_arches} noarch
- uClibc
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
- ucx
ExclusiveArch: aarch64 ppc64le x86_64
- uglify-js
ExclusiveArch: %{nodejs_arches} noarch
- umr
ExclusiveArch: x86_64 aarch64 ppc64le
- unetbootin
ExclusiveArch: %{ix86} x86_64
- univocity-parsers
ExclusiveArch: %{java_arches} noarch
- ursa-major
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- usd
ExclusiveArch: aarch64 x86_64
- v8-314
ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64
- vakzination
ExclusiveArch: %{java_arches}
- valgrind
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
- vboot-utils
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- vecmath1.2
ExclusiveArch: %{java_arches} noarch
- velocity
ExclusiveArch: %{java_arches} noarch
- vim-go
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}}
- vim-syntastic
ExclusiveArch: %{java_arches} noarch
- virt-p2v
ExclusiveArch: x86_64
- virt-v2v
ExclusiveArch: x86_64
- virtiofsd
ExclusiveArch: %{rust_arches}
- virtualbox-guest-additions
ExclusiveArch: i686 x86_64
- vkd3d
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- vmaf
ExclusiveArch: x86_64
- voms-api-java
ExclusiveArch: %{java_arches} noarch
- voms-clients-java
ExclusiveArch: %{java_arches} noarch
- vrq
ExclusiveArch: %{ix86} x86_64
- wangle
ExclusiveArch: x86_64 aarch64 ppc64le
- warsow
ExclusiveArch: %{ix86} x86_64 %{arm}
- warsow-data
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{ix86} x86_64 %{arm}
- wasmedge
ExclusiveArch: x86_64 aarch64
- watchman
ExclusiveArch: x86_64 aarch64 ppc64le
- wdt
ExclusiveArch: x86_64 aarch64 ppc64le
- webkit2-sharp
ExclusiveArch: %mono_arches
- weld-parent
ExclusiveArch: %{java_arches} noarch
- why3
ExclusiveArch: %{ocaml_native_compiler}
- widevine-installer
ExclusiveArch: aarch64
- wine
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86}
- wine-dxvk
ExclusiveArch: %{ix86} x86_64
- winetricks
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- ws-commons-util
ExclusiveArch: %{java_arches} noarch
- wsdl4j
ExclusiveArch: %{java_arches} noarch
- wult
ExclusiveArch: x86_64
- wxMaxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
- x2goclient
ExclusiveArch: x86_64
- x86-simd-sort
ExclusiveArch: x86_64
- xalan-j2
ExclusiveArch: %{java_arches} noarch
- xbean
ExclusiveArch: %{java_arches} noarch
- xbyak
ExclusiveArch: x86_64
- xbyak_aarch64
ExclusiveArch: aarch64
- xe-guest-utilities-latest
ExclusiveArch: %{ix86} x86_64
- xen
ExclusiveArch: x86_64 aarch64
- xerces-j2
ExclusiveArch: %{java_arches} noarch
- xgap
ExclusiveArch: %{gap_arches}
- xml-commons-apis
ExclusiveArch: %{java_arches} noarch
- xml-commons-resolver
ExclusiveArch: %{java_arches} noarch
- xml-maven-plugin
ExclusiveArch: %{java_arches} noarch
- xmlada
ExclusiveArch: %{GPRbuild_arches}
- xmlgraphics-commons
ExclusiveArch: %{java_arches} noarch
- xmlpull
ExclusiveArch: %{java_arches} noarch
- xmlstreambuffer
ExclusiveArch: %{java_arches} noarch
- xmlunit
ExclusiveArch: %{java_arches} noarch
- xmvn
ExclusiveArch: %{java_arches} noarch
- xmvn-connector-ivy
ExclusiveArch: %{java_arches} noarch
- xmvn-generator
ExclusiveArch: %{java_arches}
- xnnpack
ExclusiveArch: x86_64 aarch64
- xorg-x11-drv-armsoc
ExclusiveArch: %{arm} aarch64
- xorg-x11-drv-intel
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-openchrome
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vesa
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vmware
ExclusiveArch: %{ix86} x86_64 ia64
- xsp
ExclusiveArch: %mono_arches
- xstream
ExclusiveArch: %{java_arches} noarch
- xz-java
ExclusiveArch: %{java_arches} noarch
- yarnpkg
ExclusiveArch: %{nodejs_arches} noarch
- zcfan
ExclusiveArch: x86_64
- zeal
ExclusiveArch: aarch64 x86_64
- zenon
ExclusiveArch: %{ocaml_native_compiler}
- zeromq-ada
ExclusiveArch: %{GPRbuild_arches}
- zig
ExclusiveArch: %{zig_arches}
- zlib-ada
ExclusiveArch: %{GPRbuild_arches}
- zlib-ng
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- zola
ExclusiveArch: %{rust_arches}
1
0
Architecture specific change in rpms/java-latest-openjdk.git
by githook-noreply＠fedoraproject.org 26 Nov '23
by githook-noreply＠fedoraproject.org 26 Nov '23
26 Nov '23
The package rpms/java-latest-openjdk.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-latest-openjdk.git/commit/?id=….
Change:
+%ifarch %{jit_arches}
Thanks.
Full change:
============
commit fbb9bfad15f1f9a4807e32269ea26b20c24207e3
Merge: f6c3e6d 5c9d1b3
Author: Jiri <jvanek(a)redhat.com>
Date: Sun Nov 26 18:12:42 2023 +0100
Merge branch 'f38' into f37
commit 5c9d1b35aa8ea591fea5f43ca25c42bae961be5c
Merge: aa139b2 50747e7
Author: Jiri <jvanek(a)redhat.com>
Date: Sun Nov 26 18:12:16 2023 +0100
Merge branch 'rawhide' into f38
commit 50747e7123ff6577a0d7a44fd75fda479c7774e7
Author: Jiri <jvanek(a)redhat.com>
Date: Sun Nov 26 18:09:53 2023 +0100
updated to OpenJDK 21.0.1 (2023-10-17)
diff --git a/TestTranslations.java b/TestTranslations.java
index d87647a..f6a4fe2 100644
--- a/TestTranslations.java
+++ b/TestTranslations.java
@@ -52,7 +52,7 @@ public class TestTranslations {
map.put(Locale.FRANCE, new String[] { "heure normale des Rocheuses", "UTC\u221207:00", "MST",
"heure d\u2019\u00e9t\u00e9 des Rocheuses", "UTC\u221206:00", "MDT",
"heure des Rocheuses", "UTC\u221207:00", "MT"});
- map.put(Locale.GERMANY, new String[] { "Rocky Mountain-Normalzeit", "GMT-07:00", "MST",
+ map.put(Locale.GERMANY, new String[] { "Rocky-Mountain-Normalzeit", "GMT-07:00", "MST",
"Rocky-Mountain-Sommerzeit", "GMT-06:00", "MDT",
"Rocky-Mountain-Zeit", "GMT-07:00", "MT"});
CIUDAD_JUAREZ = Collections.unmodifiableMap(map);
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index d6a7f8d..c53abdc 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -1,163 +1 @@
-#!/bin/bash
-# Generates the 'source tarball' for JDK projects.
-#
-# Example:
-# When used from local repo set REPO_ROOT pointing to file:// with your repo
-# If your local repo follows upstream forests conventions, it may be enough to set OPENJDK_URL
-# If you want to use a local copy of patch PR3788, set the path to it in the PR3788 variable
-#
-# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
-# PROJECT_NAME=openjdk
-# REPO_NAME=jdk18u
-# VERSION=jdk-18.0.1+10
-# or to eg prepare systemtap:
-# icedtea7's jstack and other tapsets
-# VERSION=6327cf1cea9e
-# REPO_NAME=icedtea7-2.6
-# PROJECT_NAME=release
-# OPENJDK_URL=http://icedtea.classpath.org/hg/
-# TO_COMPRESS="*/tapset"
-#
-# They are used to create correct name and are used in construction of sources url (unless REPO_ROOT is set)
-
-# This script creates a single source tarball out of the repository
-# based on the given tag and removes code not allowed in fedora/rhel. For
-# consistency, the source tarball will always contain 'openjdk' as the top
-# level folder, name is created, based on parameter
-#
-
-if [ ! "x$PR3823" = "x" ] ; then
- if [ ! -f "$PR3823" ] ; then
- echo "You have specified PR3823 as $PR3823 but it does not exist. Exiting"
- exit 1
- fi
-fi
-
-set -e
-
-OPENJDK_URL_DEFAULT=https://github.com
-COMPRESSION_DEFAULT=xz
-# Corresponding IcedTea version
-ICEDTEA_VERSION=13.0
-
-if [ "x$1" = "xhelp" ] ; then
- echo -e "Behaviour may be specified by setting the following variables:\n"
- echo "VERSION - the version of the specified OpenJDK project"
- echo "PROJECT_NAME -- the name of the OpenJDK project being archived (optional; only needed by defaults)"
- echo "REPO_NAME - the name of the OpenJDK repository (optional; only needed by defaults)"
- echo "OPENJDK_URL - the URL to retrieve code from (optional; defaults to ${OPENJDK_URL_DEFAULT})"
- echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
- echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
- echo "TO_COMPRESS - what part of clone to pack (default is openjdk)"
- echo "PR3823 - the path to the PR3823 patch to apply (optional; downloaded if unavailable)"
- exit 1;
-fi
-
-
-if [ "x$VERSION" = "x" ] ; then
- echo "No VERSION specified"
- exit -2
-fi
-echo "Version: ${VERSION}"
-
-# REPO_NAME is only needed when we default on REPO_ROOT and FILE_NAME_ROOT
-if [ "x$FILE_NAME_ROOT" = "x" -o "x$REPO_ROOT" = "x" ] ; then
- if [ "x$PROJECT_NAME" = "x" ] ; then
- echo "No PROJECT_NAME specified"
- exit -1
- fi
- echo "Project name: ${PROJECT_NAME}"
- if [ "x$REPO_NAME" = "x" ] ; then
- echo "No REPO_NAME specified"
- exit -3
- fi
- echo "Repository name: ${REPO_NAME}"
-fi
-
-if [ "x$OPENJDK_URL" = "x" ] ; then
- OPENJDK_URL=${OPENJDK_URL_DEFAULT}
- echo "No OpenJDK URL specified; defaulting to ${OPENJDK_URL}"
-else
- echo "OpenJDK URL: ${OPENJDK_URL}"
-fi
-
-if [ "x$COMPRESSION" = "x" ] ; then
- # rhel 5 needs tar.gz
- COMPRESSION=${COMPRESSION_DEFAULT}
-fi
-echo "Creating a tar.${COMPRESSION} archive"
-
-if [ "x$FILE_NAME_ROOT" = "x" ] ; then
- FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
- echo "No file name root specified; default to ${FILE_NAME_ROOT}"
-fi
-if [ "x$REPO_ROOT" = "x" ] ; then
- REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}.git"
- echo "No repository root specified; default to ${REPO_ROOT}"
-fi;
-
-if [ "x$TO_COMPRESS" = "x" ] ; then
- TO_COMPRESS="openjdk"
- echo "No to be compressed targets specified, ; default to ${TO_COMPRESS}"
-fi;
-
-if [ -d ${FILE_NAME_ROOT} ] ; then
- echo "exists exists exists exists exists exists exists "
- echo "reusing reusing reusing reusing reusing reusing "
- echo ${FILE_NAME_ROOT}
-else
- mkdir "${FILE_NAME_ROOT}"
- pushd "${FILE_NAME_ROOT}"
- echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
- git clone -b ${VERSION} ${REPO_ROOT} openjdk
- popd
-fi
-pushd "${FILE_NAME_ROOT}"
- if [ -d openjdk/src ]; then
- pushd openjdk
- echo "Removing EC source code we don't build"
- CRYPTO_PATH=src/jdk.crypto.ec/share/native/libsunec/impl
- rm -vf ${CRYPTO_PATH}/ec2.h
- rm -vf ${CRYPTO_PATH}/ec2_163.c
- rm -vf ${CRYPTO_PATH}/ec2_193.c
- rm -vf ${CRYPTO_PATH}/ec2_233.c
- rm -vf ${CRYPTO_PATH}/ec2_aff.c
- rm -vf ${CRYPTO_PATH}/ec2_mont.c
- rm -vf ${CRYPTO_PATH}/ecp_192.c
- rm -vf ${CRYPTO_PATH}/ecp_224.c
-
- echo "Syncing EC list with NSS"
- if [ "x$PR3823" = "x" ] ; then
- # get PR3823.patch (from https://github.com/icedtea-git/icedtea) in the ${ICEDTEA_VERSION} branch
- # Do not push it or publish it
- echo "PR3823 not found. Downloading..."
- wget -v https://github.com/icedtea-git/icedtea/raw/${ICEDTEA_VERSION}/patches/pr382…
- echo "Applying ${PWD}/pr3823.patch"
- patch -Np1 < pr3823.patch
- rm pr3823.patch
- else
- echo "Applying ${PR3823}"
- patch -Np1 < $PR3823
- fi;
- find . -name '*.orig' -exec rm -vf '{}' ';'
- popd
- fi
-
- # Generate .src-rev so build has knowledge of the revision the tarball was created from
- mkdir build
- pushd build
- sh ${PWD}/../openjdk/configure
- make store-source-revision
- popd
- rm -rf build
-
- echo "Compressing remaining forest"
- if [ "X$COMPRESSION" = "Xxz" ] ; then
- SWITCH=cJf
- else
- SWITCH=czf
- fi
- tar --exclude-vcs -$SWITCH ${FILE_NAME_ROOT}.tar.${COMPRESSION} $TO_COMPRESS
- mv ${FILE_NAME_ROOT}.tar.${COMPRESSION} ..
-popd
-echo "Done. You may want to remove the uncompressed version - $FILE_NAME_ROOT."
+## This file is intentionally left blank
diff --git a/icedtea_sync.sh b/icedtea_sync.sh
index e5c54f3..c53abdc 100755
--- a/icedtea_sync.sh
+++ b/icedtea_sync.sh
@@ -1,192 +1 @@
-#!/bin/bash
-
-# Copyright (C) 2019 Red Hat, Inc.
-# Written by Andrew John Hughes <gnu.andrew(a)redhat.com>.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-ICEDTEA_USE_VCS=true
-
-ICEDTEA_VERSION=3.15.0
-ICEDTEA_URL=https://icedtea.classpath.org/download/source
-ICEDTEA_SIGNING_KEY=CFDA0F9B35964222
-
-ICEDTEA_HG_URL=https://icedtea.classpath.org/hg/icedtea11
-
-set -e
-
-RPM_DIR=${PWD}
-if [ ! -f ${RPM_DIR}/jconsole.desktop.in ] ; then
- echo "Not in RPM source tree.";
- exit 1;
-fi
-
-if test "x${TMPDIR}" = "x"; then
- TMPDIR=/tmp;
-fi
-WORKDIR=${TMPDIR}/it.sync
-
-echo "Using working directory ${WORKDIR}"
-mkdir ${WORKDIR}
-pushd ${WORKDIR}
-
-if test "x${WGET}" = "x"; then
- WGET=$(which wget);
- if test "x${WGET}" = "x"; then
- echo "wget not found";
- exit 1;
- fi
-fi
-
-if test "x${TAR}" = "x"; then
- TAR=$(which tar)
- if test "x${TAR}" = "x"; then
- echo "tar not found";
- exit 2;
- fi
-fi
-
-echo "Dependencies:";
-echo -e "\tWGET: ${WGET}";
-echo -e "\tTAR: ${TAR}\n";
-
-if test "x${ICEDTEA_USE_VCS}" = "xtrue"; then
- echo "Mode: Using VCS";
-
- if test "x${GREP}" = "x"; then
- GREP=$(which grep);
- if test "x${GREP}" = "x"; then
- echo "grep not found";
- exit 3;
- fi
- fi
-
- if test "x${CUT}" = "x"; then
- CUT=$(which cut);
- if test "x${CUT}" = "x"; then
- echo "cut not found";
- exit 4;
- fi
- fi
-
- if test "x${TR}" = "x"; then
- TR=$(which tr);
- if test "x${TR}" = "x"; then
- echo "tr not found";
- exit 5;
- fi
- fi
-
- if test "x${HG}" = "x"; then
- HG=$(which hg);
- if test "x${HG}" = "x"; then
- echo "hg not found";
- exit 6;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tGREP: ${GREP}";
- echo -e "\tCUT: ${CUT}";
- echo -e "\tTR: ${TR}";
- echo -e "\tHG: ${HG}";
-
- echo "Checking out repository from VCS...";
- ${HG} clone ${ICEDTEA_HG_URL} icedtea
-
- echo "Obtaining version from configure.ac...";
- ROOT_VER=$(${GREP} '^AC_INIT' icedtea/configure.ac|${CUT} -d ',' -f 2|${TR} -d '[][:space:]')
- echo "Root version from configure: ${ROOT_VER}";
-
- VCS_REV=$(${HG} log -R icedtea --template '{node|short}' -r tip)
- echo "VCS revision: ${VCS_REV}";
-
- ICEDTEA_VERSION="${ROOT_VER}-${VCS_REV}"
- echo "Creating icedtea-${ICEDTEA_VERSION}";
- mkdir icedtea-${ICEDTEA_VERSION}
- echo "Copying required files from checkout to icedtea-${ICEDTEA_VERSION}";
- # Commented out for now as IcedTea 6's jconsole.desktop.in is outdated
- #cp -a icedtea/jconsole.desktop.in ../icedtea-${ICEDTEA_VERSION}
- cp -a ${RPM_DIR}/jconsole.desktop.in icedtea-${ICEDTEA_VERSION}
- cp -a icedtea/tapset icedtea-${ICEDTEA_VERSION}
-
- rm -rf icedtea
-else
- echo "Mode: Using tarball";
-
- if test "x${ICEDTEA_VERSION}" = "x"; then
- echo "No IcedTea version specified for tarball download.";
- exit 3;
- fi
-
- if test "x${CHECKSUM}" = "x"; then
- CHECKSUM=$(which sha256sum)
- if test "x${CHECKSUM}" = "x"; then
- echo "sha256sum not found";
- exit 4;
- fi
- fi
-
- if test "x${PGP}" = "x"; then
- PGP=$(which gpg)
- if test "x${PGP}" = "x"; then
- echo "gpg not found";
- exit 5;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tCHECKSUM: ${CHECKSUM}";
- echo -e "\tPGP: ${PGP}\n";
-
- echo "Checking for IcedTea signing key ${ICEDTEA_SIGNING_KEY}...";
- if ! gpg --list-keys ${ICEDTEA_SIGNING_KEY}; then
- echo "IcedTea signing key ${ICEDTEA_SIGNING_KEY} not installed.";
- exit 6;
- fi
-
- echo "Downloading IcedTea release tarball...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz
- echo "Downloading IcedTea tarball signature...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- echo "Downloading IcedTea tarball checksums...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Verifying checksums...";
- ${CHECKSUM} --check --ignore-missing icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Checking signature...";
- ${PGP} --verify icedtea-${ICEDTEA_VERSION}.tar.xz.sig
-
- echo "Extracting files...";
- ${TAR} xJf icedtea-${ICEDTEA_VERSION}.tar.xz \
- icedtea-${ICEDTEA_VERSION}/tapset \
- icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in
-
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- rm -vf icedtea-${ICEDTEA_VERSION}.sha256
-fi
-
-echo "Replacing desktop files...";
-mv -v icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in ${RPM_DIR}
-
-echo "Creating new tapset tarball...";
-mv -v icedtea-${ICEDTEA_VERSION} openjdk
-${TAR} cJf ${RPM_DIR}/tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz openjdk
-
-rm -rvf openjdk
-
-popd
-rm -rf ${WORKDIR}
+## This file is intentionally left blank
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index 0454f30..ccf69da 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -278,7 +278,7 @@
# New Version-String scheme-style defines
%global featurever 21
%global interimver 0
-%global updatever 0
+%global updatever 1
%global patchver 0
# We don't add any LTS designator for STS packages (Fedora and EPEL).
@@ -287,8 +287,8 @@
%global lts_designator "LTS"
%global lts_designator_zip -%{lts_designator}
%else
- %global lts_designator ""
- %global lts_designator_zip ""
+ %global lts_designator ""
+ %global lts_designator_zip ""
%endif
# Define vendor information used by OpenJDK
@@ -304,7 +304,7 @@
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{name}&…
%else
%if 0%{?rhel}
-%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20…
+%global oj_vendor_bug_url https://access.redhat.com/support/cases/
%else
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi
%endif
@@ -314,14 +314,21 @@
# Define IcedTea version used for SystemTap tapsets and desktop file
%global icedteaver 6.0.0pre00-c848b93a8598
+# Define JDK versions
+%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
+%global javaver %{featurever}
+# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
+%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
+# The tag used to create the OpenJDK tarball
+%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Standard JPackage naming and versioning defines
%global origin openjdk
%global origin_nice OpenJDK
-%global top_level_dir_name %{origin}
+%global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
-%global buildver 35
-%global rpmrelease 3
+%global buildver 12
+%global rpmrelease 1
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -334,14 +341,6 @@
# for techpreview, using 1, so slowdebugs can have 0
%global priority %( printf '%08d' 1 )
%endif
-%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
-%global javaver %{featurever}
-
-# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
-%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
-
-# The tag used to create the OpenJDK tarball
-%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Define milestone (EA for pre-releases, GA for releases)
# Release will be (where N is usually a number starting at 1):
@@ -350,15 +349,15 @@
%global is_ga 1
%if %{is_ga}
%global build_type GA
-%global expected_ea_designator ""
-%global ea_designator_zip ""
+%global ea_designator ""
+%global ea_designator_zip %{nil}
%global extraver %{nil}
%global eaprefix %{nil}
%else
%global build_type EA
-%global expected_ea_designator ea
-%global ea_designator_zip -%{expected_ea_designator}
-%global extraver .%{expected_ea_designator}
+%global ea_designator ea
+%global ea_designator_zip -%{ea_designator}
+%global extraver .%{ea_designator}
%global eaprefix 0.
%endif
@@ -517,12 +516,15 @@ alternatives \\
--install %{_bindir}/java $key %{jrebindir -- %{?1}}/java $PRIORITY --family %{family} \\
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{sdkdir -- %{?1}} \\
--slave %{_bindir}/%{alt_java_name} %{alt_java_name} %{jrebindir -- %{?1}}/%{alt_java_name} \\
+ --slave %{_bindir}/jcmd jcmd %{sdkbindir -- %{?1}}/jcmd \\
--slave %{_bindir}/keytool keytool %{jrebindir -- %{?1}}/keytool \\
--slave %{_bindir}/rmiregistry rmiregistry %{jrebindir -- %{?1}}/rmiregistry \\
--slave %{_mandir}/man1/java.1$ext java.1$ext \\
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/%{alt_java_name}.1$ext %{alt_java_name}.1$ext \\
%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1$ext \\
+ --slave %{_mandir}/man1/jcmd.1$ext jcmd.1$ext \\
+ %{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \\
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/rmiregistry.1$ext rmiregistry.1$ext \\
@@ -607,7 +609,6 @@ alternatives \\
--slave %{_bindir}/jarsigner jarsigner %{sdkbindir -- %{?1}}/jarsigner \\
--slave %{_bindir}/javadoc javadoc %{sdkbindir -- %{?1}}/javadoc \\
--slave %{_bindir}/javap javap %{sdkbindir -- %{?1}}/javap \\
- --slave %{_bindir}/jcmd jcmd %{sdkbindir -- %{?1}}/jcmd \\
--slave %{_bindir}/jconsole jconsole %{sdkbindir -- %{?1}}/jconsole \\
--slave %{_bindir}/jdb jdb %{sdkbindir -- %{?1}}/jdb \\
--slave %{_bindir}/jdeps jdeps %{sdkbindir -- %{?1}}/jdeps \\
@@ -635,8 +636,6 @@ alternatives \\
%{_mandir}/man1/javadoc-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/javap.1$ext javap.1$ext \\
%{_mandir}/man1/javap-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/jcmd.1$ext jcmd.1$ext \\
- %{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/jconsole.1$ext jconsole.1$ext \\
%{_mandir}/man1/jconsole-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/jdb.1$ext jdb.1$ext \\
@@ -801,10 +800,11 @@ exit 0
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/bin
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/java
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/%{alt_java_name}
+%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jcmd
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/keytool
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmiregistry
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib
-%ifarch %{share_arches}
+%ifarch %{jit_arches}
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/classlist
%endif
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jexec
@@ -863,7 +863,8 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/default.jfc
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/profile.jfc
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1*
-#%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1* #TODO, resolve alt-java man page
+%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1*
+%{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{?1}}.1*
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/%{vm_variant}/
@@ -912,8 +913,9 @@ exit 0
%if %is_system_jdk
%if %{is_release_build -- %{?1}}
%ghost %{_bindir}/java
-%ghost %{_bindir}/%{alt_java_name}
%ghost %{_jvmdir}/jre
+%ghost %{_bindir}/%{alt_java_name}
+%ghost %{_bindir}/jcmd
%ghost %{_bindir}/keytool
%ghost %{_bindir}/pack200
%ghost %{_bindir}/rmid
@@ -938,7 +940,6 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javadoc
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javap
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jconsole
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jcmd
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdb
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeps
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeprscan
@@ -1013,7 +1014,6 @@ exit 0
%ghost %{_bindir}/jarsigner
%ghost %{_bindir}/javadoc
%ghost %{_bindir}/javap
-%ghost %{_bindir}/jcmd
%ghost %{_bindir}/jconsole
%ghost %{_bindir}/jdb
%ghost %{_bindir}/jdeps
@@ -1311,23 +1311,21 @@ Source18: TestTranslations.java
BuildRequires: %{portable_name}-sources >= %{portable_version}
BuildRequires: %{portable_name}-misc >= %{portable_version}
+BuildRequires: %{portable_name}-docs >= %{portable_version}
%if %{include_normal_build}
-BuildRequires: %{portable_name} >= %{portable_version}
-BuildRequires: %{portable_name}-devel >= %{portable_version}
+BuildRequires: %{portable_name}-unstripped >= %{portable_version}
%if %{include_staticlibs}
BuildRequires: %{portable_name}-static-libs >= %{portable_version}
%endif
%endif
%if %{include_fastdebug_build}
-BuildRequires: %{portable_name}-fastdebug >= %{portable_version}
BuildRequires: %{portable_name}-devel-fastdebug >= %{portable_version}
%if %{include_staticlibs}
BuildRequires: %{portable_name}-static-libs-fastdebug >= %{portable_version}
%endif
%endif
%if %{include_debug_build}
-BuildRequires: %{portable_name}-slowdebug >= %{portable_version}
BuildRequires: %{portable_name}-devel-slowdebug >= %{portable_version}
%if %{include_staticlibs}
BuildRequires: %{portable_name}-static-libs-slowdebug >= %{portable_version}
@@ -1713,24 +1711,22 @@ fi
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.sources.noarch.tar.xz
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable*.misc.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable*.docs.%{_arch}.tar.xz
%if %{include_normal_build}
-tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.jdk.%{_arch}.tar.xz
-#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.jre.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.unstripped.jdk.%{_arch}.tar.xz
%if %{include_staticlibs}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.static-libs.%{_arch}.tar.xz
%endif
%endif
%if %{include_fastdebug_build}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jdk.%{_arch}.tar.xz
-#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.static-libs.%{_arch}.tar.xz
%endif
%endif
%if %{include_debug_build}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jdk.%{_arch}.tar.xz
-#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.static-libs.%{_arch}.tar.xz
%endif
@@ -1965,6 +1961,7 @@ for suffix in %{build_loop} ; do
jdk_image=${top_dir_abs_main_build_path}
src_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.sources.noarch/"`
misc_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.misc.%{_arch}/"`
+ docs_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.docs.%{_arch}/"`
# Install the jdk
mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
@@ -2027,11 +2024,11 @@ if ! echo $suffix | grep -q "debug" ; then
# Install Javadoc documentation
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
- built_doc_archive=javadocs.zip
- cp -a ${top_dir_abs_main_build_path}/${built_doc_archive} \
- $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip || ls -l ${top_dir_abs_main_build_path}
+ built_doc_archive=$(basename $(ls ${docs_image}/jdk*docs.zip))
+ cp -a ${docs_image}/${built_doc_archive} \
+ $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
pushd $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
- unzip ${top_dir_abs_main_build_path}/${built_doc_archive}
+ unzip ${docs_image}/${built_doc_archive}
popd
fi
@@ -2070,9 +2067,6 @@ find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -name "*.so" -exec chmod 7
find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -type d -exec chmod 755 {} \; ;
find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/legal -type f -exec chmod 644 {} \; ;
-if [ "x$suffix" = "x" ] ; then
- rm $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/javadocs.zip #is in subpackages, 1 renamed, 2nd unpacked
-fi
# end, dual install
done
@@ -2396,6 +2390,9 @@ cjc.mainProgram(args)
%endif
%changelog
+* Wed Nov 22 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.1.0.12-1.rolling
+- updated to OpenJDK 21.0.1 (2023-10-17)
+
* Fri Sep 29 2023 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:21.0.0.0.35-3.rolling
- Fix flatpak build by handling different installation prefixes of package dependencies
commit 770b2dc6cf212c3adc72338d11ed49d38fed3b71
Author: Yaakov Selkowitz <yselkowi(a)redhat.com>
Date: Mon Sep 11 16:13:18 2023 -0400
Fix flatpak build
java-X-openjdk-portable must not be rebuilt for flatpaks, nor do we want
to rebuild tzdata for tzdata-java, so it will be added to the runtimes.
Therefore, we need to take into account the possibility of different
prefixes for those compared to java-X-openjdk.
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index d2f9562..0454f30 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -321,7 +321,7 @@
%global top_level_dir_name %{origin}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 35
-%global rpmrelease 2
+%global rpmrelease 3
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -412,12 +412,16 @@
%global rpm_state_dir %{_localstatedir}/lib/rpm-state/
-# For flatpack builds hard-code /usr/sbin/alternatives,
-# otherwise use %%{_sbindir} relative path.
+# For flatpack builds hard-code dependency paths,
+# otherwise use relative paths.
%if 0%{?flatpak}
%global alternatives_requires /usr/sbin/alternatives
+%global javazidir /usr/share/javazi-1.8
+%global portablejvmdir /usr/lib/jvm
%else
%global alternatives_requires %{_sbindir}/alternatives
+%global javazidir %{_datadir}/javazi-1.8
+%global portablejvmdir %{_jvmdir}
%endif
%global family %{name}.%{_arch}
@@ -1707,28 +1711,28 @@ if [ $prioritylength -ne 8 ] ; then
exit 14
fi
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.sources.noarch.tar.xz
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable*.misc.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.sources.noarch.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable*.misc.%{_arch}.tar.xz
%if %{include_normal_build}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.jdk.%{_arch}.tar.xz
-#tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.jre.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.jdk.%{_arch}.tar.xz
+#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.static-libs.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.static-libs.%{_arch}.tar.xz
%endif
%endif
%if %{include_fastdebug_build}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jdk.%{_arch}.tar.xz
-#tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jre.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jdk.%{_arch}.tar.xz
+#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.fastdebug.static-libs.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.static-libs.%{_arch}.tar.xz
%endif
%endif
%if %{include_debug_build}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jdk.%{_arch}.tar.xz
-#tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jre.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jdk.%{_arch}.tar.xz
+#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.slowdebug.static-libs.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.static-libs.%{_arch}.tar.xz
%endif
%endif
@@ -1806,7 +1810,7 @@ function installjdk() {
# Use system-wide tzdata
mv ${imagepath}/lib/tzdb.dat{,.upstream}
- ln -sv %{_datadir}/javazi-1.8/tzdb.dat ${imagepath}/lib/tzdb.dat
+ ln -sv %{javazidir}/tzdb.dat ${imagepath}/lib/tzdb.dat
# Rename OpenJDK cacerts database
mv ${imagepath}/lib/security/cacerts{,.upstream}
@@ -2119,15 +2123,11 @@ $JAVA_HOME/bin/javac -d . %{SOURCE16}
#TODO skipped vendor check. It now points to PORTABLE version of jdk.
#$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
-%if ! 0%{?flatpak}
-# Check translations are available for new timezones (during flatpak builds, the
-# tzdb.dat used by this test is not where the test expects it, so this is
-# disabled for flatpak builds)
+# Check translations are available for new timezones
$JAVA_HOME/bin/javac -d . %{SOURCE18}
#TODO doublecheck tzdata handling
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE || echo "TZDATA no longer can be synced with system, because we repack"
$JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR || echo "TZDATA no longer can be synced with system, because we repack"
-%endif
%if %{include_staticlibs}
# Check debug symbols in static libraries (smoke test)
@@ -2396,6 +2396,9 @@ cjc.mainProgram(args)
%endif
%changelog
+* Fri Sep 29 2023 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:21.0.0.0.35-3.rolling
+- Fix flatpak build by handling different installation prefixes of package dependencies
+
* Tue Sep 19 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.0.0.35-2.rolling
- adapted to new path in sources
- repacked alt-java from misc subpkg
commit 153764519d6a01cf1bfc7a329371357bb87543fd
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Fri Sep 29 14:26:02 2023 +0200
Removed no longer used {1} in misc subpkg
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index 8811542..d2f9562 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -1960,7 +1960,7 @@ for suffix in %{build_loop} ; do
%endif
jdk_image=${top_dir_abs_main_build_path}
src_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.sources.noarch/"`
- misc_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable%{1}.misc.%{_arch}/"`
+ misc_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.misc.%{_arch}/"`
# Install the jdk
mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
commit acad51e27b79ba2cf785889ee7536645e0f0bdd6
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Mon Sep 25 15:38:54 2023 +0200
adapted ssbd alt-java test to run on all arches
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index b584726..8811542 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -2107,10 +2107,11 @@ $JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=tru
if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
# Check alt-java launcher has SSB mitigation on supported architectures
+# set_speculation function exists in both cases, so check for prctl call
%ifarch %{ssbd_arches}
-nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation
+nm $JAVA_HOME/bin/%{alt_java_name} | grep prctl
%else
-if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi
+if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep prctl ; then true ; else false; fi
%endif
# Check correct vendor values have been set
@@ -2398,6 +2399,7 @@ cjc.mainProgram(args)
* Tue Sep 19 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.0.0.35-2.rolling
- adapted to new path in sources
- repacked alt-java from misc subpkg
+- adapted alt-java to grep correctly prctl
- removed no longer prepared nss.cfg
* Tue Aug 29 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.0.0.35-1.rolling
commit e205b64fcc0b92c7e511ef939489c64a71b9e466
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Wed Sep 20 20:11:03 2023 +0200
repacked alt-java from misc subpkg
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index e54fd91..b584726 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -894,7 +894,6 @@ exit 0
%config(noreplace) %{etcjavadir -- %{?1}}/conf/security/java.policy
%config(noreplace) %{etcjavadir -- %{?1}}/conf/security/java.security
%config(noreplace) %{etcjavadir -- %{?1}}/conf/logging.properties
-%config(noreplace) %{etcjavadir -- %{?1}}/conf/security/nss.cfg
%config(noreplace) %{etcjavadir -- %{?1}}/conf/security/nss.fips.cfg
%config(noreplace) %{etcjavadir -- %{?1}}/conf/management/jmxremote.access
# This is a config template, thus not config-noreplace
@@ -1307,6 +1306,7 @@ Source16: CheckVendor.java
Source18: TestTranslations.java
BuildRequires: %{portable_name}-sources >= %{portable_version}
+BuildRequires: %{portable_name}-misc >= %{portable_version}
%if %{include_normal_build}
BuildRequires: %{portable_name} >= %{portable_version}
@@ -1338,7 +1338,7 @@ BuildRequires: gdb
BuildRequires: /usr/bin/gcc
BuildRequires: /usr/bin/objcopy
BuildRequires: /usr/bin/readelf
-# Requirement for setting up nss.cfg and nss.fips.cfg
+# Requirement for setting and nss.fips.cfg
BuildRequires: nss-devel
# Requirement for system security property test
BuildRequires: crypto-policies
@@ -1708,6 +1708,8 @@ if [ $prioritylength -ne 8 ] ; then
fi
tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.sources.noarch.tar.xz
+tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable*.misc.%{_arch}.tar.xz
+
%if %{include_normal_build}
tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.jdk.%{_arch}.tar.xz
#tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.jre.%{_arch}.tar.xz
@@ -1958,6 +1960,7 @@ for suffix in %{build_loop} ; do
%endif
jdk_image=${top_dir_abs_main_build_path}
src_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.sources.noarch/"`
+ misc_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable%{1}.misc.%{_arch}/"`
# Install the jdk
mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
@@ -1972,6 +1975,7 @@ done
cp -a ${jdk_image} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}
cp -a ${src_image} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/full_sources
+cp -a ${misc_image}/alt-java $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/bin
pushd ${jdk_image}
@@ -2393,6 +2397,8 @@ cjc.mainProgram(args)
%changelog
* Tue Sep 19 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.0.0.35-2.rolling
- adapted to new path in sources
+- repacked alt-java from misc subpkg
+- removed no longer prepared nss.cfg
* Tue Aug 29 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.0.0.35-1.rolling
- updated to jdk 21
commit a77594e5884a3c9de26f0725f8e86e02a8b958f5
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Wed Sep 20 18:20:07 2023 +0200
adapted to new path in sources
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index 1e92fc0..e54fd91 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -321,7 +321,7 @@
%global top_level_dir_name %{origin}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 35
-%global rpmrelease 1
+%global rpmrelease 2
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -1965,7 +1965,7 @@ mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
# Install icons
for s in 16 24 32 48 ; do
install -D -p -m 644 \
- ${src_image}/openjdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png \
+ ${src_image}/%{vcstag}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/java-%{javaver}-%{origin}.png
done
@@ -2391,6 +2391,9 @@ cjc.mainProgram(args)
%endif
%changelog
+* Tue Sep 19 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.0.0.35-2.rolling
+- adapted to new path in sources
+
* Tue Aug 29 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.0.0.35-1.rolling
- updated to jdk 21
1
0
Architecture specific change in rpms/java-latest-openjdk.git
by githook-noreply＠fedoraproject.org 26 Nov '23
by githook-noreply＠fedoraproject.org 26 Nov '23
26 Nov '23
The package rpms/java-latest-openjdk.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-latest-openjdk.git/commit/?id=….
Change:
+%ifarch %{jit_arches}
Thanks.
Full change:
============
commit 5c9d1b35aa8ea591fea5f43ca25c42bae961be5c
Merge: aa139b2 50747e7
Author: Jiri <jvanek(a)redhat.com>
Date: Sun Nov 26 18:12:16 2023 +0100
Merge branch 'rawhide' into f38
commit 50747e7123ff6577a0d7a44fd75fda479c7774e7
Author: Jiri <jvanek(a)redhat.com>
Date: Sun Nov 26 18:09:53 2023 +0100
updated to OpenJDK 21.0.1 (2023-10-17)
diff --git a/TestTranslations.java b/TestTranslations.java
index d87647a..f6a4fe2 100644
--- a/TestTranslations.java
+++ b/TestTranslations.java
@@ -52,7 +52,7 @@ public class TestTranslations {
map.put(Locale.FRANCE, new String[] { "heure normale des Rocheuses", "UTC\u221207:00", "MST",
"heure d\u2019\u00e9t\u00e9 des Rocheuses", "UTC\u221206:00", "MDT",
"heure des Rocheuses", "UTC\u221207:00", "MT"});
- map.put(Locale.GERMANY, new String[] { "Rocky Mountain-Normalzeit", "GMT-07:00", "MST",
+ map.put(Locale.GERMANY, new String[] { "Rocky-Mountain-Normalzeit", "GMT-07:00", "MST",
"Rocky-Mountain-Sommerzeit", "GMT-06:00", "MDT",
"Rocky-Mountain-Zeit", "GMT-07:00", "MT"});
CIUDAD_JUAREZ = Collections.unmodifiableMap(map);
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index d6a7f8d..c53abdc 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -1,163 +1 @@
-#!/bin/bash
-# Generates the 'source tarball' for JDK projects.
-#
-# Example:
-# When used from local repo set REPO_ROOT pointing to file:// with your repo
-# If your local repo follows upstream forests conventions, it may be enough to set OPENJDK_URL
-# If you want to use a local copy of patch PR3788, set the path to it in the PR3788 variable
-#
-# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
-# PROJECT_NAME=openjdk
-# REPO_NAME=jdk18u
-# VERSION=jdk-18.0.1+10
-# or to eg prepare systemtap:
-# icedtea7's jstack and other tapsets
-# VERSION=6327cf1cea9e
-# REPO_NAME=icedtea7-2.6
-# PROJECT_NAME=release
-# OPENJDK_URL=http://icedtea.classpath.org/hg/
-# TO_COMPRESS="*/tapset"
-#
-# They are used to create correct name and are used in construction of sources url (unless REPO_ROOT is set)
-
-# This script creates a single source tarball out of the repository
-# based on the given tag and removes code not allowed in fedora/rhel. For
-# consistency, the source tarball will always contain 'openjdk' as the top
-# level folder, name is created, based on parameter
-#
-
-if [ ! "x$PR3823" = "x" ] ; then
- if [ ! -f "$PR3823" ] ; then
- echo "You have specified PR3823 as $PR3823 but it does not exist. Exiting"
- exit 1
- fi
-fi
-
-set -e
-
-OPENJDK_URL_DEFAULT=https://github.com
-COMPRESSION_DEFAULT=xz
-# Corresponding IcedTea version
-ICEDTEA_VERSION=13.0
-
-if [ "x$1" = "xhelp" ] ; then
- echo -e "Behaviour may be specified by setting the following variables:\n"
- echo "VERSION - the version of the specified OpenJDK project"
- echo "PROJECT_NAME -- the name of the OpenJDK project being archived (optional; only needed by defaults)"
- echo "REPO_NAME - the name of the OpenJDK repository (optional; only needed by defaults)"
- echo "OPENJDK_URL - the URL to retrieve code from (optional; defaults to ${OPENJDK_URL_DEFAULT})"
- echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
- echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
- echo "TO_COMPRESS - what part of clone to pack (default is openjdk)"
- echo "PR3823 - the path to the PR3823 patch to apply (optional; downloaded if unavailable)"
- exit 1;
-fi
-
-
-if [ "x$VERSION" = "x" ] ; then
- echo "No VERSION specified"
- exit -2
-fi
-echo "Version: ${VERSION}"
-
-# REPO_NAME is only needed when we default on REPO_ROOT and FILE_NAME_ROOT
-if [ "x$FILE_NAME_ROOT" = "x" -o "x$REPO_ROOT" = "x" ] ; then
- if [ "x$PROJECT_NAME" = "x" ] ; then
- echo "No PROJECT_NAME specified"
- exit -1
- fi
- echo "Project name: ${PROJECT_NAME}"
- if [ "x$REPO_NAME" = "x" ] ; then
- echo "No REPO_NAME specified"
- exit -3
- fi
- echo "Repository name: ${REPO_NAME}"
-fi
-
-if [ "x$OPENJDK_URL" = "x" ] ; then
- OPENJDK_URL=${OPENJDK_URL_DEFAULT}
- echo "No OpenJDK URL specified; defaulting to ${OPENJDK_URL}"
-else
- echo "OpenJDK URL: ${OPENJDK_URL}"
-fi
-
-if [ "x$COMPRESSION" = "x" ] ; then
- # rhel 5 needs tar.gz
- COMPRESSION=${COMPRESSION_DEFAULT}
-fi
-echo "Creating a tar.${COMPRESSION} archive"
-
-if [ "x$FILE_NAME_ROOT" = "x" ] ; then
- FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
- echo "No file name root specified; default to ${FILE_NAME_ROOT}"
-fi
-if [ "x$REPO_ROOT" = "x" ] ; then
- REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}.git"
- echo "No repository root specified; default to ${REPO_ROOT}"
-fi;
-
-if [ "x$TO_COMPRESS" = "x" ] ; then
- TO_COMPRESS="openjdk"
- echo "No to be compressed targets specified, ; default to ${TO_COMPRESS}"
-fi;
-
-if [ -d ${FILE_NAME_ROOT} ] ; then
- echo "exists exists exists exists exists exists exists "
- echo "reusing reusing reusing reusing reusing reusing "
- echo ${FILE_NAME_ROOT}
-else
- mkdir "${FILE_NAME_ROOT}"
- pushd "${FILE_NAME_ROOT}"
- echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
- git clone -b ${VERSION} ${REPO_ROOT} openjdk
- popd
-fi
-pushd "${FILE_NAME_ROOT}"
- if [ -d openjdk/src ]; then
- pushd openjdk
- echo "Removing EC source code we don't build"
- CRYPTO_PATH=src/jdk.crypto.ec/share/native/libsunec/impl
- rm -vf ${CRYPTO_PATH}/ec2.h
- rm -vf ${CRYPTO_PATH}/ec2_163.c
- rm -vf ${CRYPTO_PATH}/ec2_193.c
- rm -vf ${CRYPTO_PATH}/ec2_233.c
- rm -vf ${CRYPTO_PATH}/ec2_aff.c
- rm -vf ${CRYPTO_PATH}/ec2_mont.c
- rm -vf ${CRYPTO_PATH}/ecp_192.c
- rm -vf ${CRYPTO_PATH}/ecp_224.c
-
- echo "Syncing EC list with NSS"
- if [ "x$PR3823" = "x" ] ; then
- # get PR3823.patch (from https://github.com/icedtea-git/icedtea) in the ${ICEDTEA_VERSION} branch
- # Do not push it or publish it
- echo "PR3823 not found. Downloading..."
- wget -v https://github.com/icedtea-git/icedtea/raw/${ICEDTEA_VERSION}/patches/pr382…
- echo "Applying ${PWD}/pr3823.patch"
- patch -Np1 < pr3823.patch
- rm pr3823.patch
- else
- echo "Applying ${PR3823}"
- patch -Np1 < $PR3823
- fi;
- find . -name '*.orig' -exec rm -vf '{}' ';'
- popd
- fi
-
- # Generate .src-rev so build has knowledge of the revision the tarball was created from
- mkdir build
- pushd build
- sh ${PWD}/../openjdk/configure
- make store-source-revision
- popd
- rm -rf build
-
- echo "Compressing remaining forest"
- if [ "X$COMPRESSION" = "Xxz" ] ; then
- SWITCH=cJf
- else
- SWITCH=czf
- fi
- tar --exclude-vcs -$SWITCH ${FILE_NAME_ROOT}.tar.${COMPRESSION} $TO_COMPRESS
- mv ${FILE_NAME_ROOT}.tar.${COMPRESSION} ..
-popd
-echo "Done. You may want to remove the uncompressed version - $FILE_NAME_ROOT."
+## This file is intentionally left blank
diff --git a/icedtea_sync.sh b/icedtea_sync.sh
index e5c54f3..c53abdc 100755
--- a/icedtea_sync.sh
+++ b/icedtea_sync.sh
@@ -1,192 +1 @@
-#!/bin/bash
-
-# Copyright (C) 2019 Red Hat, Inc.
-# Written by Andrew John Hughes <gnu.andrew(a)redhat.com>.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-ICEDTEA_USE_VCS=true
-
-ICEDTEA_VERSION=3.15.0
-ICEDTEA_URL=https://icedtea.classpath.org/download/source
-ICEDTEA_SIGNING_KEY=CFDA0F9B35964222
-
-ICEDTEA_HG_URL=https://icedtea.classpath.org/hg/icedtea11
-
-set -e
-
-RPM_DIR=${PWD}
-if [ ! -f ${RPM_DIR}/jconsole.desktop.in ] ; then
- echo "Not in RPM source tree.";
- exit 1;
-fi
-
-if test "x${TMPDIR}" = "x"; then
- TMPDIR=/tmp;
-fi
-WORKDIR=${TMPDIR}/it.sync
-
-echo "Using working directory ${WORKDIR}"
-mkdir ${WORKDIR}
-pushd ${WORKDIR}
-
-if test "x${WGET}" = "x"; then
- WGET=$(which wget);
- if test "x${WGET}" = "x"; then
- echo "wget not found";
- exit 1;
- fi
-fi
-
-if test "x${TAR}" = "x"; then
- TAR=$(which tar)
- if test "x${TAR}" = "x"; then
- echo "tar not found";
- exit 2;
- fi
-fi
-
-echo "Dependencies:";
-echo -e "\tWGET: ${WGET}";
-echo -e "\tTAR: ${TAR}\n";
-
-if test "x${ICEDTEA_USE_VCS}" = "xtrue"; then
- echo "Mode: Using VCS";
-
- if test "x${GREP}" = "x"; then
- GREP=$(which grep);
- if test "x${GREP}" = "x"; then
- echo "grep not found";
- exit 3;
- fi
- fi
-
- if test "x${CUT}" = "x"; then
- CUT=$(which cut);
- if test "x${CUT}" = "x"; then
- echo "cut not found";
- exit 4;
- fi
- fi
-
- if test "x${TR}" = "x"; then
- TR=$(which tr);
- if test "x${TR}" = "x"; then
- echo "tr not found";
- exit 5;
- fi
- fi
-
- if test "x${HG}" = "x"; then
- HG=$(which hg);
- if test "x${HG}" = "x"; then
- echo "hg not found";
- exit 6;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tGREP: ${GREP}";
- echo -e "\tCUT: ${CUT}";
- echo -e "\tTR: ${TR}";
- echo -e "\tHG: ${HG}";
-
- echo "Checking out repository from VCS...";
- ${HG} clone ${ICEDTEA_HG_URL} icedtea
-
- echo "Obtaining version from configure.ac...";
- ROOT_VER=$(${GREP} '^AC_INIT' icedtea/configure.ac|${CUT} -d ',' -f 2|${TR} -d '[][:space:]')
- echo "Root version from configure: ${ROOT_VER}";
-
- VCS_REV=$(${HG} log -R icedtea --template '{node|short}' -r tip)
- echo "VCS revision: ${VCS_REV}";
-
- ICEDTEA_VERSION="${ROOT_VER}-${VCS_REV}"
- echo "Creating icedtea-${ICEDTEA_VERSION}";
- mkdir icedtea-${ICEDTEA_VERSION}
- echo "Copying required files from checkout to icedtea-${ICEDTEA_VERSION}";
- # Commented out for now as IcedTea 6's jconsole.desktop.in is outdated
- #cp -a icedtea/jconsole.desktop.in ../icedtea-${ICEDTEA_VERSION}
- cp -a ${RPM_DIR}/jconsole.desktop.in icedtea-${ICEDTEA_VERSION}
- cp -a icedtea/tapset icedtea-${ICEDTEA_VERSION}
-
- rm -rf icedtea
-else
- echo "Mode: Using tarball";
-
- if test "x${ICEDTEA_VERSION}" = "x"; then
- echo "No IcedTea version specified for tarball download.";
- exit 3;
- fi
-
- if test "x${CHECKSUM}" = "x"; then
- CHECKSUM=$(which sha256sum)
- if test "x${CHECKSUM}" = "x"; then
- echo "sha256sum not found";
- exit 4;
- fi
- fi
-
- if test "x${PGP}" = "x"; then
- PGP=$(which gpg)
- if test "x${PGP}" = "x"; then
- echo "gpg not found";
- exit 5;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tCHECKSUM: ${CHECKSUM}";
- echo -e "\tPGP: ${PGP}\n";
-
- echo "Checking for IcedTea signing key ${ICEDTEA_SIGNING_KEY}...";
- if ! gpg --list-keys ${ICEDTEA_SIGNING_KEY}; then
- echo "IcedTea signing key ${ICEDTEA_SIGNING_KEY} not installed.";
- exit 6;
- fi
-
- echo "Downloading IcedTea release tarball...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz
- echo "Downloading IcedTea tarball signature...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- echo "Downloading IcedTea tarball checksums...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Verifying checksums...";
- ${CHECKSUM} --check --ignore-missing icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Checking signature...";
- ${PGP} --verify icedtea-${ICEDTEA_VERSION}.tar.xz.sig
-
- echo "Extracting files...";
- ${TAR} xJf icedtea-${ICEDTEA_VERSION}.tar.xz \
- icedtea-${ICEDTEA_VERSION}/tapset \
- icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in
-
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- rm -vf icedtea-${ICEDTEA_VERSION}.sha256
-fi
-
-echo "Replacing desktop files...";
-mv -v icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in ${RPM_DIR}
-
-echo "Creating new tapset tarball...";
-mv -v icedtea-${ICEDTEA_VERSION} openjdk
-${TAR} cJf ${RPM_DIR}/tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz openjdk
-
-rm -rvf openjdk
-
-popd
-rm -rf ${WORKDIR}
+## This file is intentionally left blank
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index 0454f30..ccf69da 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -278,7 +278,7 @@
# New Version-String scheme-style defines
%global featurever 21
%global interimver 0
-%global updatever 0
+%global updatever 1
%global patchver 0
# We don't add any LTS designator for STS packages (Fedora and EPEL).
@@ -287,8 +287,8 @@
%global lts_designator "LTS"
%global lts_designator_zip -%{lts_designator}
%else
- %global lts_designator ""
- %global lts_designator_zip ""
+ %global lts_designator ""
+ %global lts_designator_zip ""
%endif
# Define vendor information used by OpenJDK
@@ -304,7 +304,7 @@
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{name}&…
%else
%if 0%{?rhel}
-%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20…
+%global oj_vendor_bug_url https://access.redhat.com/support/cases/
%else
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi
%endif
@@ -314,14 +314,21 @@
# Define IcedTea version used for SystemTap tapsets and desktop file
%global icedteaver 6.0.0pre00-c848b93a8598
+# Define JDK versions
+%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
+%global javaver %{featurever}
+# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
+%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
+# The tag used to create the OpenJDK tarball
+%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Standard JPackage naming and versioning defines
%global origin openjdk
%global origin_nice OpenJDK
-%global top_level_dir_name %{origin}
+%global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
-%global buildver 35
-%global rpmrelease 3
+%global buildver 12
+%global rpmrelease 1
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -334,14 +341,6 @@
# for techpreview, using 1, so slowdebugs can have 0
%global priority %( printf '%08d' 1 )
%endif
-%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
-%global javaver %{featurever}
-
-# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
-%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
-
-# The tag used to create the OpenJDK tarball
-%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Define milestone (EA for pre-releases, GA for releases)
# Release will be (where N is usually a number starting at 1):
@@ -350,15 +349,15 @@
%global is_ga 1
%if %{is_ga}
%global build_type GA
-%global expected_ea_designator ""
-%global ea_designator_zip ""
+%global ea_designator ""
+%global ea_designator_zip %{nil}
%global extraver %{nil}
%global eaprefix %{nil}
%else
%global build_type EA
-%global expected_ea_designator ea
-%global ea_designator_zip -%{expected_ea_designator}
-%global extraver .%{expected_ea_designator}
+%global ea_designator ea
+%global ea_designator_zip -%{ea_designator}
+%global extraver .%{ea_designator}
%global eaprefix 0.
%endif
@@ -517,12 +516,15 @@ alternatives \\
--install %{_bindir}/java $key %{jrebindir -- %{?1}}/java $PRIORITY --family %{family} \\
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{sdkdir -- %{?1}} \\
--slave %{_bindir}/%{alt_java_name} %{alt_java_name} %{jrebindir -- %{?1}}/%{alt_java_name} \\
+ --slave %{_bindir}/jcmd jcmd %{sdkbindir -- %{?1}}/jcmd \\
--slave %{_bindir}/keytool keytool %{jrebindir -- %{?1}}/keytool \\
--slave %{_bindir}/rmiregistry rmiregistry %{jrebindir -- %{?1}}/rmiregistry \\
--slave %{_mandir}/man1/java.1$ext java.1$ext \\
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/%{alt_java_name}.1$ext %{alt_java_name}.1$ext \\
%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1$ext \\
+ --slave %{_mandir}/man1/jcmd.1$ext jcmd.1$ext \\
+ %{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \\
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/rmiregistry.1$ext rmiregistry.1$ext \\
@@ -607,7 +609,6 @@ alternatives \\
--slave %{_bindir}/jarsigner jarsigner %{sdkbindir -- %{?1}}/jarsigner \\
--slave %{_bindir}/javadoc javadoc %{sdkbindir -- %{?1}}/javadoc \\
--slave %{_bindir}/javap javap %{sdkbindir -- %{?1}}/javap \\
- --slave %{_bindir}/jcmd jcmd %{sdkbindir -- %{?1}}/jcmd \\
--slave %{_bindir}/jconsole jconsole %{sdkbindir -- %{?1}}/jconsole \\
--slave %{_bindir}/jdb jdb %{sdkbindir -- %{?1}}/jdb \\
--slave %{_bindir}/jdeps jdeps %{sdkbindir -- %{?1}}/jdeps \\
@@ -635,8 +636,6 @@ alternatives \\
%{_mandir}/man1/javadoc-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/javap.1$ext javap.1$ext \\
%{_mandir}/man1/javap-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/jcmd.1$ext jcmd.1$ext \\
- %{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/jconsole.1$ext jconsole.1$ext \\
%{_mandir}/man1/jconsole-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/jdb.1$ext jdb.1$ext \\
@@ -801,10 +800,11 @@ exit 0
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/bin
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/java
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/%{alt_java_name}
+%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jcmd
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/keytool
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmiregistry
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib
-%ifarch %{share_arches}
+%ifarch %{jit_arches}
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/classlist
%endif
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jexec
@@ -863,7 +863,8 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/default.jfc
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/profile.jfc
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1*
-#%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1* #TODO, resolve alt-java man page
+%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1*
+%{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{?1}}.1*
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/%{vm_variant}/
@@ -912,8 +913,9 @@ exit 0
%if %is_system_jdk
%if %{is_release_build -- %{?1}}
%ghost %{_bindir}/java
-%ghost %{_bindir}/%{alt_java_name}
%ghost %{_jvmdir}/jre
+%ghost %{_bindir}/%{alt_java_name}
+%ghost %{_bindir}/jcmd
%ghost %{_bindir}/keytool
%ghost %{_bindir}/pack200
%ghost %{_bindir}/rmid
@@ -938,7 +940,6 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javadoc
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javap
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jconsole
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jcmd
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdb
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeps
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeprscan
@@ -1013,7 +1014,6 @@ exit 0
%ghost %{_bindir}/jarsigner
%ghost %{_bindir}/javadoc
%ghost %{_bindir}/javap
-%ghost %{_bindir}/jcmd
%ghost %{_bindir}/jconsole
%ghost %{_bindir}/jdb
%ghost %{_bindir}/jdeps
@@ -1311,23 +1311,21 @@ Source18: TestTranslations.java
BuildRequires: %{portable_name}-sources >= %{portable_version}
BuildRequires: %{portable_name}-misc >= %{portable_version}
+BuildRequires: %{portable_name}-docs >= %{portable_version}
%if %{include_normal_build}
-BuildRequires: %{portable_name} >= %{portable_version}
-BuildRequires: %{portable_name}-devel >= %{portable_version}
+BuildRequires: %{portable_name}-unstripped >= %{portable_version}
%if %{include_staticlibs}
BuildRequires: %{portable_name}-static-libs >= %{portable_version}
%endif
%endif
%if %{include_fastdebug_build}
-BuildRequires: %{portable_name}-fastdebug >= %{portable_version}
BuildRequires: %{portable_name}-devel-fastdebug >= %{portable_version}
%if %{include_staticlibs}
BuildRequires: %{portable_name}-static-libs-fastdebug >= %{portable_version}
%endif
%endif
%if %{include_debug_build}
-BuildRequires: %{portable_name}-slowdebug >= %{portable_version}
BuildRequires: %{portable_name}-devel-slowdebug >= %{portable_version}
%if %{include_staticlibs}
BuildRequires: %{portable_name}-static-libs-slowdebug >= %{portable_version}
@@ -1713,24 +1711,22 @@ fi
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.sources.noarch.tar.xz
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable*.misc.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable*.docs.%{_arch}.tar.xz
%if %{include_normal_build}
-tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.jdk.%{_arch}.tar.xz
-#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.jre.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.unstripped.jdk.%{_arch}.tar.xz
%if %{include_staticlibs}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.static-libs.%{_arch}.tar.xz
%endif
%endif
%if %{include_fastdebug_build}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jdk.%{_arch}.tar.xz
-#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.static-libs.%{_arch}.tar.xz
%endif
%endif
%if %{include_debug_build}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jdk.%{_arch}.tar.xz
-#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.static-libs.%{_arch}.tar.xz
%endif
@@ -1965,6 +1961,7 @@ for suffix in %{build_loop} ; do
jdk_image=${top_dir_abs_main_build_path}
src_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.sources.noarch/"`
misc_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.misc.%{_arch}/"`
+ docs_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.docs.%{_arch}/"`
# Install the jdk
mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
@@ -2027,11 +2024,11 @@ if ! echo $suffix | grep -q "debug" ; then
# Install Javadoc documentation
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
- built_doc_archive=javadocs.zip
- cp -a ${top_dir_abs_main_build_path}/${built_doc_archive} \
- $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip || ls -l ${top_dir_abs_main_build_path}
+ built_doc_archive=$(basename $(ls ${docs_image}/jdk*docs.zip))
+ cp -a ${docs_image}/${built_doc_archive} \
+ $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
pushd $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
- unzip ${top_dir_abs_main_build_path}/${built_doc_archive}
+ unzip ${docs_image}/${built_doc_archive}
popd
fi
@@ -2070,9 +2067,6 @@ find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -name "*.so" -exec chmod 7
find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -type d -exec chmod 755 {} \; ;
find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/legal -type f -exec chmod 644 {} \; ;
-if [ "x$suffix" = "x" ] ; then
- rm $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/javadocs.zip #is in subpackages, 1 renamed, 2nd unpacked
-fi
# end, dual install
done
@@ -2396,6 +2390,9 @@ cjc.mainProgram(args)
%endif
%changelog
+* Wed Nov 22 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.1.0.12-1.rolling
+- updated to OpenJDK 21.0.1 (2023-10-17)
+
* Fri Sep 29 2023 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:21.0.0.0.35-3.rolling
- Fix flatpak build by handling different installation prefixes of package dependencies
commit 770b2dc6cf212c3adc72338d11ed49d38fed3b71
Author: Yaakov Selkowitz <yselkowi(a)redhat.com>
Date: Mon Sep 11 16:13:18 2023 -0400
Fix flatpak build
java-X-openjdk-portable must not be rebuilt for flatpaks, nor do we want
to rebuild tzdata for tzdata-java, so it will be added to the runtimes.
Therefore, we need to take into account the possibility of different
prefixes for those compared to java-X-openjdk.
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index d2f9562..0454f30 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -321,7 +321,7 @@
%global top_level_dir_name %{origin}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 35
-%global rpmrelease 2
+%global rpmrelease 3
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -412,12 +412,16 @@
%global rpm_state_dir %{_localstatedir}/lib/rpm-state/
-# For flatpack builds hard-code /usr/sbin/alternatives,
-# otherwise use %%{_sbindir} relative path.
+# For flatpack builds hard-code dependency paths,
+# otherwise use relative paths.
%if 0%{?flatpak}
%global alternatives_requires /usr/sbin/alternatives
+%global javazidir /usr/share/javazi-1.8
+%global portablejvmdir /usr/lib/jvm
%else
%global alternatives_requires %{_sbindir}/alternatives
+%global javazidir %{_datadir}/javazi-1.8
+%global portablejvmdir %{_jvmdir}
%endif
%global family %{name}.%{_arch}
@@ -1707,28 +1711,28 @@ if [ $prioritylength -ne 8 ] ; then
exit 14
fi
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.sources.noarch.tar.xz
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable*.misc.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.sources.noarch.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable*.misc.%{_arch}.tar.xz
%if %{include_normal_build}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.jdk.%{_arch}.tar.xz
-#tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.jre.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.jdk.%{_arch}.tar.xz
+#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.static-libs.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.static-libs.%{_arch}.tar.xz
%endif
%endif
%if %{include_fastdebug_build}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jdk.%{_arch}.tar.xz
-#tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jre.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jdk.%{_arch}.tar.xz
+#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.fastdebug.static-libs.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.static-libs.%{_arch}.tar.xz
%endif
%endif
%if %{include_debug_build}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jdk.%{_arch}.tar.xz
-#tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jre.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jdk.%{_arch}.tar.xz
+#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.slowdebug.static-libs.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.static-libs.%{_arch}.tar.xz
%endif
%endif
@@ -1806,7 +1810,7 @@ function installjdk() {
# Use system-wide tzdata
mv ${imagepath}/lib/tzdb.dat{,.upstream}
- ln -sv %{_datadir}/javazi-1.8/tzdb.dat ${imagepath}/lib/tzdb.dat
+ ln -sv %{javazidir}/tzdb.dat ${imagepath}/lib/tzdb.dat
# Rename OpenJDK cacerts database
mv ${imagepath}/lib/security/cacerts{,.upstream}
@@ -2119,15 +2123,11 @@ $JAVA_HOME/bin/javac -d . %{SOURCE16}
#TODO skipped vendor check. It now points to PORTABLE version of jdk.
#$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
-%if ! 0%{?flatpak}
-# Check translations are available for new timezones (during flatpak builds, the
-# tzdb.dat used by this test is not where the test expects it, so this is
-# disabled for flatpak builds)
+# Check translations are available for new timezones
$JAVA_HOME/bin/javac -d . %{SOURCE18}
#TODO doublecheck tzdata handling
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE || echo "TZDATA no longer can be synced with system, because we repack"
$JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR || echo "TZDATA no longer can be synced with system, because we repack"
-%endif
%if %{include_staticlibs}
# Check debug symbols in static libraries (smoke test)
@@ -2396,6 +2396,9 @@ cjc.mainProgram(args)
%endif
%changelog
+* Fri Sep 29 2023 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:21.0.0.0.35-3.rolling
+- Fix flatpak build by handling different installation prefixes of package dependencies
+
* Tue Sep 19 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.0.0.35-2.rolling
- adapted to new path in sources
- repacked alt-java from misc subpkg
commit 153764519d6a01cf1bfc7a329371357bb87543fd
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Fri Sep 29 14:26:02 2023 +0200
Removed no longer used {1} in misc subpkg
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index 8811542..d2f9562 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -1960,7 +1960,7 @@ for suffix in %{build_loop} ; do
%endif
jdk_image=${top_dir_abs_main_build_path}
src_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.sources.noarch/"`
- misc_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable%{1}.misc.%{_arch}/"`
+ misc_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.misc.%{_arch}/"`
# Install the jdk
mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
commit acad51e27b79ba2cf785889ee7536645e0f0bdd6
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Mon Sep 25 15:38:54 2023 +0200
adapted ssbd alt-java test to run on all arches
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index b584726..8811542 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -2107,10 +2107,11 @@ $JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=tru
if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
# Check alt-java launcher has SSB mitigation on supported architectures
+# set_speculation function exists in both cases, so check for prctl call
%ifarch %{ssbd_arches}
-nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation
+nm $JAVA_HOME/bin/%{alt_java_name} | grep prctl
%else
-if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi
+if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep prctl ; then true ; else false; fi
%endif
# Check correct vendor values have been set
@@ -2398,6 +2399,7 @@ cjc.mainProgram(args)
* Tue Sep 19 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.0.0.35-2.rolling
- adapted to new path in sources
- repacked alt-java from misc subpkg
+- adapted alt-java to grep correctly prctl
- removed no longer prepared nss.cfg
* Tue Aug 29 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.0.0.35-1.rolling
commit e205b64fcc0b92c7e511ef939489c64a71b9e466
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Wed Sep 20 20:11:03 2023 +0200
repacked alt-java from misc subpkg
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index e54fd91..b584726 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -894,7 +894,6 @@ exit 0
%config(noreplace) %{etcjavadir -- %{?1}}/conf/security/java.policy
%config(noreplace) %{etcjavadir -- %{?1}}/conf/security/java.security
%config(noreplace) %{etcjavadir -- %{?1}}/conf/logging.properties
-%config(noreplace) %{etcjavadir -- %{?1}}/conf/security/nss.cfg
%config(noreplace) %{etcjavadir -- %{?1}}/conf/security/nss.fips.cfg
%config(noreplace) %{etcjavadir -- %{?1}}/conf/management/jmxremote.access
# This is a config template, thus not config-noreplace
@@ -1307,6 +1306,7 @@ Source16: CheckVendor.java
Source18: TestTranslations.java
BuildRequires: %{portable_name}-sources >= %{portable_version}
+BuildRequires: %{portable_name}-misc >= %{portable_version}
%if %{include_normal_build}
BuildRequires: %{portable_name} >= %{portable_version}
@@ -1338,7 +1338,7 @@ BuildRequires: gdb
BuildRequires: /usr/bin/gcc
BuildRequires: /usr/bin/objcopy
BuildRequires: /usr/bin/readelf
-# Requirement for setting up nss.cfg and nss.fips.cfg
+# Requirement for setting and nss.fips.cfg
BuildRequires: nss-devel
# Requirement for system security property test
BuildRequires: crypto-policies
@@ -1708,6 +1708,8 @@ if [ $prioritylength -ne 8 ] ; then
fi
tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.sources.noarch.tar.xz
+tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable*.misc.%{_arch}.tar.xz
+
%if %{include_normal_build}
tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.jdk.%{_arch}.tar.xz
#tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.jre.%{_arch}.tar.xz
@@ -1958,6 +1960,7 @@ for suffix in %{build_loop} ; do
%endif
jdk_image=${top_dir_abs_main_build_path}
src_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.sources.noarch/"`
+ misc_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable%{1}.misc.%{_arch}/"`
# Install the jdk
mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
@@ -1972,6 +1975,7 @@ done
cp -a ${jdk_image} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}
cp -a ${src_image} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/full_sources
+cp -a ${misc_image}/alt-java $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/bin
pushd ${jdk_image}
@@ -2393,6 +2397,8 @@ cjc.mainProgram(args)
%changelog
* Tue Sep 19 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.0.0.35-2.rolling
- adapted to new path in sources
+- repacked alt-java from misc subpkg
+- removed no longer prepared nss.cfg
* Tue Aug 29 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.0.0.35-1.rolling
- updated to jdk 21
commit a77594e5884a3c9de26f0725f8e86e02a8b958f5
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Wed Sep 20 18:20:07 2023 +0200
adapted to new path in sources
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index 1e92fc0..e54fd91 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -321,7 +321,7 @@
%global top_level_dir_name %{origin}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 35
-%global rpmrelease 1
+%global rpmrelease 2
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -1965,7 +1965,7 @@ mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
# Install icons
for s in 16 24 32 48 ; do
install -D -p -m 644 \
- ${src_image}/openjdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png \
+ ${src_image}/%{vcstag}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/java-%{javaver}-%{origin}.png
done
@@ -2391,6 +2391,9 @@ cjc.mainProgram(args)
%endif
%changelog
+* Tue Sep 19 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.0.0.35-2.rolling
+- adapted to new path in sources
+
* Tue Aug 29 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.0.0.35-1.rolling
- updated to jdk 21
1
0
Architecture specific change in rpms/java-latest-openjdk.git
by githook-noreply＠fedoraproject.org 26 Nov '23
by githook-noreply＠fedoraproject.org 26 Nov '23
26 Nov '23
The package rpms/java-latest-openjdk.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-latest-openjdk.git/commit/?id=….
Change:
+%ifarch %{jit_arches}
Thanks.
Full change:
============
commit 50747e7123ff6577a0d7a44fd75fda479c7774e7
Author: Jiri <jvanek(a)redhat.com>
Date: Sun Nov 26 18:09:53 2023 +0100
updated to OpenJDK 21.0.1 (2023-10-17)
diff --git a/TestTranslations.java b/TestTranslations.java
index d87647a..f6a4fe2 100644
--- a/TestTranslations.java
+++ b/TestTranslations.java
@@ -52,7 +52,7 @@ public class TestTranslations {
map.put(Locale.FRANCE, new String[] { "heure normale des Rocheuses", "UTC\u221207:00", "MST",
"heure d\u2019\u00e9t\u00e9 des Rocheuses", "UTC\u221206:00", "MDT",
"heure des Rocheuses", "UTC\u221207:00", "MT"});
- map.put(Locale.GERMANY, new String[] { "Rocky Mountain-Normalzeit", "GMT-07:00", "MST",
+ map.put(Locale.GERMANY, new String[] { "Rocky-Mountain-Normalzeit", "GMT-07:00", "MST",
"Rocky-Mountain-Sommerzeit", "GMT-06:00", "MDT",
"Rocky-Mountain-Zeit", "GMT-07:00", "MT"});
CIUDAD_JUAREZ = Collections.unmodifiableMap(map);
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index d6a7f8d..c53abdc 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -1,163 +1 @@
-#!/bin/bash
-# Generates the 'source tarball' for JDK projects.
-#
-# Example:
-# When used from local repo set REPO_ROOT pointing to file:// with your repo
-# If your local repo follows upstream forests conventions, it may be enough to set OPENJDK_URL
-# If you want to use a local copy of patch PR3788, set the path to it in the PR3788 variable
-#
-# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
-# PROJECT_NAME=openjdk
-# REPO_NAME=jdk18u
-# VERSION=jdk-18.0.1+10
-# or to eg prepare systemtap:
-# icedtea7's jstack and other tapsets
-# VERSION=6327cf1cea9e
-# REPO_NAME=icedtea7-2.6
-# PROJECT_NAME=release
-# OPENJDK_URL=http://icedtea.classpath.org/hg/
-# TO_COMPRESS="*/tapset"
-#
-# They are used to create correct name and are used in construction of sources url (unless REPO_ROOT is set)
-
-# This script creates a single source tarball out of the repository
-# based on the given tag and removes code not allowed in fedora/rhel. For
-# consistency, the source tarball will always contain 'openjdk' as the top
-# level folder, name is created, based on parameter
-#
-
-if [ ! "x$PR3823" = "x" ] ; then
- if [ ! -f "$PR3823" ] ; then
- echo "You have specified PR3823 as $PR3823 but it does not exist. Exiting"
- exit 1
- fi
-fi
-
-set -e
-
-OPENJDK_URL_DEFAULT=https://github.com
-COMPRESSION_DEFAULT=xz
-# Corresponding IcedTea version
-ICEDTEA_VERSION=13.0
-
-if [ "x$1" = "xhelp" ] ; then
- echo -e "Behaviour may be specified by setting the following variables:\n"
- echo "VERSION - the version of the specified OpenJDK project"
- echo "PROJECT_NAME -- the name of the OpenJDK project being archived (optional; only needed by defaults)"
- echo "REPO_NAME - the name of the OpenJDK repository (optional; only needed by defaults)"
- echo "OPENJDK_URL - the URL to retrieve code from (optional; defaults to ${OPENJDK_URL_DEFAULT})"
- echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
- echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
- echo "TO_COMPRESS - what part of clone to pack (default is openjdk)"
- echo "PR3823 - the path to the PR3823 patch to apply (optional; downloaded if unavailable)"
- exit 1;
-fi
-
-
-if [ "x$VERSION" = "x" ] ; then
- echo "No VERSION specified"
- exit -2
-fi
-echo "Version: ${VERSION}"
-
-# REPO_NAME is only needed when we default on REPO_ROOT and FILE_NAME_ROOT
-if [ "x$FILE_NAME_ROOT" = "x" -o "x$REPO_ROOT" = "x" ] ; then
- if [ "x$PROJECT_NAME" = "x" ] ; then
- echo "No PROJECT_NAME specified"
- exit -1
- fi
- echo "Project name: ${PROJECT_NAME}"
- if [ "x$REPO_NAME" = "x" ] ; then
- echo "No REPO_NAME specified"
- exit -3
- fi
- echo "Repository name: ${REPO_NAME}"
-fi
-
-if [ "x$OPENJDK_URL" = "x" ] ; then
- OPENJDK_URL=${OPENJDK_URL_DEFAULT}
- echo "No OpenJDK URL specified; defaulting to ${OPENJDK_URL}"
-else
- echo "OpenJDK URL: ${OPENJDK_URL}"
-fi
-
-if [ "x$COMPRESSION" = "x" ] ; then
- # rhel 5 needs tar.gz
- COMPRESSION=${COMPRESSION_DEFAULT}
-fi
-echo "Creating a tar.${COMPRESSION} archive"
-
-if [ "x$FILE_NAME_ROOT" = "x" ] ; then
- FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
- echo "No file name root specified; default to ${FILE_NAME_ROOT}"
-fi
-if [ "x$REPO_ROOT" = "x" ] ; then
- REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}.git"
- echo "No repository root specified; default to ${REPO_ROOT}"
-fi;
-
-if [ "x$TO_COMPRESS" = "x" ] ; then
- TO_COMPRESS="openjdk"
- echo "No to be compressed targets specified, ; default to ${TO_COMPRESS}"
-fi;
-
-if [ -d ${FILE_NAME_ROOT} ] ; then
- echo "exists exists exists exists exists exists exists "
- echo "reusing reusing reusing reusing reusing reusing "
- echo ${FILE_NAME_ROOT}
-else
- mkdir "${FILE_NAME_ROOT}"
- pushd "${FILE_NAME_ROOT}"
- echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
- git clone -b ${VERSION} ${REPO_ROOT} openjdk
- popd
-fi
-pushd "${FILE_NAME_ROOT}"
- if [ -d openjdk/src ]; then
- pushd openjdk
- echo "Removing EC source code we don't build"
- CRYPTO_PATH=src/jdk.crypto.ec/share/native/libsunec/impl
- rm -vf ${CRYPTO_PATH}/ec2.h
- rm -vf ${CRYPTO_PATH}/ec2_163.c
- rm -vf ${CRYPTO_PATH}/ec2_193.c
- rm -vf ${CRYPTO_PATH}/ec2_233.c
- rm -vf ${CRYPTO_PATH}/ec2_aff.c
- rm -vf ${CRYPTO_PATH}/ec2_mont.c
- rm -vf ${CRYPTO_PATH}/ecp_192.c
- rm -vf ${CRYPTO_PATH}/ecp_224.c
-
- echo "Syncing EC list with NSS"
- if [ "x$PR3823" = "x" ] ; then
- # get PR3823.patch (from https://github.com/icedtea-git/icedtea) in the ${ICEDTEA_VERSION} branch
- # Do not push it or publish it
- echo "PR3823 not found. Downloading..."
- wget -v https://github.com/icedtea-git/icedtea/raw/${ICEDTEA_VERSION}/patches/pr382…
- echo "Applying ${PWD}/pr3823.patch"
- patch -Np1 < pr3823.patch
- rm pr3823.patch
- else
- echo "Applying ${PR3823}"
- patch -Np1 < $PR3823
- fi;
- find . -name '*.orig' -exec rm -vf '{}' ';'
- popd
- fi
-
- # Generate .src-rev so build has knowledge of the revision the tarball was created from
- mkdir build
- pushd build
- sh ${PWD}/../openjdk/configure
- make store-source-revision
- popd
- rm -rf build
-
- echo "Compressing remaining forest"
- if [ "X$COMPRESSION" = "Xxz" ] ; then
- SWITCH=cJf
- else
- SWITCH=czf
- fi
- tar --exclude-vcs -$SWITCH ${FILE_NAME_ROOT}.tar.${COMPRESSION} $TO_COMPRESS
- mv ${FILE_NAME_ROOT}.tar.${COMPRESSION} ..
-popd
-echo "Done. You may want to remove the uncompressed version - $FILE_NAME_ROOT."
+## This file is intentionally left blank
diff --git a/icedtea_sync.sh b/icedtea_sync.sh
index e5c54f3..c53abdc 100755
--- a/icedtea_sync.sh
+++ b/icedtea_sync.sh
@@ -1,192 +1 @@
-#!/bin/bash
-
-# Copyright (C) 2019 Red Hat, Inc.
-# Written by Andrew John Hughes <gnu.andrew(a)redhat.com>.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-ICEDTEA_USE_VCS=true
-
-ICEDTEA_VERSION=3.15.0
-ICEDTEA_URL=https://icedtea.classpath.org/download/source
-ICEDTEA_SIGNING_KEY=CFDA0F9B35964222
-
-ICEDTEA_HG_URL=https://icedtea.classpath.org/hg/icedtea11
-
-set -e
-
-RPM_DIR=${PWD}
-if [ ! -f ${RPM_DIR}/jconsole.desktop.in ] ; then
- echo "Not in RPM source tree.";
- exit 1;
-fi
-
-if test "x${TMPDIR}" = "x"; then
- TMPDIR=/tmp;
-fi
-WORKDIR=${TMPDIR}/it.sync
-
-echo "Using working directory ${WORKDIR}"
-mkdir ${WORKDIR}
-pushd ${WORKDIR}
-
-if test "x${WGET}" = "x"; then
- WGET=$(which wget);
- if test "x${WGET}" = "x"; then
- echo "wget not found";
- exit 1;
- fi
-fi
-
-if test "x${TAR}" = "x"; then
- TAR=$(which tar)
- if test "x${TAR}" = "x"; then
- echo "tar not found";
- exit 2;
- fi
-fi
-
-echo "Dependencies:";
-echo -e "\tWGET: ${WGET}";
-echo -e "\tTAR: ${TAR}\n";
-
-if test "x${ICEDTEA_USE_VCS}" = "xtrue"; then
- echo "Mode: Using VCS";
-
- if test "x${GREP}" = "x"; then
- GREP=$(which grep);
- if test "x${GREP}" = "x"; then
- echo "grep not found";
- exit 3;
- fi
- fi
-
- if test "x${CUT}" = "x"; then
- CUT=$(which cut);
- if test "x${CUT}" = "x"; then
- echo "cut not found";
- exit 4;
- fi
- fi
-
- if test "x${TR}" = "x"; then
- TR=$(which tr);
- if test "x${TR}" = "x"; then
- echo "tr not found";
- exit 5;
- fi
- fi
-
- if test "x${HG}" = "x"; then
- HG=$(which hg);
- if test "x${HG}" = "x"; then
- echo "hg not found";
- exit 6;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tGREP: ${GREP}";
- echo -e "\tCUT: ${CUT}";
- echo -e "\tTR: ${TR}";
- echo -e "\tHG: ${HG}";
-
- echo "Checking out repository from VCS...";
- ${HG} clone ${ICEDTEA_HG_URL} icedtea
-
- echo "Obtaining version from configure.ac...";
- ROOT_VER=$(${GREP} '^AC_INIT' icedtea/configure.ac|${CUT} -d ',' -f 2|${TR} -d '[][:space:]')
- echo "Root version from configure: ${ROOT_VER}";
-
- VCS_REV=$(${HG} log -R icedtea --template '{node|short}' -r tip)
- echo "VCS revision: ${VCS_REV}";
-
- ICEDTEA_VERSION="${ROOT_VER}-${VCS_REV}"
- echo "Creating icedtea-${ICEDTEA_VERSION}";
- mkdir icedtea-${ICEDTEA_VERSION}
- echo "Copying required files from checkout to icedtea-${ICEDTEA_VERSION}";
- # Commented out for now as IcedTea 6's jconsole.desktop.in is outdated
- #cp -a icedtea/jconsole.desktop.in ../icedtea-${ICEDTEA_VERSION}
- cp -a ${RPM_DIR}/jconsole.desktop.in icedtea-${ICEDTEA_VERSION}
- cp -a icedtea/tapset icedtea-${ICEDTEA_VERSION}
-
- rm -rf icedtea
-else
- echo "Mode: Using tarball";
-
- if test "x${ICEDTEA_VERSION}" = "x"; then
- echo "No IcedTea version specified for tarball download.";
- exit 3;
- fi
-
- if test "x${CHECKSUM}" = "x"; then
- CHECKSUM=$(which sha256sum)
- if test "x${CHECKSUM}" = "x"; then
- echo "sha256sum not found";
- exit 4;
- fi
- fi
-
- if test "x${PGP}" = "x"; then
- PGP=$(which gpg)
- if test "x${PGP}" = "x"; then
- echo "gpg not found";
- exit 5;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tCHECKSUM: ${CHECKSUM}";
- echo -e "\tPGP: ${PGP}\n";
-
- echo "Checking for IcedTea signing key ${ICEDTEA_SIGNING_KEY}...";
- if ! gpg --list-keys ${ICEDTEA_SIGNING_KEY}; then
- echo "IcedTea signing key ${ICEDTEA_SIGNING_KEY} not installed.";
- exit 6;
- fi
-
- echo "Downloading IcedTea release tarball...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz
- echo "Downloading IcedTea tarball signature...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- echo "Downloading IcedTea tarball checksums...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Verifying checksums...";
- ${CHECKSUM} --check --ignore-missing icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Checking signature...";
- ${PGP} --verify icedtea-${ICEDTEA_VERSION}.tar.xz.sig
-
- echo "Extracting files...";
- ${TAR} xJf icedtea-${ICEDTEA_VERSION}.tar.xz \
- icedtea-${ICEDTEA_VERSION}/tapset \
- icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in
-
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- rm -vf icedtea-${ICEDTEA_VERSION}.sha256
-fi
-
-echo "Replacing desktop files...";
-mv -v icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in ${RPM_DIR}
-
-echo "Creating new tapset tarball...";
-mv -v icedtea-${ICEDTEA_VERSION} openjdk
-${TAR} cJf ${RPM_DIR}/tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz openjdk
-
-rm -rvf openjdk
-
-popd
-rm -rf ${WORKDIR}
+## This file is intentionally left blank
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index 0454f30..ccf69da 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -278,7 +278,7 @@
# New Version-String scheme-style defines
%global featurever 21
%global interimver 0
-%global updatever 0
+%global updatever 1
%global patchver 0
# We don't add any LTS designator for STS packages (Fedora and EPEL).
@@ -287,8 +287,8 @@
%global lts_designator "LTS"
%global lts_designator_zip -%{lts_designator}
%else
- %global lts_designator ""
- %global lts_designator_zip ""
+ %global lts_designator ""
+ %global lts_designator_zip ""
%endif
# Define vendor information used by OpenJDK
@@ -304,7 +304,7 @@
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{name}&…
%else
%if 0%{?rhel}
-%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20…
+%global oj_vendor_bug_url https://access.redhat.com/support/cases/
%else
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi
%endif
@@ -314,14 +314,21 @@
# Define IcedTea version used for SystemTap tapsets and desktop file
%global icedteaver 6.0.0pre00-c848b93a8598
+# Define JDK versions
+%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
+%global javaver %{featurever}
+# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
+%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
+# The tag used to create the OpenJDK tarball
+%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Standard JPackage naming and versioning defines
%global origin openjdk
%global origin_nice OpenJDK
-%global top_level_dir_name %{origin}
+%global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
-%global buildver 35
-%global rpmrelease 3
+%global buildver 12
+%global rpmrelease 1
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -334,14 +341,6 @@
# for techpreview, using 1, so slowdebugs can have 0
%global priority %( printf '%08d' 1 )
%endif
-%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
-%global javaver %{featurever}
-
-# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
-%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
-
-# The tag used to create the OpenJDK tarball
-%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Define milestone (EA for pre-releases, GA for releases)
# Release will be (where N is usually a number starting at 1):
@@ -350,15 +349,15 @@
%global is_ga 1
%if %{is_ga}
%global build_type GA
-%global expected_ea_designator ""
-%global ea_designator_zip ""
+%global ea_designator ""
+%global ea_designator_zip %{nil}
%global extraver %{nil}
%global eaprefix %{nil}
%else
%global build_type EA
-%global expected_ea_designator ea
-%global ea_designator_zip -%{expected_ea_designator}
-%global extraver .%{expected_ea_designator}
+%global ea_designator ea
+%global ea_designator_zip -%{ea_designator}
+%global extraver .%{ea_designator}
%global eaprefix 0.
%endif
@@ -517,12 +516,15 @@ alternatives \\
--install %{_bindir}/java $key %{jrebindir -- %{?1}}/java $PRIORITY --family %{family} \\
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{sdkdir -- %{?1}} \\
--slave %{_bindir}/%{alt_java_name} %{alt_java_name} %{jrebindir -- %{?1}}/%{alt_java_name} \\
+ --slave %{_bindir}/jcmd jcmd %{sdkbindir -- %{?1}}/jcmd \\
--slave %{_bindir}/keytool keytool %{jrebindir -- %{?1}}/keytool \\
--slave %{_bindir}/rmiregistry rmiregistry %{jrebindir -- %{?1}}/rmiregistry \\
--slave %{_mandir}/man1/java.1$ext java.1$ext \\
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/%{alt_java_name}.1$ext %{alt_java_name}.1$ext \\
%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1$ext \\
+ --slave %{_mandir}/man1/jcmd.1$ext jcmd.1$ext \\
+ %{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \\
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/rmiregistry.1$ext rmiregistry.1$ext \\
@@ -607,7 +609,6 @@ alternatives \\
--slave %{_bindir}/jarsigner jarsigner %{sdkbindir -- %{?1}}/jarsigner \\
--slave %{_bindir}/javadoc javadoc %{sdkbindir -- %{?1}}/javadoc \\
--slave %{_bindir}/javap javap %{sdkbindir -- %{?1}}/javap \\
- --slave %{_bindir}/jcmd jcmd %{sdkbindir -- %{?1}}/jcmd \\
--slave %{_bindir}/jconsole jconsole %{sdkbindir -- %{?1}}/jconsole \\
--slave %{_bindir}/jdb jdb %{sdkbindir -- %{?1}}/jdb \\
--slave %{_bindir}/jdeps jdeps %{sdkbindir -- %{?1}}/jdeps \\
@@ -635,8 +636,6 @@ alternatives \\
%{_mandir}/man1/javadoc-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/javap.1$ext javap.1$ext \\
%{_mandir}/man1/javap-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/jcmd.1$ext jcmd.1$ext \\
- %{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/jconsole.1$ext jconsole.1$ext \\
%{_mandir}/man1/jconsole-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/jdb.1$ext jdb.1$ext \\
@@ -801,10 +800,11 @@ exit 0
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/bin
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/java
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/%{alt_java_name}
+%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jcmd
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/keytool
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmiregistry
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib
-%ifarch %{share_arches}
+%ifarch %{jit_arches}
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/classlist
%endif
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jexec
@@ -863,7 +863,8 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/default.jfc
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/profile.jfc
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1*
-#%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1* #TODO, resolve alt-java man page
+%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1*
+%{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{?1}}.1*
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/%{vm_variant}/
@@ -912,8 +913,9 @@ exit 0
%if %is_system_jdk
%if %{is_release_build -- %{?1}}
%ghost %{_bindir}/java
-%ghost %{_bindir}/%{alt_java_name}
%ghost %{_jvmdir}/jre
+%ghost %{_bindir}/%{alt_java_name}
+%ghost %{_bindir}/jcmd
%ghost %{_bindir}/keytool
%ghost %{_bindir}/pack200
%ghost %{_bindir}/rmid
@@ -938,7 +940,6 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javadoc
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javap
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jconsole
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jcmd
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdb
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeps
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeprscan
@@ -1013,7 +1014,6 @@ exit 0
%ghost %{_bindir}/jarsigner
%ghost %{_bindir}/javadoc
%ghost %{_bindir}/javap
-%ghost %{_bindir}/jcmd
%ghost %{_bindir}/jconsole
%ghost %{_bindir}/jdb
%ghost %{_bindir}/jdeps
@@ -1311,23 +1311,21 @@ Source18: TestTranslations.java
BuildRequires: %{portable_name}-sources >= %{portable_version}
BuildRequires: %{portable_name}-misc >= %{portable_version}
+BuildRequires: %{portable_name}-docs >= %{portable_version}
%if %{include_normal_build}
-BuildRequires: %{portable_name} >= %{portable_version}
-BuildRequires: %{portable_name}-devel >= %{portable_version}
+BuildRequires: %{portable_name}-unstripped >= %{portable_version}
%if %{include_staticlibs}
BuildRequires: %{portable_name}-static-libs >= %{portable_version}
%endif
%endif
%if %{include_fastdebug_build}
-BuildRequires: %{portable_name}-fastdebug >= %{portable_version}
BuildRequires: %{portable_name}-devel-fastdebug >= %{portable_version}
%if %{include_staticlibs}
BuildRequires: %{portable_name}-static-libs-fastdebug >= %{portable_version}
%endif
%endif
%if %{include_debug_build}
-BuildRequires: %{portable_name}-slowdebug >= %{portable_version}
BuildRequires: %{portable_name}-devel-slowdebug >= %{portable_version}
%if %{include_staticlibs}
BuildRequires: %{portable_name}-static-libs-slowdebug >= %{portable_version}
@@ -1713,24 +1711,22 @@ fi
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.sources.noarch.tar.xz
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable*.misc.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable*.docs.%{_arch}.tar.xz
%if %{include_normal_build}
-tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.jdk.%{_arch}.tar.xz
-#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.jre.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.unstripped.jdk.%{_arch}.tar.xz
%if %{include_staticlibs}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.static-libs.%{_arch}.tar.xz
%endif
%endif
%if %{include_fastdebug_build}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jdk.%{_arch}.tar.xz
-#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.static-libs.%{_arch}.tar.xz
%endif
%endif
%if %{include_debug_build}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jdk.%{_arch}.tar.xz
-#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.static-libs.%{_arch}.tar.xz
%endif
@@ -1965,6 +1961,7 @@ for suffix in %{build_loop} ; do
jdk_image=${top_dir_abs_main_build_path}
src_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.sources.noarch/"`
misc_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.misc.%{_arch}/"`
+ docs_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.docs.%{_arch}/"`
# Install the jdk
mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
@@ -2027,11 +2024,11 @@ if ! echo $suffix | grep -q "debug" ; then
# Install Javadoc documentation
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
- built_doc_archive=javadocs.zip
- cp -a ${top_dir_abs_main_build_path}/${built_doc_archive} \
- $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip || ls -l ${top_dir_abs_main_build_path}
+ built_doc_archive=$(basename $(ls ${docs_image}/jdk*docs.zip))
+ cp -a ${docs_image}/${built_doc_archive} \
+ $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
pushd $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
- unzip ${top_dir_abs_main_build_path}/${built_doc_archive}
+ unzip ${docs_image}/${built_doc_archive}
popd
fi
@@ -2070,9 +2067,6 @@ find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -name "*.so" -exec chmod 7
find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -type d -exec chmod 755 {} \; ;
find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/legal -type f -exec chmod 644 {} \; ;
-if [ "x$suffix" = "x" ] ; then
- rm $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/javadocs.zip #is in subpackages, 1 renamed, 2nd unpacked
-fi
# end, dual install
done
@@ -2396,6 +2390,9 @@ cjc.mainProgram(args)
%endif
%changelog
+* Wed Nov 22 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.1.0.12-1.rolling
+- updated to OpenJDK 21.0.1 (2023-10-17)
+
* Fri Sep 29 2023 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:21.0.0.0.35-3.rolling
- Fix flatpak build by handling different installation prefixes of package dependencies
commit 770b2dc6cf212c3adc72338d11ed49d38fed3b71
Author: Yaakov Selkowitz <yselkowi(a)redhat.com>
Date: Mon Sep 11 16:13:18 2023 -0400
Fix flatpak build
java-X-openjdk-portable must not be rebuilt for flatpaks, nor do we want
to rebuild tzdata for tzdata-java, so it will be added to the runtimes.
Therefore, we need to take into account the possibility of different
prefixes for those compared to java-X-openjdk.
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index d2f9562..0454f30 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -321,7 +321,7 @@
%global top_level_dir_name %{origin}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 35
-%global rpmrelease 2
+%global rpmrelease 3
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -412,12 +412,16 @@
%global rpm_state_dir %{_localstatedir}/lib/rpm-state/
-# For flatpack builds hard-code /usr/sbin/alternatives,
-# otherwise use %%{_sbindir} relative path.
+# For flatpack builds hard-code dependency paths,
+# otherwise use relative paths.
%if 0%{?flatpak}
%global alternatives_requires /usr/sbin/alternatives
+%global javazidir /usr/share/javazi-1.8
+%global portablejvmdir /usr/lib/jvm
%else
%global alternatives_requires %{_sbindir}/alternatives
+%global javazidir %{_datadir}/javazi-1.8
+%global portablejvmdir %{_jvmdir}
%endif
%global family %{name}.%{_arch}
@@ -1707,28 +1711,28 @@ if [ $prioritylength -ne 8 ] ; then
exit 14
fi
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.sources.noarch.tar.xz
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable*.misc.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.sources.noarch.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable*.misc.%{_arch}.tar.xz
%if %{include_normal_build}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.jdk.%{_arch}.tar.xz
-#tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.jre.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.jdk.%{_arch}.tar.xz
+#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.static-libs.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.static-libs.%{_arch}.tar.xz
%endif
%endif
%if %{include_fastdebug_build}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jdk.%{_arch}.tar.xz
-#tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jre.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jdk.%{_arch}.tar.xz
+#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.fastdebug.static-libs.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.fastdebug.static-libs.%{_arch}.tar.xz
%endif
%endif
%if %{include_debug_build}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jdk.%{_arch}.tar.xz
-#tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jre.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jdk.%{_arch}.tar.xz
+#tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jre.%{_arch}.tar.xz
%if %{include_staticlibs}
-tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.slowdebug.static-libs.%{_arch}.tar.xz
+tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.static-libs.%{_arch}.tar.xz
%endif
%endif
@@ -1806,7 +1810,7 @@ function installjdk() {
# Use system-wide tzdata
mv ${imagepath}/lib/tzdb.dat{,.upstream}
- ln -sv %{_datadir}/javazi-1.8/tzdb.dat ${imagepath}/lib/tzdb.dat
+ ln -sv %{javazidir}/tzdb.dat ${imagepath}/lib/tzdb.dat
# Rename OpenJDK cacerts database
mv ${imagepath}/lib/security/cacerts{,.upstream}
@@ -2119,15 +2123,11 @@ $JAVA_HOME/bin/javac -d . %{SOURCE16}
#TODO skipped vendor check. It now points to PORTABLE version of jdk.
#$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
-%if ! 0%{?flatpak}
-# Check translations are available for new timezones (during flatpak builds, the
-# tzdb.dat used by this test is not where the test expects it, so this is
-# disabled for flatpak builds)
+# Check translations are available for new timezones
$JAVA_HOME/bin/javac -d . %{SOURCE18}
#TODO doublecheck tzdata handling
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE || echo "TZDATA no longer can be synced with system, because we repack"
$JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR || echo "TZDATA no longer can be synced with system, because we repack"
-%endif
%if %{include_staticlibs}
# Check debug symbols in static libraries (smoke test)
@@ -2396,6 +2396,9 @@ cjc.mainProgram(args)
%endif
%changelog
+* Fri Sep 29 2023 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:21.0.0.0.35-3.rolling
+- Fix flatpak build by handling different installation prefixes of package dependencies
+
* Tue Sep 19 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.0.0.35-2.rolling
- adapted to new path in sources
- repacked alt-java from misc subpkg
1
0
26 Nov '23
The package rpms/root.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/root.git/commit/?id=59989efa5f4087c….
Change:
-%ifarch %{qt6_qtwebengine_arches}
Thanks.
Full change:
============
commit 59989efa5f4087c1dd7b9eb3d4f660cd78c20675
Author: Mattias Ellert <mattias.ellert(a)physics.uu.se>
Date: Sun Nov 26 16:11:31 2023 +0100
Update to 6.30.00
Removed subpackages: root-io-gfal and root-roofit-common
Dropped patches: 6
New patches: 6
diff --git a/root-avoid-out-of-memory-during-linking.patch b/root-avoid-out-of-memory-during-linking.patch
new file mode 100644
index 0000000..d182e44
--- /dev/null
+++ b/root-avoid-out-of-memory-during-linking.patch
@@ -0,0 +1,30 @@
+From 51b84e7bc21f8729de8d3e8f9ff08b337af33b78 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
+Date: Fri, 17 Nov 2023 17:15:15 +0100
+Subject: [PATCH] Avoid out of memory during linking regardless of build type
+
+---
+ core/metacling/src/CMakeLists.txt | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/core/metacling/src/CMakeLists.txt b/core/metacling/src/CMakeLists.txt
+index e750480eb3..dd50793d29 100644
+--- a/core/metacling/src/CMakeLists.txt
++++ b/core/metacling/src/CMakeLists.txt
+@@ -111,11 +111,8 @@ ROOT_LINKER_LIBRARY(Cling
+ $<TARGET_OBJECTS:MetaCling>
+ LIBRARIES ${CLING_LIBRARIES} ${LINK_LIBS} ${CLING_PLUGIN_LINK_LIBS})
+
+-string(TOUPPER "${LLVM_BUILD_TYPE}" THE_BUILD_TYPE)
+-if("${THE_BUILD_TYPE}" STREQUAL DEBUG OR "${THE_BUILD_TYPE}" STREQUAL RELWITHDEBINFO)
+- # When these two link at the same time, they can exhaust the RAM on many machines, since they both link against llvm.
+- add_dependencies(Cling rootcling_stage1)
+-endif()
++# When these two link at the same time, they can exhaust the RAM on many machines, since they both link against llvm.
++add_dependencies(Cling rootcling_stage1)
+
+ if(MSVC)
+ set_target_properties(Cling PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
+--
+2.43.0
+
diff --git a/root-boolean-numpy-array.patch b/root-boolean-numpy-array.patch
deleted file mode 100644
index e5d6482..0000000
--- a/root-boolean-numpy-array.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 2b3dd4f1bfecea5b1b936d5507f8b0c664322a19 Mon Sep 17 00:00:00 2001
-From: Jonas Rembser <jonas.rembser(a)cern.ch>
-Date: Wed, 6 Sep 2023 02:16:33 +0200
-Subject: [PATCH] [RF][PyROOT] Avoid boolean operators on numpy arrays in unit
- test
-
-The `n_in_range` reference value in the unit test
-`roodataset_numpy.TestRooDataSetNumpy.test_ignoring_out_of_range`
-apparently doesn't get computed right on some 32 platforms.
-
-I can't reproduce the problem, but I'm sure it will be fixed by avoiding
-the use of the operators `&` and `|` with numpy arrays. Just doing a
-manual loop in Python should be more platform independent.
-
-Closes #12162.
----
- .../pythonizations/test/roofit/roodataset_numpy.py | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/bindings/pyroot/pythonizations/test/roofit/roodataset_numpy.py b/bindings/pyroot/pythonizations/test/roofit/roodataset_numpy.py
-index 79259af321..5587677c45 100644
---- a/bindings/pyroot/pythonizations/test/roofit/roodataset_numpy.py
-+++ b/bindings/pyroot/pythonizations/test/roofit/roodataset_numpy.py
-@@ -135,9 +135,15 @@ class TestRooDataSetNumpy(unittest.TestCase):
- cat.defineType("minus", -1)
- cat.defineType("plus", +1)
-
-- in_x_range = (data["x"] <= x.getMax()) & (data["x"] >= x.getMin())
-- in_cat_range = (data["cat"] == -1) | (data["cat"] == +1)
-- n_in_range = np.sum(in_x_range & in_cat_range)
-+ # Use manual loop because we had some problems with numpys boolean
-+ # comparisions in the past (see GitHub issue #12162).
-+ n_in_range = 0
-+ for i in range(n_events):
-+ in_x_range = data["x"][i] <= x.getMax() and data["x"][i] >= x.getMin()
-+ in_cat_range = (data["cat"][i] == -1) or (data["cat"][i] == +1)
-+ is_in_range = in_x_range and in_cat_range
-+ if is_in_range:
-+ n_in_range = n_in_range + 1
-
- dataset_numpy = ROOT.RooDataSet.from_numpy(data, {x, cat}, name="dataSetNumpy")
-
---
-2.41.0
-
diff --git a/root-clad.patch b/root-clad.patch
new file mode 100644
index 0000000..0715240
--- /dev/null
+++ b/root-clad.patch
@@ -0,0 +1,26 @@
+From fae9b92742c5e991ad33769d1357a721838e93f9 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
+Date: Fri, 17 Nov 2023 11:37:23 +0100
+Subject: [PATCH 1/3] Add fit/exampleFit3D.C to clad veto
+
+---
+ tutorials/CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
+index 5cba95407b..81f6539f03 100644
+--- a/tutorials/CMakeLists.txt
++++ b/tutorials/CMakeLists.txt
+@@ -74,7 +74,8 @@ if(NOT ROOT_minuit2_FOUND)
+ endif()
+
+ if(NOT clad)
+- set(clad_veto fit/minuit2GausFit.C)
++ set(clad_veto fit/minuit2GausFit.C
++ fit/exampleFit3D.C)
+ endif()
+
+ # RBatchGenerator tutorials need Python 3.8+.
+--
+2.42.0
+
diff --git a/root-do-not-remove-Wp-before-D-and-U.patch b/root-do-not-remove-Wp-before-D-and-U.patch
deleted file mode 100644
index 820b7af..0000000
--- a/root-do-not-remove-Wp-before-D-and-U.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0191a987b7583c2aa84b1293105db353fee40b1d Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
-Date: Fri, 10 Mar 2023 20:49:02 +0100
-Subject: [PATCH] Do not remove -Wp, before -D and -U when recording used
- compiler flags
-
-This breaks the pattern used when undefining and then defining a
-variable in the same flag:
-
-$ echo | g++ -Wp,-UVAR,-DVAR=1 -c -x c++ -
-
-Here -Wp,-UVAR,-DVAR=1 will first undefine VAR and then define it to 1
-
-If the -Wp, is dropped, this fails:
-$ echo | g++ -UVAR,-DVAR=1 -c -x c++ -
-<command-line>: warning: extra tokens at end of #undef directive
-
-Now it will only undefine VAR, but not defin it. I.e.
-
-insted of
-
-you get
-
-which explains the rather cryptic warning about extra token after #undef.
----
- cmake/modules/RootConfiguration.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/modules/RootConfiguration.cmake b/cmake/modules/RootConfiguration.cmake
-index 3d1ae9be53..042b43f039 100644
---- a/cmake/modules/RootConfiguration.cmake
-+++ b/cmake/modules/RootConfiguration.cmake
-@@ -729,7 +729,7 @@ if (cxxmodules)
- endif()
-
- string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __fflags "${CMAKE_Fortran_FLAGS}")
--string(REGEX MATCHALL "-(D|U)[^ ]*" __defs "${CMAKE_CXX_FLAGS}")
-+string(REGEX MATCHALL "(-Wp,)?-(D|U)[^ ]*" __defs "${CMAKE_CXX_FLAGS}")
- set(ROOT_COMPILER_FLAG_HINTS "#
- set(ROOT_DEFINITIONS \"${__defs}\")
- set(ROOT_CXX_FLAGS \"${__cxxflags}\")
---
-2.39.2
-
diff --git a/root-dont-install-roofit-files-fix.patch b/root-dont-install-roofit-files-fix.patch
deleted file mode 100644
index 295a4b7..0000000
--- a/root-dont-install-roofit-files-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 74aaf99530443a712f9b0577d8edde615ea8902d Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
-Date: Sat, 4 Mar 2023 21:27:35 +0100
-Subject: [PATCH] Use FILTER instead of REMOVE_ITEM since GLOB returns absolute
- paths
-
----
- build/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
-index e964b5e255..2b24b1d6e6 100644
---- a/build/CMakeLists.txt
-+++ b/build/CMakeLists.txt
-@@ -30,7 +30,7 @@ ROOT_EXECUTABLE(rmkdepend
- if(NOT MSVC AND _BUILD_TYPE_UPPER MATCHES "DEBUG|RELWITHDEBINFO")
- file(GLOB PRETTY_PRINTERS "gdbPrinters/*.so-gdb.py")
- if(NOT roofit)
-- list(REMOVE_ITEM PRETTY_PRINTERS gdbPrinters/libRooFitCore.so-gdb.py)
-+ list(FILTER PRETTY_PRINTERS EXCLUDE REGEX libRooFitCore.so-gdb.py)
- endif()
- set(PRETTY_PRINTER_DESTS)
- foreach(PRETTY_PRINTER ${PRETTY_PRINTERS})
---
-2.39.2
-
diff --git a/root-fixes-for-32bit-builds.patch b/root-fixes-for-32bit-builds.patch
deleted file mode 100644
index bcff78d..0000000
--- a/root-fixes-for-32bit-builds.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-From 6f69a59010a60c949b1955e52275137e39a85b82 Mon Sep 17 00:00:00 2001
-From: Jakob Blomer <jblomer(a)cern.ch>
-Date: Thu, 9 Mar 2023 15:14:22 +0100
-Subject: [PATCH] [ntuple] fixes for 32bit / non-x86_64 builds
-
----
- tree/dataframe/src/RNTupleDS.cxx | 1 +
- tree/ntuple/v7/inc/ROOT/RField.hxx | 21 +++++++++++++++++++--
- tree/ntuple/v7/test/ntuple_extended.cxx | 8 ++++----
- 3 files changed, 24 insertions(+), 6 deletions(-)
-
-diff --git a/tree/dataframe/src/RNTupleDS.cxx b/tree/dataframe/src/RNTupleDS.cxx
-index f7eb0ab5f284..aaea6df81622 100644
---- a/tree/dataframe/src/RNTupleDS.cxx
-+++ b/tree/dataframe/src/RNTupleDS.cxx
-@@ -94,6 +94,7 @@ class RRDFCardinalityField : public ROOT::Experimental::Detail::RFieldBase {
- return ROOT::Experimental::Detail::RFieldValue(true /* captureFlag */, this, where);
- }
- size_t GetValueSize() const final { return sizeof(std::size_t); }
-+ size_t GetAlignment() const final { return alignof(std::size_t); }
-
- /// Get the number of elements of the collection identified by globalIndex
- void
-diff --git a/tree/ntuple/v7/inc/ROOT/RField.hxx b/tree/ntuple/v7/inc/ROOT/RField.hxx
-index b05267d16030..9a85368a94e3 100644
---- a/tree/ntuple/v7/inc/ROOT/RField.hxx
-+++ b/tree/ntuple/v7/inc/ROOT/RField.hxx
-@@ -270,8 +270,9 @@ public:
- virtual std::vector<RFieldValue> SplitValue(const RFieldValue &value) const;
- /// The number of bytes taken by a value of the appropriate type
- virtual size_t GetValueSize() const = 0;
-- /// For many types, the alignment requirement is equal to the size; otherwise override.
-- virtual size_t GetAlignment() const { return GetValueSize(); }
-+ /// As a rule of thumb, the alignment is equal to the size of the type. There are, however, various exceptions
-+ /// to this rule depending on OS and CPU architecture. So enforce the alignment to be explicitly spelled out.
-+ virtual size_t GetAlignment() const = 0;
- int GetTraits() const { return fTraits; }
- bool HasReadCallbacks() const { return !fReadCallbacks.empty(); }
-
-@@ -383,6 +384,7 @@ public:
- Detail::RFieldValue GenerateValue(void*) override { return Detail::RFieldValue(); }
- Detail::RFieldValue CaptureValue(void*) final { return Detail::RFieldValue(); }
- size_t GetValueSize() const final { return 0; }
-+ size_t GetAlignment() const final { return 0; }
-
- void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-@@ -889,6 +891,7 @@ public:
- Detail::RColumnElement<ClusterSize_t>(static_cast<ClusterSize_t*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(ClusterSize_t); }
-+ size_t GetAlignment() const final { return alignof(ClusterSize_t); }
- void CommitCluster() final;
- };
-
-@@ -990,6 +993,7 @@ public:
- Detail::RColumnElement<ClusterSize_t>(static_cast<ClusterSize_t*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(ClusterSize_t); }
-+ size_t GetAlignment() const final { return alignof(ClusterSize_t); }
-
- /// Special help for offset fields
- void GetCollectionInfo(NTupleSize_t globalIndex, RClusterIndex *collectionStart, ClusterSize_t *size) {
-@@ -1110,6 +1115,7 @@ public:
- Detail::RColumnElement<bool>(static_cast<bool*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(bool); }
-+ size_t GetAlignment() const final { return alignof(bool); }
- void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-
-@@ -1162,6 +1168,7 @@ public:
- Detail::RColumnElement<float>(static_cast<float*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(float); }
-+ size_t GetAlignment() const final { return alignof(float); }
- void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-
-@@ -1215,6 +1222,7 @@ public:
- Detail::RColumnElement<double>(static_cast<double*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(double); }
-+ size_t GetAlignment() const final { return alignof(double); }
- void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-
-@@ -1267,6 +1275,7 @@ public:
- Detail::RColumnElement<char>(static_cast<char*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(char); }
-+ size_t GetAlignment() const final { return alignof(char); }
- void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-
-@@ -1319,6 +1328,7 @@ public:
- Detail::RColumnElement<std::int8_t>(static_cast<std::int8_t*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(std::int8_t); }
-+ size_t GetAlignment() const final { return alignof(std::int8_t); }
- void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-
-@@ -1371,6 +1381,7 @@ public:
- Detail::RColumnElement<std::uint8_t>(static_cast<std::uint8_t*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(std::uint8_t); }
-+ size_t GetAlignment() const final { return alignof(std::uint8_t); }
- void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-
-@@ -1423,6 +1434,7 @@ public:
- Detail::RColumnElement<std::int16_t>(static_cast<std::int16_t*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(std::int16_t); }
-+ size_t GetAlignment() const final { return alignof(std::int16_t); }
- void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-
-@@ -1475,6 +1487,7 @@ public:
- Detail::RColumnElement<std::uint16_t>(static_cast<std::uint16_t*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(std::uint16_t); }
-+ size_t GetAlignment() const final { return alignof(std::uint16_t); }
- void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-
-@@ -1527,6 +1540,7 @@ public:
- Detail::RColumnElement<std::int32_t>(static_cast<std::int32_t*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(std::int32_t); }
-+ size_t GetAlignment() const final { return alignof(std::int32_t); }
- void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-
-@@ -1579,6 +1593,7 @@ public:
- Detail::RColumnElement<std::uint32_t>(static_cast<std::uint32_t*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(std::uint32_t); }
-+ size_t GetAlignment() const final { return alignof(std::uint32_t); }
- void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-
-@@ -1631,6 +1646,7 @@ public:
- Detail::RColumnElement<std::uint64_t>(static_cast<std::uint64_t*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(std::uint64_t); }
-+ size_t GetAlignment() const final { return alignof(std::uint64_t); }
- void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-
-@@ -1683,6 +1699,7 @@ public:
- Detail::RColumnElement<std::int64_t>(static_cast<std::int64_t*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(std::int64_t); }
-+ size_t GetAlignment() const final { return alignof(std::int64_t); }
- void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-
-diff --git a/tree/ntuple/v7/test/ntuple_extended.cxx b/tree/ntuple/v7/test/ntuple_extended.cxx
-index 91871e288e98..d3b6ee466359 100644
---- a/tree/ntuple/v7/test/ntuple_extended.cxx
-+++ b/tree/ntuple/v7/test/ntuple_extended.cxx
-@@ -123,8 +123,8 @@ TEST(RNTuple, LargeFile1)
- RNTupleWriteOptions options;
- options.SetCompression(0);
- auto ntuple = RNTupleWriter::Recreate(std::move(modelWrite), "myNTuple", fileGuard.GetPath(), options);
-- constexpr unsigned long nEvents = 1024 * 1024 * 256; // Exceed 2GB file size
-- for (unsigned int i = 0; i < nEvents; ++i) {
-+ constexpr std::uint64_t nEvents = 1024 * 1024 * 256; // Exceed 2GB file size
-+ for (std::uint64_t i = 0; i < nEvents; ++i) {
- wrEnergy = rnd.Rndm();
- chksumWrite += wrEnergy;
- ntuple->Fill();
-@@ -195,8 +195,8 @@ TEST(RNTuple, LargeFile2)
-
- TRandom3 rnd(42);
- double chksumWrite = 0.0;
-- constexpr unsigned long nEvents = 1024 * 1024 * 256; // Exceed 2GB file size
-- for (unsigned int i = 0; i < nEvents; ++i) {
-+ constexpr std::uint64_t nEvents = 1024 * 1024 * 256; // Exceed 2GB file size
-+ for (std::uint64_t i = 0; i < nEvents; ++i) {
- *E = rnd.Rndm();
- chksumWrite += *E;
- writer->Fill();
diff --git a/root-gtest-back.patch b/root-gtest-back.patch
new file mode 100644
index 0000000..1624451
--- /dev/null
+++ b/root-gtest-back.patch
@@ -0,0 +1,25 @@
+From 1942f5569b1d101f2c89341765ea37850e3de669 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
+Date: Fri, 17 Nov 2023 11:43:46 +0100
+Subject: [PATCH 2/3] Add old gtest compat for SetUpTestSuite/TearDownTestSuite
+
+---
+ tree/tree/test/friendinfo.cxx | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tree/tree/test/friendinfo.cxx b/tree/tree/test/friendinfo.cxx
+index 141a495052..6e94056946 100644
+--- a/tree/tree/test/friendinfo.cxx
++++ b/tree/tree/test/friendinfo.cxx
+@@ -14,6 +14,8 @@
+ // Backward compatibility for gtest version < 1.10.0
+ #ifndef INSTANTIATE_TEST_SUITE_P
+ #define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
++#define SetUpTestSuite SetUpTestCase
++#define TearDownTestSuite TearDownTestCase
+ #endif
+
+ namespace {
+--
+2.42.0
+
diff --git a/root-ignore-warnings-about-RooNaNPacker-not-being-impleme.patch b/root-ignore-warnings-about-RooNaNPacker-not-being-impleme.patch
new file mode 100644
index 0000000..20e2ee5
--- /dev/null
+++ b/root-ignore-warnings-about-RooNaNPacker-not-being-impleme.patch
@@ -0,0 +1,33 @@
+From ba0dc65e558fd916dbe18f8dbe8208a3be932c25 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
+Date: Mon, 28 Mar 2022 09:20:18 +0200
+Subject: [PATCH] Ignore warnings about RooNaNPacker not being implemented for
+ big endian
+
+This warning is triggered in many tests, so it makes sense to put it
+in the default ignored set.
+---
+ core/testsupport/src/TestSupport.cxx | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/core/testsupport/src/TestSupport.cxx b/core/testsupport/src/TestSupport.cxx
+index 259ab4e09c..79cd476950 100644
+--- a/core/testsupport/src/TestSupport.cxx
++++ b/core/testsupport/src/TestSupport.cxx
+@@ -73,6 +73,13 @@ static struct ForbidDiagnostics {
+ return;
+ }
+
++ // FIXME: RooNaNPacker warns about not being implemented for big endian
++ if (level == kWarning
++ && strcmp(msg, "Fast recovery from undefined function values only implemented for little-endian machines. If necessary, request an extension of functionality on https://root.cern") == 0) {
++ std::cerr << "Warning in " << location << " " << msg << std::endl;
++ return;
++ }
++
+ FAIL() << "Received unexpected diagnostic of severity "
+ << level
+ << " at '" << location << "' reading '" << msg << "'.\n"
+--
+2.42.0
+
diff --git a/root-np32.patch b/root-np32.patch
new file mode 100644
index 0000000..3ac6f41
--- /dev/null
+++ b/root-np32.patch
@@ -0,0 +1,89 @@
+From 88162e7738d810f8203ed0242179f7af94ded500 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
+Date: Fri, 17 Nov 2023 11:46:14 +0100
+Subject: [PATCH 3/3] Fix pythonizations test errors on ix86 Linux
+
+======================================================================
+ERROR: test_sliced_array (rdataframe_makenumpy.DataFrameFromNumpy.test_sliced_array)
+Test correct reading of a sliced numpy array (#13690)
+----------------------------------------------------------------------
+Traceback (most recent call last):
+ File "/builddir/build/BUILD/root-6.30.00/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py", line 153, in test_sliced_array
+ x_col = df.Take['Long64_t']("x")
+ ^^^^^^^^^^^^^^^^^^^^^^^^
+cppyy.gbl.std.runtime_error: Could not instantiate Take<Long64_t>:
+ ROOT::RDF::RResultPtr<vector<Long64_t> > ROOT::RDF::RInterface<ROOT::Detail::RDF::RLoopManager,void>::Take(basic_string_view<char,char_traits<char> > column = "") =>
+ runtime_error: Column x has type int while the id specified is associated to type Long64_t
+----------------------------------------------------------------------
+
+======================================================================
+ERROR: test_dtypes (rtensor.AsRTensor.test_dtypes)
+Test adoption of numpy arrays with different data types
+----------------------------------------------------------------------
+Traceback (most recent call last):
+ File "/builddir/build/BUILD/root-6.30.00/bindings/pyroot/pythonizations/test/rtensor.py", line 45, in test_dtypes
+ root_obj = ROOT.TMVA.Experimental.RTensor(self.cpptypes[i])(np_obj)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/builddir/build/BUILD/root-6.30.00/redhat-linux-build/lib/ROOT/_pythonization/_tmva/_rtensor.py", line 131, in RTensorInit
+ return self._original_init_(data,shape,layout)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+TypeError: none of the 6 overloaded methods succeeded. Full details:
+ RTensor<long,vector<long> >::RTensor<long,vector<long> >(TMVA::Experimental::RTensor<long,vector<long> >&&) =>
+ TypeError: takes at most 1 arguments (3 given)
+ RTensor<long,vector<long> >::RTensor<long,vector<long> >(const TMVA::Experimental::RTensor<long,vector<long> >&) =>
+ TypeError: takes at most 1 arguments (3 given)
+ RTensor<long,vector<long> >::RTensor<long,vector<long> >(shared_ptr<vector<long> > container, vector<unsigned int> shape, TMVA::Experimental::MemoryLayout layout = MemoryLayout::RowMajor) =>
+ TypeError: could not convert argument 1
+ RTensor<long,vector<long> >::RTensor<long,vector<long> >(vector<unsigned int> shape, TMVA::Experimental::MemoryLayout layout = MemoryLayout::RowMajor) =>
+ TypeError: takes at most 2 arguments (3 given)
+ RTensor<long,vector<long> >::RTensor<long,vector<long> >(long* data, vector<unsigned int> shape, vector<unsigned int> strides, TMVA::Experimental::MemoryLayout layout = MemoryLayout::RowMajor) =>
+ TypeError: could not convert argument 1 (could not convert argument to buffer or nullptr)
+ RTensor<long,vector<long> >::RTensor<long,vector<long> >(long* data, vector<unsigned int> shape, TMVA::Experimental::MemoryLayout layout = MemoryLayout::RowMajor) =>
+ TypeError: could not convert argument 1 (could not convert argument to buffer or nullptr)
+----------------------------------------------------------------------
+---
+ .../pyroot/pythonizations/test/rdataframe_makenumpy.py | 2 +-
+ bindings/pyroot/pythonizations/test/rtensor.py | 7 +++++--
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py b/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
+index cd2ebc9b5b..1860bd49f5 100644
+--- a/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
++++ b/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
+@@ -147,7 +147,7 @@ class DataFrameFromNumpy(unittest.TestCase):
+ """
+ Test correct reading of a sliced numpy array (#13690)
+ """
+- table = np.array([[1,2], [3,4]])
++ table = np.array([[1,2], [3,4]], dtype="int64")
+ columns = {'x': table[:,0], 'y': table[:,1]}
+ df = ROOT.RDF.FromNumpy(columns)
+ x_col = df.Take['Long64_t']("x")
+diff --git a/bindings/pyroot/pythonizations/test/rtensor.py b/bindings/pyroot/pythonizations/test/rtensor.py
+index 99b458cfa9..070a5d24d0 100644
+--- a/bindings/pyroot/pythonizations/test/rtensor.py
++++ b/bindings/pyroot/pythonizations/test/rtensor.py
+@@ -3,6 +3,7 @@ import ROOT
+ RTensor = ROOT.TMVA.Experimental.RTensor
+ import numpy as np
+ import platform
++import sys
+
+
+ def check_shape(root_obj, np_obj):
+@@ -28,8 +29,10 @@ class AsRTensor(unittest.TestCase):
+ """
+ Test adoption of numpy arrays with different data types
+ """
+- #using long long on Linux does not work although it is same size as long
+- if (platform.system() == "Windows") :
++ # Using long long on 64 bit Linux does not work although it is
++ # same size as long
++ if ((platform.system() == "Windows") or
++ ((platform.system() == "Linux") and (sys.maxsize < 2**32))) :
+ self.cpptypes[1] = "long long"
+ self.cpptypes[3] = "unsigned long long"
+
+--
+2.42.0
+
diff --git a/root-old-gtest.patch b/root-old-gtest.patch
new file mode 100644
index 0000000..bdefd48
--- /dev/null
+++ b/root-old-gtest.patch
@@ -0,0 +1,54 @@
+diff --git a/roofit/histfactory/test/testHistFactory.cxx b/roofit/histfactory/test/testHistFactory.cxx
+index 7553ba4e4a..fefdca8e97 100644
+--- a/roofit/histfactory/test/testHistFactory.cxx
++++ b/roofit/histfactory/test/testHistFactory.cxx
+@@ -752,6 +752,7 @@ std::string getNameFromInfo(testing::TestParamInfo<HFFixture::ParamType> const &
+ return getName(paramInfo.param, false);
+ }
+
++/*
+ INSTANTIATE_TEST_SUITE_P(
+ HistFactory, HFFixture,
+ testing::Combine(testing::Values(MakeModelMode::OverallSyst, MakeModelMode::HistoSyst, MakeModelMode::StatSyst,
+@@ -784,3 +785,4 @@ INSTANTIATE_TEST_SUITE_P(HistFactoryCodeGen, HFFixtureFit,
+ testing::Values(RooFit::EvalBackend::Codegen())),
+ getNameFromInfo);
+ #endif
++*/
+diff --git a/roofit/roofitcore/test/testRooProdPdf.cxx b/roofit/roofitcore/test/testRooProdPdf.cxx
+index 34fb559cd1..09734f5c5d 100644
+--- a/roofit/roofitcore/test/testRooProdPdf.cxx
++++ b/roofit/roofitcore/test/testRooProdPdf.cxx
+@@ -64,6 +64,7 @@ TEST_P(TestProdPdf, CachingOpt)
+ << "b=" << b.getVal() << " +- " << b.getError() << " doesn't match truth value with O" << _optimize << ".";
+ }
+
++/*
+ INSTANTIATE_TEST_SUITE_P(RooProdPdf, TestProdPdf,
+ testing::Combine(testing::Values(0, 1, 2),
+ testing::Values(ROOFIT_EVAL_BACKENDS)),
+@@ -72,6 +73,7 @@ INSTANTIATE_TEST_SUITE_P(RooProdPdf, TestProdPdf,
+ ss << "opt" << std::get<0>(paramInfo.param) << std::get<1>(paramInfo.param).name();
+ return ss.str();
+ });
++*/
+
+ TEST(RooProdPdf, TestGetPartIntList)
+ {
+diff --git a/roofit/roofitcore/test/testTestStatistics.cxx b/roofit/roofitcore/test/testTestStatistics.cxx
+index 3099d82060..5846353043 100644
+--- a/roofit/roofitcore/test/testTestStatistics.cxx
++++ b/roofit/roofitcore/test/testTestStatistics.cxx
+@@ -585,6 +585,7 @@ INSTANTIATE_TEST_SUITE_P(RooNLLVar, TestStatisticTest, testing::Values(ROOFIT_EV
+ return ss.str();
+ });
+
++/*
+ INSTANTIATE_TEST_SUITE_P(RooNLLVar, OffsetBinTest,
+ testing::Combine(testing::Values(ROOFIT_EVAL_BACKENDS), // EvalBackend
+ testing::Values(false, true), // unbinned or binned
+@@ -622,3 +623,4 @@ INSTANTIATE_TEST_SUITE_P(RooNLLVarBinnedL, OffsetBinTest,
+ ss << (std::get<5>(paramInfo.param) ? "BinnedL" : "");
+ return ss.str();
+ });
++*/
diff --git a/root-pcre2-6.28.patch b/root-pcre2-6.28.patch
deleted file mode 100644
index db907b5..0000000
--- a/root-pcre2-6.28.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -ur root-6.28.06.orig/core/base/CMakeLists.txt root-6.28.06/core/base/CMakeLists.txt
---- root-6.28.06.orig/core/base/CMakeLists.txt 2023-08-28 13:26:43.000000000 +0200
-+++ root-6.28.06/core/base/CMakeLists.txt 2023-10-02 01:53:35.956143717 +0200
-@@ -212,9 +212,15 @@
-
- ROOT_OBJECT_LIBRARY(Base ${BASE_SOURCES})
-
-+if (PCRE2_FOUND)
-+ set(PCRE_INCDIR ${PCRE2_INCLUDE_DIR})
-+else()
-+ set(PCRE_INCDIR ${PCRE_INCLUDE_DIR})
-+endif()
-+
- target_include_directories(Base PRIVATE
- ${BASE_V7_INC}
-- ${PCRE_INCLUDE_DIR}
-+ ${PCRE_INCDIR}
- res
- ${CMAKE_SOURCE_DIR}/core/foundation/res
- ${CMAKE_SOURCE_DIR}/core/clib/inc
-@@ -237,6 +243,11 @@
- ${CMAKE_BINARY_DIR}/ginclude/TApplicationCommandLineOptionsHelp.h
- )
-
-+if(PCRE2_FOUND)
-+ set_source_files_properties(src/TPRegexp.cxx
-+ PROPERTIES COMPILE_DEFINITIONS USE_PCRE2)
-+endif()
-+
- ROOT_INSTALL_HEADERS(${BASE_HEADER_DIRS})
-
- file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/man)
-diff -ur root-6.28.06.orig/core/CMakeLists.txt root-6.28.06/core/CMakeLists.txt
---- root-6.28.06.orig/core/CMakeLists.txt 2023-08-28 13:26:43.000000000 +0200
-+++ root-6.28.06/core/CMakeLists.txt 2023-10-02 01:47:00.134174041 +0200
-@@ -261,9 +261,15 @@
-
- target_include_directories(G__Core PRIVATE ${CMAKE_SOURCE_DIR}/core/clingutils/inc)
-
-+if (PCRE2_FOUND)
-+ set (PCRE_TGT PCRE2::PCRE2)
-+else()
-+ set (PCRE_TGT PCRE::PCRE)
-+endif()
-+
- target_link_libraries(Core
- PRIVATE
-- PCRE::PCRE
-+ ${PCRE_TGT}
- ${LIBLZMA_LIBRARIES}
- xxHash::xxHash
- LZ4::LZ4
diff --git a/root-pcre2.patch b/root-pcre2.patch
index 8d1adee..359acc2 100644
--- a/root-pcre2.patch
+++ b/root-pcre2.patch
@@ -165,6 +165,26 @@ index 464155fd50..252aa56737 100644
endif()
endif()
endif()
+diff --git a/core/base/CMakeLists.txt b/core/base/CMakeLists.txt
+index df701fedea..5798c93775 100644
+--- a/core/base/CMakeLists.txt
++++ b/core/base/CMakeLists.txt
+@@ -214,7 +214,14 @@ target_include_directories(Core PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/v7/inc>
+ )
+
+-target_link_libraries(Core PRIVATE PCRE::PCRE)
++if(PCRE2_FOUND)
++ target_link_libraries(Core PRIVATE PCRE2::PCRE2)
++ set_source_files_properties(src/TPRegexp.cxx
++ TARGET_DIRECTORY Core
++ PROPERTIES COMPILE_DEFINITIONS USE_PCRE2)
++else()
++ target_link_libraries(Core PRIVATE PCRE::PCRE)
++endif()
+
+ ROOT_INSTALL_HEADERS(${BASE_HEADER_DIRS})
+
diff --git a/core/base/src/TPRegexp.cxx b/core/base/src/TPRegexp.cxx
index 949b8cc8e9..d70f3e5b8b 100644
--- a/core/base/src/TPRegexp.cxx
diff --git a/root-stressvector-test-fails-on-ix86.patch b/root-stressvector-test-fails-on-ix86.patch
deleted file mode 100644
index fa519f2..0000000
--- a/root-stressvector-test-fails-on-ix86.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From aae37d7eceeb25e4a09e8504275083e6830832d6 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
-Date: Tue, 28 Feb 2023 11:33:28 +0100
-Subject: [PATCH] The stressVector test fails on ix86 due to too strict check:
-
-DeltaR TLorentzVector time = 0.2610929 (sec)
-DeltaR XYZTVector time = 0.22973299 (sec)
-DeltaR PtEtaPhiEVector time = 0.0016570091 (sec)
--12823.3585955796 -12823.35859557827 -12823.35859557827
-Test DeltaR failed !!
-
-The new value for the scale parameter (50) was calculated from the
-above values:
-
-root [2] (-12823.3585955796 - (-12823.35859557827)) / -12823.3585955796 / std::numeric_limits<double>::epsilon() / 10
-(double) 46.762663
----
- test/stressVector.cxx | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/test/stressVector.cxx b/test/stressVector.cxx
-index b0ba21e845..18dc97d421 100644
---- a/test/stressVector.cxx
-+++ b/test/stressVector.cxx
-@@ -540,8 +540,7 @@ int main(int argc,const char *argv[]) {
- s1=a.testDeltaR (v1, t, t1, "DeltaR TLorentzVector " );
- s2=a.testDeltaR (v2, t, t2, "DeltaR XYZTVector " );
- s3=a.testDeltaR (v3, t, t3, "DeltaR PtEtaPhiEVector " );
-- a.check("DeltaR",s1,s2,s3,20);
--
-+ a.check("DeltaR", s1, s2, s3, 50);
-
- int n1, n2, n3;
- n1 = a.testAnalysis (v1, t, t1, "Analysis1 TLorentzVector " );
---
-2.40.1
-
diff --git a/root-tmva-rbdt.patch b/root-tmva-rbdt.patch
index b7afb2d..b31769a 100644
--- a/root-tmva-rbdt.patch
+++ b/root-tmva-rbdt.patch
@@ -28,7 +28,7 @@ index ebe1be187b..5dcf5175f2 100644
+++ b/tmva/tmva/test/CMakeLists.txt
@@ -29,7 +29,7 @@ if(dataframe)
# Tree inference system and user interface
- if(NOT MSVC OR ${LLVM_VERSION} VERSION_LESS 13.0.0 OR llvm13_broken_tests)
+ if(NOT MSVC OR llvm13_broken_tests)
ROOT_ADD_GTEST(branchlessForest branchlessForest.cxx LIBRARIES TMVA)
- ROOT_ADD_GTEST(rbdt rbdt.cxx LIBRARIES ROOTVecOps TMVA)
+ ROOT_ADD_GTEST(rbdt rbdt.cxx LIBRARIES ROOTVecOps TMVAUtils)
diff --git a/root.spec b/root.spec
index 96f8888..547164c 100644
--- a/root.spec
+++ b/root.spec
@@ -7,13 +7,7 @@
%global python3_version_uscore %(tr . _ <<< "%{python3_version}")
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
-# Building the experimental ROOT 7 classes requires c++-17.
-# This is the default for gcc 11 and later.
%global root7 1
-%else
-%global root7 0
-%endif
%if %{?rhel}%{!?rhel:0} == 8
%ifarch %{power64}
@@ -33,26 +27,27 @@
%global tmvasofieparser 1
%endif
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
-# DistRDF requires Python 3.8+
-%global distrdf %{dataframe}
-%else
+%if %{?rhel}%{!?rhel:0} == 8
+# DistRDF requires Python 3.8 or later, RHEL 8 has version 3.6
%global distrdf 0
+%else
+%global distrdf %{dataframe}
%endif
-# qt6-srpm-macros not in buildroot for Fedora 37/38
-# https://bugzilla.redhat.com/show_bug.cgi?id=2220859
-%if %{?fedora}%{!?fedora:0} == 37 || %{?fedora}%{!?fedora:0} == 38
-%global qt6_qtwebengine_arches aarch64 x86_64
+%if %{?rhel}%{!?rhel:0} == 8
+# Requires nlohmann json version 3.9 or later, RHEL 8 has version 3.6
+%global bundlejson 1
+%else
+%global bundlejson 0
%endif
# Do not generate autoprovides for Python modules
%global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
Name: root
-Version: 6.28.08
+Version: 6.30.00
%global libversion %(cut -d. -f 1-2 <<< %{version})
-Release: 3%{?dist}
+Release: 1%{?dist}
Summary: Numerical data analysis framework
License: LGPL-2.1-or-later
@@ -98,30 +93,26 @@ Patch6: %{name}-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch
Patch7: %{name}-big-endian-byte-swap.patch
# https://github.com/root-project/root/pull/12375
Patch8: %{name}-use-consistent-wording-in-tmva-test-comments.patch
-# https://github.com/root-project/root/pull/12390
-Patch9: %{name}-stressvector-test-fails-on-ix86.patch
-# https://github.com/root-project/root/pull/12423
-Patch10: %{name}-dont-install-roofit-files-fix.patch
-# https://github.com/root-project/root/issues/12427
-# https://github.com/root-project/root/pull/12468
-Patch11: %{name}-fixes-for-32bit-builds.patch
-# https://github.com/root-project/root/pull/12476
-Patch12: %{name}-do-not-remove-Wp-before-D-and-U.patch
-# Avoid boolean operators on numpy arrays in unit test
-# https://github.com/root-project/root/issues/12162
-# https://github.com/root-project/root/pull/13612
-Patch13: %{name}-boolean-numpy-array.patch
+# https://github.com/root-project/root/pull/10303
+Patch9: %{name}-ignore-warnings-about-RooNaNPacker-not-being-impleme.patch
# Port to pcre2
# https://github.com/root-project/root/issues/11395
# https://github.com/root-project/root/pull/13771
-Patch14: %{name}-pcre2.patch
-Patch15: %{name}-pcre2-6.28.patch
+Patch10: %{name}-pcre2.patch
# src/RBDT.cxx is a source file of both libTMVA and libTMVAUtils
# https://github.com/root-project/root/pull/13863
-Patch16: %{name}-tmva-rbdt.patch
+Patch11: %{name}-tmva-rbdt.patch
# Fix cmake/modules/FindZeroMQ.cmake
# https://github.com/root-project/root/pull/13995
-Patch17: %{name}-Fix-cmake-modules-FindZeroMQ.cmake.patch
+Patch12: %{name}-Fix-cmake-modules-FindZeroMQ.cmake.patch
+# https://github.com/root-project/root/pull/14111
+Patch13: %{name}-avoid-out-of-memory-during-linking.patch
+# https://github.com/root-project/root/pull/14112
+Patch14: %{name}-clad.patch
+Patch15: %{name}-gtest-back.patch
+Patch16: %{name}-np32.patch
+# Only for EPEL 8 - disable tests not working with old gtest
+Patch17: %{name}-old-gtest.patch
BuildRequires: gcc-c++
BuildRequires: gcc-gfortran
@@ -175,7 +166,6 @@ BuildRequires: dcap-devel
BuildRequires: xrootd-client-devel >= 1:5.0.0
BuildRequires: cfitsio-devel
BuildRequires: davix-devel >= 0.6.4
-BuildRequires: gfal2-devel
BuildRequires: R-Rcpp-devel
BuildRequires: R-RInside-devel
BuildRequires: readline-devel
@@ -192,7 +182,9 @@ BuildRequires: cmake-data >= 3.18.3-1
%else
BuildRequires: openblas-devel
%endif
-BuildRequires: json-devel
+%if ! %{bundlejson}
+BuildRequires: json-devel >= 3.9
+%endif
%if %{?fedora}%{!?fedora:0}
# Disable uring in EPEL 8 and 9 (liburing is available,
# but uring not supported by the kernel)
@@ -328,7 +320,11 @@ Requires: %{name}-tree-dataframe%{?_isa} = %{version}-%{release}
Requires: %{name}-tree-player%{?_isa} = %{version}-%{release}
Requires: %{name}-vecops%{?_isa} = %{version}-%{release}
# To resolve dependency in installed ROOTConfig.cmake
-Requires: json-devel
+%if %{bundlejson}
+Provides: bundled(json-devel) = 3.10.5
+%else
+Requires: json-devel >= 3.9
+%endif
# Fonts
Requires: xorg-x11-fonts-ISO8859-1-75dpi
Requires: font(freesans)
@@ -356,19 +352,9 @@ Obsoletes: %{name}-table < 6.18.00
Obsoletes: %{name}-memstat < 6.26.00
Obsoletes: %{name}-montecarlo-vmc < 6.26.00
Obsoletes: %{name}-doc < 6.26.00
+Obsoletes: %{name}-io-gfal < 6.30.00
+Obsoletes: %{name}-roofit-common < 6.30.00
%if %{?rhel}%{!?rhel:0} == 8
-# Obsolete the ROOT 7 packages in EPEL 8
-# Minimum C++ version changed from 14 to 17
-Obsoletes: %{name}-graf-gpadv7 < 6.26.00
-Obsoletes: %{name}-graf-primitives < 6.26.00
-Obsoletes: %{name}-graf3d-eve7 < 6.26.00
-Obsoletes: %{name}-gui-browsable < 6.26.00
-Obsoletes: %{name}-gui-browserv7 < 6.26.00
-Obsoletes: %{name}-gui-canvaspainter < 6.26.00
-Obsoletes: %{name}-gui-fitpanelv7 < 6.26.00
-Obsoletes: %{name}-histv7 < 6.26.00
-Obsoletes: %{name}-hist-draw < 6.26.00
-Obsoletes: %{name}-tree-ntuple < 6.26.00
# Obsolete the DistRDF package in EPEL 8
# Minimum Python version requirement introduced
Obsoletes: python%{python3_pkgversion}-distrdf < 6.26.00
@@ -910,14 +896,6 @@ Requires: %{name}-io%{?_isa} = %{version}-%{release}
%description io-dcache
This package contains the dCache extension for ROOT.
-%package io-gfal
-Summary: Grid File Access Library input/output library for ROOT
-Requires: %{name}-core%{?_isa} = %{version}-%{release}
-Requires: %{name}-io%{?_isa} = %{version}-%{release}
-
-%description io-gfal
-This package contains the Grid File Access Library extension for ROOT.
-
%package io-sql
Summary: SQL input/output library for ROOT
Requires: %{name}-core%{?_isa} = %{version}-%{release}
@@ -1208,7 +1186,7 @@ access to http based storage such as webdav and S3.
Summary: HTTP server extension for ROOT
Requires: %{name}-core%{?_isa} = %{version}-%{release}
Requires: %{name}-io%{?_isa} = %{version}-%{release}
-Requires: js-jsroot >= 7
+Requires: js-jsroot >= 7.5
# Library split (net-httpsniff from net-http)
Obsoletes: %{name}-net-http < 6.14.00
@@ -1336,26 +1314,6 @@ suitable for adoption in different disciplines as well.
This package contains the RooFit toolkit classes.
-%package roofit-common
-Summary: ROOT extension for modeling expected distributions - common
-License: BSD-2-Clause
-Requires: %{name}-core%{?_isa} = %{version}-%{release}
-
-%description roofit-common
-The RooFit packages provide a toolkit for modeling the expected
-distribution of events in a physics analysis. Models can be used to
-perform likelihood fits, produce plots, and generate "toy Monte
-Carlo" samples for various studies. The RooFit tools are integrated
-with the object-oriented and interactive ROOT graphical environment.
-
-RooFit has been developed for the BaBar collaboration, a high energy
-physics experiment at the Stanford Linear Accelerator Center, and is
-primarily targeted to the high-energy physicists using the ROOT
-analysis environment, but the general nature of the package make it
-suitable for adoption in different disciplines as well.
-
-This package contains the RooFit common classes.
-
%package roofit-core
Summary: ROOT extension for modeling expected distributions - core
License: BSD-2-Clause
@@ -1368,7 +1326,6 @@ Requires: %{name}-mathcore%{?_isa} = %{version}-%{release}
Requires: %{name}-matrix%{?_isa} = %{version}-%{release}
Requires: %{name}-minuit%{?_isa} = %{version}-%{release}
Requires: %{name}-roofit-batchcompute%{?_isa} = %{version}-%{release}
-Requires: %{name}-roofit-common%{?_isa} = %{version}-%{release}
Requires: %{name}-tree%{?_isa} = %{version}-%{release}
# Package split / Library split (from roofit)
Obsoletes: %{name}-roofit < 6.20.00
@@ -1502,7 +1459,6 @@ Summary: Multi-process support for RooFit
License: BSD-2-Clause
Requires: %{name}-core%{?_isa} = %{version}-%{release}
Requires: %{name}-hist%{?_isa} = %{version}-%{release}
-Requires: %{name}-roofit-common%{?_isa} = %{version}-%{release}
Requires: %{name}-roofit-zmq%{?_isa} = %{version}-%{release}
%description roofit-multiprocess
@@ -1552,6 +1508,39 @@ Requires: %{name}-roostats%{?_isa} = %{version}-%{release}
%description hist-factory
Create RooFit probability density functions from ROOT histograms.
+
+%package xroofit
+Summary: Extra tools for RooFit projects
+License: BSD-2-Clause
+Requires: %{name}-core%{?_isa} = %{version}-%{release}
+Requires: %{name}-graf%{?_isa} = %{version}-%{release}
+Requires: %{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires: %{name}-gui%{?_isa} = %{version}-%{release}
+Requires: %{name}-gui-ged%{?_isa} = %{version}-%{release}
+Requires: %{name}-hist%{?_isa} = %{version}-%{release}
+Requires: %{name}-hist-factory%{?_isa} = %{version}-%{release}
+Requires: %{name}-io%{?_isa} = %{version}-%{release}
+Requires: %{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires: %{name}-matrix%{?_isa} = %{version}-%{release}
+Requires: %{name}-roofit%{?_isa} = %{version}-%{release}
+Requires: %{name}-roofit-core%{?_isa} = %{version}-%{release}
+Requires: %{name}-roofit-hs3%{?_isa} = %{version}-%{release}
+Requires: %{name}-roostats%{?_isa} = %{version}-%{release}
+
+%description xroofit
+The RooFit packages provide a toolkit for modeling the expected
+distribution of events in a physics analysis. Models can be used to
+perform likelihood fits, produce plots, and generate "toy Monte
+Carlo" samples for various studies. The RooFit tools are integrated
+with the object-oriented and interactive ROOT graphical environment.
+
+RooFit has been developed for the BaBar collaboration, a high energy
+physics experiment at the Stanford Linear Accelerator Center, and is
+primarily targeted to the high-energy physicists using the ROOT
+analysis environment, but the general nature of the package make it
+suitable for adoption in different disciplines as well.
+
+This package contains extra tools for RooFit projects.
%endif
%package sql-mysql
@@ -1809,7 +1798,7 @@ written in python.
Summary: Static files for the Jupyter ROOT Notebook
BuildArch: noarch
Requires: %{name}-core = %{version}-%{release}
-Requires: js-jsroot >= 7
+Requires: js-jsroot >= 7.5
%if %{?fedora}%{!?fedora:0}
# jupyter-notebook not available in RHEL/EPEL
# some functionality missing
@@ -1993,41 +1982,6 @@ Requires: %{name}-tree-ntuple%{?_isa} = %{version}-%{release}
%description tree-ntuple-utils
This package contains utility functions for ntuples.
-
-%if %{roofit}
-%package xroofit
-Summary: Extra tools for RooFit projects
-License: BSD-2-Clause
-Requires: %{name}-core%{?_isa} = %{version}-%{release}
-Requires: %{name}-graf%{?_isa} = %{version}-%{release}
-Requires: %{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires: %{name}-gui%{?_isa} = %{version}-%{release}
-Requires: %{name}-gui-ged%{?_isa} = %{version}-%{release}
-Requires: %{name}-hist%{?_isa} = %{version}-%{release}
-Requires: %{name}-hist-factory%{?_isa} = %{version}-%{release}
-Requires: %{name}-io%{?_isa} = %{version}-%{release}
-Requires: %{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires: %{name}-matrix%{?_isa} = %{version}-%{release}
-Requires: %{name}-roofit%{?_isa} = %{version}-%{release}
-Requires: %{name}-roofit-core%{?_isa} = %{version}-%{release}
-Requires: %{name}-roofit-hs3%{?_isa} = %{version}-%{release}
-Requires: %{name}-roostats%{?_isa} = %{version}-%{release}
-
-%description xroofit
-The RooFit packages provide a toolkit for modeling the expected
-distribution of events in a physics analysis. Models can be used to
-perform likelihood fits, produce plots, and generate "toy Monte
-Carlo" samples for various studies. The RooFit tools are integrated
-with the object-oriented and interactive ROOT graphical environment.
-
-RooFit has been developed for the BaBar collaboration, a high energy
-physics experiment at the Stanford Linear Accelerator Center, and is
-primarily targeted to the high-energy physicists using the ROOT
-analysis environment, but the general nature of the package make it
-suitable for adoption in different disciplines as well.
-
-This package contains extra tools for RooFit projects.
-%endif
%endif
%prep
@@ -2050,7 +2004,9 @@ This package contains extra tools for RooFit projects.
%patch -P 14 -p1
%patch -P 15 -p1
%patch -P 16 -p1
+%if %{?rhel}%{!?rhel:0} == 8
%patch -P 17 -p1
+%endif
# Remove bundled sources in order to be sure they are not used
# * afterimage
@@ -2063,7 +2019,9 @@ rm -rf graf2d/freetype/src
rm -rf builtins/davix
rm -rf builtins/glew
rm -rf builtins/lz4
+%if ! %{bundlejson}
rm -rf builtins/nlohmann
+%endif
rm -rf builtins/openssl
rm -rf builtins/pcre
rm -rf builtins/tbb
@@ -2073,17 +2031,15 @@ rm -rf builtins/zeromq
rm -rf builtins/zlib
rm -rf builtins/zstd
# * lzma
-rm -rf core/lzma/src/*.tar.gz
+rm core/lzma/src/*.tar.gz
# * gl2ps
rm graf3d/gl/src/gl2ps.cxx graf3d/gl/src/gl2ps/gl2ps.h
# * unuran
-rm -rf math/unuran/src/*.tar.gz
+rm math/unuran/src/*.tar.gz
# * xrootd-private-devel headers
rm -rf proof/xrdinc/*
# * x11 extension headers
rm -rf graf2d/x11/inc/X11
-# * mathjax
-rm -rf documentation/doxygen/mathjax.tar.gz
# * jsroot
rm -rf js/[^f]* js/files/draw.htm js/files/online.htm
@@ -2091,12 +2047,6 @@ rm -rf js/[^f]* js/files/draw.htm js/files/online.htm
rm etc/notebook/JsMVA/js/*.min.js
rm etc/notebook/JsMVA/css/*.min.css
-%if %{?rhel}%{!?rhel:0} == 8
-# Allow older json on EPEL 8
-sed 's!nlohmann_json 3.9!nlohmann_json 3.6!' \
- -i cmake/modules/SearchInstalledSoftware.cmake
-%endif
-
%build
# This package triggers a fault in LLVM when LTO is enabled. Until LLVM
# is analyzed and fixed, disable LTO
@@ -2142,7 +2092,11 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
-Dbuiltin_llvm:BOOL=ON \
-Dbuiltin_lz4:BOOL=OFF \
-Dbuiltin_lzma:BOOL=OFF \
+%if %{bundlejson}
+ -Dbuiltin_nlohmannjson:BOOL=ON \
+%else
-Dbuiltin_nlohmannjson:BOOL=OFF \
+%endif
-Dbuiltin_openssl:BOOL=OFF \
-Dbuiltin_openui5:BOOL=ON \
-Dbuiltin_pcre:BOOL=OFF \
@@ -2156,7 +2110,6 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
-Dbuiltin_zeromq:BOOL=OFF \
-Dbuiltin_zlib:BOOL=OFF \
-Dbuiltin_zstd:BOOL=OFF \
- -Dalien:BOOL=OFF \
%ifnarch %{ix86} %{arm}
-Darrow:BOOL=ON \
%else
@@ -2186,12 +2139,9 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
-Dfitsio:BOOL=ON \
-Dfortran:BOOL=ON \
-Dgdml:BOOL=ON \
- -Dgfal:BOOL=ON \
- -Dgsl_shared:BOOL=ON \
-Dgviz:BOOL=ON \
-Dhttp:BOOL=ON \
-Dimt:BOOL=ON \
- -Djemalloc:BOOL=OFF \
-Dlibcxx:BOOL=OFF \
-Dmathmore:BOOL=ON \
-Dmemory_termination:BOOL=OFF \
@@ -2199,17 +2149,17 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
-Dminuit2_mpi:BOOL=OFF \
-Dminuit2_omp:BOOL=OFF \
-Dmlp:BOOL=ON \
- -Dmonalisa:BOOL=OFF \
-Dmpi:BOOL=OFF \
-Dmysql:BOOL=ON \
-Dodbc:BOOL=ON \
-Dopengl:BOOL=ON \
-Doracle:BOOL=OFF \
-Dpgsql:BOOL=ON \
+ -Dproof:BOOL=ON \
+ -Dpyroot:BOOL=ON \
+ -Dpyroot-python2:BOOL=OFF \
-Dpythia6:BOOL=OFF \
-Dpythia8:BOOL=ON \
- -Dpyroot:BOOL=ON \
- -Dpyroot_legacy:BOOL=OFF \
%ifarch %{qt5_qtwebengine_arches}
-Dqt5web:BOOL=ON \
%else
@@ -2247,7 +2197,6 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
-Dspectrum:BOOL=ON \
-Dsqlite:BOOL=ON \
-Dssl:BOOL=ON \
- -Dtcmalloc:BOOL=OFF \
-Dtmva:BOOL=ON \
-Dtmva-cpu:BOOL=ON \
-Dtmva-gpu:BOOL=OFF \
@@ -2258,6 +2207,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
%else
-Dtmva-sofie:BOOL=OFF \
%endif
+ -Dunfold:BOOL=ON \
-Dunuran:BOOL=ON \
%if %{?fedora}%{!?fedora:0}
-During:BOOL=ON \
@@ -2272,7 +2222,6 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
-Dx11:BOOL=ON \
-Dxml:BOOL=ON \
-Dxrootd:BOOL=ON \
- -Dxproofd:BOOL=OFF \
-Dfail-on-missing:BOOL=ON \
-Dtesting:BOOL=ON \
-Dtest_distrdf_pyspark:BOOL=OFF \
@@ -2414,6 +2363,8 @@ sed -e 's!/usr/bin/env python!%{__python3}!' \
%{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/GenerateModel.py \
%{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/MulticlassKeras.py \
%{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/RegressionKeras.py
+sed -e 's!/usr/bin/python!%{__python3}!' \
+ -i %{buildroot}%{_datadir}/%{name}/pdg_table_update.py
# Remove some junk
rm %{buildroot}%{_datadir}/%{name}/proof/*.sample
@@ -2422,7 +2373,6 @@ rm %{buildroot}%{_datadir}/%{name}/root.desktop
rm %{buildroot}%{_bindir}/setxrd*
rm %{buildroot}%{_bindir}/thisroot*
rm %{buildroot}%{_pkgdocdir}/INSTALL
-rm %{buildroot}%{_pkgdocdir}/README.ALIEN
rm %{buildroot}%{_pkgdocdir}/README.CXXMODULES.md
rm %{buildroot}%{_pkgdocdir}/README.MONALISA
@@ -2434,16 +2384,13 @@ pushd %{buildroot}%{_datadir}/%{name}/plugins
%if ! %{root7}
rm TBrowserImp/P030_RWebBrowserImp.C
%endif
-rm TDataSetManager/P020_TDataSetManagerAliEn.C
-rm TFile/P070_TAlienFile.C
+rm TFile/P050_TGFALFile.C
rm TGLManager/P020_TGWin32GLManager.C
rm TGLManager/P030_TGOSXGLManager.C
-rm TGrid/P010_TAlien.C
rm TProofMgr/P010_TXProofMgr.C
rm TProofServ/P010_TXProofServ.C
rm TSlave/P010_TXSlave.C
rm TSQLServer/P040_TOracleServer.C
-rm TSystem/P030_TAlienSystem.C
rm TVirtualGeoConverter/P010_TGeoVGConverter.C
%if ! %{root7}
rm TVirtualGeoPainter/P020_RGeoPainter.C
@@ -2452,7 +2399,6 @@ rm TVirtualGLImp/P020_TGWin32GL.C
rm TVirtualMonitoringWriter/P010_TMonaLisaWriter.C
rm TVirtualX/P030_TGWin32.C
rm TVirtualX/P050_TGQuartz.C
-rmdir TGrid
rmdir TProofMgr
rmdir TProofServ
rmdir TSlave
@@ -2460,7 +2406,7 @@ rmdir TVirtualGeoConverter
popd
# Replace bundled jsroot with symlinks to system version
-for x in build img modules scripts files/draw.htm files/online.htm ; do
+for x in build img mathjax modules scripts files/draw.htm files/online.htm ; do
ln -nrs %{buildroot}%{_jsdir}/jsroot/$x \
%{buildroot}%{_datadir}/%{name}/js/$x
done
@@ -2481,13 +2427,8 @@ If this target is not used this warning can be ignored.")' \
-e '/Possible reasons include/,/)/d' \
-i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets.cmake
-# Rename to avoid name clashes
-cp -p interpreter/llvm/src/CREDITS.TXT interpreter/llvm/src/llvm-CREDITS.TXT
-cp -p interpreter/llvm/src/LICENSE.TXT interpreter/llvm/src/llvm-LICENSE.TXT
-cp -p interpreter/llvm/src/README.txt interpreter/llvm/src/llvm-README.txt
-
# Create includelist files ...
-for f in `find %{_vpath_builddir} -name cmake_install.cmake -a '!' -path '*/llvm/*'` ; do
+for f in `find %{_vpath_builddir} -name cmake_install.cmake -a '!' -path '*/llvm-project/*'` ; do
l=`sed 's!%{_vpath_builddir}/\(.*\)/cmake_install.cmake!includelist-\1!' <<< $f`
l=`tr / - <<< $l`
tmpdir=`mktemp -d`
@@ -2518,6 +2459,9 @@ for x in df014_CsvDataSource_MuRun2010B_cpp.csv \
ln -sf ../../files/tutorials/df014_CsvDataSource_MuRun2010B.csv $x
done
popd
+pushd tmva/tmva/test
+ln -s ../../../../files files
+popd
pushd tmva/tmva/test/DNN
ln -s ../../../../../files files
popd
@@ -2558,7 +2502,7 @@ popd
#
# - tutorial-dataframe-df104_HiggsToTwoPhotons-py
# - tutorial-dataframe-df105_WBosonAnalysis-py
-# - tutorial-dataframe-df106_HiggsToFourLeptons-py
+# - tutorial-dataframe-df106_HiggsToFourLeptons(-py)
# - tutorial-dataframe-df107_SingleTopAnalysis-py
# - tutorial-rcanvas-df104-py
# - tutorial-rcanvas-df105-py
@@ -2577,6 +2521,10 @@ popd
# reads input data over network
# http://root.cern.ch/files/NanoAOD_DoubleMuon_CMS2011OpenData.root (1.5 GB)
#
+# - tutorial-v7-ntuple-ntpl008_import
+# reads input data over network
+# http://root.cern.ch/files/HiggsTauTauReduced/GluGluToHToTauTau.root (20 MB)
+#
# - gtest-net-davix-test-RRawFileDavix
# reads input file over network
# http://root.cern.ch/files/davix.test
@@ -2585,6 +2533,10 @@ popd
# reads input file over network
# root://eospublic.cern.ch/eos/root-eos/xrootd.test
#
+# - gtest-net-netxng-test-TNetXNGFileTest
+# reads input file over network
+# root://eospublic.cern.ch/eos/root-eos/h1/dstarmb.root
+#
# - gtest-tmva-tmva-test-rreader
# - gtest-tmva-tmva-test-rstandardscaler
# - tutorial-tmva-tmva003_RReader
@@ -2596,6 +2548,10 @@ popd
# reads input data over network
# http://root.cern/files/tmva101.root
#
+# - tutorial-tmva-RBatchGenerator_NumPy-py
+# reads input data over network
+# http://root.cern/files/Higgs_data.root
+#
# - test-import-numba
# - tutorial-pyroot-pyroot004_NumbaDeclare-py
# these tests require the numba python module which is not available
@@ -2618,20 +2574,23 @@ gtest-tree-treeplayer-test-treeprocessormt-remotefiles|\
tutorial-dataframe-df103_NanoAODHiggsAnalysis|\
tutorial-dataframe-df104_HiggsToTwoPhotons-py|\
tutorial-dataframe-df105_WBosonAnalysis-py|\
-tutorial-dataframe-df106_HiggsToFourLeptons-py|\
+tutorial-dataframe-df106_HiggsToFourLeptons|\
tutorial-dataframe-df107_SingleTopAnalysis-py|\
tutorial-rcanvas-df104-py|\
tutorial-rcanvas-df105-py|\
tutorial-v7-global_temperatures.cxx|\
tutorial-v7-ntuple-ntpl003_lhcbOpenData|\
tutorial-v7-ntuple-ntpl004_dimuon|\
+tutorial-v7-ntuple-ntpl008_import|\
gtest-net-davix-test-RRawFileDavix|\
gtest-net-netxng-test-RRawFileNetXNG|\
+gtest-net-netxng-test-TNetXNGFileTest|\
gtest-tmva-tmva-test-rreader|\
gtest-tmva-tmva-test-rstandardscaler|\
tutorial-tmva-tmva003_RReader|\
tutorial-tmva-tmva004_RStandardScaler|\
tutorial-tmva-tmva103_Application|\
+tutorial-tmva-RBatchGenerator_NumPy-py|\
test-import-numba|\
tutorial-pyroot-pyroot004_NumbaDeclare-py|\
test-webgui-ping"
@@ -2647,12 +2606,18 @@ tutorial-dataframe-df026_AsNumpyArrays-py|\
tutorial-roofit-rf409_NumPyPandasToRooFit-py"
%endif
+%ifarch %{ix86}
+# - gtest-tree-dataframe-test-dataframe-concurrency
+# "There's already an active task arena."
+excluded="${excluded}|\
+gtest-tree-dataframe-test-dataframe-concurrency"
+%endif
+
%ifarch %{power64}
# PPC64LE specific failures
# - test-stresshistofit-interpreted
# - test-stresshistogram-interpreted
# - test-stressmathcore-interpreted
-# - test-stressroostats-interpreted
#
# Always timeout (hang?)
# - test-stressinterpreter
@@ -2661,7 +2626,6 @@ excluded="${excluded}|\
test-stresshistofit-interpreted|\
test-stresshistogram-interpreted|\
test-stressmathcore-interpreted|\
-test-stressroostats-interpreted|\
test-stressinterpreter|\
tutorial-unuran-unuranFoamTest"
@@ -2675,7 +2639,6 @@ tutorial-unuran-unuranFoamTest"
# - pyunittests-pyroot-import-load-libs
#
# - tutorial-fit-combinedFit(-py)
-# - tutorial-fit-exampleFit3D
# - tutorial-fit-fit2dHist
# - tutorial-fit-fitCircle
# - tutorial-fit-line3Dfit
@@ -2686,10 +2649,17 @@ tutorial-unuran-unuranFoamTest"
# - tutorial-multicore-mtbb001_fillHistos
# - tutorial-multicore-mtbb101_fillNtuples
# - tutorial-multicore-mtbb201_parallelHistoFill
+# - tutorial-rcanvas-*
+# - tutorial-v7-concurrentfill.cxx
+# - tutorial-v7-ntuple-ntpl001_staff
+# - tutorial-v7-ntuple-ntpl002_vector
+# - tutorial-v7-ntuple-ntpl005_introspection
+# - tutorial-v7-ntuple-ntpl006_friends
+# - tutorial-v7-ntuple-ntpl007_mtFill
+# - tutorial-v7-simple.cxx
excluded="${excluded}|\
pyunittests-pyroot-import-load-libs|\
tutorial-fit-combinedFit|\
-tutorial-fit-exampleFit3D|\
tutorial-fit-fit2dHist|\
tutorial-fit-fitCircle|\
tutorial-fit-line3Dfit|\
@@ -2699,32 +2669,64 @@ tutorial-multicore-mt201_parallelHistoFill|\
tutorial-multicore-mt304_fillHistos|\
tutorial-multicore-mtbb001_fillHistos|\
tutorial-multicore-mtbb101_fillNtuples|\
-tutorial-multicore-mtbb201_parallelHistoFill"
+tutorial-multicore-mtbb201_parallelHistoFill|\
+tutorial-rcanvas|\
+tutorial-v7-concurrentfill.cxx|\
+tutorial-v7-ntuple-ntpl001_staff|\
+tutorial-v7-ntuple-ntpl002_vector|\
+tutorial-v7-ntuple-ntpl005_introspection|\
+tutorial-v7-ntuple-ntpl006_friends|\
+tutorial-v7-ntuple-ntpl007_mtFill|\
+tutorial-v7-simple.cxx"
%endif
%endif
%ifarch s390x
# - gtest-roofit-roofitcore-test-testNaNPacker
-# - tutorial-roofit-rf612_recoverFromInvalidParameters
# Uses "Packed NaN" feature, not implemented for big endian.
excluded="${excluded}|\
-gtest-roofit-roofitcore-test-testNaNPacker|\
-tutorial-roofit-rf612_recoverFromInvalidParameters"
+gtest-roofit-roofitcore-test-testNaNPacker"
+# - gtest-core-base-test-CoreBaseTests
+# - gtest-core-dictgen-test-dictgen-base
+# - gtest-core-meta-test-testTDataType
+#
+# - gtest-tree-dataframe-test-datasource-ntuple
# - gtest-tree-ntuple-v7-test-ntuple-basics
+# - gtest-tree-ntuple-v7-test-ntuple-bulk
# - gtest-tree-ntuple-v7-test-ntuple-endian
# - gtest-tree-ntuple-v7-test-ntuple-extended
+# - gtest-tree-ntuple-v7-test-ntuple-friends
# - gtest-tree-ntuple-v7-test-ntuple-minifile
-# - gtest-tree-ntuple-v7-test-ntuple-rdf
+# - gtest-tree-ntuple-v7-test-ntuple-modelext
+# - gtest-tree-ntuple-v7-test-ntuple-packing
+# - gtest-tree-ntuple-v7-test-ntuple-project
# - gtest-tree-ntuple-v7-test-ntuple-serialize
+# - gtest-tree-ntuple-v7-test-ntuple-show
+# - gtest-tree-ntuple-v7-test-ntuple-storage
+# - gtest-tree-ntuple-v7-test-ntuple-storage-daos
# - gtest-tree-ntuple-v7-test-ntuple-types
+# - gtest-tree-ntuple-v7-test-ntuple-view
+# - gtest-tree-ntuple-v7-test-rfield-vector
+# - gtest-tree-ntupleutil-v7-test-ntuple-importer
+# - gtest-tree-ntupleutil-v7-test-ntuple-inspector
# https://github.com/root-project/root/issues/12426
#
+# - pyunittests-distrdf-unit-backend-test-graph-caching
# - pyunittests-pyroot-pyz-rtensor
# - pyunittests-pyroot-pyz-stl-vector
# - tutorial-dataframe-df006_ranges-py
# - tutorial-fit-combinedFit-py
+# - tutorial-fit-fitcont
+# - tutorial-fit-NumericalMinimization-py
# - tutorial-math-exampleFunction-py
+# - tutorial-rcanvas-rbox-py
+# - tutorial-roofit-rf108_plotbinning-py
+# - tutorial-roofit-rf306_condpereventerrors-py
+# - tutorial-roofit-rf307_fullpereventerrors-py
+# - tutorial-roofit-rf310_sliceplot-py
+# - tutorial-roofit-rf708_bphysics-py
+# - tutorial-tmva-RBatchGenerator_filters_vectors-py
# - tutorial-tmva-TMVA_CNN_Classification-py
# - tutorial-tmva-TMVA_Higgs_Classification-py
# - tutorial-tmva-TMVA_RNN_Classification-py
@@ -2738,18 +2740,43 @@ tutorial-roofit-rf612_recoverFromInvalidParameters"
# - test-stresshistogram
# - test-stresshistogram-interpreted
excluded="${excluded}|\
+gtest-core-base-test-CoreBaseTests|\
+gtest-core-dictgen-test-dictgen-base|\
+gtest-core-meta-test-testTDataType|\
+gtest-tree-dataframe-test-datasource-ntuple|\
gtest-tree-ntuple-v7-test-ntuple-basics|\
+gtest-tree-ntuple-v7-test-ntuple-bulk|\
gtest-tree-ntuple-v7-test-ntuple-endian|\
gtest-tree-ntuple-v7-test-ntuple-extended|\
+gtest-tree-ntuple-v7-test-ntuple-friends|\
gtest-tree-ntuple-v7-test-ntuple-minifile|\
-gtest-tree-ntuple-v7-test-ntuple-rdf|\
+gtest-tree-ntuple-v7-test-ntuple-modelext|\
+gtest-tree-ntuple-v7-test-ntuple-packing|\
+gtest-tree-ntuple-v7-test-ntuple-project|\
gtest-tree-ntuple-v7-test-ntuple-serialize|\
+gtest-tree-ntuple-v7-test-ntuple-show|\
+gtest-tree-ntuple-v7-test-ntuple-storage|\
+gtest-tree-ntuple-v7-test-ntuple-storage-daos|\
gtest-tree-ntuple-v7-test-ntuple-types|\
+gtest-tree-ntuple-v7-test-ntuple-view|\
+gtest-tree-ntuple-v7-test-rfield-vector|\
+gtest-tree-ntupleutil-v7-test-ntuple-importer|\
+gtest-tree-ntupleutil-v7-test-ntuple-inspector|\
+pyunittests-distrdf-unit-backend-test-graph-caching|\
pyunittests-pyroot-pyz-rtensor|\
pyunittests-pyroot-pyz-stl-vector|\
tutorial-dataframe-df006_ranges-py|\
tutorial-fit-combinedFit-py|\
+tutorial-fit-fitcont|\
+tutorial-fit-NumericalMinimization-py|\
tutorial-math-exampleFunction-py|\
+tutorial-rcanvas-rbox-py|\
+tutorial-roofit-rf108_plotbinning-py|\
+tutorial-roofit-rf306_condpereventerrors-py|\
+tutorial-roofit-rf307_fullpereventerrors-py|\
+tutorial-roofit-rf310_sliceplot-py|\
+tutorial-roofit-rf708_bphysics-py|\
+tutorial-tmva-RBatchGenerator_filters_vectors-py|\
tutorial-tmva-TMVA_CNN_Classification-py|\
tutorial-tmva-TMVA_Higgs_Classification-py|\
tutorial-tmva-TMVA_RNN_Classification-py|\
@@ -2776,7 +2803,14 @@ test-stressgraphics"
# Filter out parts of tests that require remote network access
# RNTuple.TClassEBO seg fault
# https://github.com/root-project/root/issues/12428
-GTEST_FILTER=-RCsvDS.Remote:RRawFile.Remote:RSqliteDS.Davix:TFile.ReadWithoutGlobalRegistrationWeb:TFile.ReadWithoutGlobalRegistrationNet:RNTuple.TClassEBO \
+GTEST_FILTER=-\
+RCsvDS.Remote:\
+RRawFile.Remote:\
+RSqliteDS.Davix:\
+TChainParsing.RemoteGlob:\
+TFile.ReadWithoutGlobalRegistrationNet:\
+TFile.ReadWithoutGlobalRegistrationWeb:\
+RNTuple.TClassEBO \
%if ! ( %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 8 )
ROOTTEST_IGNORE_PANDAS_PY3=1 \
%endif
@@ -2795,12 +2829,9 @@ end
%post net-http
# Replace bundled jsroot with symlinks to system version
-for x in build img modules scripts files/draw.htm files/online.htm ; do
+for x in build img mathjax modules scripts files/draw.htm files/online.htm ; do
ln -fnrs %{_jsdir}/jsroot/$x %{_datadir}/%{name}/js/$x
done
-%{?ldconfig}
-
-%ldconfig_postun net-http
%pre -n python%{python3_pkgversion}-%{name}
if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
@@ -2851,143 +2882,6 @@ fi
%post core -p /sbin/ldconfig
%postun core -p /sbin/ldconfig
-%ldconfig_scriptlets multiproc
-%ldconfig_scriptlets cling
-%ldconfig_scriptlets tpython
-%ldconfig_scriptlets -n python%{python3_pkgversion}-%{name}
-%ldconfig_scriptlets r
-%ldconfig_scriptlets r-tools
-%ldconfig_scriptlets genetic
-%ldconfig_scriptlets geom
-%ldconfig_scriptlets geom-builder
-%ldconfig_scriptlets geom-painter
-%ldconfig_scriptlets gdml
-%ldconfig_scriptlets graf
-%ldconfig_scriptlets graf-asimage
-%ldconfig_scriptlets graf-fitsio
-%ldconfig_scriptlets graf-gpad
-%ldconfig_scriptlets graf-gviz
-%ldconfig_scriptlets graf-postscript
-%ldconfig_scriptlets graf-x11
-%ldconfig_scriptlets graf3d
-%ldconfig_scriptlets graf3d-csg
-%ldconfig_scriptlets graf3d-eve
-%ldconfig_scriptlets graf3d-gl
-%ldconfig_scriptlets graf3d-gviz3d
-%ldconfig_scriptlets graf3d-x3d
-%ldconfig_scriptlets gui
-%ldconfig_scriptlets gui-html
-%ldconfig_scriptlets gui-fitpanel
-%ldconfig_scriptlets gui-ged
-%ldconfig_scriptlets gui-builder
-%ldconfig_scriptlets gui-recorder
-%ldconfig_scriptlets hbook
-%ldconfig_scriptlets hist
-%ldconfig_scriptlets hist-painter
-%ldconfig_scriptlets spectrum
-%ldconfig_scriptlets spectrum-painter
-%ldconfig_scriptlets html
-%ldconfig_scriptlets io
-%ldconfig_scriptlets io-dcache
-%ldconfig_scriptlets io-gfal
-%ldconfig_scriptlets io-sql
-%ldconfig_scriptlets io-xml
-%ldconfig_scriptlets io-xmlparser
-%ldconfig_scriptlets foam
-%ldconfig_scriptlets fftw
-%ldconfig_scriptlets fumili
-%ldconfig_scriptlets genvector
-%ldconfig_scriptlets mathcore
-%ldconfig_scriptlets mathmore
-%ldconfig_scriptlets matrix
-%ldconfig_scriptlets minuit
-%ldconfig_scriptlets minuit2
-%ldconfig_scriptlets mlp
-%ldconfig_scriptlets physics
-%ldconfig_scriptlets quadp
-%ldconfig_scriptlets smatrix
-%ldconfig_scriptlets splot
-%ldconfig_scriptlets unuran
-%ldconfig_scriptlets vecops
-%ldconfig_scriptlets montecarlo-eg
-%ldconfig_scriptlets montecarlo-pythia8
-%ldconfig_scriptlets net
-%ldconfig_scriptlets net-rpdutils
-%ldconfig_scriptlets net-auth
-%ldconfig_scriptlets net-davix
-%ldconfig_scriptlets net-httpsniff
-%ldconfig_scriptlets netx
-%ldconfig_scriptlets proof
-%ldconfig_scriptlets proof-bench
-%ldconfig_scriptlets proof-player
-%ldconfig_scriptlets proof-sessionviewer
-%if %{roofit}
-%ldconfig_scriptlets roofit
-%ldconfig_scriptlets roofit-common
-%ldconfig_scriptlets roofit-core
-%ldconfig_scriptlets roofit-more
-%ldconfig_scriptlets roofit-batchcompute
-%if %{dataframe}
-%ldconfig_scriptlets roofit-dataframe-helpers
-%endif
-%ldconfig_scriptlets roofit-hs3
-%ldconfig_scriptlets roofit-jsoninterface
-%if %{?fedora}%{!?fedora:0} >= 40
-%ldconfig_scriptlets roofit-multiprocess
-%ldconfig_scriptlets roofit-zmq
-%endif
-%ldconfig_scriptlets roostats
-%ldconfig_scriptlets hist-factory
-%endif
-%ldconfig_scriptlets sql-mysql
-%ldconfig_scriptlets sql-odbc
-%ldconfig_scriptlets sql-sqlite
-%ldconfig_scriptlets sql-pgsql
-%ldconfig_scriptlets tmva
-%if %{dataframe}
-%ldconfig_scriptlets tmva-utils
-%endif
-%ldconfig_scriptlets tmva-python
-%ldconfig_scriptlets tmva-r
-%ldconfig_scriptlets tmva-sofie
-%if %{tmvasofieparser}
-%ldconfig_scriptlets tmva-sofie-parser
-%endif
-%ldconfig_scriptlets tmva-gui
-%ldconfig_scriptlets tree
-%if %{dataframe}
-%ldconfig_scriptlets tree-dataframe
-%endif
-%ldconfig_scriptlets tree-player
-%ldconfig_scriptlets tree-viewer
-%ldconfig_scriptlets tree-webviewer
-%ldconfig_scriptlets unfold
-%ldconfig_scriptlets gui-webdisplay
-%ifarch %{qt5_qtwebengine_arches}
-%ldconfig_scriptlets gui-qt5webdisplay
-%endif
-%ifarch %{qt6_qtwebengine_arches}
-%ldconfig_scriptlets gui-qt6webdisplay
-%endif
-%ldconfig_scriptlets gui-webgui6
-%if %{root7}
-%ldconfig_scriptlets geom-webviewer
-%ldconfig_scriptlets graf-gpadv7
-%ldconfig_scriptlets graf-primitives
-%ldconfig_scriptlets graf3d-eve7
-%ldconfig_scriptlets gui-browsable
-%ldconfig_scriptlets gui-browserv7
-%ldconfig_scriptlets gui-canvaspainter
-%ldconfig_scriptlets gui-fitpanelv7
-%ldconfig_scriptlets histv7
-%ldconfig_scriptlets hist-draw
-%ldconfig_scriptlets tree-ntuple
-%ldconfig_scriptlets tree-ntuple-utils
-%if %{roofit}
-%ldconfig_scriptlets xroofit
-%endif
-%endif
-
%files
%{_bindir}/hadd
%{_bindir}/root
@@ -3055,9 +2949,13 @@ fi
%dir %{_datadir}/%{name}/plugins
%dir %{_datadir}/%{name}/plugins/*
%dir %{_includedir}/%{name}
+%if %{bundlejson}
+%dir %{_includedir}/%{name}/nlohmann
+%{_includedir}/%{name}/nlohmann/json.hpp
+%{_includedir}/%{name}/nlohmann/json_fwd.hpp
+%endif
%{_includedir}/%{name}/RConfigOptions.h
%{_includedir}/%{name}/RConfigure.h
-%{_includedir}/%{name}/RGitCommit.h
%{_includedir}/%{name}/compiledata.h
%{_includedir}/%{name}/module.modulemap
%dir %{_includedir}/%{name}/Math
@@ -3086,13 +2984,10 @@ fi
%doc interpreter/cling/CREDITS.txt
%doc interpreter/cling/README.md
%license interpreter/cling/LICENSE.TXT
-%doc interpreter/llvm/src/llvm-CREDITS.TXT
-%doc interpreter/llvm/src/llvm-README.txt
-%license interpreter/llvm/src/llvm-LICENSE.TXT
%files testsupport
%{_includedir}/%{name}/ROOT/TestSupport.hxx
-%{_libdir}/%{name}/libTestSupport.a
+%{_libdir}/%{name}/TestSupport
%doc core/testsupport/README.md
%files tpython -f includelist-bindings-tpython
@@ -3314,11 +3209,6 @@ fi
%{_datadir}/%{name}/plugins/TFile/P040_TDCacheFile.C
%{_datadir}/%{name}/plugins/TSystem/P020_TDCacheSystem.C
-%files io-gfal -f includelist-io-gfal
-%{_libdir}/%{name}/libGFAL.*
-%{_libdir}/%{name}/libGFAL_rdict.pcm
-%{_datadir}/%{name}/plugins/TFile/P050_TGFALFile.C
-
%files io-sql -f includelist-io-sql
%{_libdir}/%{name}/libSQLIO.*
%{_libdir}/%{name}/libSQLIO_rdict.pcm
@@ -3433,6 +3323,7 @@ fi
%{_libdir}/%{name}/libEG.*
%{_libdir}/%{name}/libEG_rdict.pcm
%{_datadir}/%{name}/pdg_table.txt
+%{_datadir}/%{name}/pdg_table_update.py
%doc %{_pkgdocdir}/cfortran.doc
%files montecarlo-pythia8 -f includelist-montecarlo-pythia8
@@ -3479,6 +3370,7 @@ fi
%{_datadir}/%{name}/js/files/wslist.htm
%ghost %{_datadir}/%{name}/js/build
%ghost %{_datadir}/%{name}/js/img
+%ghost %{_datadir}/%{name}/js/mathjax
%ghost %{_datadir}/%{name}/js/modules
%ghost %{_datadir}/%{name}/js/scripts
%ghost %{_datadir}/%{name}/js/files/draw.htm
@@ -3544,12 +3436,13 @@ fi
%{_libdir}/%{name}/libRooFit.*
%{_libdir}/%{name}/libRooFit_rdict.pcm
-%files roofit-common
-%{_libdir}/%{name}/libRooFitCommon.*
-
%files roofit-core -f includelist-roofit-roofitcore
%{_libdir}/%{name}/libRooFitCore.*
%{_libdir}/%{name}/libRooFitCore_rdict.pcm
+%dir %{_includedir}/%{name}/RooFit
+%dir %{_includedir}/%{name}/RooFit/Detail
+%dir %{_includedir}/%{name}/RooFit/TestStatistics
+%dir %{_includedir}/%{name}/RooFitLegacy
%{_datadir}/gdb/auto-load%{_libdir}/%{name}/libRooFitCore.*
%{_datadir}/gdb/auto-load%{_libdir}/%{name}/__pycache__/libRooFitCore.*
@@ -3557,10 +3450,9 @@ fi
%{_libdir}/%{name}/libRooFitMore.*
%{_libdir}/%{name}/libRooFitMore_rdict.pcm
-%files roofit-batchcompute -f includelist-roofit-batchcompute
+%files roofit-batchcompute
%{_libdir}/%{name}/libRooBatchCompute.*
%{_libdir}/%{name}/libRooBatchCompute_*
-%doc roofit/batchcompute/README.md
%if %{dataframe}
%files roofit-dataframe-helpers -f includelist-roofit-RDataFrameHelpers
@@ -3571,17 +3463,20 @@ fi
%files roofit-hs3 -f includelist-roofit-hs3
%{_libdir}/%{name}/libRooFitHS3.*
%{_libdir}/%{name}/libRooFitHS3_rdict.pcm
+%dir %{_includedir}/%{name}/RooFitHS3
%{_datadir}/%{name}/RooFitHS3_wsexportkeys.json
%{_datadir}/%{name}/RooFitHS3_wsfactoryexpressions.json
-%doc roofit/hs3/README.md
%files roofit-jsoninterface -f includelist-roofit-jsoninterface
%{_libdir}/%{name}/libRooFitJSONInterface.*
%{_libdir}/%{name}/libRooFitJSONInterface_rdict.pcm
+%dir %{_includedir}/%{name}/RooFit
%if %{?fedora}%{!?fedora:0} >= 40
%files roofit-multiprocess -f includelist-roofit-multiprocess
%{_libdir}/%{name}/libRooFitMultiProcess.*
+%dir %{_includedir}/%{name}/RooFit
+%dir %{_includedir}/%{name}/RooFit/MultiProcess
%files roofit-zmq
%{_libdir}/%{name}/libRooFitZMQ.*
@@ -3601,7 +3496,13 @@ fi
%{_libdir}/%{name}/libHistFactory_rdict.pcm
%{_datadir}/%{name}/HistFactorySchema.dtd
%dir %{_includedir}/%{name}/RooStats/HistFactory
+%dir %{_includedir}/%{name}/RooStats/HistFactory/Detail
%doc roofit/histfactory/doc/README
+
+%files xroofit -f includelist-roofit-xroofit
+%{_libdir}/%{name}/libRooFitXRooFit.*
+%{_libdir}/%{name}/libRooFitXRooFit_rdict.pcm
+%dir %{_includedir}/%{name}/RooFit/xRooFit
%endif
%files sql-mysql -f includelist-sql-mysql
@@ -3632,6 +3533,8 @@ fi
%dir %{_includedir}/%{name}/TMVA/DNN/Architectures
%dir %{_includedir}/%{name}/TMVA/DNN/Architectures/Cpu
%dir %{_includedir}/%{name}/TMVA/DNN/Architectures/Reference
+%dir %{_includedir}/%{name}/TMVA/DNN/CNN
+%dir %{_includedir}/%{name}/TMVA/DNN/RNN
%license tmva/doc/LICENSE
%exclude %{_includedir}/%{name}/TMVA/RBDT.hxx
%exclude %{_includedir}/%{name}/TMVA/RInferenceUtils.hxx
@@ -3777,6 +3680,7 @@ fi
%{_libdir}/%{name}/libROOTBrowsable.*
%{_libdir}/%{name}/libROOTBrowsable_rdict.pcm
%{_libdir}/%{name}/libROOTBranchBrowseProvider.*
+%{_libdir}/%{name}/libROOTGeoBrowseProvider.*
%{_libdir}/%{name}/libROOTHistDrawProvider.*
%{_libdir}/%{name}/libROOTLeafDraw6Provider.*
%{_libdir}/%{name}/libROOTLeafDraw7Provider.*
@@ -3814,19 +3718,20 @@ fi
%files tree-ntuple -f includelist-tree-ntuple
%{_libdir}/%{name}/libROOTNTuple.*
%{_libdir}/%{name}/libROOTNTuple_rdict.pcm
+%dir %{_includedir}/%{name}/ROOT/libdaos_mock
%files tree-ntuple-utils -f includelist-tree-ntupleutil
%{_libdir}/%{name}/libROOTNTupleUtil.*
%{_libdir}/%{name}/libROOTNTupleUtil_rdict.pcm
-
-%if %{roofit}
-%files xroofit -f includelist-roofit-xroofit
-%{_libdir}/%{name}/libRooFitXRooFit.*
-%{_libdir}/%{name}/libRooFitXRooFit_rdict.pcm
-%endif
%endif
%changelog
+* Sat Nov 25 2023 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 6.30.00-1
+- Update to 6.30.00
+- Removed subpackages: root-io-gfal and root-roofit-common
+- Dropped patches: 6
+- New patches: 6
+
* Thu Nov 02 2023 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 6.28.08-3
- Rebuilt for libarrow.so.1400
diff --git a/sources b/sources
index abdf4dd..3dad81b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.28.08.tar.xz) = 868d770a05372677da84e4456023c1b2b575ff1eac8b6b841ed45dd1e0fd0c6c7aede533271b986404f2a55c91ea196ac2d8c81b3b4d1edfae159c0b665c415e
+SHA512 (root-6.30.00.tar.xz) = 0050fea34b679343829cf0bfe4bbd6ff66d93c8e2ceedef41b71d401c4e82495ec5fa4ecac82ef8d4d58f8cc0c724a6331d59b63998e6af28f022dd1942e3797
SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f
commit ae0a7919250ae3903e9f4d78501b4cef0b775525
Author: Mattias Ellert <mattias.ellert(a)physics.uu.se>
Date: Thu Nov 2 12:45:23 2023 +0100
Rebuilt for libarrow.so.1400
diff --git a/root.spec b/root.spec
index 1c76e82..96f8888 100644
--- a/root.spec
+++ b/root.spec
@@ -52,7 +52,7 @@
Name: root
Version: 6.28.08
%global libversion %(cut -d. -f 1-2 <<< %{version})
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Numerical data analysis framework
License: LGPL-2.1-or-later
@@ -3827,8 +3827,11 @@ fi
%endif
%changelog
+* Thu Nov 02 2023 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 6.28.08-3
+- Rebuilt for libarrow.so.1400
+
* Wed Nov 01 2023 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 6.28.08-2
-- Enable RooFit::MultiProcess on Fedroa 40+
+- Enable RooFit::MultiProcess on Fedora 40+
* Sat Oct 14 2023 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 6.28.08-1
- Update to 6.28.08
commit fb5c22a14dac9c1c25b9afcf43a4d813279d2b9c
Author: Mattias Ellert <ellert(a)ellert.se>
Date: Wed Nov 1 13:42:56 2023 +0100
Enable RooFit::MultiProcess on Fedroa 40+
diff --git a/root-Fix-cmake-modules-FindZeroMQ.cmake.patch b/root-Fix-cmake-modules-FindZeroMQ.cmake.patch
new file mode 100644
index 0000000..196ae81
--- /dev/null
+++ b/root-Fix-cmake-modules-FindZeroMQ.cmake.patch
@@ -0,0 +1,51 @@
+From f178a821b57043fdb7b722187e0175b975c7076b Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
+Date: Wed, 1 Nov 2023 10:04:03 +0100
+Subject: [PATCH] Fix cmake/modules/FindZeroMQ.cmake
+
+It now finds ZeroMQ in Fedora 40.
+---
+ cmake/modules/FindZeroMQ.cmake | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/cmake/modules/FindZeroMQ.cmake b/cmake/modules/FindZeroMQ.cmake
+index 24a1c171f5..bd8bf0b3db 100644
+--- a/cmake/modules/FindZeroMQ.cmake
++++ b/cmake/modules/FindZeroMQ.cmake
+@@ -38,17 +38,21 @@ set ( ZeroMQ_LIBRARIES ${ZeroMQ_LIBRARY} )
+ set ( ZeroMQ_INCLUDE_DIRS ${ZeroMQ_INCLUDE_DIR} )
+
+ # check for zmq_ppoll
+-if(ZeroMQ_FOUND)
+- SET(SAVE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}")
+- SET(CMAKE_REQUIRED_DEFINITIONS "-DZMQ_BUILD_DRAFT_API")
++if(ZeroMQ_LIBRARIES)
++ include(CheckCXXSymbolExists)
++ set(CMAKE_REQUIRED_LIBRARIES ${ZeroMQ_LIBRARIES})
++ set(CMAKE_REQUIRED_INCLUDES ${ZeroMQ_INCLUDE_DIRS})
++ set(CMAKE_REQUIRED_DEFINITIONS "-DZMQ_BUILD_DRAFT_API")
+ check_cxx_symbol_exists(zmq_ppoll zmq.h ZeroMQ_HAS_PPOLL)
+- SET(CMAKE_REQUIRED_DEFINITIONS "${SAVE_CMAKE_REQUIRED_DEFINITIONS}")
++ unset(CMAKE_REQUIRED_LIBRARIES)
++ unset(CMAKE_REQUIRED_INCLUDES)
++ unset(CMAKE_REQUIRED_DEFINITIONS)
+ endif()
+
+ include ( FindPackageHandleStandardArgs )
+ # handle the QUIETLY and REQUIRED arguments and set ZeroMQ_FOUND to TRUE
+ # if all listed variables are TRUE
+-find_package_handle_standard_args ( ZeroMQ DEFAULT_MSG ZeroMQ_LIBRARIES ZeroMQ_INCLUDE_DIRS ZeroMQ_HAS_PPOLL)
++find_package_handle_standard_args ( ZeroMQ DEFAULT_MSG ZeroMQ_LIBRARIES ZeroMQ_INCLUDE_DIRS ZeroMQ_HAS_PPOLL )
+
+ if(ZeroMQ_FOUND)
+ if(NOT TARGET libzmq)
+@@ -57,4 +61,4 @@ if(ZeroMQ_FOUND)
+ IMPORTED_LOCATION ${ZeroMQ_LIBRARIES}
+ INTERFACE_INCLUDE_DIRECTORIES ${ZeroMQ_INCLUDE_DIRS})
+ endif()
+-endif()
+\ No newline at end of file
++endif()
+--
+2.41.0
+
diff --git a/root.spec b/root.spec
index b880090..1c76e82 100644
--- a/root.spec
+++ b/root.spec
@@ -40,12 +40,9 @@
%global distrdf 0
%endif
-# qt6-srpm-macros not in buildroot for Fedora 37/38 or EPEL 9
+# qt6-srpm-macros not in buildroot for Fedora 37/38
# https://bugzilla.redhat.com/show_bug.cgi?id=2220859
-# https://bugzilla.redhat.com/show_bug.cgi?id=2220860
-# Definition of qt6_qtwebengine_arches incorrect in qt6-srpm-macros
-# https://bugzilla.redhat.com/show_bug.cgi?id=2215703
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
+%if %{?fedora}%{!?fedora:0} == 37 || %{?fedora}%{!?fedora:0} == 38
%global qt6_qtwebengine_arches aarch64 x86_64
%endif
@@ -55,7 +52,7 @@
Name: root
Version: 6.28.08
%global libversion %(cut -d. -f 1-2 <<< %{version})
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Numerical data analysis framework
License: LGPL-2.1-or-later
@@ -113,15 +110,18 @@ Patch12: %{name}-do-not-remove-Wp-before-D-and-U.patch
# Avoid boolean operators on numpy arrays in unit test
# https://github.com/root-project/root/issues/12162
# https://github.com/root-project/root/pull/13612
-Patch13: root-boolean-numpy-array.patch
+Patch13: %{name}-boolean-numpy-array.patch
# Port to pcre2
# https://github.com/root-project/root/issues/11395
# https://github.com/root-project/root/pull/13771
-Patch14: root-pcre2.patch
-Patch15: root-pcre2-6.28.patch
+Patch14: %{name}-pcre2.patch
+Patch15: %{name}-pcre2-6.28.patch
# src/RBDT.cxx is a source file of both libTMVA and libTMVAUtils
# https://github.com/root-project/root/pull/13863
-Patch16: root-tmva-rbdt.patch
+Patch16: %{name}-tmva-rbdt.patch
+# Fix cmake/modules/FindZeroMQ.cmake
+# https://github.com/root-project/root/pull/13995
+Patch17: %{name}-Fix-cmake-modules-FindZeroMQ.cmake.patch
BuildRequires: gcc-c++
BuildRequires: gcc-gfortran
@@ -204,6 +204,14 @@ BuildRequires: protobuf-devel >= 3.0
%ifnarch %{ix86} %{arm}
BuildRequires: libarrow-devel
%endif
+%if %{roofit}
+%if %{?fedora}%{!?fedora:0} >= 40
+# Required for roofit-multiprocess
+# Requires new zeromq with zmq_ppoll
+BuildRequires: zeromq-devel >= 4.3.5
+BuildRequires: cppzmq-devel
+%endif
+%endif
%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 8
BuildRequires: python%{python3_pkgversion}-pandas
%endif
@@ -1488,6 +1496,28 @@ suitable for adoption in different disciplines as well.
This package contains the JSON interface to RooFit.
+%if %{?fedora}%{!?fedora:0} >= 40
+%package roofit-multiprocess
+Summary: Multi-process support for RooFit
+License: BSD-2-Clause
+Requires: %{name}-core%{?_isa} = %{version}-%{release}
+Requires: %{name}-hist%{?_isa} = %{version}-%{release}
+Requires: %{name}-roofit-common%{?_isa} = %{version}-%{release}
+Requires: %{name}-roofit-zmq%{?_isa} = %{version}-%{release}
+
+%description roofit-multiprocess
+This package contains a library providing classes that implements
+mult-process support for RooFit.
+
+%package roofit-zmq
+Summary: ZeroMQ interface library for RooFit
+License: BSD-2-Clause
+
+%description roofit-zmq
+This package contains a helper library used by RooFit::MultiProcess to
+interface to the ZeroMQ library.
+%endif
+
%package roostats
Summary: Statistical tools built on top of RooFit
Requires: %{name}-core%{?_isa} = %{version}-%{release}
@@ -2020,6 +2050,7 @@ This package contains extra tools for RooFit projects.
%patch -P 14 -p1
%patch -P 15 -p1
%patch -P 16 -p1
+%patch -P 17 -p1
# Remove bundled sources in order to be sure they are not used
# * afterimage
@@ -2192,10 +2223,15 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
-Dr:BOOL=ON \
%if %{roofit}
-Droofit:BOOL=ON \
+%if %{?fedora}%{!?fedora:0} >= 40
+ -Droofit_multiprocess:BOOL=ON \
%else
- -Droofit:BOOL=OFF \
+ -Droofit_multiprocess:BOOL=OFF \
%endif
+%else
+ -Droofit:BOOL=OFF \
-Droofit_multiprocess:BOOL=OFF \
+%endif
-Droofit_hs3_ryml:BOOL=OFF \
%if %{root7}
-Droot7:BOOL=ON \
@@ -2894,8 +2930,12 @@ fi
%if %{dataframe}
%ldconfig_scriptlets roofit-dataframe-helpers
%endif
-%ldconfig_scriptlets roofit-jsoninterface
%ldconfig_scriptlets roofit-hs3
+%ldconfig_scriptlets roofit-jsoninterface
+%if %{?fedora}%{!?fedora:0} >= 40
+%ldconfig_scriptlets roofit-multiprocess
+%ldconfig_scriptlets roofit-zmq
+%endif
%ldconfig_scriptlets roostats
%ldconfig_scriptlets hist-factory
%endif
@@ -3539,6 +3579,14 @@ fi
%{_libdir}/%{name}/libRooFitJSONInterface.*
%{_libdir}/%{name}/libRooFitJSONInterface_rdict.pcm
+%if %{?fedora}%{!?fedora:0} >= 40
+%files roofit-multiprocess -f includelist-roofit-multiprocess
+%{_libdir}/%{name}/libRooFitMultiProcess.*
+
+%files roofit-zmq
+%{_libdir}/%{name}/libRooFitZMQ.*
+%endif
+
%files roostats -f includelist-roofit-roostats
%{_libdir}/%{name}/libRooStats.*
%{_libdir}/%{name}/libRooStats_rdict.pcm
@@ -3779,6 +3827,9 @@ fi
%endif
%changelog
+* Wed Nov 01 2023 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 6.28.08-2
+- Enable RooFit::MultiProcess on Fedroa 40+
+
* Sat Oct 14 2023 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 6.28.08-1
- Update to 6.28.08
- New subpackage root-tmva-utils (split off from root-tmva)
1
0
26 Nov '23
The package rpms/root.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/root.git/commit/?id=59989efa5f4087c….
Change:
-%ifarch %{qt6_qtwebengine_arches}
Thanks.
Full change:
============
commit 59989efa5f4087c1dd7b9eb3d4f660cd78c20675
Author: Mattias Ellert <mattias.ellert(a)physics.uu.se>
Date: Sun Nov 26 16:11:31 2023 +0100
Update to 6.30.00
Removed subpackages: root-io-gfal and root-roofit-common
Dropped patches: 6
New patches: 6
diff --git a/root-avoid-out-of-memory-during-linking.patch b/root-avoid-out-of-memory-during-linking.patch
new file mode 100644
index 0000000..d182e44
--- /dev/null
+++ b/root-avoid-out-of-memory-during-linking.patch
@@ -0,0 +1,30 @@
+From 51b84e7bc21f8729de8d3e8f9ff08b337af33b78 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
+Date: Fri, 17 Nov 2023 17:15:15 +0100
+Subject: [PATCH] Avoid out of memory during linking regardless of build type
+
+---
+ core/metacling/src/CMakeLists.txt | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/core/metacling/src/CMakeLists.txt b/core/metacling/src/CMakeLists.txt
+index e750480eb3..dd50793d29 100644
+--- a/core/metacling/src/CMakeLists.txt
++++ b/core/metacling/src/CMakeLists.txt
+@@ -111,11 +111,8 @@ ROOT_LINKER_LIBRARY(Cling
+ $<TARGET_OBJECTS:MetaCling>
+ LIBRARIES ${CLING_LIBRARIES} ${LINK_LIBS} ${CLING_PLUGIN_LINK_LIBS})
+
+-string(TOUPPER "${LLVM_BUILD_TYPE}" THE_BUILD_TYPE)
+-if("${THE_BUILD_TYPE}" STREQUAL DEBUG OR "${THE_BUILD_TYPE}" STREQUAL RELWITHDEBINFO)
+- # When these two link at the same time, they can exhaust the RAM on many machines, since they both link against llvm.
+- add_dependencies(Cling rootcling_stage1)
+-endif()
++# When these two link at the same time, they can exhaust the RAM on many machines, since they both link against llvm.
++add_dependencies(Cling rootcling_stage1)
+
+ if(MSVC)
+ set_target_properties(Cling PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
+--
+2.43.0
+
diff --git a/root-boolean-numpy-array.patch b/root-boolean-numpy-array.patch
deleted file mode 100644
index e5d6482..0000000
--- a/root-boolean-numpy-array.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 2b3dd4f1bfecea5b1b936d5507f8b0c664322a19 Mon Sep 17 00:00:00 2001
-From: Jonas Rembser <jonas.rembser(a)cern.ch>
-Date: Wed, 6 Sep 2023 02:16:33 +0200
-Subject: [PATCH] [RF][PyROOT] Avoid boolean operators on numpy arrays in unit
- test
-
-The `n_in_range` reference value in the unit test
-`roodataset_numpy.TestRooDataSetNumpy.test_ignoring_out_of_range`
-apparently doesn't get computed right on some 32 platforms.
-
-I can't reproduce the problem, but I'm sure it will be fixed by avoiding
-the use of the operators `&` and `|` with numpy arrays. Just doing a
-manual loop in Python should be more platform independent.
-
-Closes #12162.
----
- .../pythonizations/test/roofit/roodataset_numpy.py | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/bindings/pyroot/pythonizations/test/roofit/roodataset_numpy.py b/bindings/pyroot/pythonizations/test/roofit/roodataset_numpy.py
-index 79259af321..5587677c45 100644
---- a/bindings/pyroot/pythonizations/test/roofit/roodataset_numpy.py
-+++ b/bindings/pyroot/pythonizations/test/roofit/roodataset_numpy.py
-@@ -135,9 +135,15 @@ class TestRooDataSetNumpy(unittest.TestCase):
- cat.defineType("minus", -1)
- cat.defineType("plus", +1)
-
-- in_x_range = (data["x"] <= x.getMax()) & (data["x"] >= x.getMin())
-- in_cat_range = (data["cat"] == -1) | (data["cat"] == +1)
-- n_in_range = np.sum(in_x_range & in_cat_range)
-+ # Use manual loop because we had some problems with numpys boolean
-+ # comparisions in the past (see GitHub issue #12162).
-+ n_in_range = 0
-+ for i in range(n_events):
-+ in_x_range = data["x"][i] <= x.getMax() and data["x"][i] >= x.getMin()
-+ in_cat_range = (data["cat"][i] == -1) or (data["cat"][i] == +1)
-+ is_in_range = in_x_range and in_cat_range
-+ if is_in_range:
-+ n_in_range = n_in_range + 1
-
- dataset_numpy = ROOT.RooDataSet.from_numpy(data, {x, cat}, name="dataSetNumpy")
-
---
-2.41.0
-
diff --git a/root-clad.patch b/root-clad.patch
new file mode 100644
index 0000000..0715240
--- /dev/null
+++ b/root-clad.patch
@@ -0,0 +1,26 @@
+From fae9b92742c5e991ad33769d1357a721838e93f9 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
+Date: Fri, 17 Nov 2023 11:37:23 +0100
+Subject: [PATCH 1/3] Add fit/exampleFit3D.C to clad veto
+
+---
+ tutorials/CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
+index 5cba95407b..81f6539f03 100644
+--- a/tutorials/CMakeLists.txt
++++ b/tutorials/CMakeLists.txt
+@@ -74,7 +74,8 @@ if(NOT ROOT_minuit2_FOUND)
+ endif()
+
+ if(NOT clad)
+- set(clad_veto fit/minuit2GausFit.C)
++ set(clad_veto fit/minuit2GausFit.C
++ fit/exampleFit3D.C)
+ endif()
+
+ # RBatchGenerator tutorials need Python 3.8+.
+--
+2.42.0
+
diff --git a/root-do-not-remove-Wp-before-D-and-U.patch b/root-do-not-remove-Wp-before-D-and-U.patch
deleted file mode 100644
index 820b7af..0000000
--- a/root-do-not-remove-Wp-before-D-and-U.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0191a987b7583c2aa84b1293105db353fee40b1d Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
-Date: Fri, 10 Mar 2023 20:49:02 +0100
-Subject: [PATCH] Do not remove -Wp, before -D and -U when recording used
- compiler flags
-
-This breaks the pattern used when undefining and then defining a
-variable in the same flag:
-
-$ echo | g++ -Wp,-UVAR,-DVAR=1 -c -x c++ -
-
-Here -Wp,-UVAR,-DVAR=1 will first undefine VAR and then define it to 1
-
-If the -Wp, is dropped, this fails:
-$ echo | g++ -UVAR,-DVAR=1 -c -x c++ -
-<command-line>: warning: extra tokens at end of #undef directive
-
-Now it will only undefine VAR, but not defin it. I.e.
-
-insted of
-
-you get
-
-which explains the rather cryptic warning about extra token after #undef.
----
- cmake/modules/RootConfiguration.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/modules/RootConfiguration.cmake b/cmake/modules/RootConfiguration.cmake
-index 3d1ae9be53..042b43f039 100644
---- a/cmake/modules/RootConfiguration.cmake
-+++ b/cmake/modules/RootConfiguration.cmake
-@@ -729,7 +729,7 @@ if (cxxmodules)
- endif()
-
- string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __fflags "${CMAKE_Fortran_FLAGS}")
--string(REGEX MATCHALL "-(D|U)[^ ]*" __defs "${CMAKE_CXX_FLAGS}")
-+string(REGEX MATCHALL "(-Wp,)?-(D|U)[^ ]*" __defs "${CMAKE_CXX_FLAGS}")
- set(ROOT_COMPILER_FLAG_HINTS "#
- set(ROOT_DEFINITIONS \"${__defs}\")
- set(ROOT_CXX_FLAGS \"${__cxxflags}\")
---
-2.39.2
-
diff --git a/root-dont-install-roofit-files-fix.patch b/root-dont-install-roofit-files-fix.patch
deleted file mode 100644
index 295a4b7..0000000
--- a/root-dont-install-roofit-files-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 74aaf99530443a712f9b0577d8edde615ea8902d Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
-Date: Sat, 4 Mar 2023 21:27:35 +0100
-Subject: [PATCH] Use FILTER instead of REMOVE_ITEM since GLOB returns absolute
- paths
-
----
- build/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
-index e964b5e255..2b24b1d6e6 100644
---- a/build/CMakeLists.txt
-+++ b/build/CMakeLists.txt
-@@ -30,7 +30,7 @@ ROOT_EXECUTABLE(rmkdepend
- if(NOT MSVC AND _BUILD_TYPE_UPPER MATCHES "DEBUG|RELWITHDEBINFO")
- file(GLOB PRETTY_PRINTERS "gdbPrinters/*.so-gdb.py")
- if(NOT roofit)
-- list(REMOVE_ITEM PRETTY_PRINTERS gdbPrinters/libRooFitCore.so-gdb.py)
-+ list(FILTER PRETTY_PRINTERS EXCLUDE REGEX libRooFitCore.so-gdb.py)
- endif()
- set(PRETTY_PRINTER_DESTS)
- foreach(PRETTY_PRINTER ${PRETTY_PRINTERS})
---
-2.39.2
-
diff --git a/root-fixes-for-32bit-builds.patch b/root-fixes-for-32bit-builds.patch
deleted file mode 100644
index bcff78d..0000000
--- a/root-fixes-for-32bit-builds.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-From 6f69a59010a60c949b1955e52275137e39a85b82 Mon Sep 17 00:00:00 2001
-From: Jakob Blomer <jblomer(a)cern.ch>
-Date: Thu, 9 Mar 2023 15:14:22 +0100
-Subject: [PATCH] [ntuple] fixes for 32bit / non-x86_64 builds
-
----
- tree/dataframe/src/RNTupleDS.cxx | 1 +
- tree/ntuple/v7/inc/ROOT/RField.hxx | 21 +++++++++++++++++++--
- tree/ntuple/v7/test/ntuple_extended.cxx | 8 ++++----
- 3 files changed, 24 insertions(+), 6 deletions(-)
-
-diff --git a/tree/dataframe/src/RNTupleDS.cxx b/tree/dataframe/src/RNTupleDS.cxx
-index f7eb0ab5f284..aaea6df81622 100644
---- a/tree/dataframe/src/RNTupleDS.cxx
-+++ b/tree/dataframe/src/RNTupleDS.cxx
-@@ -94,6 +94,7 @@ class RRDFCardinalityField : public ROOT::Experimental::Detail::RFieldBase {
- return ROOT::Experimental::Detail::RFieldValue(true /* captureFlag */, this, where);
- }
- size_t GetValueSize() const final { return sizeof(std::size_t); }
-+ size_t GetAlignment() const final { return alignof(std::size_t); }
-
- /// Get the number of elements of the collection identified by globalIndex
- void
-diff --git a/tree/ntuple/v7/inc/ROOT/RField.hxx b/tree/ntuple/v7/inc/ROOT/RField.hxx
-index b05267d16030..9a85368a94e3 100644
---- a/tree/ntuple/v7/inc/ROOT/RField.hxx
-+++ b/tree/ntuple/v7/inc/ROOT/RField.hxx
-@@ -270,8 +270,9 @@ public:
- virtual std::vector<RFieldValue> SplitValue(const RFieldValue &value) const;
- /// The number of bytes taken by a value of the appropriate type
- virtual size_t GetValueSize() const = 0;
-- /// For many types, the alignment requirement is equal to the size; otherwise override.
-- virtual size_t GetAlignment() const { return GetValueSize(); }
-+ /// As a rule of thumb, the alignment is equal to the size of the type. There are, however, various exceptions
-+ /// to this rule depending on OS and CPU architecture. So enforce the alignment to be explicitly spelled out.
-+ virtual size_t GetAlignment() const = 0;
- int GetTraits() const { return fTraits; }
- bool HasReadCallbacks() const { return !fReadCallbacks.empty(); }
-
-@@ -383,6 +384,7 @@ public:
- Detail::RFieldValue GenerateValue(void*) override { return Detail::RFieldValue(); }
- Detail::RFieldValue CaptureValue(void*) final { return Detail::RFieldValue(); }
- size_t GetValueSize() const final { return 0; }
-+ size_t GetAlignment() const final { return 0; }
-
- void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-@@ -889,6 +891,7 @@ public:
- Detail::RColumnElement<ClusterSize_t>(static_cast<ClusterSize_t*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(ClusterSize_t); }
-+ size_t GetAlignment() const final { return alignof(ClusterSize_t); }
- void CommitCluster() final;
- };
-
-@@ -990,6 +993,7 @@ public:
- Detail::RColumnElement<ClusterSize_t>(static_cast<ClusterSize_t*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(ClusterSize_t); }
-+ size_t GetAlignment() const final { return alignof(ClusterSize_t); }
-
- /// Special help for offset fields
- void GetCollectionInfo(NTupleSize_t globalIndex, RClusterIndex *collectionStart, ClusterSize_t *size) {
-@@ -1110,6 +1115,7 @@ public:
- Detail::RColumnElement<bool>(static_cast<bool*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(bool); }
-+ size_t GetAlignment() const final { return alignof(bool); }
- void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-
-@@ -1162,6 +1168,7 @@ public:
- Detail::RColumnElement<float>(static_cast<float*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(float); }
-+ size_t GetAlignment() const final { return alignof(float); }
- void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-
-@@ -1215,6 +1222,7 @@ public:
- Detail::RColumnElement<double>(static_cast<double*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(double); }
-+ size_t GetAlignment() const final { return alignof(double); }
- void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-
-@@ -1267,6 +1275,7 @@ public:
- Detail::RColumnElement<char>(static_cast<char*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(char); }
-+ size_t GetAlignment() const final { return alignof(char); }
- void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-
-@@ -1319,6 +1328,7 @@ public:
- Detail::RColumnElement<std::int8_t>(static_cast<std::int8_t*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(std::int8_t); }
-+ size_t GetAlignment() const final { return alignof(std::int8_t); }
- void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-
-@@ -1371,6 +1381,7 @@ public:
- Detail::RColumnElement<std::uint8_t>(static_cast<std::uint8_t*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(std::uint8_t); }
-+ size_t GetAlignment() const final { return alignof(std::uint8_t); }
- void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-
-@@ -1423,6 +1434,7 @@ public:
- Detail::RColumnElement<std::int16_t>(static_cast<std::int16_t*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(std::int16_t); }
-+ size_t GetAlignment() const final { return alignof(std::int16_t); }
- void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-
-@@ -1475,6 +1487,7 @@ public:
- Detail::RColumnElement<std::uint16_t>(static_cast<std::uint16_t*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(std::uint16_t); }
-+ size_t GetAlignment() const final { return alignof(std::uint16_t); }
- void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-
-@@ -1527,6 +1540,7 @@ public:
- Detail::RColumnElement<std::int32_t>(static_cast<std::int32_t*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(std::int32_t); }
-+ size_t GetAlignment() const final { return alignof(std::int32_t); }
- void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-
-@@ -1579,6 +1593,7 @@ public:
- Detail::RColumnElement<std::uint32_t>(static_cast<std::uint32_t*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(std::uint32_t); }
-+ size_t GetAlignment() const final { return alignof(std::uint32_t); }
- void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-
-@@ -1631,6 +1646,7 @@ public:
- Detail::RColumnElement<std::uint64_t>(static_cast<std::uint64_t*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(std::uint64_t); }
-+ size_t GetAlignment() const final { return alignof(std::uint64_t); }
- void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-
-@@ -1683,6 +1699,7 @@ public:
- Detail::RColumnElement<std::int64_t>(static_cast<std::int64_t*>(where)), this, where);
- }
- size_t GetValueSize() const final { return sizeof(std::int64_t); }
-+ size_t GetAlignment() const final { return alignof(std::int64_t); }
- void AcceptVisitor(Detail::RFieldVisitor &visitor) const final;
- };
-
-diff --git a/tree/ntuple/v7/test/ntuple_extended.cxx b/tree/ntuple/v7/test/ntuple_extended.cxx
-index 91871e288e98..d3b6ee466359 100644
---- a/tree/ntuple/v7/test/ntuple_extended.cxx
-+++ b/tree/ntuple/v7/test/ntuple_extended.cxx
-@@ -123,8 +123,8 @@ TEST(RNTuple, LargeFile1)
- RNTupleWriteOptions options;
- options.SetCompression(0);
- auto ntuple = RNTupleWriter::Recreate(std::move(modelWrite), "myNTuple", fileGuard.GetPath(), options);
-- constexpr unsigned long nEvents = 1024 * 1024 * 256; // Exceed 2GB file size
-- for (unsigned int i = 0; i < nEvents; ++i) {
-+ constexpr std::uint64_t nEvents = 1024 * 1024 * 256; // Exceed 2GB file size
-+ for (std::uint64_t i = 0; i < nEvents; ++i) {
- wrEnergy = rnd.Rndm();
- chksumWrite += wrEnergy;
- ntuple->Fill();
-@@ -195,8 +195,8 @@ TEST(RNTuple, LargeFile2)
-
- TRandom3 rnd(42);
- double chksumWrite = 0.0;
-- constexpr unsigned long nEvents = 1024 * 1024 * 256; // Exceed 2GB file size
-- for (unsigned int i = 0; i < nEvents; ++i) {
-+ constexpr std::uint64_t nEvents = 1024 * 1024 * 256; // Exceed 2GB file size
-+ for (std::uint64_t i = 0; i < nEvents; ++i) {
- *E = rnd.Rndm();
- chksumWrite += *E;
- writer->Fill();
diff --git a/root-gtest-back.patch b/root-gtest-back.patch
new file mode 100644
index 0000000..1624451
--- /dev/null
+++ b/root-gtest-back.patch
@@ -0,0 +1,25 @@
+From 1942f5569b1d101f2c89341765ea37850e3de669 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
+Date: Fri, 17 Nov 2023 11:43:46 +0100
+Subject: [PATCH 2/3] Add old gtest compat for SetUpTestSuite/TearDownTestSuite
+
+---
+ tree/tree/test/friendinfo.cxx | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tree/tree/test/friendinfo.cxx b/tree/tree/test/friendinfo.cxx
+index 141a495052..6e94056946 100644
+--- a/tree/tree/test/friendinfo.cxx
++++ b/tree/tree/test/friendinfo.cxx
+@@ -14,6 +14,8 @@
+ // Backward compatibility for gtest version < 1.10.0
+ #ifndef INSTANTIATE_TEST_SUITE_P
+ #define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
++#define SetUpTestSuite SetUpTestCase
++#define TearDownTestSuite TearDownTestCase
+ #endif
+
+ namespace {
+--
+2.42.0
+
diff --git a/root-ignore-warnings-about-RooNaNPacker-not-being-impleme.patch b/root-ignore-warnings-about-RooNaNPacker-not-being-impleme.patch
new file mode 100644
index 0000000..20e2ee5
--- /dev/null
+++ b/root-ignore-warnings-about-RooNaNPacker-not-being-impleme.patch
@@ -0,0 +1,33 @@
+From ba0dc65e558fd916dbe18f8dbe8208a3be932c25 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
+Date: Mon, 28 Mar 2022 09:20:18 +0200
+Subject: [PATCH] Ignore warnings about RooNaNPacker not being implemented for
+ big endian
+
+This warning is triggered in many tests, so it makes sense to put it
+in the default ignored set.
+---
+ core/testsupport/src/TestSupport.cxx | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/core/testsupport/src/TestSupport.cxx b/core/testsupport/src/TestSupport.cxx
+index 259ab4e09c..79cd476950 100644
+--- a/core/testsupport/src/TestSupport.cxx
++++ b/core/testsupport/src/TestSupport.cxx
+@@ -73,6 +73,13 @@ static struct ForbidDiagnostics {
+ return;
+ }
+
++ // FIXME: RooNaNPacker warns about not being implemented for big endian
++ if (level == kWarning
++ && strcmp(msg, "Fast recovery from undefined function values only implemented for little-endian machines. If necessary, request an extension of functionality on https://root.cern") == 0) {
++ std::cerr << "Warning in " << location << " " << msg << std::endl;
++ return;
++ }
++
+ FAIL() << "Received unexpected diagnostic of severity "
+ << level
+ << " at '" << location << "' reading '" << msg << "'.\n"
+--
+2.42.0
+
diff --git a/root-np32.patch b/root-np32.patch
new file mode 100644
index 0000000..3ac6f41
--- /dev/null
+++ b/root-np32.patch
@@ -0,0 +1,89 @@
+From 88162e7738d810f8203ed0242179f7af94ded500 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
+Date: Fri, 17 Nov 2023 11:46:14 +0100
+Subject: [PATCH 3/3] Fix pythonizations test errors on ix86 Linux
+
+======================================================================
+ERROR: test_sliced_array (rdataframe_makenumpy.DataFrameFromNumpy.test_sliced_array)
+Test correct reading of a sliced numpy array (#13690)
+----------------------------------------------------------------------
+Traceback (most recent call last):
+ File "/builddir/build/BUILD/root-6.30.00/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py", line 153, in test_sliced_array
+ x_col = df.Take['Long64_t']("x")
+ ^^^^^^^^^^^^^^^^^^^^^^^^
+cppyy.gbl.std.runtime_error: Could not instantiate Take<Long64_t>:
+ ROOT::RDF::RResultPtr<vector<Long64_t> > ROOT::RDF::RInterface<ROOT::Detail::RDF::RLoopManager,void>::Take(basic_string_view<char,char_traits<char> > column = "") =>
+ runtime_error: Column x has type int while the id specified is associated to type Long64_t
+----------------------------------------------------------------------
+
+======================================================================
+ERROR: test_dtypes (rtensor.AsRTensor.test_dtypes)
+Test adoption of numpy arrays with different data types
+----------------------------------------------------------------------
+Traceback (most recent call last):
+ File "/builddir/build/BUILD/root-6.30.00/bindings/pyroot/pythonizations/test/rtensor.py", line 45, in test_dtypes
+ root_obj = ROOT.TMVA.Experimental.RTensor(self.cpptypes[i])(np_obj)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ File "/builddir/build/BUILD/root-6.30.00/redhat-linux-build/lib/ROOT/_pythonization/_tmva/_rtensor.py", line 131, in RTensorInit
+ return self._original_init_(data,shape,layout)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+TypeError: none of the 6 overloaded methods succeeded. Full details:
+ RTensor<long,vector<long> >::RTensor<long,vector<long> >(TMVA::Experimental::RTensor<long,vector<long> >&&) =>
+ TypeError: takes at most 1 arguments (3 given)
+ RTensor<long,vector<long> >::RTensor<long,vector<long> >(const TMVA::Experimental::RTensor<long,vector<long> >&) =>
+ TypeError: takes at most 1 arguments (3 given)
+ RTensor<long,vector<long> >::RTensor<long,vector<long> >(shared_ptr<vector<long> > container, vector<unsigned int> shape, TMVA::Experimental::MemoryLayout layout = MemoryLayout::RowMajor) =>
+ TypeError: could not convert argument 1
+ RTensor<long,vector<long> >::RTensor<long,vector<long> >(vector<unsigned int> shape, TMVA::Experimental::MemoryLayout layout = MemoryLayout::RowMajor) =>
+ TypeError: takes at most 2 arguments (3 given)
+ RTensor<long,vector<long> >::RTensor<long,vector<long> >(long* data, vector<unsigned int> shape, vector<unsigned int> strides, TMVA::Experimental::MemoryLayout layout = MemoryLayout::RowMajor) =>
+ TypeError: could not convert argument 1 (could not convert argument to buffer or nullptr)
+ RTensor<long,vector<long> >::RTensor<long,vector<long> >(long* data, vector<unsigned int> shape, TMVA::Experimental::MemoryLayout layout = MemoryLayout::RowMajor) =>
+ TypeError: could not convert argument 1 (could not convert argument to buffer or nullptr)
+----------------------------------------------------------------------
+---
+ .../pyroot/pythonizations/test/rdataframe_makenumpy.py | 2 +-
+ bindings/pyroot/pythonizations/test/rtensor.py | 7 +++++--
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py b/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
+index cd2ebc9b5b..1860bd49f5 100644
+--- a/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
++++ b/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
+@@ -147,7 +147,7 @@ class DataFrameFromNumpy(unittest.TestCase):
+ """
+ Test correct reading of a sliced numpy array (#13690)
+ """
+- table = np.array([[1,2], [3,4]])
++ table = np.array([[1,2], [3,4]], dtype="int64")
+ columns = {'x': table[:,0], 'y': table[:,1]}
+ df = ROOT.RDF.FromNumpy(columns)
+ x_col = df.Take['Long64_t']("x")
+diff --git a/bindings/pyroot/pythonizations/test/rtensor.py b/bindings/pyroot/pythonizations/test/rtensor.py
+index 99b458cfa9..070a5d24d0 100644
+--- a/bindings/pyroot/pythonizations/test/rtensor.py
++++ b/bindings/pyroot/pythonizations/test/rtensor.py
+@@ -3,6 +3,7 @@ import ROOT
+ RTensor = ROOT.TMVA.Experimental.RTensor
+ import numpy as np
+ import platform
++import sys
+
+
+ def check_shape(root_obj, np_obj):
+@@ -28,8 +29,10 @@ class AsRTensor(unittest.TestCase):
+ """
+ Test adoption of numpy arrays with different data types
+ """
+- #using long long on Linux does not work although it is same size as long
+- if (platform.system() == "Windows") :
++ # Using long long on 64 bit Linux does not work although it is
++ # same size as long
++ if ((platform.system() == "Windows") or
++ ((platform.system() == "Linux") and (sys.maxsize < 2**32))) :
+ self.cpptypes[1] = "long long"
+ self.cpptypes[3] = "unsigned long long"
+
+--
+2.42.0
+
diff --git a/root-old-gtest.patch b/root-old-gtest.patch
new file mode 100644
index 0000000..bdefd48
--- /dev/null
+++ b/root-old-gtest.patch
@@ -0,0 +1,54 @@
+diff --git a/roofit/histfactory/test/testHistFactory.cxx b/roofit/histfactory/test/testHistFactory.cxx
+index 7553ba4e4a..fefdca8e97 100644
+--- a/roofit/histfactory/test/testHistFactory.cxx
++++ b/roofit/histfactory/test/testHistFactory.cxx
+@@ -752,6 +752,7 @@ std::string getNameFromInfo(testing::TestParamInfo<HFFixture::ParamType> const &
+ return getName(paramInfo.param, false);
+ }
+
++/*
+ INSTANTIATE_TEST_SUITE_P(
+ HistFactory, HFFixture,
+ testing::Combine(testing::Values(MakeModelMode::OverallSyst, MakeModelMode::HistoSyst, MakeModelMode::StatSyst,
+@@ -784,3 +785,4 @@ INSTANTIATE_TEST_SUITE_P(HistFactoryCodeGen, HFFixtureFit,
+ testing::Values(RooFit::EvalBackend::Codegen())),
+ getNameFromInfo);
+ #endif
++*/
+diff --git a/roofit/roofitcore/test/testRooProdPdf.cxx b/roofit/roofitcore/test/testRooProdPdf.cxx
+index 34fb559cd1..09734f5c5d 100644
+--- a/roofit/roofitcore/test/testRooProdPdf.cxx
++++ b/roofit/roofitcore/test/testRooProdPdf.cxx
+@@ -64,6 +64,7 @@ TEST_P(TestProdPdf, CachingOpt)
+ << "b=" << b.getVal() << " +- " << b.getError() << " doesn't match truth value with O" << _optimize << ".";
+ }
+
++/*
+ INSTANTIATE_TEST_SUITE_P(RooProdPdf, TestProdPdf,
+ testing::Combine(testing::Values(0, 1, 2),
+ testing::Values(ROOFIT_EVAL_BACKENDS)),
+@@ -72,6 +73,7 @@ INSTANTIATE_TEST_SUITE_P(RooProdPdf, TestProdPdf,
+ ss << "opt" << std::get<0>(paramInfo.param) << std::get<1>(paramInfo.param).name();
+ return ss.str();
+ });
++*/
+
+ TEST(RooProdPdf, TestGetPartIntList)
+ {
+diff --git a/roofit/roofitcore/test/testTestStatistics.cxx b/roofit/roofitcore/test/testTestStatistics.cxx
+index 3099d82060..5846353043 100644
+--- a/roofit/roofitcore/test/testTestStatistics.cxx
++++ b/roofit/roofitcore/test/testTestStatistics.cxx
+@@ -585,6 +585,7 @@ INSTANTIATE_TEST_SUITE_P(RooNLLVar, TestStatisticTest, testing::Values(ROOFIT_EV
+ return ss.str();
+ });
+
++/*
+ INSTANTIATE_TEST_SUITE_P(RooNLLVar, OffsetBinTest,
+ testing::Combine(testing::Values(ROOFIT_EVAL_BACKENDS), // EvalBackend
+ testing::Values(false, true), // unbinned or binned
+@@ -622,3 +623,4 @@ INSTANTIATE_TEST_SUITE_P(RooNLLVarBinnedL, OffsetBinTest,
+ ss << (std::get<5>(paramInfo.param) ? "BinnedL" : "");
+ return ss.str();
+ });
++*/
diff --git a/root-pcre2-6.28.patch b/root-pcre2-6.28.patch
deleted file mode 100644
index db907b5..0000000
--- a/root-pcre2-6.28.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -ur root-6.28.06.orig/core/base/CMakeLists.txt root-6.28.06/core/base/CMakeLists.txt
---- root-6.28.06.orig/core/base/CMakeLists.txt 2023-08-28 13:26:43.000000000 +0200
-+++ root-6.28.06/core/base/CMakeLists.txt 2023-10-02 01:53:35.956143717 +0200
-@@ -212,9 +212,15 @@
-
- ROOT_OBJECT_LIBRARY(Base ${BASE_SOURCES})
-
-+if (PCRE2_FOUND)
-+ set(PCRE_INCDIR ${PCRE2_INCLUDE_DIR})
-+else()
-+ set(PCRE_INCDIR ${PCRE_INCLUDE_DIR})
-+endif()
-+
- target_include_directories(Base PRIVATE
- ${BASE_V7_INC}
-- ${PCRE_INCLUDE_DIR}
-+ ${PCRE_INCDIR}
- res
- ${CMAKE_SOURCE_DIR}/core/foundation/res
- ${CMAKE_SOURCE_DIR}/core/clib/inc
-@@ -237,6 +243,11 @@
- ${CMAKE_BINARY_DIR}/ginclude/TApplicationCommandLineOptionsHelp.h
- )
-
-+if(PCRE2_FOUND)
-+ set_source_files_properties(src/TPRegexp.cxx
-+ PROPERTIES COMPILE_DEFINITIONS USE_PCRE2)
-+endif()
-+
- ROOT_INSTALL_HEADERS(${BASE_HEADER_DIRS})
-
- file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/man)
-diff -ur root-6.28.06.orig/core/CMakeLists.txt root-6.28.06/core/CMakeLists.txt
---- root-6.28.06.orig/core/CMakeLists.txt 2023-08-28 13:26:43.000000000 +0200
-+++ root-6.28.06/core/CMakeLists.txt 2023-10-02 01:47:00.134174041 +0200
-@@ -261,9 +261,15 @@
-
- target_include_directories(G__Core PRIVATE ${CMAKE_SOURCE_DIR}/core/clingutils/inc)
-
-+if (PCRE2_FOUND)
-+ set (PCRE_TGT PCRE2::PCRE2)
-+else()
-+ set (PCRE_TGT PCRE::PCRE)
-+endif()
-+
- target_link_libraries(Core
- PRIVATE
-- PCRE::PCRE
-+ ${PCRE_TGT}
- ${LIBLZMA_LIBRARIES}
- xxHash::xxHash
- LZ4::LZ4
diff --git a/root-pcre2.patch b/root-pcre2.patch
index 8d1adee..359acc2 100644
--- a/root-pcre2.patch
+++ b/root-pcre2.patch
@@ -165,6 +165,26 @@ index 464155fd50..252aa56737 100644
endif()
endif()
endif()
+diff --git a/core/base/CMakeLists.txt b/core/base/CMakeLists.txt
+index df701fedea..5798c93775 100644
+--- a/core/base/CMakeLists.txt
++++ b/core/base/CMakeLists.txt
+@@ -214,7 +214,14 @@ target_include_directories(Core PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/v7/inc>
+ )
+
+-target_link_libraries(Core PRIVATE PCRE::PCRE)
++if(PCRE2_FOUND)
++ target_link_libraries(Core PRIVATE PCRE2::PCRE2)
++ set_source_files_properties(src/TPRegexp.cxx
++ TARGET_DIRECTORY Core
++ PROPERTIES COMPILE_DEFINITIONS USE_PCRE2)
++else()
++ target_link_libraries(Core PRIVATE PCRE::PCRE)
++endif()
+
+ ROOT_INSTALL_HEADERS(${BASE_HEADER_DIRS})
+
diff --git a/core/base/src/TPRegexp.cxx b/core/base/src/TPRegexp.cxx
index 949b8cc8e9..d70f3e5b8b 100644
--- a/core/base/src/TPRegexp.cxx
diff --git a/root-stressvector-test-fails-on-ix86.patch b/root-stressvector-test-fails-on-ix86.patch
deleted file mode 100644
index fa519f2..0000000
--- a/root-stressvector-test-fails-on-ix86.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From aae37d7eceeb25e4a09e8504275083e6830832d6 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
-Date: Tue, 28 Feb 2023 11:33:28 +0100
-Subject: [PATCH] The stressVector test fails on ix86 due to too strict check:
-
-DeltaR TLorentzVector time = 0.2610929 (sec)
-DeltaR XYZTVector time = 0.22973299 (sec)
-DeltaR PtEtaPhiEVector time = 0.0016570091 (sec)
--12823.3585955796 -12823.35859557827 -12823.35859557827
-Test DeltaR failed !!
-
-The new value for the scale parameter (50) was calculated from the
-above values:
-
-root [2] (-12823.3585955796 - (-12823.35859557827)) / -12823.3585955796 / std::numeric_limits<double>::epsilon() / 10
-(double) 46.762663
----
- test/stressVector.cxx | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/test/stressVector.cxx b/test/stressVector.cxx
-index b0ba21e845..18dc97d421 100644
---- a/test/stressVector.cxx
-+++ b/test/stressVector.cxx
-@@ -540,8 +540,7 @@ int main(int argc,const char *argv[]) {
- s1=a.testDeltaR (v1, t, t1, "DeltaR TLorentzVector " );
- s2=a.testDeltaR (v2, t, t2, "DeltaR XYZTVector " );
- s3=a.testDeltaR (v3, t, t3, "DeltaR PtEtaPhiEVector " );
-- a.check("DeltaR",s1,s2,s3,20);
--
-+ a.check("DeltaR", s1, s2, s3, 50);
-
- int n1, n2, n3;
- n1 = a.testAnalysis (v1, t, t1, "Analysis1 TLorentzVector " );
---
-2.40.1
-
diff --git a/root-tmva-rbdt.patch b/root-tmva-rbdt.patch
index b7afb2d..b31769a 100644
--- a/root-tmva-rbdt.patch
+++ b/root-tmva-rbdt.patch
@@ -28,7 +28,7 @@ index ebe1be187b..5dcf5175f2 100644
+++ b/tmva/tmva/test/CMakeLists.txt
@@ -29,7 +29,7 @@ if(dataframe)
# Tree inference system and user interface
- if(NOT MSVC OR ${LLVM_VERSION} VERSION_LESS 13.0.0 OR llvm13_broken_tests)
+ if(NOT MSVC OR llvm13_broken_tests)
ROOT_ADD_GTEST(branchlessForest branchlessForest.cxx LIBRARIES TMVA)
- ROOT_ADD_GTEST(rbdt rbdt.cxx LIBRARIES ROOTVecOps TMVA)
+ ROOT_ADD_GTEST(rbdt rbdt.cxx LIBRARIES ROOTVecOps TMVAUtils)
diff --git a/root.spec b/root.spec
index 96f8888..547164c 100644
--- a/root.spec
+++ b/root.spec
@@ -7,13 +7,7 @@
%global python3_version_uscore %(tr . _ <<< "%{python3_version}")
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
-# Building the experimental ROOT 7 classes requires c++-17.
-# This is the default for gcc 11 and later.
%global root7 1
-%else
-%global root7 0
-%endif
%if %{?rhel}%{!?rhel:0} == 8
%ifarch %{power64}
@@ -33,26 +27,27 @@
%global tmvasofieparser 1
%endif
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
-# DistRDF requires Python 3.8+
-%global distrdf %{dataframe}
-%else
+%if %{?rhel}%{!?rhel:0} == 8
+# DistRDF requires Python 3.8 or later, RHEL 8 has version 3.6
%global distrdf 0
+%else
+%global distrdf %{dataframe}
%endif
-# qt6-srpm-macros not in buildroot for Fedora 37/38
-# https://bugzilla.redhat.com/show_bug.cgi?id=2220859
-%if %{?fedora}%{!?fedora:0} == 37 || %{?fedora}%{!?fedora:0} == 38
-%global qt6_qtwebengine_arches aarch64 x86_64
+%if %{?rhel}%{!?rhel:0} == 8
+# Requires nlohmann json version 3.9 or later, RHEL 8 has version 3.6
+%global bundlejson 1
+%else
+%global bundlejson 0
%endif
# Do not generate autoprovides for Python modules
%global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
Name: root
-Version: 6.28.08
+Version: 6.30.00
%global libversion %(cut -d. -f 1-2 <<< %{version})
-Release: 3%{?dist}
+Release: 1%{?dist}
Summary: Numerical data analysis framework
License: LGPL-2.1-or-later
@@ -98,30 +93,26 @@ Patch6: %{name}-fix-test-failure-on-ppc64le-and-aarch64-with-gcc-12.patch
Patch7: %{name}-big-endian-byte-swap.patch
# https://github.com/root-project/root/pull/12375
Patch8: %{name}-use-consistent-wording-in-tmva-test-comments.patch
-# https://github.com/root-project/root/pull/12390
-Patch9: %{name}-stressvector-test-fails-on-ix86.patch
-# https://github.com/root-project/root/pull/12423
-Patch10: %{name}-dont-install-roofit-files-fix.patch
-# https://github.com/root-project/root/issues/12427
-# https://github.com/root-project/root/pull/12468
-Patch11: %{name}-fixes-for-32bit-builds.patch
-# https://github.com/root-project/root/pull/12476
-Patch12: %{name}-do-not-remove-Wp-before-D-and-U.patch
-# Avoid boolean operators on numpy arrays in unit test
-# https://github.com/root-project/root/issues/12162
-# https://github.com/root-project/root/pull/13612
-Patch13: %{name}-boolean-numpy-array.patch
+# https://github.com/root-project/root/pull/10303
+Patch9: %{name}-ignore-warnings-about-RooNaNPacker-not-being-impleme.patch
# Port to pcre2
# https://github.com/root-project/root/issues/11395
# https://github.com/root-project/root/pull/13771
-Patch14: %{name}-pcre2.patch
-Patch15: %{name}-pcre2-6.28.patch
+Patch10: %{name}-pcre2.patch
# src/RBDT.cxx is a source file of both libTMVA and libTMVAUtils
# https://github.com/root-project/root/pull/13863
-Patch16: %{name}-tmva-rbdt.patch
+Patch11: %{name}-tmva-rbdt.patch
# Fix cmake/modules/FindZeroMQ.cmake
# https://github.com/root-project/root/pull/13995
-Patch17: %{name}-Fix-cmake-modules-FindZeroMQ.cmake.patch
+Patch12: %{name}-Fix-cmake-modules-FindZeroMQ.cmake.patch
+# https://github.com/root-project/root/pull/14111
+Patch13: %{name}-avoid-out-of-memory-during-linking.patch
+# https://github.com/root-project/root/pull/14112
+Patch14: %{name}-clad.patch
+Patch15: %{name}-gtest-back.patch
+Patch16: %{name}-np32.patch
+# Only for EPEL 8 - disable tests not working with old gtest
+Patch17: %{name}-old-gtest.patch
BuildRequires: gcc-c++
BuildRequires: gcc-gfortran
@@ -175,7 +166,6 @@ BuildRequires: dcap-devel
BuildRequires: xrootd-client-devel >= 1:5.0.0
BuildRequires: cfitsio-devel
BuildRequires: davix-devel >= 0.6.4
-BuildRequires: gfal2-devel
BuildRequires: R-Rcpp-devel
BuildRequires: R-RInside-devel
BuildRequires: readline-devel
@@ -192,7 +182,9 @@ BuildRequires: cmake-data >= 3.18.3-1
%else
BuildRequires: openblas-devel
%endif
-BuildRequires: json-devel
+%if ! %{bundlejson}
+BuildRequires: json-devel >= 3.9
+%endif
%if %{?fedora}%{!?fedora:0}
# Disable uring in EPEL 8 and 9 (liburing is available,
# but uring not supported by the kernel)
@@ -328,7 +320,11 @@ Requires: %{name}-tree-dataframe%{?_isa} = %{version}-%{release}
Requires: %{name}-tree-player%{?_isa} = %{version}-%{release}
Requires: %{name}-vecops%{?_isa} = %{version}-%{release}
# To resolve dependency in installed ROOTConfig.cmake
-Requires: json-devel
+%if %{bundlejson}
+Provides: bundled(json-devel) = 3.10.5
+%else
+Requires: json-devel >= 3.9
+%endif
# Fonts
Requires: xorg-x11-fonts-ISO8859-1-75dpi
Requires: font(freesans)
@@ -356,19 +352,9 @@ Obsoletes: %{name}-table < 6.18.00
Obsoletes: %{name}-memstat < 6.26.00
Obsoletes: %{name}-montecarlo-vmc < 6.26.00
Obsoletes: %{name}-doc < 6.26.00
+Obsoletes: %{name}-io-gfal < 6.30.00
+Obsoletes: %{name}-roofit-common < 6.30.00
%if %{?rhel}%{!?rhel:0} == 8
-# Obsolete the ROOT 7 packages in EPEL 8
-# Minimum C++ version changed from 14 to 17
-Obsoletes: %{name}-graf-gpadv7 < 6.26.00
-Obsoletes: %{name}-graf-primitives < 6.26.00
-Obsoletes: %{name}-graf3d-eve7 < 6.26.00
-Obsoletes: %{name}-gui-browsable < 6.26.00
-Obsoletes: %{name}-gui-browserv7 < 6.26.00
-Obsoletes: %{name}-gui-canvaspainter < 6.26.00
-Obsoletes: %{name}-gui-fitpanelv7 < 6.26.00
-Obsoletes: %{name}-histv7 < 6.26.00
-Obsoletes: %{name}-hist-draw < 6.26.00
-Obsoletes: %{name}-tree-ntuple < 6.26.00
# Obsolete the DistRDF package in EPEL 8
# Minimum Python version requirement introduced
Obsoletes: python%{python3_pkgversion}-distrdf < 6.26.00
@@ -910,14 +896,6 @@ Requires: %{name}-io%{?_isa} = %{version}-%{release}
%description io-dcache
This package contains the dCache extension for ROOT.
-%package io-gfal
-Summary: Grid File Access Library input/output library for ROOT
-Requires: %{name}-core%{?_isa} = %{version}-%{release}
-Requires: %{name}-io%{?_isa} = %{version}-%{release}
-
-%description io-gfal
-This package contains the Grid File Access Library extension for ROOT.
-
%package io-sql
Summary: SQL input/output library for ROOT
Requires: %{name}-core%{?_isa} = %{version}-%{release}
@@ -1208,7 +1186,7 @@ access to http based storage such as webdav and S3.
Summary: HTTP server extension for ROOT
Requires: %{name}-core%{?_isa} = %{version}-%{release}
Requires: %{name}-io%{?_isa} = %{version}-%{release}
-Requires: js-jsroot >= 7
+Requires: js-jsroot >= 7.5
# Library split (net-httpsniff from net-http)
Obsoletes: %{name}-net-http < 6.14.00
@@ -1336,26 +1314,6 @@ suitable for adoption in different disciplines as well.
This package contains the RooFit toolkit classes.
-%package roofit-common
-Summary: ROOT extension for modeling expected distributions - common
-License: BSD-2-Clause
-Requires: %{name}-core%{?_isa} = %{version}-%{release}
-
-%description roofit-common
-The RooFit packages provide a toolkit for modeling the expected
-distribution of events in a physics analysis. Models can be used to
-perform likelihood fits, produce plots, and generate "toy Monte
-Carlo" samples for various studies. The RooFit tools are integrated
-with the object-oriented and interactive ROOT graphical environment.
-
-RooFit has been developed for the BaBar collaboration, a high energy
-physics experiment at the Stanford Linear Accelerator Center, and is
-primarily targeted to the high-energy physicists using the ROOT
-analysis environment, but the general nature of the package make it
-suitable for adoption in different disciplines as well.
-
-This package contains the RooFit common classes.
-
%package roofit-core
Summary: ROOT extension for modeling expected distributions - core
License: BSD-2-Clause
@@ -1368,7 +1326,6 @@ Requires: %{name}-mathcore%{?_isa} = %{version}-%{release}
Requires: %{name}-matrix%{?_isa} = %{version}-%{release}
Requires: %{name}-minuit%{?_isa} = %{version}-%{release}
Requires: %{name}-roofit-batchcompute%{?_isa} = %{version}-%{release}
-Requires: %{name}-roofit-common%{?_isa} = %{version}-%{release}
Requires: %{name}-tree%{?_isa} = %{version}-%{release}
# Package split / Library split (from roofit)
Obsoletes: %{name}-roofit < 6.20.00
@@ -1502,7 +1459,6 @@ Summary: Multi-process support for RooFit
License: BSD-2-Clause
Requires: %{name}-core%{?_isa} = %{version}-%{release}
Requires: %{name}-hist%{?_isa} = %{version}-%{release}
-Requires: %{name}-roofit-common%{?_isa} = %{version}-%{release}
Requires: %{name}-roofit-zmq%{?_isa} = %{version}-%{release}
%description roofit-multiprocess
@@ -1552,6 +1508,39 @@ Requires: %{name}-roostats%{?_isa} = %{version}-%{release}
%description hist-factory
Create RooFit probability density functions from ROOT histograms.
+
+%package xroofit
+Summary: Extra tools for RooFit projects
+License: BSD-2-Clause
+Requires: %{name}-core%{?_isa} = %{version}-%{release}
+Requires: %{name}-graf%{?_isa} = %{version}-%{release}
+Requires: %{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires: %{name}-gui%{?_isa} = %{version}-%{release}
+Requires: %{name}-gui-ged%{?_isa} = %{version}-%{release}
+Requires: %{name}-hist%{?_isa} = %{version}-%{release}
+Requires: %{name}-hist-factory%{?_isa} = %{version}-%{release}
+Requires: %{name}-io%{?_isa} = %{version}-%{release}
+Requires: %{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires: %{name}-matrix%{?_isa} = %{version}-%{release}
+Requires: %{name}-roofit%{?_isa} = %{version}-%{release}
+Requires: %{name}-roofit-core%{?_isa} = %{version}-%{release}
+Requires: %{name}-roofit-hs3%{?_isa} = %{version}-%{release}
+Requires: %{name}-roostats%{?_isa} = %{version}-%{release}
+
+%description xroofit
+The RooFit packages provide a toolkit for modeling the expected
+distribution of events in a physics analysis. Models can be used to
+perform likelihood fits, produce plots, and generate "toy Monte
+Carlo" samples for various studies. The RooFit tools are integrated
+with the object-oriented and interactive ROOT graphical environment.
+
+RooFit has been developed for the BaBar collaboration, a high energy
+physics experiment at the Stanford Linear Accelerator Center, and is
+primarily targeted to the high-energy physicists using the ROOT
+analysis environment, but the general nature of the package make it
+suitable for adoption in different disciplines as well.
+
+This package contains extra tools for RooFit projects.
%endif
%package sql-mysql
@@ -1809,7 +1798,7 @@ written in python.
Summary: Static files for the Jupyter ROOT Notebook
BuildArch: noarch
Requires: %{name}-core = %{version}-%{release}
-Requires: js-jsroot >= 7
+Requires: js-jsroot >= 7.5
%if %{?fedora}%{!?fedora:0}
# jupyter-notebook not available in RHEL/EPEL
# some functionality missing
@@ -1993,41 +1982,6 @@ Requires: %{name}-tree-ntuple%{?_isa} = %{version}-%{release}
%description tree-ntuple-utils
This package contains utility functions for ntuples.
-
-%if %{roofit}
-%package xroofit
-Summary: Extra tools for RooFit projects
-License: BSD-2-Clause
-Requires: %{name}-core%{?_isa} = %{version}-%{release}
-Requires: %{name}-graf%{?_isa} = %{version}-%{release}
-Requires: %{name}-graf-gpad%{?_isa} = %{version}-%{release}
-Requires: %{name}-gui%{?_isa} = %{version}-%{release}
-Requires: %{name}-gui-ged%{?_isa} = %{version}-%{release}
-Requires: %{name}-hist%{?_isa} = %{version}-%{release}
-Requires: %{name}-hist-factory%{?_isa} = %{version}-%{release}
-Requires: %{name}-io%{?_isa} = %{version}-%{release}
-Requires: %{name}-mathcore%{?_isa} = %{version}-%{release}
-Requires: %{name}-matrix%{?_isa} = %{version}-%{release}
-Requires: %{name}-roofit%{?_isa} = %{version}-%{release}
-Requires: %{name}-roofit-core%{?_isa} = %{version}-%{release}
-Requires: %{name}-roofit-hs3%{?_isa} = %{version}-%{release}
-Requires: %{name}-roostats%{?_isa} = %{version}-%{release}
-
-%description xroofit
-The RooFit packages provide a toolkit for modeling the expected
-distribution of events in a physics analysis. Models can be used to
-perform likelihood fits, produce plots, and generate "toy Monte
-Carlo" samples for various studies. The RooFit tools are integrated
-with the object-oriented and interactive ROOT graphical environment.
-
-RooFit has been developed for the BaBar collaboration, a high energy
-physics experiment at the Stanford Linear Accelerator Center, and is
-primarily targeted to the high-energy physicists using the ROOT
-analysis environment, but the general nature of the package make it
-suitable for adoption in different disciplines as well.
-
-This package contains extra tools for RooFit projects.
-%endif
%endif
%prep
@@ -2050,7 +2004,9 @@ This package contains extra tools for RooFit projects.
%patch -P 14 -p1
%patch -P 15 -p1
%patch -P 16 -p1
+%if %{?rhel}%{!?rhel:0} == 8
%patch -P 17 -p1
+%endif
# Remove bundled sources in order to be sure they are not used
# * afterimage
@@ -2063,7 +2019,9 @@ rm -rf graf2d/freetype/src
rm -rf builtins/davix
rm -rf builtins/glew
rm -rf builtins/lz4
+%if ! %{bundlejson}
rm -rf builtins/nlohmann
+%endif
rm -rf builtins/openssl
rm -rf builtins/pcre
rm -rf builtins/tbb
@@ -2073,17 +2031,15 @@ rm -rf builtins/zeromq
rm -rf builtins/zlib
rm -rf builtins/zstd
# * lzma
-rm -rf core/lzma/src/*.tar.gz
+rm core/lzma/src/*.tar.gz
# * gl2ps
rm graf3d/gl/src/gl2ps.cxx graf3d/gl/src/gl2ps/gl2ps.h
# * unuran
-rm -rf math/unuran/src/*.tar.gz
+rm math/unuran/src/*.tar.gz
# * xrootd-private-devel headers
rm -rf proof/xrdinc/*
# * x11 extension headers
rm -rf graf2d/x11/inc/X11
-# * mathjax
-rm -rf documentation/doxygen/mathjax.tar.gz
# * jsroot
rm -rf js/[^f]* js/files/draw.htm js/files/online.htm
@@ -2091,12 +2047,6 @@ rm -rf js/[^f]* js/files/draw.htm js/files/online.htm
rm etc/notebook/JsMVA/js/*.min.js
rm etc/notebook/JsMVA/css/*.min.css
-%if %{?rhel}%{!?rhel:0} == 8
-# Allow older json on EPEL 8
-sed 's!nlohmann_json 3.9!nlohmann_json 3.6!' \
- -i cmake/modules/SearchInstalledSoftware.cmake
-%endif
-
%build
# This package triggers a fault in LLVM when LTO is enabled. Until LLVM
# is analyzed and fixed, disable LTO
@@ -2142,7 +2092,11 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
-Dbuiltin_llvm:BOOL=ON \
-Dbuiltin_lz4:BOOL=OFF \
-Dbuiltin_lzma:BOOL=OFF \
+%if %{bundlejson}
+ -Dbuiltin_nlohmannjson:BOOL=ON \
+%else
-Dbuiltin_nlohmannjson:BOOL=OFF \
+%endif
-Dbuiltin_openssl:BOOL=OFF \
-Dbuiltin_openui5:BOOL=ON \
-Dbuiltin_pcre:BOOL=OFF \
@@ -2156,7 +2110,6 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
-Dbuiltin_zeromq:BOOL=OFF \
-Dbuiltin_zlib:BOOL=OFF \
-Dbuiltin_zstd:BOOL=OFF \
- -Dalien:BOOL=OFF \
%ifnarch %{ix86} %{arm}
-Darrow:BOOL=ON \
%else
@@ -2186,12 +2139,9 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
-Dfitsio:BOOL=ON \
-Dfortran:BOOL=ON \
-Dgdml:BOOL=ON \
- -Dgfal:BOOL=ON \
- -Dgsl_shared:BOOL=ON \
-Dgviz:BOOL=ON \
-Dhttp:BOOL=ON \
-Dimt:BOOL=ON \
- -Djemalloc:BOOL=OFF \
-Dlibcxx:BOOL=OFF \
-Dmathmore:BOOL=ON \
-Dmemory_termination:BOOL=OFF \
@@ -2199,17 +2149,17 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
-Dminuit2_mpi:BOOL=OFF \
-Dminuit2_omp:BOOL=OFF \
-Dmlp:BOOL=ON \
- -Dmonalisa:BOOL=OFF \
-Dmpi:BOOL=OFF \
-Dmysql:BOOL=ON \
-Dodbc:BOOL=ON \
-Dopengl:BOOL=ON \
-Doracle:BOOL=OFF \
-Dpgsql:BOOL=ON \
+ -Dproof:BOOL=ON \
+ -Dpyroot:BOOL=ON \
+ -Dpyroot-python2:BOOL=OFF \
-Dpythia6:BOOL=OFF \
-Dpythia8:BOOL=ON \
- -Dpyroot:BOOL=ON \
- -Dpyroot_legacy:BOOL=OFF \
%ifarch %{qt5_qtwebengine_arches}
-Dqt5web:BOOL=ON \
%else
@@ -2247,7 +2197,6 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
-Dspectrum:BOOL=ON \
-Dsqlite:BOOL=ON \
-Dssl:BOOL=ON \
- -Dtcmalloc:BOOL=OFF \
-Dtmva:BOOL=ON \
-Dtmva-cpu:BOOL=ON \
-Dtmva-gpu:BOOL=OFF \
@@ -2258,6 +2207,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
%else
-Dtmva-sofie:BOOL=OFF \
%endif
+ -Dunfold:BOOL=ON \
-Dunuran:BOOL=ON \
%if %{?fedora}%{!?fedora:0}
-During:BOOL=ON \
@@ -2272,7 +2222,6 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
-Dx11:BOOL=ON \
-Dxml:BOOL=ON \
-Dxrootd:BOOL=ON \
- -Dxproofd:BOOL=OFF \
-Dfail-on-missing:BOOL=ON \
-Dtesting:BOOL=ON \
-Dtest_distrdf_pyspark:BOOL=OFF \
@@ -2414,6 +2363,8 @@ sed -e 's!/usr/bin/env python!%{__python3}!' \
%{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/GenerateModel.py \
%{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/MulticlassKeras.py \
%{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/RegressionKeras.py
+sed -e 's!/usr/bin/python!%{__python3}!' \
+ -i %{buildroot}%{_datadir}/%{name}/pdg_table_update.py
# Remove some junk
rm %{buildroot}%{_datadir}/%{name}/proof/*.sample
@@ -2422,7 +2373,6 @@ rm %{buildroot}%{_datadir}/%{name}/root.desktop
rm %{buildroot}%{_bindir}/setxrd*
rm %{buildroot}%{_bindir}/thisroot*
rm %{buildroot}%{_pkgdocdir}/INSTALL
-rm %{buildroot}%{_pkgdocdir}/README.ALIEN
rm %{buildroot}%{_pkgdocdir}/README.CXXMODULES.md
rm %{buildroot}%{_pkgdocdir}/README.MONALISA
@@ -2434,16 +2384,13 @@ pushd %{buildroot}%{_datadir}/%{name}/plugins
%if ! %{root7}
rm TBrowserImp/P030_RWebBrowserImp.C
%endif
-rm TDataSetManager/P020_TDataSetManagerAliEn.C
-rm TFile/P070_TAlienFile.C
+rm TFile/P050_TGFALFile.C
rm TGLManager/P020_TGWin32GLManager.C
rm TGLManager/P030_TGOSXGLManager.C
-rm TGrid/P010_TAlien.C
rm TProofMgr/P010_TXProofMgr.C
rm TProofServ/P010_TXProofServ.C
rm TSlave/P010_TXSlave.C
rm TSQLServer/P040_TOracleServer.C
-rm TSystem/P030_TAlienSystem.C
rm TVirtualGeoConverter/P010_TGeoVGConverter.C
%if ! %{root7}
rm TVirtualGeoPainter/P020_RGeoPainter.C
@@ -2452,7 +2399,6 @@ rm TVirtualGLImp/P020_TGWin32GL.C
rm TVirtualMonitoringWriter/P010_TMonaLisaWriter.C
rm TVirtualX/P030_TGWin32.C
rm TVirtualX/P050_TGQuartz.C
-rmdir TGrid
rmdir TProofMgr
rmdir TProofServ
rmdir TSlave
@@ -2460,7 +2406,7 @@ rmdir TVirtualGeoConverter
popd
# Replace bundled jsroot with symlinks to system version
-for x in build img modules scripts files/draw.htm files/online.htm ; do
+for x in build img mathjax modules scripts files/draw.htm files/online.htm ; do
ln -nrs %{buildroot}%{_jsdir}/jsroot/$x \
%{buildroot}%{_datadir}/%{name}/js/$x
done
@@ -2481,13 +2427,8 @@ If this target is not used this warning can be ignored.")' \
-e '/Possible reasons include/,/)/d' \
-i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets.cmake
-# Rename to avoid name clashes
-cp -p interpreter/llvm/src/CREDITS.TXT interpreter/llvm/src/llvm-CREDITS.TXT
-cp -p interpreter/llvm/src/LICENSE.TXT interpreter/llvm/src/llvm-LICENSE.TXT
-cp -p interpreter/llvm/src/README.txt interpreter/llvm/src/llvm-README.txt
-
# Create includelist files ...
-for f in `find %{_vpath_builddir} -name cmake_install.cmake -a '!' -path '*/llvm/*'` ; do
+for f in `find %{_vpath_builddir} -name cmake_install.cmake -a '!' -path '*/llvm-project/*'` ; do
l=`sed 's!%{_vpath_builddir}/\(.*\)/cmake_install.cmake!includelist-\1!' <<< $f`
l=`tr / - <<< $l`
tmpdir=`mktemp -d`
@@ -2518,6 +2459,9 @@ for x in df014_CsvDataSource_MuRun2010B_cpp.csv \
ln -sf ../../files/tutorials/df014_CsvDataSource_MuRun2010B.csv $x
done
popd
+pushd tmva/tmva/test
+ln -s ../../../../files files
+popd
pushd tmva/tmva/test/DNN
ln -s ../../../../../files files
popd
@@ -2558,7 +2502,7 @@ popd
#
# - tutorial-dataframe-df104_HiggsToTwoPhotons-py
# - tutorial-dataframe-df105_WBosonAnalysis-py
-# - tutorial-dataframe-df106_HiggsToFourLeptons-py
+# - tutorial-dataframe-df106_HiggsToFourLeptons(-py)
# - tutorial-dataframe-df107_SingleTopAnalysis-py
# - tutorial-rcanvas-df104-py
# - tutorial-rcanvas-df105-py
@@ -2577,6 +2521,10 @@ popd
# reads input data over network
# http://root.cern.ch/files/NanoAOD_DoubleMuon_CMS2011OpenData.root (1.5 GB)
#
+# - tutorial-v7-ntuple-ntpl008_import
+# reads input data over network
+# http://root.cern.ch/files/HiggsTauTauReduced/GluGluToHToTauTau.root (20 MB)
+#
# - gtest-net-davix-test-RRawFileDavix
# reads input file over network
# http://root.cern.ch/files/davix.test
@@ -2585,6 +2533,10 @@ popd
# reads input file over network
# root://eospublic.cern.ch/eos/root-eos/xrootd.test
#
+# - gtest-net-netxng-test-TNetXNGFileTest
+# reads input file over network
+# root://eospublic.cern.ch/eos/root-eos/h1/dstarmb.root
+#
# - gtest-tmva-tmva-test-rreader
# - gtest-tmva-tmva-test-rstandardscaler
# - tutorial-tmva-tmva003_RReader
@@ -2596,6 +2548,10 @@ popd
# reads input data over network
# http://root.cern/files/tmva101.root
#
+# - tutorial-tmva-RBatchGenerator_NumPy-py
+# reads input data over network
+# http://root.cern/files/Higgs_data.root
+#
# - test-import-numba
# - tutorial-pyroot-pyroot004_NumbaDeclare-py
# these tests require the numba python module which is not available
@@ -2618,20 +2574,23 @@ gtest-tree-treeplayer-test-treeprocessormt-remotefiles|\
tutorial-dataframe-df103_NanoAODHiggsAnalysis|\
tutorial-dataframe-df104_HiggsToTwoPhotons-py|\
tutorial-dataframe-df105_WBosonAnalysis-py|\
-tutorial-dataframe-df106_HiggsToFourLeptons-py|\
+tutorial-dataframe-df106_HiggsToFourLeptons|\
tutorial-dataframe-df107_SingleTopAnalysis-py|\
tutorial-rcanvas-df104-py|\
tutorial-rcanvas-df105-py|\
tutorial-v7-global_temperatures.cxx|\
tutorial-v7-ntuple-ntpl003_lhcbOpenData|\
tutorial-v7-ntuple-ntpl004_dimuon|\
+tutorial-v7-ntuple-ntpl008_import|\
gtest-net-davix-test-RRawFileDavix|\
gtest-net-netxng-test-RRawFileNetXNG|\
+gtest-net-netxng-test-TNetXNGFileTest|\
gtest-tmva-tmva-test-rreader|\
gtest-tmva-tmva-test-rstandardscaler|\
tutorial-tmva-tmva003_RReader|\
tutorial-tmva-tmva004_RStandardScaler|\
tutorial-tmva-tmva103_Application|\
+tutorial-tmva-RBatchGenerator_NumPy-py|\
test-import-numba|\
tutorial-pyroot-pyroot004_NumbaDeclare-py|\
test-webgui-ping"
@@ -2647,12 +2606,18 @@ tutorial-dataframe-df026_AsNumpyArrays-py|\
tutorial-roofit-rf409_NumPyPandasToRooFit-py"
%endif
+%ifarch %{ix86}
+# - gtest-tree-dataframe-test-dataframe-concurrency
+# "There's already an active task arena."
+excluded="${excluded}|\
+gtest-tree-dataframe-test-dataframe-concurrency"
+%endif
+
%ifarch %{power64}
# PPC64LE specific failures
# - test-stresshistofit-interpreted
# - test-stresshistogram-interpreted
# - test-stressmathcore-interpreted
-# - test-stressroostats-interpreted
#
# Always timeout (hang?)
# - test-stressinterpreter
@@ -2661,7 +2626,6 @@ excluded="${excluded}|\
test-stresshistofit-interpreted|\
test-stresshistogram-interpreted|\
test-stressmathcore-interpreted|\
-test-stressroostats-interpreted|\
test-stressinterpreter|\
tutorial-unuran-unuranFoamTest"
@@ -2675,7 +2639,6 @@ tutorial-unuran-unuranFoamTest"
# - pyunittests-pyroot-import-load-libs
#
# - tutorial-fit-combinedFit(-py)
-# - tutorial-fit-exampleFit3D
# - tutorial-fit-fit2dHist
# - tutorial-fit-fitCircle
# - tutorial-fit-line3Dfit
@@ -2686,10 +2649,17 @@ tutorial-unuran-unuranFoamTest"
# - tutorial-multicore-mtbb001_fillHistos
# - tutorial-multicore-mtbb101_fillNtuples
# - tutorial-multicore-mtbb201_parallelHistoFill
+# - tutorial-rcanvas-*
+# - tutorial-v7-concurrentfill.cxx
+# - tutorial-v7-ntuple-ntpl001_staff
+# - tutorial-v7-ntuple-ntpl002_vector
+# - tutorial-v7-ntuple-ntpl005_introspection
+# - tutorial-v7-ntuple-ntpl006_friends
+# - tutorial-v7-ntuple-ntpl007_mtFill
+# - tutorial-v7-simple.cxx
excluded="${excluded}|\
pyunittests-pyroot-import-load-libs|\
tutorial-fit-combinedFit|\
-tutorial-fit-exampleFit3D|\
tutorial-fit-fit2dHist|\
tutorial-fit-fitCircle|\
tutorial-fit-line3Dfit|\
@@ -2699,32 +2669,64 @@ tutorial-multicore-mt201_parallelHistoFill|\
tutorial-multicore-mt304_fillHistos|\
tutorial-multicore-mtbb001_fillHistos|\
tutorial-multicore-mtbb101_fillNtuples|\
-tutorial-multicore-mtbb201_parallelHistoFill"
+tutorial-multicore-mtbb201_parallelHistoFill|\
+tutorial-rcanvas|\
+tutorial-v7-concurrentfill.cxx|\
+tutorial-v7-ntuple-ntpl001_staff|\
+tutorial-v7-ntuple-ntpl002_vector|\
+tutorial-v7-ntuple-ntpl005_introspection|\
+tutorial-v7-ntuple-ntpl006_friends|\
+tutorial-v7-ntuple-ntpl007_mtFill|\
+tutorial-v7-simple.cxx"
%endif
%endif
%ifarch s390x
# - gtest-roofit-roofitcore-test-testNaNPacker
-# - tutorial-roofit-rf612_recoverFromInvalidParameters
# Uses "Packed NaN" feature, not implemented for big endian.
excluded="${excluded}|\
-gtest-roofit-roofitcore-test-testNaNPacker|\
-tutorial-roofit-rf612_recoverFromInvalidParameters"
+gtest-roofit-roofitcore-test-testNaNPacker"
+# - gtest-core-base-test-CoreBaseTests
+# - gtest-core-dictgen-test-dictgen-base
+# - gtest-core-meta-test-testTDataType
+#
+# - gtest-tree-dataframe-test-datasource-ntuple
# - gtest-tree-ntuple-v7-test-ntuple-basics
+# - gtest-tree-ntuple-v7-test-ntuple-bulk
# - gtest-tree-ntuple-v7-test-ntuple-endian
# - gtest-tree-ntuple-v7-test-ntuple-extended
+# - gtest-tree-ntuple-v7-test-ntuple-friends
# - gtest-tree-ntuple-v7-test-ntuple-minifile
-# - gtest-tree-ntuple-v7-test-ntuple-rdf
+# - gtest-tree-ntuple-v7-test-ntuple-modelext
+# - gtest-tree-ntuple-v7-test-ntuple-packing
+# - gtest-tree-ntuple-v7-test-ntuple-project
# - gtest-tree-ntuple-v7-test-ntuple-serialize
+# - gtest-tree-ntuple-v7-test-ntuple-show
+# - gtest-tree-ntuple-v7-test-ntuple-storage
+# - gtest-tree-ntuple-v7-test-ntuple-storage-daos
# - gtest-tree-ntuple-v7-test-ntuple-types
+# - gtest-tree-ntuple-v7-test-ntuple-view
+# - gtest-tree-ntuple-v7-test-rfield-vector
+# - gtest-tree-ntupleutil-v7-test-ntuple-importer
+# - gtest-tree-ntupleutil-v7-test-ntuple-inspector
# https://github.com/root-project/root/issues/12426
#
+# - pyunittests-distrdf-unit-backend-test-graph-caching
# - pyunittests-pyroot-pyz-rtensor
# - pyunittests-pyroot-pyz-stl-vector
# - tutorial-dataframe-df006_ranges-py
# - tutorial-fit-combinedFit-py
+# - tutorial-fit-fitcont
+# - tutorial-fit-NumericalMinimization-py
# - tutorial-math-exampleFunction-py
+# - tutorial-rcanvas-rbox-py
+# - tutorial-roofit-rf108_plotbinning-py
+# - tutorial-roofit-rf306_condpereventerrors-py
+# - tutorial-roofit-rf307_fullpereventerrors-py
+# - tutorial-roofit-rf310_sliceplot-py
+# - tutorial-roofit-rf708_bphysics-py
+# - tutorial-tmva-RBatchGenerator_filters_vectors-py
# - tutorial-tmva-TMVA_CNN_Classification-py
# - tutorial-tmva-TMVA_Higgs_Classification-py
# - tutorial-tmva-TMVA_RNN_Classification-py
@@ -2738,18 +2740,43 @@ tutorial-roofit-rf612_recoverFromInvalidParameters"
# - test-stresshistogram
# - test-stresshistogram-interpreted
excluded="${excluded}|\
+gtest-core-base-test-CoreBaseTests|\
+gtest-core-dictgen-test-dictgen-base|\
+gtest-core-meta-test-testTDataType|\
+gtest-tree-dataframe-test-datasource-ntuple|\
gtest-tree-ntuple-v7-test-ntuple-basics|\
+gtest-tree-ntuple-v7-test-ntuple-bulk|\
gtest-tree-ntuple-v7-test-ntuple-endian|\
gtest-tree-ntuple-v7-test-ntuple-extended|\
+gtest-tree-ntuple-v7-test-ntuple-friends|\
gtest-tree-ntuple-v7-test-ntuple-minifile|\
-gtest-tree-ntuple-v7-test-ntuple-rdf|\
+gtest-tree-ntuple-v7-test-ntuple-modelext|\
+gtest-tree-ntuple-v7-test-ntuple-packing|\
+gtest-tree-ntuple-v7-test-ntuple-project|\
gtest-tree-ntuple-v7-test-ntuple-serialize|\
+gtest-tree-ntuple-v7-test-ntuple-show|\
+gtest-tree-ntuple-v7-test-ntuple-storage|\
+gtest-tree-ntuple-v7-test-ntuple-storage-daos|\
gtest-tree-ntuple-v7-test-ntuple-types|\
+gtest-tree-ntuple-v7-test-ntuple-view|\
+gtest-tree-ntuple-v7-test-rfield-vector|\
+gtest-tree-ntupleutil-v7-test-ntuple-importer|\
+gtest-tree-ntupleutil-v7-test-ntuple-inspector|\
+pyunittests-distrdf-unit-backend-test-graph-caching|\
pyunittests-pyroot-pyz-rtensor|\
pyunittests-pyroot-pyz-stl-vector|\
tutorial-dataframe-df006_ranges-py|\
tutorial-fit-combinedFit-py|\
+tutorial-fit-fitcont|\
+tutorial-fit-NumericalMinimization-py|\
tutorial-math-exampleFunction-py|\
+tutorial-rcanvas-rbox-py|\
+tutorial-roofit-rf108_plotbinning-py|\
+tutorial-roofit-rf306_condpereventerrors-py|\
+tutorial-roofit-rf307_fullpereventerrors-py|\
+tutorial-roofit-rf310_sliceplot-py|\
+tutorial-roofit-rf708_bphysics-py|\
+tutorial-tmva-RBatchGenerator_filters_vectors-py|\
tutorial-tmva-TMVA_CNN_Classification-py|\
tutorial-tmva-TMVA_Higgs_Classification-py|\
tutorial-tmva-TMVA_RNN_Classification-py|\
@@ -2776,7 +2803,14 @@ test-stressgraphics"
# Filter out parts of tests that require remote network access
# RNTuple.TClassEBO seg fault
# https://github.com/root-project/root/issues/12428
-GTEST_FILTER=-RCsvDS.Remote:RRawFile.Remote:RSqliteDS.Davix:TFile.ReadWithoutGlobalRegistrationWeb:TFile.ReadWithoutGlobalRegistrationNet:RNTuple.TClassEBO \
+GTEST_FILTER=-\
+RCsvDS.Remote:\
+RRawFile.Remote:\
+RSqliteDS.Davix:\
+TChainParsing.RemoteGlob:\
+TFile.ReadWithoutGlobalRegistrationNet:\
+TFile.ReadWithoutGlobalRegistrationWeb:\
+RNTuple.TClassEBO \
%if ! ( %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 8 )
ROOTTEST_IGNORE_PANDAS_PY3=1 \
%endif
@@ -2795,12 +2829,9 @@ end
%post net-http
# Replace bundled jsroot with symlinks to system version
-for x in build img modules scripts files/draw.htm files/online.htm ; do
+for x in build img mathjax modules scripts files/draw.htm files/online.htm ; do
ln -fnrs %{_jsdir}/jsroot/$x %{_datadir}/%{name}/js/$x
done
-%{?ldconfig}
-
-%ldconfig_postun net-http
%pre -n python%{python3_pkgversion}-%{name}
if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
@@ -2851,143 +2882,6 @@ fi
%post core -p /sbin/ldconfig
%postun core -p /sbin/ldconfig
-%ldconfig_scriptlets multiproc
-%ldconfig_scriptlets cling
-%ldconfig_scriptlets tpython
-%ldconfig_scriptlets -n python%{python3_pkgversion}-%{name}
-%ldconfig_scriptlets r
-%ldconfig_scriptlets r-tools
-%ldconfig_scriptlets genetic
-%ldconfig_scriptlets geom
-%ldconfig_scriptlets geom-builder
-%ldconfig_scriptlets geom-painter
-%ldconfig_scriptlets gdml
-%ldconfig_scriptlets graf
-%ldconfig_scriptlets graf-asimage
-%ldconfig_scriptlets graf-fitsio
-%ldconfig_scriptlets graf-gpad
-%ldconfig_scriptlets graf-gviz
-%ldconfig_scriptlets graf-postscript
-%ldconfig_scriptlets graf-x11
-%ldconfig_scriptlets graf3d
-%ldconfig_scriptlets graf3d-csg
-%ldconfig_scriptlets graf3d-eve
-%ldconfig_scriptlets graf3d-gl
-%ldconfig_scriptlets graf3d-gviz3d
-%ldconfig_scriptlets graf3d-x3d
-%ldconfig_scriptlets gui
-%ldconfig_scriptlets gui-html
-%ldconfig_scriptlets gui-fitpanel
-%ldconfig_scriptlets gui-ged
-%ldconfig_scriptlets gui-builder
-%ldconfig_scriptlets gui-recorder
-%ldconfig_scriptlets hbook
-%ldconfig_scriptlets hist
-%ldconfig_scriptlets hist-painter
-%ldconfig_scriptlets spectrum
-%ldconfig_scriptlets spectrum-painter
-%ldconfig_scriptlets html
-%ldconfig_scriptlets io
-%ldconfig_scriptlets io-dcache
-%ldconfig_scriptlets io-gfal
-%ldconfig_scriptlets io-sql
-%ldconfig_scriptlets io-xml
-%ldconfig_scriptlets io-xmlparser
-%ldconfig_scriptlets foam
-%ldconfig_scriptlets fftw
-%ldconfig_scriptlets fumili
-%ldconfig_scriptlets genvector
-%ldconfig_scriptlets mathcore
-%ldconfig_scriptlets mathmore
-%ldconfig_scriptlets matrix
-%ldconfig_scriptlets minuit
-%ldconfig_scriptlets minuit2
-%ldconfig_scriptlets mlp
-%ldconfig_scriptlets physics
-%ldconfig_scriptlets quadp
-%ldconfig_scriptlets smatrix
-%ldconfig_scriptlets splot
-%ldconfig_scriptlets unuran
-%ldconfig_scriptlets vecops
-%ldconfig_scriptlets montecarlo-eg
-%ldconfig_scriptlets montecarlo-pythia8
-%ldconfig_scriptlets net
-%ldconfig_scriptlets net-rpdutils
-%ldconfig_scriptlets net-auth
-%ldconfig_scriptlets net-davix
-%ldconfig_scriptlets net-httpsniff
-%ldconfig_scriptlets netx
-%ldconfig_scriptlets proof
-%ldconfig_scriptlets proof-bench
-%ldconfig_scriptlets proof-player
-%ldconfig_scriptlets proof-sessionviewer
-%if %{roofit}
-%ldconfig_scriptlets roofit
-%ldconfig_scriptlets roofit-common
-%ldconfig_scriptlets roofit-core
-%ldconfig_scriptlets roofit-more
-%ldconfig_scriptlets roofit-batchcompute
-%if %{dataframe}
-%ldconfig_scriptlets roofit-dataframe-helpers
-%endif
-%ldconfig_scriptlets roofit-hs3
-%ldconfig_scriptlets roofit-jsoninterface
-%if %{?fedora}%{!?fedora:0} >= 40
-%ldconfig_scriptlets roofit-multiprocess
-%ldconfig_scriptlets roofit-zmq
-%endif
-%ldconfig_scriptlets roostats
-%ldconfig_scriptlets hist-factory
-%endif
-%ldconfig_scriptlets sql-mysql
-%ldconfig_scriptlets sql-odbc
-%ldconfig_scriptlets sql-sqlite
-%ldconfig_scriptlets sql-pgsql
-%ldconfig_scriptlets tmva
-%if %{dataframe}
-%ldconfig_scriptlets tmva-utils
-%endif
-%ldconfig_scriptlets tmva-python
-%ldconfig_scriptlets tmva-r
-%ldconfig_scriptlets tmva-sofie
-%if %{tmvasofieparser}
-%ldconfig_scriptlets tmva-sofie-parser
-%endif
-%ldconfig_scriptlets tmva-gui
-%ldconfig_scriptlets tree
-%if %{dataframe}
-%ldconfig_scriptlets tree-dataframe
-%endif
-%ldconfig_scriptlets tree-player
-%ldconfig_scriptlets tree-viewer
-%ldconfig_scriptlets tree-webviewer
-%ldconfig_scriptlets unfold
-%ldconfig_scriptlets gui-webdisplay
-%ifarch %{qt5_qtwebengine_arches}
-%ldconfig_scriptlets gui-qt5webdisplay
-%endif
-%ifarch %{qt6_qtwebengine_arches}
-%ldconfig_scriptlets gui-qt6webdisplay
-%endif
-%ldconfig_scriptlets gui-webgui6
-%if %{root7}
-%ldconfig_scriptlets geom-webviewer
-%ldconfig_scriptlets graf-gpadv7
-%ldconfig_scriptlets graf-primitives
-%ldconfig_scriptlets graf3d-eve7
-%ldconfig_scriptlets gui-browsable
-%ldconfig_scriptlets gui-browserv7
-%ldconfig_scriptlets gui-canvaspainter
-%ldconfig_scriptlets gui-fitpanelv7
-%ldconfig_scriptlets histv7
-%ldconfig_scriptlets hist-draw
-%ldconfig_scriptlets tree-ntuple
-%ldconfig_scriptlets tree-ntuple-utils
-%if %{roofit}
-%ldconfig_scriptlets xroofit
-%endif
-%endif
-
%files
%{_bindir}/hadd
%{_bindir}/root
@@ -3055,9 +2949,13 @@ fi
%dir %{_datadir}/%{name}/plugins
%dir %{_datadir}/%{name}/plugins/*
%dir %{_includedir}/%{name}
+%if %{bundlejson}
+%dir %{_includedir}/%{name}/nlohmann
+%{_includedir}/%{name}/nlohmann/json.hpp
+%{_includedir}/%{name}/nlohmann/json_fwd.hpp
+%endif
%{_includedir}/%{name}/RConfigOptions.h
%{_includedir}/%{name}/RConfigure.h
-%{_includedir}/%{name}/RGitCommit.h
%{_includedir}/%{name}/compiledata.h
%{_includedir}/%{name}/module.modulemap
%dir %{_includedir}/%{name}/Math
@@ -3086,13 +2984,10 @@ fi
%doc interpreter/cling/CREDITS.txt
%doc interpreter/cling/README.md
%license interpreter/cling/LICENSE.TXT
-%doc interpreter/llvm/src/llvm-CREDITS.TXT
-%doc interpreter/llvm/src/llvm-README.txt
-%license interpreter/llvm/src/llvm-LICENSE.TXT
%files testsupport
%{_includedir}/%{name}/ROOT/TestSupport.hxx
-%{_libdir}/%{name}/libTestSupport.a
+%{_libdir}/%{name}/TestSupport
%doc core/testsupport/README.md
%files tpython -f includelist-bindings-tpython
@@ -3314,11 +3209,6 @@ fi
%{_datadir}/%{name}/plugins/TFile/P040_TDCacheFile.C
%{_datadir}/%{name}/plugins/TSystem/P020_TDCacheSystem.C
-%files io-gfal -f includelist-io-gfal
-%{_libdir}/%{name}/libGFAL.*
-%{_libdir}/%{name}/libGFAL_rdict.pcm
-%{_datadir}/%{name}/plugins/TFile/P050_TGFALFile.C
-
%files io-sql -f includelist-io-sql
%{_libdir}/%{name}/libSQLIO.*
%{_libdir}/%{name}/libSQLIO_rdict.pcm
@@ -3433,6 +3323,7 @@ fi
%{_libdir}/%{name}/libEG.*
%{_libdir}/%{name}/libEG_rdict.pcm
%{_datadir}/%{name}/pdg_table.txt
+%{_datadir}/%{name}/pdg_table_update.py
%doc %{_pkgdocdir}/cfortran.doc
%files montecarlo-pythia8 -f includelist-montecarlo-pythia8
@@ -3479,6 +3370,7 @@ fi
%{_datadir}/%{name}/js/files/wslist.htm
%ghost %{_datadir}/%{name}/js/build
%ghost %{_datadir}/%{name}/js/img
+%ghost %{_datadir}/%{name}/js/mathjax
%ghost %{_datadir}/%{name}/js/modules
%ghost %{_datadir}/%{name}/js/scripts
%ghost %{_datadir}/%{name}/js/files/draw.htm
@@ -3544,12 +3436,13 @@ fi
%{_libdir}/%{name}/libRooFit.*
%{_libdir}/%{name}/libRooFit_rdict.pcm
-%files roofit-common
-%{_libdir}/%{name}/libRooFitCommon.*
-
%files roofit-core -f includelist-roofit-roofitcore
%{_libdir}/%{name}/libRooFitCore.*
%{_libdir}/%{name}/libRooFitCore_rdict.pcm
+%dir %{_includedir}/%{name}/RooFit
+%dir %{_includedir}/%{name}/RooFit/Detail
+%dir %{_includedir}/%{name}/RooFit/TestStatistics
+%dir %{_includedir}/%{name}/RooFitLegacy
%{_datadir}/gdb/auto-load%{_libdir}/%{name}/libRooFitCore.*
%{_datadir}/gdb/auto-load%{_libdir}/%{name}/__pycache__/libRooFitCore.*
@@ -3557,10 +3450,9 @@ fi
%{_libdir}/%{name}/libRooFitMore.*
%{_libdir}/%{name}/libRooFitMore_rdict.pcm
-%files roofit-batchcompute -f includelist-roofit-batchcompute
+%files roofit-batchcompute
%{_libdir}/%{name}/libRooBatchCompute.*
%{_libdir}/%{name}/libRooBatchCompute_*
-%doc roofit/batchcompute/README.md
%if %{dataframe}
%files roofit-dataframe-helpers -f includelist-roofit-RDataFrameHelpers
@@ -3571,17 +3463,20 @@ fi
%files roofit-hs3 -f includelist-roofit-hs3
%{_libdir}/%{name}/libRooFitHS3.*
%{_libdir}/%{name}/libRooFitHS3_rdict.pcm
+%dir %{_includedir}/%{name}/RooFitHS3
%{_datadir}/%{name}/RooFitHS3_wsexportkeys.json
%{_datadir}/%{name}/RooFitHS3_wsfactoryexpressions.json
-%doc roofit/hs3/README.md
%files roofit-jsoninterface -f includelist-roofit-jsoninterface
%{_libdir}/%{name}/libRooFitJSONInterface.*
%{_libdir}/%{name}/libRooFitJSONInterface_rdict.pcm
+%dir %{_includedir}/%{name}/RooFit
%if %{?fedora}%{!?fedora:0} >= 40
%files roofit-multiprocess -f includelist-roofit-multiprocess
%{_libdir}/%{name}/libRooFitMultiProcess.*
+%dir %{_includedir}/%{name}/RooFit
+%dir %{_includedir}/%{name}/RooFit/MultiProcess
%files roofit-zmq
%{_libdir}/%{name}/libRooFitZMQ.*
@@ -3601,7 +3496,13 @@ fi
%{_libdir}/%{name}/libHistFactory_rdict.pcm
%{_datadir}/%{name}/HistFactorySchema.dtd
%dir %{_includedir}/%{name}/RooStats/HistFactory
+%dir %{_includedir}/%{name}/RooStats/HistFactory/Detail
%doc roofit/histfactory/doc/README
+
+%files xroofit -f includelist-roofit-xroofit
+%{_libdir}/%{name}/libRooFitXRooFit.*
+%{_libdir}/%{name}/libRooFitXRooFit_rdict.pcm
+%dir %{_includedir}/%{name}/RooFit/xRooFit
%endif
%files sql-mysql -f includelist-sql-mysql
@@ -3632,6 +3533,8 @@ fi
%dir %{_includedir}/%{name}/TMVA/DNN/Architectures
%dir %{_includedir}/%{name}/TMVA/DNN/Architectures/Cpu
%dir %{_includedir}/%{name}/TMVA/DNN/Architectures/Reference
+%dir %{_includedir}/%{name}/TMVA/DNN/CNN
+%dir %{_includedir}/%{name}/TMVA/DNN/RNN
%license tmva/doc/LICENSE
%exclude %{_includedir}/%{name}/TMVA/RBDT.hxx
%exclude %{_includedir}/%{name}/TMVA/RInferenceUtils.hxx
@@ -3777,6 +3680,7 @@ fi
%{_libdir}/%{name}/libROOTBrowsable.*
%{_libdir}/%{name}/libROOTBrowsable_rdict.pcm
%{_libdir}/%{name}/libROOTBranchBrowseProvider.*
+%{_libdir}/%{name}/libROOTGeoBrowseProvider.*
%{_libdir}/%{name}/libROOTHistDrawProvider.*
%{_libdir}/%{name}/libROOTLeafDraw6Provider.*
%{_libdir}/%{name}/libROOTLeafDraw7Provider.*
@@ -3814,19 +3718,20 @@ fi
%files tree-ntuple -f includelist-tree-ntuple
%{_libdir}/%{name}/libROOTNTuple.*
%{_libdir}/%{name}/libROOTNTuple_rdict.pcm
+%dir %{_includedir}/%{name}/ROOT/libdaos_mock
%files tree-ntuple-utils -f includelist-tree-ntupleutil
%{_libdir}/%{name}/libROOTNTupleUtil.*
%{_libdir}/%{name}/libROOTNTupleUtil_rdict.pcm
-
-%if %{roofit}
-%files xroofit -f includelist-roofit-xroofit
-%{_libdir}/%{name}/libRooFitXRooFit.*
-%{_libdir}/%{name}/libRooFitXRooFit_rdict.pcm
-%endif
%endif
%changelog
+* Sat Nov 25 2023 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 6.30.00-1
+- Update to 6.30.00
+- Removed subpackages: root-io-gfal and root-roofit-common
+- Dropped patches: 6
+- New patches: 6
+
* Thu Nov 02 2023 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 6.28.08-3
- Rebuilt for libarrow.so.1400
diff --git a/sources b/sources
index abdf4dd..3dad81b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.28.08.tar.xz) = 868d770a05372677da84e4456023c1b2b575ff1eac8b6b841ed45dd1e0fd0c6c7aede533271b986404f2a55c91ea196ac2d8c81b3b4d1edfae159c0b665c415e
+SHA512 (root-6.30.00.tar.xz) = 0050fea34b679343829cf0bfe4bbd6ff66d93c8e2ceedef41b71d401c4e82495ec5fa4ecac82ef8d4d58f8cc0c724a6331d59b63998e6af28f022dd1942e3797
SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f
commit ae0a7919250ae3903e9f4d78501b4cef0b775525
Author: Mattias Ellert <mattias.ellert(a)physics.uu.se>
Date: Thu Nov 2 12:45:23 2023 +0100
Rebuilt for libarrow.so.1400
diff --git a/root.spec b/root.spec
index 1c76e82..96f8888 100644
--- a/root.spec
+++ b/root.spec
@@ -52,7 +52,7 @@
Name: root
Version: 6.28.08
%global libversion %(cut -d. -f 1-2 <<< %{version})
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Numerical data analysis framework
License: LGPL-2.1-or-later
@@ -3827,8 +3827,11 @@ fi
%endif
%changelog
+* Thu Nov 02 2023 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 6.28.08-3
+- Rebuilt for libarrow.so.1400
+
* Wed Nov 01 2023 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 6.28.08-2
-- Enable RooFit::MultiProcess on Fedroa 40+
+- Enable RooFit::MultiProcess on Fedora 40+
* Sat Oct 14 2023 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 6.28.08-1
- Update to 6.28.08
commit fb5c22a14dac9c1c25b9afcf43a4d813279d2b9c
Author: Mattias Ellert <ellert(a)ellert.se>
Date: Wed Nov 1 13:42:56 2023 +0100
Enable RooFit::MultiProcess on Fedroa 40+
diff --git a/root-Fix-cmake-modules-FindZeroMQ.cmake.patch b/root-Fix-cmake-modules-FindZeroMQ.cmake.patch
new file mode 100644
index 0000000..196ae81
--- /dev/null
+++ b/root-Fix-cmake-modules-FindZeroMQ.cmake.patch
@@ -0,0 +1,51 @@
+From f178a821b57043fdb7b722187e0175b975c7076b Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
+Date: Wed, 1 Nov 2023 10:04:03 +0100
+Subject: [PATCH] Fix cmake/modules/FindZeroMQ.cmake
+
+It now finds ZeroMQ in Fedora 40.
+---
+ cmake/modules/FindZeroMQ.cmake | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/cmake/modules/FindZeroMQ.cmake b/cmake/modules/FindZeroMQ.cmake
+index 24a1c171f5..bd8bf0b3db 100644
+--- a/cmake/modules/FindZeroMQ.cmake
++++ b/cmake/modules/FindZeroMQ.cmake
+@@ -38,17 +38,21 @@ set ( ZeroMQ_LIBRARIES ${ZeroMQ_LIBRARY} )
+ set ( ZeroMQ_INCLUDE_DIRS ${ZeroMQ_INCLUDE_DIR} )
+
+ # check for zmq_ppoll
+-if(ZeroMQ_FOUND)
+- SET(SAVE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}")
+- SET(CMAKE_REQUIRED_DEFINITIONS "-DZMQ_BUILD_DRAFT_API")
++if(ZeroMQ_LIBRARIES)
++ include(CheckCXXSymbolExists)
++ set(CMAKE_REQUIRED_LIBRARIES ${ZeroMQ_LIBRARIES})
++ set(CMAKE_REQUIRED_INCLUDES ${ZeroMQ_INCLUDE_DIRS})
++ set(CMAKE_REQUIRED_DEFINITIONS "-DZMQ_BUILD_DRAFT_API")
+ check_cxx_symbol_exists(zmq_ppoll zmq.h ZeroMQ_HAS_PPOLL)
+- SET(CMAKE_REQUIRED_DEFINITIONS "${SAVE_CMAKE_REQUIRED_DEFINITIONS}")
++ unset(CMAKE_REQUIRED_LIBRARIES)
++ unset(CMAKE_REQUIRED_INCLUDES)
++ unset(CMAKE_REQUIRED_DEFINITIONS)
+ endif()
+
+ include ( FindPackageHandleStandardArgs )
+ # handle the QUIETLY and REQUIRED arguments and set ZeroMQ_FOUND to TRUE
+ # if all listed variables are TRUE
+-find_package_handle_standard_args ( ZeroMQ DEFAULT_MSG ZeroMQ_LIBRARIES ZeroMQ_INCLUDE_DIRS ZeroMQ_HAS_PPOLL)
++find_package_handle_standard_args ( ZeroMQ DEFAULT_MSG ZeroMQ_LIBRARIES ZeroMQ_INCLUDE_DIRS ZeroMQ_HAS_PPOLL )
+
+ if(ZeroMQ_FOUND)
+ if(NOT TARGET libzmq)
+@@ -57,4 +61,4 @@ if(ZeroMQ_FOUND)
+ IMPORTED_LOCATION ${ZeroMQ_LIBRARIES}
+ INTERFACE_INCLUDE_DIRECTORIES ${ZeroMQ_INCLUDE_DIRS})
+ endif()
+-endif()
+\ No newline at end of file
++endif()
+--
+2.41.0
+
diff --git a/root.spec b/root.spec
index b880090..1c76e82 100644
--- a/root.spec
+++ b/root.spec
@@ -40,12 +40,9 @@
%global distrdf 0
%endif
-# qt6-srpm-macros not in buildroot for Fedora 37/38 or EPEL 9
+# qt6-srpm-macros not in buildroot for Fedora 37/38
# https://bugzilla.redhat.com/show_bug.cgi?id=2220859
-# https://bugzilla.redhat.com/show_bug.cgi?id=2220860
-# Definition of qt6_qtwebengine_arches incorrect in qt6-srpm-macros
-# https://bugzilla.redhat.com/show_bug.cgi?id=2215703
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
+%if %{?fedora}%{!?fedora:0} == 37 || %{?fedora}%{!?fedora:0} == 38
%global qt6_qtwebengine_arches aarch64 x86_64
%endif
@@ -55,7 +52,7 @@
Name: root
Version: 6.28.08
%global libversion %(cut -d. -f 1-2 <<< %{version})
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Numerical data analysis framework
License: LGPL-2.1-or-later
@@ -113,15 +110,18 @@ Patch12: %{name}-do-not-remove-Wp-before-D-and-U.patch
# Avoid boolean operators on numpy arrays in unit test
# https://github.com/root-project/root/issues/12162
# https://github.com/root-project/root/pull/13612
-Patch13: root-boolean-numpy-array.patch
+Patch13: %{name}-boolean-numpy-array.patch
# Port to pcre2
# https://github.com/root-project/root/issues/11395
# https://github.com/root-project/root/pull/13771
-Patch14: root-pcre2.patch
-Patch15: root-pcre2-6.28.patch
+Patch14: %{name}-pcre2.patch
+Patch15: %{name}-pcre2-6.28.patch
# src/RBDT.cxx is a source file of both libTMVA and libTMVAUtils
# https://github.com/root-project/root/pull/13863
-Patch16: root-tmva-rbdt.patch
+Patch16: %{name}-tmva-rbdt.patch
+# Fix cmake/modules/FindZeroMQ.cmake
+# https://github.com/root-project/root/pull/13995
+Patch17: %{name}-Fix-cmake-modules-FindZeroMQ.cmake.patch
BuildRequires: gcc-c++
BuildRequires: gcc-gfortran
@@ -204,6 +204,14 @@ BuildRequires: protobuf-devel >= 3.0
%ifnarch %{ix86} %{arm}
BuildRequires: libarrow-devel
%endif
+%if %{roofit}
+%if %{?fedora}%{!?fedora:0} >= 40
+# Required for roofit-multiprocess
+# Requires new zeromq with zmq_ppoll
+BuildRequires: zeromq-devel >= 4.3.5
+BuildRequires: cppzmq-devel
+%endif
+%endif
%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 8
BuildRequires: python%{python3_pkgversion}-pandas
%endif
@@ -1488,6 +1496,28 @@ suitable for adoption in different disciplines as well.
This package contains the JSON interface to RooFit.
+%if %{?fedora}%{!?fedora:0} >= 40
+%package roofit-multiprocess
+Summary: Multi-process support for RooFit
+License: BSD-2-Clause
+Requires: %{name}-core%{?_isa} = %{version}-%{release}
+Requires: %{name}-hist%{?_isa} = %{version}-%{release}
+Requires: %{name}-roofit-common%{?_isa} = %{version}-%{release}
+Requires: %{name}-roofit-zmq%{?_isa} = %{version}-%{release}
+
+%description roofit-multiprocess
+This package contains a library providing classes that implements
+mult-process support for RooFit.
+
+%package roofit-zmq
+Summary: ZeroMQ interface library for RooFit
+License: BSD-2-Clause
+
+%description roofit-zmq
+This package contains a helper library used by RooFit::MultiProcess to
+interface to the ZeroMQ library.
+%endif
+
%package roostats
Summary: Statistical tools built on top of RooFit
Requires: %{name}-core%{?_isa} = %{version}-%{release}
@@ -2020,6 +2050,7 @@ This package contains extra tools for RooFit projects.
%patch -P 14 -p1
%patch -P 15 -p1
%patch -P 16 -p1
+%patch -P 17 -p1
# Remove bundled sources in order to be sure they are not used
# * afterimage
@@ -2192,10 +2223,15 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
-Dr:BOOL=ON \
%if %{roofit}
-Droofit:BOOL=ON \
+%if %{?fedora}%{!?fedora:0} >= 40
+ -Droofit_multiprocess:BOOL=ON \
%else
- -Droofit:BOOL=OFF \
+ -Droofit_multiprocess:BOOL=OFF \
%endif
+%else
+ -Droofit:BOOL=OFF \
-Droofit_multiprocess:BOOL=OFF \
+%endif
-Droofit_hs3_ryml:BOOL=OFF \
%if %{root7}
-Droot7:BOOL=ON \
@@ -2894,8 +2930,12 @@ fi
%if %{dataframe}
%ldconfig_scriptlets roofit-dataframe-helpers
%endif
-%ldconfig_scriptlets roofit-jsoninterface
%ldconfig_scriptlets roofit-hs3
+%ldconfig_scriptlets roofit-jsoninterface
+%if %{?fedora}%{!?fedora:0} >= 40
+%ldconfig_scriptlets roofit-multiprocess
+%ldconfig_scriptlets roofit-zmq
+%endif
%ldconfig_scriptlets roostats
%ldconfig_scriptlets hist-factory
%endif
@@ -3539,6 +3579,14 @@ fi
%{_libdir}/%{name}/libRooFitJSONInterface.*
%{_libdir}/%{name}/libRooFitJSONInterface_rdict.pcm
+%if %{?fedora}%{!?fedora:0} >= 40
+%files roofit-multiprocess -f includelist-roofit-multiprocess
+%{_libdir}/%{name}/libRooFitMultiProcess.*
+
+%files roofit-zmq
+%{_libdir}/%{name}/libRooFitZMQ.*
+%endif
+
%files roostats -f includelist-roofit-roostats
%{_libdir}/%{name}/libRooStats.*
%{_libdir}/%{name}/libRooStats_rdict.pcm
@@ -3779,6 +3827,9 @@ fi
%endif
%changelog
+* Wed Nov 01 2023 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 6.28.08-2
+- Enable RooFit::MultiProcess on Fedroa 40+
+
* Sat Oct 14 2023 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 6.28.08-1
- Update to 6.28.08
- New subpackage root-tmva-utils (split off from root-tmva)
1
0
Architecture specific change in rpms/rust-remove_dir_all.git
by githook-noreply＠fedoraproject.org 26 Nov '23
by githook-noreply＠fedoraproject.org 26 Nov '23
26 Nov '23
The package rpms/rust-remove_dir_all.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-remove_dir_all.git/commit/?id=….
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 8e58a6d18cc6cb1f992eb5507f3a5e038939c220
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Sun Nov 26 13:28:49 2023 +0100
Update to version 0.8.2; Fixes RHBZ#2173156
diff --git a/.gitignore b/.gitignore
index 68c260b..d7e524f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/remove_dir_all-0.5.2.crate
/remove_dir_all-0.5.3.crate
/remove_dir_all-0.7.0.crate
+/remove_dir_all-0.8.2.crate
diff --git a/remove_dir_all-fix-metadata-auto.diff b/remove_dir_all-fix-metadata-auto.diff
index ebb9101..a4a0856 100644
--- a/remove_dir_all-fix-metadata-auto.diff
+++ b/remove_dir_all-fix-metadata-auto.diff
@@ -1,18 +1,19 @@
---- remove_dir_all-0.7.0/Cargo.toml 1970-01-01T00:00:00+00:00
-+++ remove_dir_all-0.7.0/Cargo.toml 2023-05-25T19:03:22.357769+00:00
-@@ -32,15 +32,3 @@
- version = "3.1"
+--- remove_dir_all-0.8.2/Cargo.toml 1970-01-01T00:00:01+00:00
++++ remove_dir_all-0.8.2/Cargo.toml 2023-11-04T23:50:51.144272+00:00
+@@ -101,16 +101,3 @@
[target."cfg(not(windows))".dependencies.libc]
version = "0.2"
--[target."cfg(windows)".dependencies.log]
--version = "0.4.11"
+
+-[target."cfg(windows)".dependencies.aligned]
+-version = "0.4.1"
-
--[target."cfg(windows)".dependencies.num_cpus]
--version = "1.13"
--
--[target."cfg(windows)".dependencies.rayon]
--version = "1.4"
--
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3"
--features = ["std", "errhandlingapi", "winerror", "fileapi", "winbase"]
+-[target."cfg(windows)".dependencies.windows-sys]
+-version = "0.45.0"
+-features = [
+- "Win32_Foundation",
+- "Win32_Storage_FileSystem",
+- "Win32_System_IO",
+- "Win32_System_Ioctl",
+- "Win32_System_SystemServices",
+- "Win32_System_Threading",
+-]
diff --git a/remove_dir_all-fix-metadata.diff b/remove_dir_all-fix-metadata.diff
new file mode 100644
index 0000000..54671d6
--- /dev/null
+++ b/remove_dir_all-fix-metadata.diff
@@ -0,0 +1,39 @@
+--- remove_dir_all-0.8.2/Cargo.toml 1970-01-01T00:00:01+00:00
++++ remove_dir_all-0.8.2/Cargo.toml 2023-11-04T23:51:34.050434+00:00
+@@ -35,22 +35,10 @@
+ categories = ["filesystem"]
+ license = "MIT OR Apache-2.0"
+ repository = "https://github.com/XAMPPRocky/remove_dir_all.git"
+-
+-[[bin]]
+-name = "remove-dir-all"
+-required-features = ["cli"]
++autobins = false
+
+ [dependencies.cfg-if]
+ version = "1.0.0"
+-
+-[dependencies.clap]
+-version = "4.1.11"
+-features = ["derive"]
+-optional = true
+-
+-[dependencies.env_logger]
+-version = "0.10.0"
+-optional = true
+
+ [dependencies.fs_at]
+ version = "0.1.4"
+@@ -85,12 +73,6 @@
+ version = "0.2"
+
+ [features]
+-cli = [
+- "dep:clap",
+- "dep:env_logger",
+- "log",
+- "parallel",
+-]
+ default = []
+ log = ["dep:log"]
+ parallel = ["dep:rayon"]
diff --git a/rust-remove_dir_all.spec b/rust-remove_dir_all.spec
index d5efcc4..e04eea3 100644
--- a/rust-remove_dir_all.spec
+++ b/rust-remove_dir_all.spec
@@ -1,23 +1,24 @@
-# Generated by rust2rpm 24
-# * tests seem to be broken with Rust 1.55+
-%bcond_with check
+# Generated by rust2rpm 25
+%bcond_without check
%global debug_package %{nil}
%global crate remove_dir_all
Name: rust-remove_dir_all
-Version: 0.7.0
+Version: 0.8.2
Release: %autorelease
Summary: Safe, reliable implementation of remove_dir_all
-# Upstream license specification: MIT/Apache-2.0
License: MIT OR Apache-2.0
URL: https://crates.io/crates/remove_dir_all
Source: %{crates_source}
-# Automatically generated patch to strip foreign dependencies
+# Automatically generated patch to strip dependencies and normalize metadata
Patch: remove_dir_all-fix-metadata-auto.diff
+# Manually created patch for downstream crate metadata changes
+# * prevent unused remove-dir-all executable from being built and shipped
+Patch: remove_dir_all-fix-metadata.diff
-BuildRequires: rust-packaging >= 21
+BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
A safe, reliable implementation of remove_dir_all for Windows.}
@@ -51,8 +52,32 @@ use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
%ghost %{crate_instdir}/Cargo.toml
+%package -n %{name}+log-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+log-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "log" feature of the "%{crate}" crate.
+
+%files -n %{name}+log-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+parallel-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+parallel-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "parallel" feature of the "%{crate}" crate.
+
+%files -n %{name}+parallel-devel
+%ghost %{crate_instdir}/Cargo.toml
+
%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
%cargo_prep
%generate_buildrequires
diff --git a/rust2rpm.toml b/rust2rpm.toml
new file mode 100644
index 0000000..2ac47f4
--- /dev/null
+++ b/rust2rpm.toml
@@ -0,0 +1,3 @@
+[package]
+summary = "Safe, reliable implementation of remove_dir_all"
+
diff --git a/sources b/sources
index ba8dd94..57a0317 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (remove_dir_all-0.7.0.crate) = a4a426e7f3e9f4d3925809e22ebb61d06be04703ecabbc07aae80894458f29a146bc6aa6540ab4ac96c74a160a5520ea079ebb6ac6cca489ba036ece6678339c
+SHA512 (remove_dir_all-0.8.2.crate) = db20998b6db76ead161b69ad4f92cc7139a67285b1d7cd7a3631b4c46450503b378a597d3e27c618dd5a4f77c0b3f20a25036ad495c88a9a1d134a6af58f0134
commit d0dfa4346e2a784455bafebd18809ef37b40049c
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 21 23:06:23 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
commit 4c37eea2e49e93b995e4aa4ca9ccadc7f632b93a
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Thu May 25 21:04:46 2023 +0200
Regenerate with rust2rpm v24
diff --git a/README.md b/README.md
deleted file mode 100644
index e9226f5..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-remove_dir_all
-
-The rust-remove_dir_all package
\ No newline at end of file
diff --git a/remove_dir_all-fix-metadata.diff b/remove_dir_all-fix-metadata-auto.diff
similarity index 88%
rename from remove_dir_all-fix-metadata.diff
rename to remove_dir_all-fix-metadata-auto.diff
index 93ee99b..ebb9101 100644
--- a/remove_dir_all-fix-metadata.diff
+++ b/remove_dir_all-fix-metadata-auto.diff
@@ -1,5 +1,5 @@
--- remove_dir_all-0.7.0/Cargo.toml 1970-01-01T00:00:00+00:00
-+++ remove_dir_all-0.7.0/Cargo.toml 2021-05-19T13:12:48.032737+00:00
++++ remove_dir_all-0.7.0/Cargo.toml 2023-05-25T19:03:22.357769+00:00
@@ -32,15 +32,3 @@
version = "3.1"
[target."cfg(not(windows))".dependencies.libc]
diff --git a/rust-remove_dir_all.spec b/rust-remove_dir_all.spec
index d7b9875..d5efcc4 100644
--- a/rust-remove_dir_all.spec
+++ b/rust-remove_dir_all.spec
@@ -1,32 +1,26 @@
-# Generated by rust2rpm 19
+# Generated by rust2rpm 24
# * tests seem to be broken with Rust 1.55+
%bcond_with check
%global debug_package %{nil}
%global crate remove_dir_all
-Name: rust-%{crate}
+Name: rust-remove_dir_all
Version: 0.7.0
Release: %autorelease
Summary: Safe, reliable implementation of remove_dir_all
# Upstream license specification: MIT/Apache-2.0
-License: MIT or ASL 2.0
+License: MIT OR Apache-2.0
URL: https://crates.io/crates/remove_dir_all
Source: %{crates_source}
-# Initial patched metadata
-# * drop windows-specific dependencies
-Patch0: remove_dir_all-fix-metadata.diff
+# Automatically generated patch to strip foreign dependencies
+Patch: remove_dir_all-fix-metadata-auto.diff
-ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
-
-BuildRequires: rust-packaging
+BuildRequires: rust-packaging >= 21
%global _description %{expand:
-Safe, reliable implementation of remove_dir_all for Windows.}
+A safe, reliable implementation of remove_dir_all for Windows.}
%description %{_description}
@@ -37,12 +31,13 @@ BuildArch: noarch
%description devel %{_description}
This package contains library source intended for building other packages which
-use "%{crate}" crate.
+use the "%{crate}" crate.
%files devel
-%license LICENCE-APACHE LICENCE-MIT
-%doc README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENCE-APACHE
+%license %{crate_instdir}/LICENCE-MIT
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -51,10 +46,10 @@ BuildArch: noarch
%description -n %{name}+default-devel %{_description}
This package contains library source intended for building other packages which
-use "the default" feature of the "%{crate}" crate.
+use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
1
0
26 Nov '23
The package rpms/rust-rpds.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-rpds.git/commit/?id=f39ea1700c…
https://src.fedoraproject.org/cgit/rpms/rust-rpds.git/commit/?id=c54891449b….
Change:
-ExcludeArch: %{ix86}
+ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit f39ea1700cab289f0765bcf607409e197ea4549c
Author: Mattia Verga <mattia.verga(a)proton.me>
Date: Sun Nov 26 09:54:21 2023 +0100
Do not exclude i686
diff --git a/rust-rpds.spec b/rust-rpds.spec
index 26e6052..7938413 100644
--- a/rust-rpds.spec
+++ b/rust-rpds.spec
@@ -17,10 +17,6 @@ Source: %{crates_source}
# - bump archery dependency
Patch: rpds-fix-metadata.diff
-# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
-# Also i686 is FTB because of tests failing due to precision errors
-ExcludeArch: %{ix86}
-
BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
commit c54891449b272dd20419f9e25b007bb7682ed0d2
Author: Mattia Verga <mattia.verga(a)proton.me>
Date: Sun Nov 26 09:32:59 2023 +0100
Update to 1.1.0
diff --git a/.gitignore b/.gitignore
index d190fbd..769fcea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/rpds-0.13.0.crate
/rpds-1.0.0.crate
/rpds-1.0.1.crate
+/rpds-1.1.0.crate
diff --git a/rpds-fix-metadata.diff b/rpds-fix-metadata.diff
index f94e819..5d45074 100644
--- a/rpds-fix-metadata.diff
+++ b/rpds-fix-metadata.diff
@@ -1,6 +1,6 @@
---- rpds-1.0.1/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ rpds-1.0.1/Cargo.toml 2023-09-07T06:40:04.910494+00:00
-@@ -112,9 +112,6 @@
+--- rpds-1.1.0/Cargo.toml 1970-01-01T00:00:01+00:00
++++ rpds-1.1.0/Cargo.toml 2023-11-18T16:34:10.364420+00:00
+@@ -113,9 +113,6 @@
[dev-dependencies.bincode]
version = "1.3.3"
diff --git a/rust-rpds.spec b/rust-rpds.spec
index 9786120..26e6052 100644
--- a/rust-rpds.spec
+++ b/rust-rpds.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 25
%bcond_without check
%global debug_package %{nil}
%global crate rpds
Name: rust-rpds
-Version: 1.0.1
+Version: 1.1.0
Release: %autorelease
Summary: Persistent data structures with structural sharing
@@ -14,9 +14,14 @@ URL: https://crates.io/crates/rpds
Source: %{crates_source}
# Manually created patch for downstream crate metadata changes
# - remove criterion dependency
+# - bump archery dependency
Patch: rpds-fix-metadata.diff
-BuildRequires: rust-packaging >= 21
+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+# Also i686 is FTB because of tests failing due to precision errors
+ExcludeArch: %{ix86}
+
+BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
Persistent data structures with structural sharing.}
@@ -87,7 +92,7 @@ use the "std" feature of the "%{crate}" crate.
%ghost %{crate_instdir}/Cargo.toml
%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
%cargo_prep
%generate_buildrequires
diff --git a/sources b/sources
index 0be4514..ebc50be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rpds-1.0.1.crate) = 119527d615f359ddf2681dda05e9bf853a2747db4524559601c4cf5114cfdc00ba734fcd727830787e3f1cb978eb28538e5f9424d968deec95ff3826db18f377
+SHA512 (rpds-1.1.0.crate) = b24640e34c2f88ecfff5efb1581941eb02987bb7b342dc439513e8d7c8ee0afa63949f8dee09bf8f445ec6f3b3ec22d2927d3d03be05fee3c651b29c924a6b3e
1
0
List of packages currently excluding arches (1133)
===========================================
- 0ad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- 90-Second-Portraits
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- BareBonesBrowserLaunch
ExclusiveArch: %{java_arches} noarch
- CFR
ExclusiveArch: %{java_arches} noarch
- CardManager
ExclusiveArch: %{java_arches} noarch
- GAPDoc
ExclusiveArch: %{gap_arches} noarch
- GoldenCheetah
ExclusiveArch: %{qt5_qtwebengine_arches}
- GtkAda
ExclusiveArch: %{GPRbuild_arches}
- GtkAda3
ExclusiveArch: %{GPRbuild_arches}
- IPAddress
ExclusiveArch: %{java_arches} noarch
- Mars
ExclusiveArch: %{java_arches} noarch
- OpenColorIO
ExclusiveArch: x86_64 ppc64le
- OpenImageIO
ExclusiveArch: x86_64 ppc64le
- OpenMolcas
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- OpenStego
ExclusiveArch: %{java_arches} noarch
- PragmARC
ExclusiveArch: %{GPRbuild_arches}
- R-V8
ExclusiveArch: %{nodejs_arches}
- R-rJava
ExclusiveArch: %{java_arches}
- RdRand
ExclusiveArch: %{ix86} x86_64
- RediSearch
ExclusiveArch: x86_64
- SLOF
ExclusiveArch: ppc64le
- YafaRay
ExclusiveArch: %{ix86} x86_64
- aardvark-dns
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- accel-config
ExclusiveArch: %{ix86} x86_64
- acpid
ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64
- ahven
ExclusiveArch: %{GPRbuild_arches}
- algobox
ExclusiveArch: %{qt5_qtwebengine_arches}
- american-fuzzy-lop
ExclusiveArch: %{ix86} x86_64 s390x
- anet
ExclusiveArch: %{GPRbuild_arches}
- ant
ExclusiveArch: %{java_arches} noarch
- ant-antunit
ExclusiveArch: %{java_arches} noarch
- ant-contrib
ExclusiveArch: %{java_arches} noarch
- antlr
ExclusiveArch: %{java_arches}
- antlr3
ExclusiveArch: %{java_arches}
- antlr4-project
ExclusiveArch: %{java_arches}
- antlrworks
ExclusiveArch: %{java_arches} noarch
- aopalliance
ExclusiveArch: %{java_arches} noarch
- apache-commons-beanutils
ExclusiveArch: %{java_arches} noarch
- apache-commons-cli
ExclusiveArch: %{java_arches} noarch
- apache-commons-codec
ExclusiveArch: %{java_arches} noarch
- apache-commons-collections
ExclusiveArch: %{java_arches} noarch
- apache-commons-collections4
ExclusiveArch: %{java_arches} noarch
- apache-commons-compress
ExclusiveArch: %{java_arches} noarch
- apache-commons-configuration
ExclusiveArch: %{java_arches} noarch
- apache-commons-digester
ExclusiveArch: %{java_arches} noarch
- apache-commons-exec
ExclusiveArch: %{java_arches} noarch
- apache-commons-io
ExclusiveArch: %{java_arches} noarch
- apache-commons-jexl
ExclusiveArch: %{java_arches} noarch
- apache-commons-jxpath
ExclusiveArch: %{java_arches} noarch
- apache-commons-lang3
ExclusiveArch: %{java_arches} noarch
- apache-commons-logging
ExclusiveArch: %{java_arches} noarch
- apache-commons-math
ExclusiveArch: %{java_arches} noarch
- apache-commons-modeler
ExclusiveArch: %{java_arches} noarch
- apache-commons-net
ExclusiveArch: %{java_arches} noarch
- apache-commons-parent
ExclusiveArch: %{java_arches} noarch
- apache-commons-pool
ExclusiveArch: %{java_arches} noarch
- apache-commons-vfs
ExclusiveArch: %{java_arches} noarch
- apache-ivy
ExclusiveArch: %{java_arches} noarch
- apache-parent
ExclusiveArch: %{java_arches} noarch
- apache-resource-bundles
ExclusiveArch: %{java_arches} noarch
- apache-sshd
ExclusiveArch: %{java_arches} noarch
- apiguardian
ExclusiveArch: %{java_arches} noarch
- apmd
ExclusiveArch: %{ix86}
- appstream-generator
ExclusiveArch: %{ldc_arches}
- aqute-bnd
ExclusiveArch: %{java_arches} noarch
- args4j
ExclusiveArch: %{java_arches} noarch
- arianna
ExclusiveArch: %{qt6_qtwebengine_arches}
- arm-trusted-firmware
ExclusiveArch: aarch64
- asmjit
ExclusiveArch: aarch64 x86_64
- assertj-core
ExclusiveArch: %{java_arches} noarch
- atinject
ExclusiveArch: %{java_arches} noarch
- aunit
ExclusiveArch: %GPRbuild_arches
- auto
ExclusiveArch: %{java_arches} noarch
- autolink-java
ExclusiveArch: noarch %{java_arches}
- avgtime
ExclusiveArch: %{ldc_arches}
- aws
ExclusiveArch: %GPRbuild_arches
- azure-cli
ExclusiveArch: %{java_arches} noarch
- batik
ExclusiveArch: %{java_arches} noarch
- bcal
ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x
- bcc
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
- bcel
ExclusiveArch: %{java_arches} noarch
- bcm283x-firmware
ExclusiveArch: aarch64
- beansbinding
ExclusiveArch: %{java_arches} noarch
- berusky2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips}
- beust-jcommander
ExclusiveArch: %{java_arches} noarch
- bibletime
ExclusiveArch: %{java_arches}
- biosdevname
ExclusiveArch: %{ix86} x86_64
- bless
ExclusiveArch: %mono_arches
- bodhi-server
ExclusiveArch: %{golang_arches_future}
- bolzplatz2006
ExclusiveArch: %{java_arches}
- bouncycastle
ExclusiveArch: %{java_arches} noarch
- box64
ExclusiveArch: aarch64 ppc64le x86_64
- bpftrace
ExclusiveArch: x86_64 %{power64} aarch64 s390x
- brazil
ExclusiveArch: %{java_arches} noarch
- bsf
ExclusiveArch: %{java_arches} noarch
- bsh
ExclusiveArch: %{java_arches} noarch
- build-helper-maven-plugin
ExclusiveArch: %{java_arches} noarch
- buildah
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- byebyebios
ExclusiveArch: x86_64
- byte-buddy
ExclusiveArch: %{java_arches} noarch
- byteman
ExclusiveArch: %{java_arches} noarch
- cachelib
ExclusiveArch: x86_64 aarch64 ppc64le
- caddy
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: %{golang_arches}
- caffe
ExclusiveArch: x86_64 aarch64 ppc64le
- calamares
ExclusiveArch: %{ix86} x86_64 aarch64
- calibre
ExclusiveArch: aarch64 x86_64
- cambozola
ExclusiveArch: %{java_arches} noarch
- canl-java
ExclusiveArch: %{java_arches} noarch
- catatonit
ExclusiveArch: aarch64 ppc64le s390x x86_64
ExclusiveArch: %{golang_arches_future}
- ccdciel
ExclusiveArch: %{fpc_arches}
- cdcollect
ExclusiveArch: %{mono_arches}
- cdi-api
ExclusiveArch: %{java_arches} noarch
- ceph
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- cglib
ExclusiveArch: %{java_arches} noarch
- chromium
ExclusiveArch: x86_64
ExclusiveArch: x86_64 aarch64
- cjdns
ExclusiveArch: %{nodejs_arches}
- classloader-leak-test-framework
ExclusiveArch: %{java_arches} noarch
- classpathless-compiler
ExclusiveArch: %{java_arches} noarch
- clevis-pin-tpm2
ExclusiveArch: %{rust_arches}
- clojure
ExclusiveArch: %{java_arches} noarch
- clojure-core-specs-alpha
ExclusiveArch: %{java_arches} noarch
- clojure-maven-plugin
ExclusiveArch: %{java_arches} noarch
- clojure-spec-alpha
ExclusiveArch: %{java_arches} noarch
- cmospwd
ExclusiveArch: %{ix86} x86_64
- cmrt
ExclusiveArch: %{ix86} x86_64 ia64
- codehaus-parent
ExclusiveArch: %{java_arches} noarch
- colorful
ExclusiveArch: %{fpc_arches}
- colossus
ExclusiveArch: %{java_arches} noarch
- conmon
ExclusiveArch: %{golang_arches_future}
- console-image-viewer
ExclusiveArch: %{java_arches} noarch
- containernetworking-plugins
ExclusiveArch: %{golang_arches}
- coq
ExclusiveArch: %{ocaml_native_compiler}
- cortado
ExclusiveArch: %{java_arches} noarch
- cpu-x
ExclusiveArch: i686 x86_64
- cpufetch
ExclusiveArch: %{arm} aarch64 x86_64 ppc ppc64 ppc64le
- cpuid
ExclusiveArch: %{ix86} x86_64
- cpuinfo
ExclusiveArch: x86_64 aarch64
- cqrlog
ExclusiveArch: %{fpc_arches}
- crash
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- crash-gcore-command
ExclusiveArch: aarch64 ppc64le x86_64
- crash-trace-command
ExclusiveArch: aarch64 ppc64le s390x x86_64
- credentials-fetcher
ExclusiveArch: x86_64 aarch64 s390x
- cri-o
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- cri-tools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- criu
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- crun
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le riscv64 s390x x86_64
- cryptlib
ExclusiveArch: x86_64 aarch64 ppc64le
- crypto-policies
ExclusiveArch: %{java_arches} noarch
- cryptobone
ExclusiveArch: x86_64 ppc64le aarch64
- csslint
ExclusiveArch: %{nodejs_arches} noarch
- daq
ExclusiveArch: x86_64 aarch64
- dbus-sharp
ExclusiveArch: %mono_arches
- dbus-sharp-glib
ExclusiveArch: %mono_arches
- decentxml
ExclusiveArch: %{java_arches} noarch
- deepin-daemon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- deepin-desktop-schemas
ExclusiveArch: %{go_arches}
- directory-maven-plugin
ExclusiveArch: %{java_arches} noarch
- dirgra
ExclusiveArch: %{java_arches} noarch
- disruptor
ExclusiveArch: %{java_arches} noarch
- ditaa
ExclusiveArch: %{java_arches} noarch
- dlm
ExclusiveArch: i686 x86_64
- dmidecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- dmtcp
ExclusiveArch: x86_64
- docker-distribution
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- dogtag-pki
ExclusiveArch: %{java_arches}
- dolphin-emu
ExclusiveArch: x86_64 aarch64
- dom4j
ExclusiveArch: %{java_arches} noarch
- dotnet6.0
ExclusiveArch: aarch64 x86_64 s390x
ExclusiveArch: x86_64
- dotnet7.0
ExclusiveArch: aarch64 ppc64le s390x x86_64
ExclusiveArch: x86_64
- doublecmd
ExclusiveArch: %{ix86} x86_64
- dpdk
ExclusiveArch: x86_64 i686 aarch64 ppc64le
- dub
ExclusiveArch: %{ldc_arches}
- dxvk-native
ExclusiveArch: %{ix86} x86_64
- dyninst
ExclusiveArch: %{ix86} x86_64 ppc64le aarch64
- e3
ExclusiveArch: %{ix86} x86_64
- easymock
ExclusiveArch: %{java_arches} noarch
- ecj
ExclusiveArch: %{java_arches} noarch
- eclipse-swt
ExclusiveArch: %{java_arches}
- ed25519-java
ExclusiveArch: %{java_arches} noarch
- edk2
ExclusiveArch: x86_64 aarch64 riscv64
- efibootmgr
ExclusiveArch: %{efi}
- efifs
ExclusiveArch: %{efi}
- efitools
ExclusiveArch: %{efi}
- efivar
ExclusiveArch: %{efi}
- elk
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- emacs-slime
ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64
- embree
ExclusiveArch: aarch64 x86_64
- embree3
ExclusiveArch: aarch64 x86_64
- enjarify
ExclusiveArch: %{java_arches} noarch
- enki
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
- envytools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- eric
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
- erlang-corba
ExclusiveArch: %{java_arches}
- esmi_ib_library
ExclusiveArch: x86_64
- eth-tools
ExclusiveArch: x86_64
- exec-maven-plugin
ExclusiveArch: %{java_arches} noarch
- external-editor-revived
ExclusiveArch: %{rust_arches}
- extra-enforcer-rules
ExclusiveArch: %{java_arches} noarch
- fasterxml-oss-parent
ExclusiveArch: %{java_arches} noarch
- fb303
ExclusiveArch: x86_64 aarch64 ppc64le
- fbthrift
ExclusiveArch: x86_64 aarch64 ppc64le
- fcitx-libpinyin
ExclusiveArch: %{qt5_qtwebengine_arches}
- fedora-dockerfiles
ExclusiveArch: %{go_arches}
- felix-parent
ExclusiveArch: %{java_arches} noarch
- felix-utils
ExclusiveArch: %{java_arches} noarch
- fernflower
ExclusiveArch: %{java_arches} noarch
- fes
ExclusiveArch: %{ix86} x86_64
- filedrop
ExclusiveArch: %{java_arches} noarch
- firecracker
ExclusiveArch: aarch64 x86_64
- fishbowl
ExclusiveArch: %{java_arches} noarch
- fizz
ExclusiveArch: x86_64 aarch64 ppc64le
- flexmark-java
ExclusiveArch: noarch %{java_arches}
- flocq
ExclusiveArch: %{ocaml_native_compiler}
- florist
ExclusiveArch: %{GPRbuild_arches}
- fluent-bit
ExclusiveArch: x86_64 aarch64
- flute
ExclusiveArch: %{java_arches} noarch
- folly
ExclusiveArch: x86_64 aarch64 ppc64le
- fop
ExclusiveArch: %{java_arches} noarch
- forge-parent
ExclusiveArch: %{java_arches} noarch
- fpc
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc64le
- frama-c
ExclusiveArch: %{ocaml_native_compiler}
- freecol
ExclusiveArch: %{java_arches} noarch
- freemarker
ExclusiveArch: %{java_arches} noarch
- freerouting
ExclusiveArch: %{java_arches} noarch
- frescobaldi
ExclusiveArch: %{qt5_qtwebengine_arches}
- frysk
ExclusiveArch: x86_64 ppc64
- fuse-overlayfs
ExclusiveArch: %{arm64} ppc64le s390x x86_64
- fusesource-pom
ExclusiveArch: %{java_arches} noarch
- fwts
ExclusiveArch: x86_64 %{arm} aarch64 s390x riscv64 %{power64}
- fwupd-efi
ExclusiveArch: x86_64 aarch64
- ga
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- gap
ExclusiveArch: %{gap_arches}
- gap-pkg-ace
ExclusiveArch: %{gap_arches}
- gap-pkg-aclib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-alnuth
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-atlasrep
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-autodoc
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-automata
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-autpgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-browse
ExclusiveArch: %{gap_arches}
- gap-pkg-caratinterface
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-circle
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-cohomolo
ExclusiveArch: %{gap_arches}
- gap-pkg-congruence
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-corelg
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crime
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crisp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crypting
ExclusiveArch: %{gap_arches}
- gap-pkg-cryst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crystcat
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-ctbllib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-curlinterface
ExclusiveArch: %{gap_arches}
- gap-pkg-cvec
ExclusiveArch: %{gap_arches}
- gap-pkg-datastructures
ExclusiveArch: %{gap_arches}
- gap-pkg-design
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-digraphs
ExclusiveArch: %{gap_arches}
- gap-pkg-edim
ExclusiveArch: %{gap_arches}
- gap-pkg-factint
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-ferret
ExclusiveArch: %{gap_arches}
- gap-pkg-fga
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-fining
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-float
ExclusiveArch: %{gap_arches}
- gap-pkg-format
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-forms
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-fr
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-francy
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-gbnp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-genss
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-grape
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-groupoids
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-grpconst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-guava
ExclusiveArch: %{gap_arches}
- gap-pkg-hap
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-hapcryst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-hecke
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-images
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-io
ExclusiveArch: %{gap_arches}
- gap-pkg-irredsol
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-json
ExclusiveArch: %{gap_arches}
- gap-pkg-jupyterkernel
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-jupyterviz
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-laguna
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liealgdb
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liepring
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liering
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-loops
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-lpres
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-mapclass
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-nautytracesinterface
ExclusiveArch: %{gap_arches}
- gap-pkg-nq
ExclusiveArch: %{gap_arches}
- gap-pkg-openmath
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-orb
ExclusiveArch: %{gap_arches}
- gap-pkg-polenta
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-polycyclic
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-polymaking
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-primgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-profiling
ExclusiveArch: %{gap_arches}
- gap-pkg-qpa
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-quagroup
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-radiroot
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-recog
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-repsn
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-resclasses
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-scscp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-semigroups
ExclusiveArch: %{gap_arches}
- gap-pkg-singular
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sla
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-smallgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-smallsemi
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sonata
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sophus
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-spinsym
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-standardff
ExclusiveArch: %{gap_arches}
- gap-pkg-tomlib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-toric
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-transgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-utils
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-uuid
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-xmod
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-zeromqinterface
ExclusiveArch: %{gap_arches}
- gappalib-coq
ExclusiveArch: %{ocaml_native_compiler}
- gbrainy
ExclusiveArch: %mono_arches
- gdb
ExclusiveArch: %{ix86} x86_64
- gdb-exploitable
ExclusiveArch: x86_64 i386
ExclusiveArch: x86_64 noarch
- gearhead1
ExclusiveArch: %{fpc_arches}
- gearhead2
ExclusiveArch: %{fpc_arches}
- ghdl
ExclusiveArch: %{GNAT_arches}
- ghostwriter
ExclusiveArch: %{qt5_qtwebengine_arches}
- gio-sharp
ExclusiveArch: %mono_arches
- gir-to-d
ExclusiveArch: %{ldc_arches}
- git-octopus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- gitqlient
ExclusiveArch: %{qt5_qtwebengine_arches}
- giver
ExclusiveArch: %{mono_arches}
- gkeyfile-sharp
ExclusiveArch: %mono_arches
- glibc32
ExclusiveArch: x86_64
- glibd
ExclusiveArch: %{ldc_arches}
- gnatcoll
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-bindings
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-db
ExclusiveArch: %{GPRbuild_arches}
- gnome-boxes
ExclusiveArch: x86_64
- gnome-desktop-sharp
ExclusiveArch: %mono_arches
- gnome-do
ExclusiveArch: %mono_arches
- gnome-keyring-sharp
ExclusiveArch: %mono_arches
- gnome-rdp
ExclusiveArch: %{mono_arches}
- gnome-sharp
ExclusiveArch: %mono_arches
- gnome-subtitles
ExclusiveArch: %mono_arches
- gnu-efi
ExclusiveArch: %{efi}
- go-bindata
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- godep
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang
ExclusiveArch: %{golang_arches}
- google-gson
ExclusiveArch: %{java_arches} noarch
- google-guice
ExclusiveArch: %{java_arches} noarch
- gotun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: x86_64
- goverlay
ExclusiveArch: %{fpc_arches}
- gprbuild
ExclusiveArch: %{GPRbuild_arches}
- gprolog
ExclusiveArch: x86_64 %{ix86} ppc alpha aarch64
- grafana
ExclusiveArch: %{grafana_arches}
- grafana-pcp
ExclusiveArch: %{grafanapcp_arches}
- gtk-sharp-beans
ExclusiveArch: %mono_arches
- gtk-sharp2
ExclusiveArch: %mono_arches
- gtk-sharp3
ExclusiveArch: %{mono_arches}
- gtkd
ExclusiveArch: %{ldc_arches}
- guava
ExclusiveArch: %{java_arches} noarch
- gudev-sharp
ExclusiveArch: %mono_arches
- guestfs-tools
ExclusiveArch: %{kernel_arches}
- gvisor-tap-vsock
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- hamcrest
ExclusiveArch: %{java_arches} noarch
- harec
ExclusiveArch: x86_64 aarch64
- hawtjni
ExclusiveArch: %{java_arches} noarch
- hedgewars
ExclusiveArch: %{fpc_arches}
- hibernate-jpa-2.0-api
ExclusiveArch: %{java_arches} noarch
- hid4java
ExclusiveArch: %{java_arches} noarch
- hipblas
ExclusiveArch: x86_64
- hipcub
ExclusiveArch: x86_64
- hipify
ExclusiveArch: x86_64
- hsakmt
ExclusiveArch: x86_64 aarch64 ppc64le
- httpcomponents-client
ExclusiveArch: %{java_arches} noarch
- httpcomponents-core
ExclusiveArch: %{java_arches} noarch
- httpcomponents-project
ExclusiveArch: %{java_arches} noarch
- hyena
ExclusiveArch: %{mono_arches}
- hyperscan
ExclusiveArch: x86_64
- hyperv-daemons
ExclusiveArch: i686 x86_64 aarch64
- icaro
ExclusiveArch: %{ix86} x86_64 noarch
- icedtea-web
ExclusiveArch: %{java_arches}
- icu4j
ExclusiveArch: %{java_arches} noarch
- imagej
ExclusiveArch: %{java_arches} noarch
- imhex
ExclusiveArch: x86_64 %{arm64}
- imvirt
ExclusiveArch: %{ix86} x86_64 ia64
- indistarter
ExclusiveArch: %{fpc_arches}
- infinipath-psm
ExclusiveArch: x86_64
- intel-cm-compiler
ExclusiveArch: i686 x86_64
- intel-cmt-cat
ExclusiveArch: x86_64
- intel-compute-runtime
ExclusiveArch: x86_64
- intel-gmmlib
ExclusiveArch: x86_64 i686
- intel-igc
ExclusiveArch: x86_64
- intel-ipp-crypto-mb
ExclusiveArch: x86_64
- intel-ipsec-mb
ExclusiveArch: x86_64
- intel-mediasdk
ExclusiveArch: x86_64
- intel-undervolt
ExclusiveArch: i386 x86_64
- ioport
ExclusiveArch: %{ix86} x86_64
- ipmctl
ExclusiveArch: x86_64
- ispc
ExclusiveArch: x86_64 aarch64
- iucode-tool
ExclusiveArch: %{ix86} x86_64
- iyfct
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- jFormatString
ExclusiveArch: %{java_arches} noarch
- jackson-annotations
ExclusiveArch: %{java_arches} noarch
- jackson-bom
ExclusiveArch: %{java_arches} noarch
- jackson-core
ExclusiveArch: %{java_arches} noarch
- jackson-databind
ExclusiveArch: %{java_arches} noarch
- jackson-dataformats-binary
ExclusiveArch: %{java_arches} noarch
- jackson-dataformats-text
ExclusiveArch: %{java_arches} noarch
- jackson-jaxrs-providers
ExclusiveArch: %{java_arches} noarch
- jackson-modules-base
ExclusiveArch: %{java_arches} noarch
- jackson-parent
ExclusiveArch: %{java_arches} noarch
- jacoco
ExclusiveArch: %{java_arches} noarch
- jacop
ExclusiveArch: %{java_arches} noarch
- jakarta-activation
ExclusiveArch: %{java_arches} noarch
- jakarta-activation1
ExclusiveArch: %{java_arches} noarch
- jakarta-annotations
ExclusiveArch: %{java_arches} noarch
- jakarta-el
ExclusiveArch: %{java_arches} noarch
- jakarta-interceptors
ExclusiveArch: %{java_arches} noarch
- jakarta-json
ExclusiveArch: %{java_arches} noarch
- jakarta-mail
ExclusiveArch: %{java_arches} noarch
- jakarta-mail1
ExclusiveArch: %{java_arches} noarch
- jakarta-oro
ExclusiveArch: %{java_arches} noarch
- jakarta-saaj
ExclusiveArch: %{java_arches} noarch
- jakarta-server-pages
ExclusiveArch: %{java_arches} noarch
- jakarta-servlet
ExclusiveArch: %{java_arches} noarch
- jakarta-xml-ws
ExclusiveArch: %{java_arches} noarch
- janino
ExclusiveArch: %{java_arches} noarch
- jansi
ExclusiveArch: %{java_arches}
- jansi-native
ExclusiveArch: %{java_arches}
- jansi1
ExclusiveArch: %{java_arches} noarch
- java-1.8.0-openjdk
ExclusiveArch: %{java_arches}
- java-1.8.0-openjdk-aarch32
ExclusiveArch: %{arm}
- java-1.8.0-openjdk-portable
ExclusiveArch: %{java_arches}
- java-11-openjdk
ExclusiveArch: %{java_arches}
- java-11-openjdk-portable
ExclusiveArch: %{java_arches}
- java-17-openjdk
ExclusiveArch: %{java_arches}
- java-17-openjdk-portable
ExclusiveArch: %{java_arches}
- java-diff-utils
ExclusiveArch: %{java_arches} noarch
- java-dirq
ExclusiveArch: %{java_arches} noarch
- java-jd-decompiler
ExclusiveArch: %{java_arches} noarch
- java-latest-openjdk
ExclusiveArch: %{java_arches}
- java-latest-openjdk-portable
ExclusiveArch: %{java_arches}
- java-runtime-decompiler
ExclusiveArch: %{java_arches} noarch
- java-scrypt
ExclusiveArch: %{java_arches} noarch
- java_cup
ExclusiveArch: %{java_arches} noarch
- javacc
ExclusiveArch: %{java_arches} noarch
- javacc-maven-plugin
ExclusiveArch: %{java_arches} noarch
- javaewah
ExclusiveArch: %{java_arches} noarch
- javapackages-bootstrap
ExclusiveArch: %{java_arches}
- javaparser
ExclusiveArch: %{java_arches} noarch
- javapoet
ExclusiveArch: %{java_arches} noarch
- javassist
ExclusiveArch: %{java_arches} noarch
- jaxb
ExclusiveArch: %{java_arches} noarch
- jaxb-api
ExclusiveArch: %{java_arches} noarch
- jaxb-api2
ExclusiveArch: %{java_arches} noarch
- jaxb-dtd-parser
ExclusiveArch: %{java_arches} noarch
- jaxb-fi
ExclusiveArch: %{java_arches} noarch
- jaxb-istack-commons
ExclusiveArch: %{java_arches} noarch
- jaxb-stax-ex
ExclusiveArch: %{java_arches} noarch
- jaxen
ExclusiveArch: %{java_arches} noarch
- jboss-jaxrs-2.0-api
ExclusiveArch: %{java_arches} noarch
- jboss-logging
ExclusiveArch: %{java_arches} noarch
- jboss-logging-tools
ExclusiveArch: %{java_arches} noarch
- jboss-parent
ExclusiveArch: %{java_arches} noarch
- jchardet
ExclusiveArch: %{java_arches} noarch
- jcip-annotations
ExclusiveArch: %{java_arches} noarch
- jctools
ExclusiveArch: %{java_arches} noarch
- jcuber
ExclusiveArch: %{java_arches} noarch
- jdeparser
ExclusiveArch: %{java_arches} noarch
- jdepend
ExclusiveArch: %{java_arches} noarch
- jdependency
ExclusiveArch: %{java_arches} noarch
- jdom
ExclusiveArch: %{java_arches} noarch
- jdom2
ExclusiveArch: %{java_arches} noarch
- jedit
ExclusiveArch: %{java_arches} noarch
- jericho-html
ExclusiveArch: %{java_arches} noarch
- jetbrains-annotations
ExclusiveArch: noarch %{java_arches}
- jetty
ExclusiveArch: %{java_arches} noarch
- jflex
ExclusiveArch: %{java_arches} noarch
- jfreechart
ExclusiveArch: %{java_arches} noarch
- jgit
ExclusiveArch: %{java_arches} noarch
- jglobus
ExclusiveArch: %{java_arches} noarch
- jgoodies-common
ExclusiveArch: %{java_arches} noarch
- jgoodies-forms
ExclusiveArch: %{java_arches} noarch
- jgoodies-looks
ExclusiveArch: %{java_arches} noarch
- jigawatts
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- jline
ExclusiveArch: %{java_arches}
- jline2
ExclusiveArch: %{java_arches} noarch
- jmock
ExclusiveArch: %{java_arches} noarch
- jmol
ExclusiveArch: %{java_arches} noarch
- jna
ExclusiveArch: %{java_arches}
- jneuroml-core
ExclusiveArch: %{java_arches} noarch
- jni-inchi
ExclusiveArch: %{java_arches}
- jol
ExclusiveArch: %{java_arches} noarch
- jolokia-jvm-agent
ExclusiveArch: %{java_arches} noarch
- jopt-simple
ExclusiveArch: %{java_arches} noarch
- jorbis
ExclusiveArch: %{java_arches} noarch
- jowl
ExclusiveArch: %{nodejs_arches} noarch
- jpanoramamaker
ExclusiveArch: %{java_arches} noarch
- jsch
ExclusiveArch: %{java_arches} noarch
- jsch-agent-proxy
ExclusiveArch: %{java_arches} noarch
- json_simple
ExclusiveArch: %{java_arches} noarch
- jsoup
ExclusiveArch: %{java_arches} noarch
- jsr-305
ExclusiveArch: %{java_arches} noarch
- jss
ExclusiveArch: %{java_arches}
- jssc
ExclusiveArch: %{java_arches}
- jtidy
ExclusiveArch: %{java_arches} noarch
- julia
ExclusiveArch: x86_64
- junit
ExclusiveArch: %{java_arches} noarch
- junit5
ExclusiveArch: %{java_arches} noarch
- juniversalchardet
ExclusiveArch: %{java_arches} noarch
- jzlib
ExclusiveArch: %{java_arches} noarch
- kaidan
ExclusiveArch: %{qt5_qtwebengine_arches}
- kchmviewer
ExclusiveArch: %{qt5_qtwebengine_arches}
- kernel
ExclusiveArch: noarch x86_64 s390x aarch64 ppc64le
ExclusiveArch: noarch i386 i686 x86_64 s390x aarch64 ppc64le
- keylime-agent-rust
ExclusiveArch: %{rust_arches}
- keyring-ima-signer
ExclusiveArch: %{rust_arches}
- kf5-akonadi-search
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-audiocd-kio
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kblog
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarcore
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarutils
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kitinerary
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-ktnef
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-libkdcraw
ExclusiveArch: x86_64 ppc64le %{arm}
- kicad
ExclusiveArch: x86_64 aarch64 ppc64le
- kiwix-desktop
ExclusiveArch: %{qt5_qtwebengine_arches}
- knot-resolver
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- knotes
ExclusiveArch: x86_64 %{arm}
- kubernetes
ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm}
- laf-plugin
ExclusiveArch: %{java_arches} noarch
- lazarus
ExclusiveArch: %{fpc_arches}
- lazpaint
ExclusiveArch: %{fpc_arches}
- ldapjdk
ExclusiveArch: %{java_arches} noarch
- ldc
ExclusiveArch: %{ldc_arches} ppc64le
- ldc1.32
ExclusiveArch: %{ldc_arches} ppc64le
- libbase
ExclusiveArch: %{java_arches} noarch
- libclc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x
- libcxl
ExclusiveArch: %{power64}
- libdfp
ExclusiveArch: ppc ppc64 ppc64le s390 s390x x86_64
- libdispatch
ExclusiveArch: x86_64 aarch64 ppc64le
- libfonts
ExclusiveArch: %{java_arches} noarch
- libformula
ExclusiveArch: %{java_arches} noarch
- libguestfs
ExclusiveArch: %{kernel_arches}
- libica
ExclusiveArch: s390 s390x
- libipt
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- libkgapi
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- libkrun
ExclusiveArch: x86_64 aarch64
- libkrunfw
ExclusiveArch: x86_64 aarch64
- liblayout
ExclusiveArch: %{java_arches} noarch
- libloader
ExclusiveArch: %{java_arches} noarch
- libnxz
ExclusiveArch: ppc64le
- libocxl
ExclusiveArch: ppc64le
- libpsm2
ExclusiveArch: x86_64
- libquentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- libreoffice-TexMaths
ExclusiveArch: %{java_arches}
- librepository
ExclusiveArch: %{java_arches} noarch
- libretro-desmume2015
ExclusiveArch: i686 x86_64
- librtas
ExclusiveArch: %{power64}
- libserializer
ExclusiveArch: %{java_arches} noarch
- libservicelog
ExclusiveArch: ppc %{power64}
- libsmbios
ExclusiveArch: x86_64 %{ix86}
- libunicode
ExclusiveArch: x86_64 aarch64
- libunwind
ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64
- libva-nvidia-driver
ExclusiveArch: %{x86_64} %{ix86} %{arm64} ppc64le
- libvirt-java
ExclusiveArch: %{java_arches} noarch
- libvma
ExclusiveArch: x86_64 ppc64le ppc64 aarch64
- libvmi
ExclusiveArch: x86_64
- libvpd
ExclusiveArch: %{power64}
- libxsmm
ExclusiveArch: x86_64
- libzdnn
ExclusiveArch: s390x
- libzfcphbaapi
ExclusiveArch: s390 s390x
- libzpc
ExclusiveArch: s390x
- llhttp
ExclusiveArch: %{nodejs_arches}
- log4j
ExclusiveArch: %{java_arches} noarch
- log4net
ExclusiveArch: %mono_arches
- lrmi
ExclusiveArch: %{ix86}
- lsvpd
ExclusiveArch: %{power64}
- luajit
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- lucene
ExclusiveArch: %{java_arches} noarch
- lujavrite
ExclusiveArch: %{java_arches}
- luxcorerender
ExclusiveArch: x86_64
- mactel-boot
ExclusiveArch: x86_64
- magicmirror
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-airnow
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-onthisday
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-singlestock
ExclusiveArch: %{nodejs_arches} noarch
- manifest-tool
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- mariadb-java-client
ExclusiveArch: %{java_arches} noarch
- marked
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- matrix-synapse
ExclusiveArch: %{rust_arches}
- maui-mauikit
ExclusiveArch: %{ix86} s390x aarch64 x86_64
- maven
ExclusiveArch: %{java_arches} noarch
- maven-antrun-plugin
ExclusiveArch: %{java_arches} noarch
- maven-archetype
ExclusiveArch: %{java_arches} noarch
- maven-archiver
ExclusiveArch: %{java_arches} noarch
- maven-artifact-transfer
ExclusiveArch: %{java_arches} noarch
- maven-assembly-plugin
ExclusiveArch: %{java_arches} noarch
- maven-bundle-plugin
ExclusiveArch: %{java_arches} noarch
- maven-clean-plugin
ExclusiveArch: %{java_arches} noarch
- maven-common-artifact-filters
ExclusiveArch: %{java_arches} noarch
- maven-compiler-plugin
ExclusiveArch: %{java_arches} noarch
- maven-dependency-analyzer
ExclusiveArch: %{java_arches} noarch
- maven-dependency-plugin
ExclusiveArch: %{java_arches} noarch
- maven-dependency-tree
ExclusiveArch: %{java_arches} noarch
- maven-doxia
ExclusiveArch: %{java_arches} noarch
- maven-doxia-sitetools
ExclusiveArch: %{java_arches} noarch
- maven-enforcer
ExclusiveArch: %{java_arches} noarch
- maven-file-management
ExclusiveArch: %{java_arches} noarch
- maven-filtering
ExclusiveArch: %{java_arches} noarch
- maven-invoker
ExclusiveArch: %{java_arches} noarch
- maven-invoker-plugin
ExclusiveArch: %{java_arches} noarch
- maven-jar-plugin
ExclusiveArch: %{java_arches} noarch
- maven-mapping
ExclusiveArch: %{java_arches} noarch
- maven-native
ExclusiveArch: %{java_arches} noarch
- maven-parent
ExclusiveArch: %{java_arches} noarch
- maven-patch-plugin
ExclusiveArch: %{java_arches} noarch
- maven-plugin-testing
ExclusiveArch: %{java_arches} noarch
- maven-plugin-tools
ExclusiveArch: %{java_arches} noarch
- maven-remote-resources-plugin
ExclusiveArch: %{java_arches} noarch
- maven-reporting-api
ExclusiveArch: %{java_arches} noarch
- maven-reporting-impl
ExclusiveArch: %{java_arches} noarch
- maven-resolver
ExclusiveArch: %{java_arches} noarch
- maven-resources-plugin
ExclusiveArch: %{java_arches} noarch
- maven-script-interpreter
ExclusiveArch: %{java_arches} noarch
- maven-shade-plugin
ExclusiveArch: %{java_arches} noarch
- maven-shared-incremental
ExclusiveArch: %{java_arches} noarch
- maven-shared-io
ExclusiveArch: %{java_arches} noarch
- maven-shared-utils
ExclusiveArch: %{java_arches} noarch
- maven-source-plugin
ExclusiveArch: %{java_arches} noarch
- maven-surefire
ExclusiveArch: %{java_arches} noarch
- maven-verifier
ExclusiveArch: %{java_arches} noarch
- maven-verifier-plugin
ExclusiveArch: %{java_arches} noarch
- maven-wagon
ExclusiveArch: %{java_arches} noarch
- maxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- mbpfan
ExclusiveArch: x86_64
- mcelog
ExclusiveArch: i686 x86_64
- mcrouter
ExclusiveArch: x86_64 aarch64 ppc64le
- mecab-java
ExclusiveArch: %java_arches
- mediaconch
ExclusiveArch: %{qt5_qtwebengine_arches}
- mellowplayer
ExclusiveArch: %{qt5_qtwebengine_arches}
- memkind
ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64
- memtest86+
ExclusiveArch: x86_64 %{ix86}
- merkuro
ExclusiveArch: %{qt5_qtwebengine_arches}
- microcode_ctl
ExclusiveArch: %{ix86} x86_64
- micropython
ExclusiveArch: %{arm} x86_64 riscv64
- miglayout
ExclusiveArch: %{java_arches} noarch
- mine_detector
ExclusiveArch: %{GPRbuild_arches}
- minetest
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mingw-libidn2
ExclusiveArch: %{ix86} x86_64 %{arm}
- mingw-wine-gecko
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- mkbootdisk
ExclusiveArch: %{ix86} sparc sparc64 x86_64
- moby-engine
ExclusiveArch: %{golang_arches}
- mockito
ExclusiveArch: %{java_arches} noarch
- mod_mono
ExclusiveArch: %mono_arches
- modello
ExclusiveArch: %{java_arches} noarch
- moditect
ExclusiveArch: %{java_arches} noarch
- module-build-service
ExclusiveArch: %{ix86} x86_64 noarch
- modulemaker-maven-plugin
ExclusiveArch: %{java_arches} noarch
- mojo-executor
ExclusiveArch: %{java_arches} noarch
- mojo-parent
ExclusiveArch: %{java_arches} noarch
- mokutil
ExclusiveArch: %{ix86} x86_64 aarch64 %{arm}
- mono
ExclusiveArch: %mono_arches
- mono-addins
ExclusiveArch: %mono_arches
- mono-basic
ExclusiveArch: %{mono_arches}
- mono-bouncycastle
ExclusiveArch: %mono_arches
- mono-cecil
ExclusiveArch: %mono_arches
- mono-cecil-flowanalysis
ExclusiveArch: %mono_arches
- mono-reflection
ExclusiveArch: %mono_arches
- mono-tools
ExclusiveArch: %mono_arches
- mono-zeroconf
ExclusiveArch: %mono_arches
- monodevelop
ExclusiveArch: %mono_arches
- monodevelop-debugger-gdb
ExclusiveArch: %{mono_arches}
- mrrescue
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- msr-tools
ExclusiveArch: %{ix86} x86_64
- msv
ExclusiveArch: %{java_arches} noarch
- mvfst
ExclusiveArch: x86_64 aarch64 ppc64le
- mxparser
ExclusiveArch: %{java_arches} noarch
- mysql-connector-java
ExclusiveArch: %{java_arches} noarch
- mysql-connector-net
ExclusiveArch: %{mono_arches}
- naev
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- naga
ExclusiveArch: %{java_arches} noarch
- nant
ExclusiveArch: %mono_arches
- nativejit
ExclusiveArch: x86_64
- nbc
ExclusiveArch: %{fpc_arches}
- nbdkit
ExclusiveArch: x86_64
- ndesk-dbus
ExclusiveArch: %{mono_arches}
- ndesk-dbus-glib
ExclusiveArch: %{mono_arches}
- nekohtml
ExclusiveArch: %{java_arches} noarch
- netavark
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- newtonsoft-json
ExclusiveArch: %{mono_arches}
- nodejs-acorn-object-spread
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-backbone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bash-language-server
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buble
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cjs-module-lexer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-generic-pool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-less
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-linefix
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nodemon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-packaging
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-replace-require-self
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-underscore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-undici
ExclusiveArch: %{nodejs_arches} noarch
- nodejs18
ExclusiveArch: %{nodejs_arches}
- nodejs20
ExclusiveArch: %{nodejs_arches}
- nom-tam-fits
ExclusiveArch: %{java_arches} noarch
- notify-sharp
ExclusiveArch: %{mono_arches}
- notify-sharp3
ExclusiveArch: %{mono_arches}
- nuget
ExclusiveArch: %{mono_arches}
- numatop
ExclusiveArch: x86_64 ppc64le
- nunit
ExclusiveArch: %{mono_arches}
- nunit2
ExclusiveArch: %{mono_arches}
- nvml
ExclusiveArch: x86_64 ppc64le
- objectweb-asm
ExclusiveArch: %{java_arches} noarch
- objenesis
ExclusiveArch: %{java_arches} noarch
- obs-service-rust2rpm
ExclusiveArch: %{rust_arches} noarch
- oci-seccomp-bpf-hook
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
ExclusiveArch: %{golang_arches_future}
- oidn
ExclusiveArch: x86_64
- olpc-utils
ExclusiveArch: %{ix86} %{arm}
- oneVPL
ExclusiveArch: x86_64
- oneVPL-intel-gpu
ExclusiveArch: x86_64
- oneapi-level-zero
ExclusiveArch: x86_64
- onednn
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- onedrive
ExclusiveArch: %{ldc_arches}
- ongres-scram
ExclusiveArch: %{java_arches} noarch
- ongres-stringprep
ExclusiveArch: %{java_arches} noarch
- opae
ExclusiveArch: x86_64
- opal-prd
ExclusiveArch: ppc64le
- open-vm-tools
ExclusiveArch: x86_64 aarch64
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: x86_64
- openblas
ExclusiveArch: %{openblas_arches}
- openjdk-asmtools
ExclusiveArch: %{java_arches} noarch
- openjdk-asmtools7
ExclusiveArch: %{java_arches} noarch
- openjfx
ExclusiveArch: %{java_arches}
- openjfx8
ExclusiveArch: x86_64
- openlibm
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64}
- openms
ExclusiveArch: %{qt5_qtwebengine_arches}
- openni
ExclusiveArch: x86_64 %{arm}
- openni-primesense
ExclusiveArch: %{ix86} x86_64 %{arm}
- openoffice.org-diafilter
ExclusiveArch: %{java_arches}
- openpgl
ExclusiveArch: aarch64 x86_64
- openssl-ibmca
ExclusiveArch: s390 s390x
- openstack-java-sdk
ExclusiveArch: %{java_arches} noarch
- opentest4j
ExclusiveArch: %{java_arches} noarch
- openvkl
ExclusiveArch: aarch64 x86_64
- optee_client
ExclusiveArch: aarch64
- optee_os
ExclusiveArch: aarch64
- options
ExclusiveArch: %{java_arches} noarch
- orthorobot
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- osgi-annotation
ExclusiveArch: %{java_arches} noarch
- osgi-compendium
ExclusiveArch: %{java_arches} noarch
- osgi-core
ExclusiveArch: %{java_arches} noarch
- pacemaker
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64 %{arm}
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- pageedit
ExclusiveArch: %{qt5_qtwebengine_arches}
- parserng
ExclusiveArch: %{java_arches} noarch
- pasdoc
ExclusiveArch: %{fpc_arches}
- pcc
ExclusiveArch: %{ix86} x86_64
- pcfi
ExclusiveArch: %{java_arches} noarch
- pcm
ExclusiveArch: %{ix86} x86_64
- pcmciautils
ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm}
- pdbg
ExclusiveArch: ppc64le
- pdfbox
ExclusiveArch: %{java_arches} noarch
- pdfmod
ExclusiveArch: %mono_arches
- pdftk-java
ExclusiveArch: %{java_arches} noarch
- pentaho-libxml
ExclusiveArch: %{java_arches} noarch
- pentaho-reporting-flow-engine
ExclusiveArch: %{java_arches} noarch
- perl-Dumbbench
ExclusiveArch: %{ix86} x86_64 noarch
- perl-Parse-DMIDecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- pesign
ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm}
- pesign-test-app
ExclusiveArch: x86_64
- picocli
ExclusiveArch: %{java_arches} noarch
- pinta
ExclusiveArch: %mono_arches
- pioneer
ExclusiveArch: %{ix86} x86_64
- plantuml
ExclusiveArch: %{java_arches} noarch
- plasma-dialer
ExclusiveArch: %{java_arches}
- playonlinux
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- plexus-archiver
ExclusiveArch: %{java_arches} noarch
- plexus-build-api
ExclusiveArch: %{java_arches} noarch
- plexus-build-api0
ExclusiveArch: %{java_arches} noarch
- plexus-cipher
ExclusiveArch: %{java_arches} noarch
- plexus-classworlds
ExclusiveArch: %{java_arches} noarch
- plexus-compiler
ExclusiveArch: %{java_arches} noarch
- plexus-component-api
ExclusiveArch: %{java_arches} noarch
- plexus-components-pom
ExclusiveArch: %{java_arches} noarch
- plexus-containers
ExclusiveArch: %{java_arches} noarch
- plexus-i18n
ExclusiveArch: %{java_arches} noarch
- plexus-interpolation
ExclusiveArch: %{java_arches} noarch
- plexus-io
ExclusiveArch: %{java_arches} noarch
- plexus-languages
ExclusiveArch: %{java_arches} noarch
- plexus-pom
ExclusiveArch: %{java_arches} noarch
- plexus-resources
ExclusiveArch: %{java_arches} noarch
- plexus-sec-dispatcher
ExclusiveArch: %{java_arches} noarch
- plexus-utils
ExclusiveArch: %{java_arches} noarch
- plexus-velocity
ExclusiveArch: %{java_arches} noarch
- podman
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- poppler-sharp
ExclusiveArch: %mono_arches
- popub
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- postgresql-jdbc
ExclusiveArch: %{java_arches} noarch
- powerpc-utils
ExclusiveArch: ppc %{power64}
- powerstat
ExclusiveArch: %{ix86} x86_64
- ppc64-diag
ExclusiveArch: ppc %{power64}
- procyon
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
- proguard
ExclusiveArch: %{java_arches} noarch
- prometheus-jmx-exporter
ExclusiveArch: %{java_arches} noarch
- prometheus-simpleclient-java
ExclusiveArch: %{java_arches} noarch
- proxygen
ExclusiveArch: x86_64 aarch64 ppc64le
- pveclib
ExclusiveArch: ppc %{power64}
- pyqtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- python-ast-monitor
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
- python-cryptography
ExclusiveArch: %{rust_arches}
- python-damo
ExclusiveArch: x86_64 aarch64 ppc64le s390x noarch
- python-etcd
ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- python-javaobj
ExclusiveArch: %{java_arches} noarch
- python-jnius
ExclusiveArch: %{java_arches}
- python-jupyter-polymake
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- python-openoffice
ExclusiveArch: noarch x86_64
- python-pyahocorasick
ExclusiveArch: x86_64 %{arm64} ppc64le
- python-pymoc
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-pyqt6-webengine
ExclusiveArch: aarch64 x86_64
- q4wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- qatengine
ExclusiveArch: x86_64
- qatzip
ExclusiveArch: x86_64
- qbe
ExclusiveArch: x86_64 aarch64
- qcint
ExclusiveArch: x86_64
- qclib
ExclusiveArch: s390 s390x
- qdox
ExclusiveArch: %{java_arches} noarch
- qemu-sanity-check
ExclusiveArch: %{kernel_arches}
- qevercloud
ExclusiveArch: %{qt5_qtwebengine_arches}
- qmapshack
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt4pas
ExclusiveArch: %{fpc_arches}
- qt5-qtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt6-qtwebengine
ExclusiveArch: aarch64 x86_64
- qt6-qtwebview
ExclusiveArch: aarch64 x86_64
- quantum-espresso
ExclusiveArch: x86_64 %{ix86} aarch64 %{power64}
- quentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- rEFInd
ExclusiveArch: %{efi}
- rachota
ExclusiveArch: %{java_arches} noarch
- rear
ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64
- reflections
ExclusiveArch: %{java_arches} noarch
- reg
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- regexp
ExclusiveArch: %{java_arches} noarch
- relaxng-datatype-java
ExclusiveArch: %{java_arches} noarch
- replacer
ExclusiveArch: %{java_arches} noarch
- reptyr
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- rescene
ExclusiveArch: %{mono_arches}
- resteasy
ExclusiveArch: %{java_arches} noarch
- restool
ExclusiveArch: aarch64
- restsharp
ExclusiveArch: %{mono_arches}
- retsnoop
ExclusiveArch: %{rust_arches}
- rhino
ExclusiveArch: %{java_arches} noarch
- river
ExclusiveArch: %{zig_arches}
- rkcommon
ExclusiveArch: x86_64 aarch64
- rocalution
ExclusiveArch: x86_64
- rocblas
ExclusiveArch: x86_64
- rocclr
ExclusiveArch: x86_64
- rocm-compilersupport
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-device-libs
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-rpm-macros
ExclusiveArch: x86_64
- rocm-runtime
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-smi
ExclusiveArch: x86_64 aarch64 ppc64le
- rocminfo
ExclusiveArch: x86_64 aarch64 ppc64le
- rocprim
ExclusiveArch: x86_64
- rocrand
ExclusiveArch: x86_64
- rocsparse
ExclusiveArch: x86_64
- rocthrust
ExclusiveArch: x86_64
- rpm-ostree
ExclusiveArch: %{rust_arches}
- rr
ExclusiveArch: %{ix86} x86_64 aarch64
- rssguard
ExclusiveArch: %{qt6_qtwebengine_arches}
- rstudio
ExclusiveArch: %{java_arches}
- rsyntaxtextarea
ExclusiveArch: %{java_arches} noarch
- rubygem-childprocess
ExclusiveArch: %{ix86} x86_64 noarch
- runc
ExclusiveArch: %{golang_arches_future}
- rundoc
ExclusiveArch: %{java_arches} noarch
- rust
ExclusiveArch: %{rust_arches}
- rust-brotli
ExclusiveArch: %{rust_arches}
- rust-compress-tools
ExclusiveArch: %{rust_arches}
- rust-coreos-installer
ExclusiveArch: %{rust_arches}
- rust-ctr
ExclusiveArch: %{rust_arches}
- rust-dashmap4
ExclusiveArch: %{rust_arches}
- rust-deflate
ExclusiveArch: %{rust_arches}
- rust-deflate0.8
ExclusiveArch: %{rust_arches}
- rust-drg
ExclusiveArch: %{rust_arches}
- rust-epoll
ExclusiveArch: %{rust_arches}
- rust-getch
ExclusiveArch: %{rust_arches}
- rust-gzip-header
ExclusiveArch: %{rust_arches}
- rust-hamming
ExclusiveArch: %{rust_arches}
- rust-hidapi
ExclusiveArch: %{rust_arches}
- rust-httparse
ExclusiveArch: %{rust_arches}
- rust-humantime-serde
ExclusiveArch: %{rust_arches}
- rust-hyperlocal
ExclusiveArch: %{rust_arches}
- rust-image0.23
ExclusiveArch: %{rust_arches}
- rust-inflate
ExclusiveArch: %{rust_arches}
- rust-jpeg-decoder0.1
ExclusiveArch: %{rust_arches}
- rust-k9
ExclusiveArch: %{rust_arches}
- rust-krunvm
ExclusiveArch: x86_64 aarch64
- rust-kstring
ExclusiveArch: %{rust_arches}
- rust-kvm-ioctls
ExclusiveArch: x86_64 aarch64
- rust-lebe
ExclusiveArch: %{rust_arches}
- rust-libslirp-sys
ExclusiveArch: %{rust_arches}
- rust-msru
ExclusiveArch: x86_64
- rust-nanorand
ExclusiveArch: %{rust_arches}
- rust-netstat2
ExclusiveArch: %{rust_arches}
- rust-onig
ExclusiveArch: %{rust_arches}
- rust-openat-ext
ExclusiveArch: %{rust_arches}
- rust-os_type
ExclusiveArch: %{rust_arches}
- rust-pager
ExclusiveArch: %{rust_arches}
- rust-pathsearch
ExclusiveArch: %{rust_arches}
- rust-pretty-bytes
ExclusiveArch: %{rust_arches}
- rust-pretty-hex
ExclusiveArch: %{rust_arches}
- rust-primal-bit
ExclusiveArch: %{rust_arches}
- rust-primal-check
ExclusiveArch: %{rust_arches}
- rust-primal-estimate
ExclusiveArch: %{rust_arches}
- rust-procfs0.9
ExclusiveArch: %{rust_arches}
- rust-psl-types
ExclusiveArch: %{rust_arches}
- rust-psm
ExclusiveArch: %{rust_arches}
- rust-pwd
ExclusiveArch: %{rust_arches}
- rust-rand_core
ExclusiveArch: %{rust_arches}
- rust-schemafy_core
ExclusiveArch: %{rust_arches}
- rust-schemafy_lib
ExclusiveArch: %{rust_arches}
- rust-seahash
ExclusiveArch: %{rust_arches}
- rust-serde-big-array
ExclusiveArch: %{rust_arches}
- rust-serde_qs
ExclusiveArch: %{rust_arches}
- rust-serde_yaml0.8
ExclusiveArch: %{rust_arches}
- rust-sev
ExclusiveArch: x86_64
- rust-sevctl
ExclusiveArch: x86_64
- rust-silver
ExclusiveArch: %{rust_arches}
- rust-sinit
ExclusiveArch: %{rust_arches}
- rust-snphost
ExclusiveArch: x86_64
- rust-ssh-key-dir
ExclusiveArch: %{rust_arches}
- rust-stacker
ExclusiveArch: %{rust_arches}
- rust-structopt
ExclusiveArch: %{rust_arches}
- rust-tiff0.6
ExclusiveArch: %{rust_arches}
- rust-totp-lite
ExclusiveArch: %{rust_arches}
- rust-tower-layer
ExclusiveArch: %{rust_arches}
- rust-tpm2-policy
ExclusiveArch: %{rust_arches}
- rust-unicode-normalization
ExclusiveArch: %{rust_arches}
- rust-unicode-xid
ExclusiveArch: %{rust_arches}
- rust-uriparse
ExclusiveArch: %{rust_arches}
- rust-uucore
ExclusiveArch: %{rust_arches}
- rust-varlink_generator
ExclusiveArch: %{rust_arches}
- rust-varlink_parser
ExclusiveArch: %{rust_arches}
- rust-virtio-bindings
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-vmm-sys-util
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-vtparse
ExclusiveArch: %{rust_arches}
- rust-web-ext-native-messaging
ExclusiveArch: %{rust_arches}
- rust-wezterm-color-types
ExclusiveArch: %{rust_arches}
- rust-wezterm-dynamic
ExclusiveArch: %{rust_arches}
- rust-wezterm-dynamic-derive
ExclusiveArch: %{rust_arches}
- rust-zbus1
ExclusiveArch: %{rust_arches}
- rust-zbus_macros1
ExclusiveArch: %{rust_arches}
- rust-zvariant2
ExclusiveArch: %{rust_arches}
- rust-zvariant_derive2
ExclusiveArch: %{rust_arches}
- rutabaga-gfx-ffi
ExclusiveArch: x86_64 aarch64
- sac
ExclusiveArch: %{java_arches} noarch
- safetyblanket
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- sat4j
ExclusiveArch: %{java_arches} noarch
- sbcl
ExclusiveArch: %{ix86} x86_64 aarch64 %{power64}
- sbd
ExclusiveArch: i686 x86_64 s390x aarch64 ppc64le
- sblim-cim-client
ExclusiveArch: %{java_arches} noarch
- sblim-cim-client2
ExclusiveArch: %{java_arches} noarch
- sbsigntools
ExclusiveArch: x86_64 aarch64 %{arm} %{ix86}
- scala
ExclusiveArch: %{java_arches} noarch
- scannotation
ExclusiveArch: %{java_arches} noarch
- sdljava
ExclusiveArch: %{java_arches}
- sdrangel
ExclusiveArch: %{qt5_qtwebengine_arches}
- sdsl-lite
ExclusiveArch: %{power64} x86_64 aarch64
- sdubby
ExclusiveArch: %{efi}
- seabios
ExclusiveArch: x86_64
- seadrive-gui
ExclusiveArch: %{qt5_qtwebengine_arches}
- seafile-client
ExclusiveArch: %{qt5_qtwebengine_arches}
- seamonkey
ExclusiveArch: x86_64
- seqan3
ExclusiveArch: %{power64} x86_64 aarch64
- sequence-library
ExclusiveArch: %{java_arches} noarch
- servicelog
ExclusiveArch: ppc %{power64}
- shaman
ExclusiveArch: %{java_arches} noarch
- sharpfont
ExclusiveArch: %mono_arches
- sharpziplib
ExclusiveArch: %{mono_arches}
- shim
ExclusiveArch: %{efi}
- shim-unsigned-aarch64
ExclusiveArch: aarch64
- shim-unsigned-x64
ExclusiveArch: x86_64
- sigil
ExclusiveArch: %{qt5_qtwebengine_arches}
- sigul
ExclusiveArch: x86_64
- singularity-ce
ExclusiveArch: %{go_arches}
- sisu
ExclusiveArch: %{java_arches} noarch
- sisu-mojos
ExclusiveArch: %{java_arches} noarch
- skopeo
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- skychart
ExclusiveArch: %{fpc_arches}
- slf4j
ExclusiveArch: %{java_arches} noarch
- slirp4netns
ExclusiveArch: %{golang_arches_future}
- snakeyaml
ExclusiveArch: %{java_arches} noarch
- snapd
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x}
- snip
ExclusiveArch: %{java_arches} noarch
- softnet-stat
ExclusiveArch: %{rust_arches}
- soup-sharp
ExclusiveArch: %{mono_arches}
- spacebar
ExclusiveArch: %{java_arches}
- sparkleshare
ExclusiveArch: %{mono_arches}
- spec-version-maven-plugin
ExclusiveArch: %{java_arches} noarch
- spicctrl
ExclusiveArch: %{ix86} x86_64
- spice
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- spice-parent
ExclusiveArch: %{java_arches} noarch
- springlobby
ExclusiveArch: %{ix86} x86_64
- spyder
ExclusiveArch: %{qt5_qtwebengine_arches}
- sqljet
ExclusiveArch: %{java_arches} noarch
- squeekboard
ExclusiveArch: %{rust_arches}
- startdde
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- stats-collect
ExclusiveArch: %{ix86} x86_64 noarch
- statsd
ExclusiveArch: %{nodejs_arches} noarch
- stratis-cli
ExclusiveArch: %{rust_arches} noarch
- stratisd
ExclusiveArch: %{rust_arches}
ExclusiveArch: %{rust_arches}
ExclusiveArch: %{rust_arches}
- string-template-maven-plugin
ExclusiveArch: %{java_arches} noarch
- stringtemplate
ExclusiveArch: %{java_arches} noarch
- stringtemplate4
ExclusiveArch: %{java_arches} noarch
- stripesnoop
ExclusiveArch: %{ix86} x86_64
- subscription-manager-cockpit
ExclusiveArch: %{nodejs_arches} noarch
- supercollider
ExclusiveArch: %{qt5_qtwebengine_arches}
- supermin
ExclusiveArch: %{kernel_arches}
- svnkit
ExclusiveArch: %{java_arches} noarch
- svt-vp9
ExclusiveArch: x86_64
- swift-lang
ExclusiveArch: x86_64 aarch64
- swiftlint
ExclusiveArch: x86_64 aarch64
- swing-layout
ExclusiveArch: %{java_arches} noarch
- sysbench
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64le s390x
- syslinux
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- system-rules
ExclusiveArch: %{java_arches} noarch
- systemd-boot
ExclusiveArch: %efi
- t-digest
ExclusiveArch: %{java_arches} noarch
- taglib-sharp
ExclusiveArch: %{mono_arches}
- tagsoup
ExclusiveArch: %{java_arches} noarch
- tarantool
ExclusiveArch: %{ix86} x86_64
- tboot
ExclusiveArch: %{ix86} x86_64
- tdlib
ExclusiveArch: x86_64 aarch64
- templates_parser
ExclusiveArch: %GPRbuild_arches
- ternimal
ExclusiveArch: %{rust_arches}
- testcloud
ExclusiveArch: %{kernel_arches} noarch
- testng
ExclusiveArch: %{java_arches} noarch
- texlive
ExclusiveArch: %{java_arches} noarch
- thermald
ExclusiveArch: %{ix86} x86_64
- tilix
ExclusiveArch: %{ldc_arches}
- tomboy
ExclusiveArch: %{mono_arches}
- tomcat
ExclusiveArch: %{java_arches} noarch
- tomcat-native
ExclusiveArch: %{java_arches}
- tomcat-taglibs-parent
ExclusiveArch: %{java_arches} noarch
- tomcatjss
ExclusiveArch: %{java_arches} noarch
- torbrowser-launcher
ExclusiveArch: %{ix86} x86_64
- treelayout
ExclusiveArch: %{java_arches} noarch
- trilead-ssh2
ExclusiveArch: %{java_arches} noarch
- truth
ExclusiveArch: %{java_arches} noarch
- tuned-profiles-nfv-host-bin
ExclusiveArch: %{ix86} x86_64
- typescript
ExclusiveArch: %{nodejs_arches} noarch
- uClibc
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
- ucx
ExclusiveArch: aarch64 ppc64le x86_64
- uglify-js
ExclusiveArch: %{nodejs_arches} noarch
- umr
ExclusiveArch: x86_64 aarch64 ppc64le
- unetbootin
ExclusiveArch: %{ix86} x86_64
- univocity-parsers
ExclusiveArch: %{java_arches} noarch
- ursa-major
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- usd
ExclusiveArch: aarch64 x86_64
- v8-314
ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64
- vakzination
ExclusiveArch: %{java_arches}
- valgrind
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
- vboot-utils
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- vecmath1.2
ExclusiveArch: %{java_arches} noarch
- velocity
ExclusiveArch: %{java_arches} noarch
- vim-go
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}}
- vim-syntastic
ExclusiveArch: %{java_arches} noarch
- virt-p2v
ExclusiveArch: x86_64
- virt-v2v
ExclusiveArch: x86_64
- virtiofsd
ExclusiveArch: %{rust_arches}
- virtualbox-guest-additions
ExclusiveArch: i686 x86_64
- vkd3d
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- vmaf
ExclusiveArch: x86_64
- voms-api-java
ExclusiveArch: %{java_arches} noarch
- voms-clients-java
ExclusiveArch: %{java_arches} noarch
- vrq
ExclusiveArch: %{ix86} x86_64
- wangle
ExclusiveArch: x86_64 aarch64 ppc64le
- warsow
ExclusiveArch: %{ix86} x86_64 %{arm}
- warsow-data
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{ix86} x86_64 %{arm}
- wasmedge
ExclusiveArch: x86_64 aarch64
- watchman
ExclusiveArch: x86_64 aarch64 ppc64le
- wdt
ExclusiveArch: x86_64 aarch64 ppc64le
- webkit2-sharp
ExclusiveArch: %mono_arches
- weld-parent
ExclusiveArch: %{java_arches} noarch
- why3
ExclusiveArch: %{ocaml_native_compiler}
- widevine-installer
ExclusiveArch: aarch64
- wine
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86}
- wine-dxvk
ExclusiveArch: %{ix86} x86_64
- winetricks
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- ws-commons-util
ExclusiveArch: %{java_arches} noarch
- wsdl4j
ExclusiveArch: %{java_arches} noarch
- wult
ExclusiveArch: x86_64
- wxMaxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
- x2goclient
ExclusiveArch: x86_64
- x86-simd-sort
ExclusiveArch: x86_64
- xalan-j2
ExclusiveArch: %{java_arches} noarch
- xbean
ExclusiveArch: %{java_arches} noarch
- xbyak
ExclusiveArch: x86_64
- xbyak_aarch64
ExclusiveArch: aarch64
- xe-guest-utilities-latest
ExclusiveArch: %{ix86} x86_64
- xen
ExclusiveArch: x86_64 aarch64
- xerces-j2
ExclusiveArch: %{java_arches} noarch
- xgap
ExclusiveArch: %{gap_arches}
- xml-commons-apis
ExclusiveArch: %{java_arches} noarch
- xml-commons-resolver
ExclusiveArch: %{java_arches} noarch
- xml-maven-plugin
ExclusiveArch: %{java_arches} noarch
- xmlada
ExclusiveArch: %{GPRbuild_arches}
- xmlgraphics-commons
ExclusiveArch: %{java_arches} noarch
- xmlpull
ExclusiveArch: %{java_arches} noarch
- xmlstreambuffer
ExclusiveArch: %{java_arches} noarch
- xmlunit
ExclusiveArch: %{java_arches} noarch
- xmvn
ExclusiveArch: %{java_arches} noarch
- xmvn-connector-ivy
ExclusiveArch: %{java_arches} noarch
- xmvn-generator
ExclusiveArch: %{java_arches}
- xnnpack
ExclusiveArch: x86_64 aarch64
- xorg-x11-drv-armsoc
ExclusiveArch: %{arm} aarch64
- xorg-x11-drv-intel
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-openchrome
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vesa
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vmware
ExclusiveArch: %{ix86} x86_64 ia64
- xsp
ExclusiveArch: %mono_arches
- xstream
ExclusiveArch: %{java_arches} noarch
- xz-java
ExclusiveArch: %{java_arches} noarch
- yarnpkg
ExclusiveArch: %{nodejs_arches} noarch
- zcfan
ExclusiveArch: x86_64
- zeal
ExclusiveArch: aarch64 x86_64
- zenon
ExclusiveArch: %{ocaml_native_compiler}
- zeromq-ada
ExclusiveArch: %{GPRbuild_arches}
- zig
ExclusiveArch: %{zig_arches}
- zlib-ada
ExclusiveArch: %{GPRbuild_arches}
- zlib-ng
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- zola
ExclusiveArch: %{rust_arches}
1
0
Architecture specific change in rpms/rust-utf8-width.git
by githook-noreply＠fedoraproject.org 25 Nov '23
by githook-noreply＠fedoraproject.org 25 Nov '23
25 Nov '23
The package rpms/rust-utf8-width.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-utf8-width.git/commit/?id=9969….
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 9627ffd9f31a60c6e86ac06630e860790816b41b
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Sat Nov 25 12:02:51 2023 +0100
Update to version 0.1.7; Fixes RHBZ#2250697
diff --git a/.gitignore b/.gitignore
index e1dc704..311def6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/utf8-width-0.1.4.crate
/utf8-width-0.1.5.crate
/utf8-width-0.1.6.crate
+/utf8-width-0.1.7.crate
diff --git a/rust-utf8-width.spec b/rust-utf8-width.spec
index 293f26c..070d43d 100644
--- a/rust-utf8-width.spec
+++ b/rust-utf8-width.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 25
%bcond_without check
%global debug_package %{nil}
%global crate utf8-width
Name: rust-utf8-width
-Version: 0.1.6
+Version: 0.1.7
Release: %autorelease
Summary: Determine the width of a UTF-8 character by providing its first byte
@@ -13,7 +13,7 @@ License: MIT
URL: https://crates.io/crates/utf8-width
Source: %{crates_source}
-BuildRequires: rust-packaging >= 21
+BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
To determine the width of a UTF-8 character by providing its first byte.}
@@ -47,7 +47,7 @@ use the "default" feature of the "%{crate}" crate.
%ghost %{crate_instdir}/Cargo.toml
%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
%cargo_prep
%generate_buildrequires
diff --git a/rust2rpm.conf b/rust2rpm.conf
deleted file mode 100644
index a6ae5ac..0000000
--- a/rust2rpm.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[DEFAULT]
-summary = Determine the width of a UTF-8 character by providing its first byte
diff --git a/rust2rpm.toml b/rust2rpm.toml
new file mode 100644
index 0000000..b34fabc
--- /dev/null
+++ b/rust2rpm.toml
@@ -0,0 +1,3 @@
+[package]
+summary = "Determine the width of a UTF-8 character by providing its first byte"
+
diff --git a/sources b/sources
index a746704..609650c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (utf8-width-0.1.6.crate) = 2c51e38c7fa2a2c113ff74164067e49e2e615048144f3065c228a965804029447f7a1e65d926facccb8332a2ab2be02fffb7413d8eee6f883d941909b350844c
+SHA512 (utf8-width-0.1.7.crate) = ae870bc338bc74f9e214acbb31155ed37e3c686abcda81e7a3f9b8440d2782e4b29efa6d1a52afb22da390f3e64f012380f18ba1e3c1a37bde927812c361909e
commit 99691f6a3ca0e4398172717933a427bf79a3a510
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Mon Aug 7 20:40:50 2023 +0200
Regenerate with rust2rpm v24
diff --git a/rust-utf8-width.spec b/rust-utf8-width.spec
index 01162f9..293f26c 100644
--- a/rust-utf8-width.spec
+++ b/rust-utf8-width.spec
@@ -1,25 +1,22 @@
-# Generated by rust2rpm 21
+# Generated by rust2rpm 24
%bcond_without check
%global debug_package %{nil}
%global crate utf8-width
-Name: rust-%{crate}
+Name: rust-utf8-width
Version: 0.1.6
Release: %autorelease
Summary: Determine the width of a UTF-8 character by providing its first byte
-# Upstream license specification: MIT
License: MIT
URL: https://crates.io/crates/utf8-width
Source: %{crates_source}
-ExclusiveArch: %{rust_arches}
-
BuildRequires: rust-packaging >= 21
%global _description %{expand:
-Determine the width of a UTF-8 character by providing its first byte.}
+To determine the width of a UTF-8 character by providing its first byte.}
%description %{_description}
diff --git a/rust2rpm.conf b/rust2rpm.conf
new file mode 100644
index 0000000..a6ae5ac
--- /dev/null
+++ b/rust2rpm.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+summary = Determine the width of a UTF-8 character by providing its first byte
commit 5e3af9da93923d828b64ef9dcb330f38b9363133
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jul 22 00:30:49 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
1
0
Architecture specific change in rpms/rust-page_size.git
by githook-noreply＠fedoraproject.org 25 Nov '23
by githook-noreply＠fedoraproject.org 25 Nov '23
25 Nov '23
The package rpms/rust-page_size.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-page_size.git/commit/?id=a1cf0….
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 694e9fc5a88ac65b087c0844def0a40e7b65f985
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Sat Nov 25 10:21:43 2023 +0100
Update to version 0.6.0; Fixes RHBZ#2144307
diff --git a/.gitignore b/.gitignore
index 19be465..b9474e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/page_size-0.4.2.crate
+/page_size-0.6.0.crate
diff --git a/page_size-fix-metadata-auto.diff b/page_size-fix-metadata-auto.diff
index 8512126..42ea02f 100644
--- a/page_size-fix-metadata-auto.diff
+++ b/page_size-fix-metadata-auto.diff
@@ -1,12 +1,16 @@
---- page_size-0.4.2/Cargo.toml 1970-01-01T00:00:00+00:00
-+++ page_size-0.4.2/Cargo.toml 2023-05-21T12:50:35.693885+00:00
-@@ -30,9 +30,6 @@
- no_std = ["spin"]
+--- page_size-0.6.0/Cargo.toml 1970-01-01T00:00:01+00:00
++++ page_size-0.6.0/Cargo.toml 2023-11-25T09:16:52.055070+00:00
+@@ -37,12 +37,9 @@
[target."cfg(unix)".dependencies.libc]
- version = "0.2"
+ version = "^0.2"
+
-[target."cfg(windows)".dependencies.winapi]
--version = "0.3.8"
+-version = "0.3.9"
-features = ["sysinfoapi"]
+-
[badges.appveyor]
repository = "Elzair/page_size_rs"
+ [badges.travis-ci]
+ repository = "Elzair/page_size_rs"
++
diff --git a/rust-page_size.spec b/rust-page_size.spec
index 475fcb4..3a1c55b 100644
--- a/rust-page_size.spec
+++ b/rust-page_size.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 25
%bcond_without check
%global debug_package %{nil}
%global crate page_size
Name: rust-page_size
-Version: 0.4.2
+Version: 0.6.0
Release: %autorelease
Summary: Easy, fast, cross-platform way to retrieve the memory page size
@@ -13,10 +13,10 @@ Summary: Easy, fast, cross-platform way to retrieve the memory page size
License: MIT OR Apache-2.0
URL: https://crates.io/crates/page_size
Source: %{crates_source}
-# Automatically generated patch to strip foreign dependencies
+# Automatically generated patch to strip dependencies and normalize metadata
Patch: page_size-fix-metadata-auto.diff
-BuildRequires: rust-packaging >= 21
+BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
Provides an easy, fast, cross-platform way to retrieve the memory page
@@ -76,7 +76,7 @@ use the "spin" feature of the "%{crate}" crate.
%ghost %{crate_instdir}/Cargo.toml
%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
%cargo_prep
%generate_buildrequires
diff --git a/sources b/sources
index 1aaf9a1..0a41108 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (page_size-0.4.2.crate) = 171f1c4fecec80538a3ef0063c0cf1ebd611d9208a45329d769705db05f71973a140c497164393cac571934c3e2d24ab4caa055365f24cd4785fbd3d4d0f607a
+SHA512 (page_size-0.6.0.crate) = 204faf102760e9f3edc480302a7d7e6b995b7a40850372ebb332cab82b9c8301e761351c7abce93bde9473ad9e944bb07e6c4447d4ee1891f5ae2c261b74b8e5
commit 532cf136d585447c2aa8c0c73d26fbf58da35073
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 21 22:13:34 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
commit a1cf08aca4bdeca48e54e6d34cb45b0fd2738b0e
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Sun May 21 14:51:31 2023 +0200
Regenerate with rust2rpm v24
diff --git a/README.md b/README.md
deleted file mode 100644
index edecdcd..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-page_size
-
-The rust-page_size package
diff --git a/page_size-fix-metadata.diff b/page_size-fix-metadata-auto.diff
similarity index 82%
rename from page_size-fix-metadata.diff
rename to page_size-fix-metadata-auto.diff
index 63990f7..8512126 100644
--- a/page_size-fix-metadata.diff
+++ b/page_size-fix-metadata-auto.diff
@@ -1,5 +1,5 @@
--- page_size-0.4.2/Cargo.toml 1970-01-01T00:00:00+00:00
-+++ page_size-0.4.2/Cargo.toml 2021-06-17T17:57:38.471764+00:00
++++ page_size-0.4.2/Cargo.toml 2023-05-21T12:50:35.693885+00:00
@@ -30,9 +30,6 @@
no_std = ["spin"]
[target."cfg(unix)".dependencies.libc]
diff --git a/rust-page_size.spec b/rust-page_size.spec
index a5fb7e1..475fcb4 100644
--- a/rust-page_size.spec
+++ b/rust-page_size.spec
@@ -1,30 +1,26 @@
-# Generated by rust2rpm 17
+# Generated by rust2rpm 24
%bcond_without check
%global debug_package %{nil}
%global crate page_size
-Name: rust-%{crate}
+Name: rust-page_size
Version: 0.4.2
Release: %autorelease
-Summary: Provides an easy, fast, cross-platform way to retrieve the memory page size
+Summary: Easy, fast, cross-platform way to retrieve the memory page size
# Upstream license specification: MIT/Apache-2.0
-License: MIT or ASL 2.0
+License: MIT OR Apache-2.0
URL: https://crates.io/crates/page_size
Source: %{crates_source}
-# Drop winapi dependency
-Patch0: page_size-fix-metadata.diff
+# Automatically generated patch to strip foreign dependencies
+Patch: page_size-fix-metadata-auto.diff
-ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
-
-BuildRequires: rust-packaging
+BuildRequires: rust-packaging >= 21
%global _description %{expand:
-Provides an easy, fast, cross-platform way to retrieve the memory page size.}
+Provides an easy, fast, cross-platform way to retrieve the memory page
+size.}
%description %{_description}
@@ -34,13 +30,14 @@ BuildArch: noarch
%description devel %{_description}
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
%files devel
-%license LICENSE-APACHE LICENSE-MIT
-%doc README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE-APACHE
+%license %{crate_instdir}/LICENSE-MIT
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -48,11 +45,11 @@ BuildArch: noarch
%description -n %{name}+default-devel %{_description}
-This package contains library source intended for building other packages
-which use "default" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+no_std-devel
Summary: %{summary}
@@ -60,11 +57,11 @@ BuildArch: noarch
%description -n %{name}+no_std-devel %{_description}
-This package contains library source intended for building other packages
-which use "no_std" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "no_std" feature of the "%{crate}" crate.
%files -n %{name}+no_std-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+spin-devel
Summary: %{summary}
@@ -72,11 +69,11 @@ BuildArch: noarch
%description -n %{name}+spin-devel %{_description}
-This package contains library source intended for building other packages
-which use "spin" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "spin" feature of the "%{crate}" crate.
%files -n %{name}+spin-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
commit 0577dddea95ff1b2d30116a9b96323bee94c6a03
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Sun May 21 14:50:26 2023 +0200
Convert to %autorelease and %autochangelog
[skip changelog]
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..1993647
--- /dev/null
+++ b/changelog
@@ -0,0 +1,14 @@
+* Sat Jan 21 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.4.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.4.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.4.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jun 17 2021 Davide Cavalca <dcavalca(a)fedoraproject.org> - 0.4.2-1
+- Initial package
diff --git a/rust-page_size.spec b/rust-page_size.spec
index 6f38312..a5fb7e1 100644
--- a/rust-page_size.spec
+++ b/rust-page_size.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.4.2
-Release: 5%{?dist}
+Release: %autorelease
Summary: Provides an easy, fast, cross-platform way to retrieve the memory page size
# Upstream license specification: MIT/Apache-2.0
@@ -97,17 +97,4 @@ which use "spin" feature of "%{crate}" crate.
%endif
%changelog
-* Sat Jan 21 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.4.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.4.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.4.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.4.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Jun 17 2021 Davide Cavalca <dcavalca(a)fedoraproject.org> - 0.4.2-1
-- Initial package
+%autochangelog
1
0
Package no longer excluding arches (1)
==================================
- rust-askalono-cli
List of packages currently excluding arches (1133)
===========================================
- 0ad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- 90-Second-Portraits
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- BareBonesBrowserLaunch
ExclusiveArch: %{java_arches} noarch
- CFR
ExclusiveArch: %{java_arches} noarch
- CardManager
ExclusiveArch: %{java_arches} noarch
- GAPDoc
ExclusiveArch: %{gap_arches} noarch
- GoldenCheetah
ExclusiveArch: %{qt5_qtwebengine_arches}
- GtkAda
ExclusiveArch: %{GPRbuild_arches}
- GtkAda3
ExclusiveArch: %{GPRbuild_arches}
- IPAddress
ExclusiveArch: %{java_arches} noarch
- Mars
ExclusiveArch: %{java_arches} noarch
- OpenColorIO
ExclusiveArch: x86_64 ppc64le
- OpenImageIO
ExclusiveArch: x86_64 ppc64le
- OpenMolcas
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- OpenStego
ExclusiveArch: %{java_arches} noarch
- PragmARC
ExclusiveArch: %{GPRbuild_arches}
- R-V8
ExclusiveArch: %{nodejs_arches}
- R-rJava
ExclusiveArch: %{java_arches}
- RdRand
ExclusiveArch: %{ix86} x86_64
- RediSearch
ExclusiveArch: x86_64
- SLOF
ExclusiveArch: ppc64le
- YafaRay
ExclusiveArch: %{ix86} x86_64
- aardvark-dns
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- accel-config
ExclusiveArch: %{ix86} x86_64
- acpid
ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64
- ahven
ExclusiveArch: %{GPRbuild_arches}
- algobox
ExclusiveArch: %{qt5_qtwebengine_arches}
- american-fuzzy-lop
ExclusiveArch: %{ix86} x86_64 s390x
- anet
ExclusiveArch: %{GPRbuild_arches}
- ant
ExclusiveArch: %{java_arches} noarch
- ant-antunit
ExclusiveArch: %{java_arches} noarch
- ant-contrib
ExclusiveArch: %{java_arches} noarch
- antlr
ExclusiveArch: %{java_arches}
- antlr3
ExclusiveArch: %{java_arches}
- antlr4-project
ExclusiveArch: %{java_arches}
- antlrworks
ExclusiveArch: %{java_arches} noarch
- aopalliance
ExclusiveArch: %{java_arches} noarch
- apache-commons-beanutils
ExclusiveArch: %{java_arches} noarch
- apache-commons-cli
ExclusiveArch: %{java_arches} noarch
- apache-commons-codec
ExclusiveArch: %{java_arches} noarch
- apache-commons-collections
ExclusiveArch: %{java_arches} noarch
- apache-commons-collections4
ExclusiveArch: %{java_arches} noarch
- apache-commons-compress
ExclusiveArch: %{java_arches} noarch
- apache-commons-configuration
ExclusiveArch: %{java_arches} noarch
- apache-commons-digester
ExclusiveArch: %{java_arches} noarch
- apache-commons-exec
ExclusiveArch: %{java_arches} noarch
- apache-commons-io
ExclusiveArch: %{java_arches} noarch
- apache-commons-jexl
ExclusiveArch: %{java_arches} noarch
- apache-commons-jxpath
ExclusiveArch: %{java_arches} noarch
- apache-commons-lang3
ExclusiveArch: %{java_arches} noarch
- apache-commons-logging
ExclusiveArch: %{java_arches} noarch
- apache-commons-math
ExclusiveArch: %{java_arches} noarch
- apache-commons-modeler
ExclusiveArch: %{java_arches} noarch
- apache-commons-net
ExclusiveArch: %{java_arches} noarch
- apache-commons-parent
ExclusiveArch: %{java_arches} noarch
- apache-commons-pool
ExclusiveArch: %{java_arches} noarch
- apache-commons-vfs
ExclusiveArch: %{java_arches} noarch
- apache-ivy
ExclusiveArch: %{java_arches} noarch
- apache-parent
ExclusiveArch: %{java_arches} noarch
- apache-resource-bundles
ExclusiveArch: %{java_arches} noarch
- apache-sshd
ExclusiveArch: %{java_arches} noarch
- apiguardian
ExclusiveArch: %{java_arches} noarch
- apmd
ExclusiveArch: %{ix86}
- appstream-generator
ExclusiveArch: %{ldc_arches}
- aqute-bnd
ExclusiveArch: %{java_arches} noarch
- args4j
ExclusiveArch: %{java_arches} noarch
- arianna
ExclusiveArch: %{qt6_qtwebengine_arches}
- arm-trusted-firmware
ExclusiveArch: aarch64
- asmjit
ExclusiveArch: aarch64 x86_64
- assertj-core
ExclusiveArch: %{java_arches} noarch
- atinject
ExclusiveArch: %{java_arches} noarch
- aunit
ExclusiveArch: %GPRbuild_arches
- auto
ExclusiveArch: %{java_arches} noarch
- autolink-java
ExclusiveArch: noarch %{java_arches}
- avgtime
ExclusiveArch: %{ldc_arches}
- aws
ExclusiveArch: %GPRbuild_arches
- azure-cli
ExclusiveArch: %{java_arches} noarch
- batik
ExclusiveArch: %{java_arches} noarch
- bcal
ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x
- bcc
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
- bcel
ExclusiveArch: %{java_arches} noarch
- bcm283x-firmware
ExclusiveArch: aarch64
- beansbinding
ExclusiveArch: %{java_arches} noarch
- berusky2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips}
- beust-jcommander
ExclusiveArch: %{java_arches} noarch
- bibletime
ExclusiveArch: %{java_arches}
- biosdevname
ExclusiveArch: %{ix86} x86_64
- bless
ExclusiveArch: %mono_arches
- bodhi-server
ExclusiveArch: %{golang_arches_future}
- bolzplatz2006
ExclusiveArch: %{java_arches}
- bouncycastle
ExclusiveArch: %{java_arches} noarch
- box64
ExclusiveArch: aarch64 ppc64le x86_64
- bpftrace
ExclusiveArch: x86_64 %{power64} aarch64 s390x
- brazil
ExclusiveArch: %{java_arches} noarch
- bsf
ExclusiveArch: %{java_arches} noarch
- bsh
ExclusiveArch: %{java_arches} noarch
- build-helper-maven-plugin
ExclusiveArch: %{java_arches} noarch
- buildah
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- byebyebios
ExclusiveArch: x86_64
- byte-buddy
ExclusiveArch: %{java_arches} noarch
- byteman
ExclusiveArch: %{java_arches} noarch
- cachelib
ExclusiveArch: x86_64 aarch64 ppc64le
- caddy
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: %{golang_arches}
- caffe
ExclusiveArch: x86_64 aarch64 ppc64le
- calamares
ExclusiveArch: %{ix86} x86_64 aarch64
- calibre
ExclusiveArch: aarch64 x86_64
- cambozola
ExclusiveArch: %{java_arches} noarch
- canl-java
ExclusiveArch: %{java_arches} noarch
- catatonit
ExclusiveArch: aarch64 ppc64le s390x x86_64
ExclusiveArch: %{golang_arches_future}
- ccdciel
ExclusiveArch: %{fpc_arches}
- cdcollect
ExclusiveArch: %{mono_arches}
- cdi-api
ExclusiveArch: %{java_arches} noarch
- ceph
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- cglib
ExclusiveArch: %{java_arches} noarch
- chromium
ExclusiveArch: x86_64
ExclusiveArch: x86_64 aarch64
- cjdns
ExclusiveArch: %{nodejs_arches}
- classloader-leak-test-framework
ExclusiveArch: %{java_arches} noarch
- classpathless-compiler
ExclusiveArch: %{java_arches} noarch
- clevis-pin-tpm2
ExclusiveArch: %{rust_arches}
- clojure
ExclusiveArch: %{java_arches} noarch
- clojure-core-specs-alpha
ExclusiveArch: %{java_arches} noarch
- clojure-maven-plugin
ExclusiveArch: %{java_arches} noarch
- clojure-spec-alpha
ExclusiveArch: %{java_arches} noarch
- cmospwd
ExclusiveArch: %{ix86} x86_64
- cmrt
ExclusiveArch: %{ix86} x86_64 ia64
- codehaus-parent
ExclusiveArch: %{java_arches} noarch
- colorful
ExclusiveArch: %{fpc_arches}
- colossus
ExclusiveArch: %{java_arches} noarch
- conmon
ExclusiveArch: %{golang_arches_future}
- console-image-viewer
ExclusiveArch: %{java_arches} noarch
- containernetworking-plugins
ExclusiveArch: %{golang_arches}
- coq
ExclusiveArch: %{ocaml_native_compiler}
- cortado
ExclusiveArch: %{java_arches} noarch
- cpu-x
ExclusiveArch: i686 x86_64
- cpufetch
ExclusiveArch: %{arm} aarch64 x86_64 ppc ppc64 ppc64le
- cpuid
ExclusiveArch: %{ix86} x86_64
- cpuinfo
ExclusiveArch: x86_64 aarch64
- cqrlog
ExclusiveArch: %{fpc_arches}
- crash
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- crash-gcore-command
ExclusiveArch: aarch64 ppc64le x86_64
- crash-trace-command
ExclusiveArch: aarch64 ppc64le s390x x86_64
- credentials-fetcher
ExclusiveArch: x86_64 aarch64 s390x
- cri-o
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- cri-tools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- criu
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- crun
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le riscv64 s390x x86_64
- cryptlib
ExclusiveArch: x86_64 aarch64 ppc64le
- crypto-policies
ExclusiveArch: %{java_arches} noarch
- cryptobone
ExclusiveArch: x86_64 ppc64le aarch64
- csslint
ExclusiveArch: %{nodejs_arches} noarch
- daq
ExclusiveArch: x86_64 aarch64
- dbus-sharp
ExclusiveArch: %mono_arches
- dbus-sharp-glib
ExclusiveArch: %mono_arches
- decentxml
ExclusiveArch: %{java_arches} noarch
- deepin-daemon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- deepin-desktop-schemas
ExclusiveArch: %{go_arches}
- directory-maven-plugin
ExclusiveArch: %{java_arches} noarch
- dirgra
ExclusiveArch: %{java_arches} noarch
- disruptor
ExclusiveArch: %{java_arches} noarch
- ditaa
ExclusiveArch: %{java_arches} noarch
- dlm
ExclusiveArch: i686 x86_64
- dmidecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- dmtcp
ExclusiveArch: x86_64
- docker-distribution
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- dogtag-pki
ExclusiveArch: %{java_arches}
- dolphin-emu
ExclusiveArch: x86_64 aarch64
- dom4j
ExclusiveArch: %{java_arches} noarch
- dotnet6.0
ExclusiveArch: aarch64 x86_64 s390x
ExclusiveArch: x86_64
- dotnet7.0
ExclusiveArch: aarch64 ppc64le s390x x86_64
ExclusiveArch: x86_64
- doublecmd
ExclusiveArch: %{ix86} x86_64
- dpdk
ExclusiveArch: x86_64 i686 aarch64 ppc64le
- dub
ExclusiveArch: %{ldc_arches}
- dxvk-native
ExclusiveArch: %{ix86} x86_64
- dyninst
ExclusiveArch: %{ix86} x86_64 ppc64le aarch64
- e3
ExclusiveArch: %{ix86} x86_64
- easymock
ExclusiveArch: %{java_arches} noarch
- ecj
ExclusiveArch: %{java_arches} noarch
- eclipse-swt
ExclusiveArch: %{java_arches}
- ed25519-java
ExclusiveArch: %{java_arches} noarch
- edk2
ExclusiveArch: x86_64 aarch64 riscv64
- efibootmgr
ExclusiveArch: %{efi}
- efifs
ExclusiveArch: %{efi}
- efitools
ExclusiveArch: %{efi}
- efivar
ExclusiveArch: %{efi}
- elk
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- emacs-slime
ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64
- embree
ExclusiveArch: aarch64 x86_64
- embree3
ExclusiveArch: aarch64 x86_64
- enjarify
ExclusiveArch: %{java_arches} noarch
- enki
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
- envytools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- eric
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
- erlang-corba
ExclusiveArch: %{java_arches}
- esmi_ib_library
ExclusiveArch: x86_64
- eth-tools
ExclusiveArch: x86_64
- exec-maven-plugin
ExclusiveArch: %{java_arches} noarch
- external-editor-revived
ExclusiveArch: %{rust_arches}
- extra-enforcer-rules
ExclusiveArch: %{java_arches} noarch
- fasterxml-oss-parent
ExclusiveArch: %{java_arches} noarch
- fb303
ExclusiveArch: x86_64 aarch64 ppc64le
- fbthrift
ExclusiveArch: x86_64 aarch64 ppc64le
- fcitx-libpinyin
ExclusiveArch: %{qt5_qtwebengine_arches}
- fedora-dockerfiles
ExclusiveArch: %{go_arches}
- felix-parent
ExclusiveArch: %{java_arches} noarch
- felix-utils
ExclusiveArch: %{java_arches} noarch
- fernflower
ExclusiveArch: %{java_arches} noarch
- fes
ExclusiveArch: %{ix86} x86_64
- filedrop
ExclusiveArch: %{java_arches} noarch
- firecracker
ExclusiveArch: aarch64 x86_64
- fishbowl
ExclusiveArch: %{java_arches} noarch
- fizz
ExclusiveArch: x86_64 aarch64 ppc64le
- flexmark-java
ExclusiveArch: noarch %{java_arches}
- flocq
ExclusiveArch: %{ocaml_native_compiler}
- florist
ExclusiveArch: %{GPRbuild_arches}
- fluent-bit
ExclusiveArch: x86_64 aarch64
- flute
ExclusiveArch: %{java_arches} noarch
- folly
ExclusiveArch: x86_64 aarch64 ppc64le
- fop
ExclusiveArch: %{java_arches} noarch
- forge-parent
ExclusiveArch: %{java_arches} noarch
- fpc
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc64le
- frama-c
ExclusiveArch: %{ocaml_native_compiler}
- freecol
ExclusiveArch: %{java_arches} noarch
- freemarker
ExclusiveArch: %{java_arches} noarch
- freerouting
ExclusiveArch: %{java_arches} noarch
- frescobaldi
ExclusiveArch: %{qt5_qtwebengine_arches}
- frysk
ExclusiveArch: x86_64 ppc64
- fuse-overlayfs
ExclusiveArch: %{arm64} ppc64le s390x x86_64
- fusesource-pom
ExclusiveArch: %{java_arches} noarch
- fwts
ExclusiveArch: x86_64 %{arm} aarch64 s390x riscv64 %{power64}
- fwupd-efi
ExclusiveArch: x86_64 aarch64
- ga
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- gap
ExclusiveArch: %{gap_arches}
- gap-pkg-ace
ExclusiveArch: %{gap_arches}
- gap-pkg-aclib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-alnuth
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-atlasrep
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-autodoc
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-automata
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-autpgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-browse
ExclusiveArch: %{gap_arches}
- gap-pkg-caratinterface
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-circle
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-cohomolo
ExclusiveArch: %{gap_arches}
- gap-pkg-congruence
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-corelg
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crime
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crisp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crypting
ExclusiveArch: %{gap_arches}
- gap-pkg-cryst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crystcat
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-ctbllib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-curlinterface
ExclusiveArch: %{gap_arches}
- gap-pkg-cvec
ExclusiveArch: %{gap_arches}
- gap-pkg-datastructures
ExclusiveArch: %{gap_arches}
- gap-pkg-design
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-digraphs
ExclusiveArch: %{gap_arches}
- gap-pkg-edim
ExclusiveArch: %{gap_arches}
- gap-pkg-factint
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-ferret
ExclusiveArch: %{gap_arches}
- gap-pkg-fga
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-fining
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-float
ExclusiveArch: %{gap_arches}
- gap-pkg-format
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-forms
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-fr
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-francy
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-gbnp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-genss
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-grape
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-groupoids
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-grpconst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-guava
ExclusiveArch: %{gap_arches}
- gap-pkg-hap
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-hapcryst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-hecke
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-images
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-io
ExclusiveArch: %{gap_arches}
- gap-pkg-irredsol
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-json
ExclusiveArch: %{gap_arches}
- gap-pkg-jupyterkernel
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-jupyterviz
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-laguna
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liealgdb
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liepring
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liering
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-loops
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-lpres
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-mapclass
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-nautytracesinterface
ExclusiveArch: %{gap_arches}
- gap-pkg-nq
ExclusiveArch: %{gap_arches}
- gap-pkg-openmath
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-orb
ExclusiveArch: %{gap_arches}
- gap-pkg-polenta
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-polycyclic
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-polymaking
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-primgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-profiling
ExclusiveArch: %{gap_arches}
- gap-pkg-qpa
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-quagroup
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-radiroot
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-recog
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-repsn
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-resclasses
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-scscp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-semigroups
ExclusiveArch: %{gap_arches}
- gap-pkg-singular
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sla
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-smallgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-smallsemi
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sonata
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sophus
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-spinsym
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-standardff
ExclusiveArch: %{gap_arches}
- gap-pkg-tomlib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-toric
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-transgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-utils
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-uuid
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-xmod
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-zeromqinterface
ExclusiveArch: %{gap_arches}
- gappalib-coq
ExclusiveArch: %{ocaml_native_compiler}
- gbrainy
ExclusiveArch: %mono_arches
- gdb
ExclusiveArch: %{ix86} x86_64
- gdb-exploitable
ExclusiveArch: x86_64 i386
ExclusiveArch: x86_64 noarch
- gearhead1
ExclusiveArch: %{fpc_arches}
- gearhead2
ExclusiveArch: %{fpc_arches}
- ghdl
ExclusiveArch: %{GNAT_arches}
- ghostwriter
ExclusiveArch: %{qt5_qtwebengine_arches}
- gio-sharp
ExclusiveArch: %mono_arches
- gir-to-d
ExclusiveArch: %{ldc_arches}
- git-octopus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- gitqlient
ExclusiveArch: %{qt5_qtwebengine_arches}
- giver
ExclusiveArch: %{mono_arches}
- gkeyfile-sharp
ExclusiveArch: %mono_arches
- glibc32
ExclusiveArch: x86_64
- glibd
ExclusiveArch: %{ldc_arches}
- gnatcoll
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-bindings
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-db
ExclusiveArch: %{GPRbuild_arches}
- gnome-boxes
ExclusiveArch: x86_64
- gnome-desktop-sharp
ExclusiveArch: %mono_arches
- gnome-do
ExclusiveArch: %mono_arches
- gnome-keyring-sharp
ExclusiveArch: %mono_arches
- gnome-rdp
ExclusiveArch: %{mono_arches}
- gnome-sharp
ExclusiveArch: %mono_arches
- gnome-subtitles
ExclusiveArch: %mono_arches
- gnu-efi
ExclusiveArch: %{efi}
- go-bindata
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- godep
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang
ExclusiveArch: %{golang_arches}
- google-gson
ExclusiveArch: %{java_arches} noarch
- google-guice
ExclusiveArch: %{java_arches} noarch
- gotun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: x86_64
- goverlay
ExclusiveArch: %{fpc_arches}
- gprbuild
ExclusiveArch: %{GPRbuild_arches}
- gprolog
ExclusiveArch: x86_64 %{ix86} ppc alpha aarch64
- grafana
ExclusiveArch: %{grafana_arches}
- grafana-pcp
ExclusiveArch: %{grafanapcp_arches}
- gtk-sharp-beans
ExclusiveArch: %mono_arches
- gtk-sharp2
ExclusiveArch: %mono_arches
- gtk-sharp3
ExclusiveArch: %{mono_arches}
- gtkd
ExclusiveArch: %{ldc_arches}
- guava
ExclusiveArch: %{java_arches} noarch
- gudev-sharp
ExclusiveArch: %mono_arches
- guestfs-tools
ExclusiveArch: %{kernel_arches}
- gvisor-tap-vsock
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- hamcrest
ExclusiveArch: %{java_arches} noarch
- harec
ExclusiveArch: x86_64 aarch64
- hawtjni
ExclusiveArch: %{java_arches} noarch
- hedgewars
ExclusiveArch: %{fpc_arches}
- hibernate-jpa-2.0-api
ExclusiveArch: %{java_arches} noarch
- hid4java
ExclusiveArch: %{java_arches} noarch
- hipblas
ExclusiveArch: x86_64
- hipcub
ExclusiveArch: x86_64
- hipify
ExclusiveArch: x86_64
- hsakmt
ExclusiveArch: x86_64 aarch64 ppc64le
- httpcomponents-client
ExclusiveArch: %{java_arches} noarch
- httpcomponents-core
ExclusiveArch: %{java_arches} noarch
- httpcomponents-project
ExclusiveArch: %{java_arches} noarch
- hyena
ExclusiveArch: %{mono_arches}
- hyperscan
ExclusiveArch: x86_64
- hyperv-daemons
ExclusiveArch: i686 x86_64 aarch64
- icaro
ExclusiveArch: %{ix86} x86_64 noarch
- icedtea-web
ExclusiveArch: %{java_arches}
- icu4j
ExclusiveArch: %{java_arches} noarch
- imagej
ExclusiveArch: %{java_arches} noarch
- imhex
ExclusiveArch: x86_64 %{arm64}
- imvirt
ExclusiveArch: %{ix86} x86_64 ia64
- indistarter
ExclusiveArch: %{fpc_arches}
- infinipath-psm
ExclusiveArch: x86_64
- intel-cm-compiler
ExclusiveArch: i686 x86_64
- intel-cmt-cat
ExclusiveArch: x86_64
- intel-compute-runtime
ExclusiveArch: x86_64
- intel-gmmlib
ExclusiveArch: x86_64 i686
- intel-igc
ExclusiveArch: x86_64
- intel-ipp-crypto-mb
ExclusiveArch: x86_64
- intel-ipsec-mb
ExclusiveArch: x86_64
- intel-mediasdk
ExclusiveArch: x86_64
- intel-undervolt
ExclusiveArch: i386 x86_64
- ioport
ExclusiveArch: %{ix86} x86_64
- ipmctl
ExclusiveArch: x86_64
- ispc
ExclusiveArch: x86_64 aarch64
- iucode-tool
ExclusiveArch: %{ix86} x86_64
- iyfct
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- jFormatString
ExclusiveArch: %{java_arches} noarch
- jackson-annotations
ExclusiveArch: %{java_arches} noarch
- jackson-bom
ExclusiveArch: %{java_arches} noarch
- jackson-core
ExclusiveArch: %{java_arches} noarch
- jackson-databind
ExclusiveArch: %{java_arches} noarch
- jackson-dataformats-binary
ExclusiveArch: %{java_arches} noarch
- jackson-dataformats-text
ExclusiveArch: %{java_arches} noarch
- jackson-jaxrs-providers
ExclusiveArch: %{java_arches} noarch
- jackson-modules-base
ExclusiveArch: %{java_arches} noarch
- jackson-parent
ExclusiveArch: %{java_arches} noarch
- jacoco
ExclusiveArch: %{java_arches} noarch
- jacop
ExclusiveArch: %{java_arches} noarch
- jakarta-activation
ExclusiveArch: %{java_arches} noarch
- jakarta-activation1
ExclusiveArch: %{java_arches} noarch
- jakarta-annotations
ExclusiveArch: %{java_arches} noarch
- jakarta-el
ExclusiveArch: %{java_arches} noarch
- jakarta-interceptors
ExclusiveArch: %{java_arches} noarch
- jakarta-json
ExclusiveArch: %{java_arches} noarch
- jakarta-mail
ExclusiveArch: %{java_arches} noarch
- jakarta-mail1
ExclusiveArch: %{java_arches} noarch
- jakarta-oro
ExclusiveArch: %{java_arches} noarch
- jakarta-saaj
ExclusiveArch: %{java_arches} noarch
- jakarta-server-pages
ExclusiveArch: %{java_arches} noarch
- jakarta-servlet
ExclusiveArch: %{java_arches} noarch
- jakarta-xml-ws
ExclusiveArch: %{java_arches} noarch
- janino
ExclusiveArch: %{java_arches} noarch
- jansi
ExclusiveArch: %{java_arches}
- jansi-native
ExclusiveArch: %{java_arches}
- jansi1
ExclusiveArch: %{java_arches} noarch
- java-1.8.0-openjdk
ExclusiveArch: %{java_arches}
- java-1.8.0-openjdk-aarch32
ExclusiveArch: %{arm}
- java-1.8.0-openjdk-portable
ExclusiveArch: %{java_arches}
- java-11-openjdk
ExclusiveArch: %{java_arches}
- java-11-openjdk-portable
ExclusiveArch: %{java_arches}
- java-17-openjdk
ExclusiveArch: %{java_arches}
- java-17-openjdk-portable
ExclusiveArch: %{java_arches}
- java-diff-utils
ExclusiveArch: %{java_arches} noarch
- java-dirq
ExclusiveArch: %{java_arches} noarch
- java-jd-decompiler
ExclusiveArch: %{java_arches} noarch
- java-latest-openjdk
ExclusiveArch: %{java_arches}
- java-latest-openjdk-portable
ExclusiveArch: %{java_arches}
- java-runtime-decompiler
ExclusiveArch: %{java_arches} noarch
- java-scrypt
ExclusiveArch: %{java_arches} noarch
- java_cup
ExclusiveArch: %{java_arches} noarch
- javacc
ExclusiveArch: %{java_arches} noarch
- javacc-maven-plugin
ExclusiveArch: %{java_arches} noarch
- javaewah
ExclusiveArch: %{java_arches} noarch
- javapackages-bootstrap
ExclusiveArch: %{java_arches}
- javaparser
ExclusiveArch: %{java_arches} noarch
- javapoet
ExclusiveArch: %{java_arches} noarch
- javassist
ExclusiveArch: %{java_arches} noarch
- jaxb
ExclusiveArch: %{java_arches} noarch
- jaxb-api
ExclusiveArch: %{java_arches} noarch
- jaxb-api2
ExclusiveArch: %{java_arches} noarch
- jaxb-dtd-parser
ExclusiveArch: %{java_arches} noarch
- jaxb-fi
ExclusiveArch: %{java_arches} noarch
- jaxb-istack-commons
ExclusiveArch: %{java_arches} noarch
- jaxb-stax-ex
ExclusiveArch: %{java_arches} noarch
- jaxen
ExclusiveArch: %{java_arches} noarch
- jboss-jaxrs-2.0-api
ExclusiveArch: %{java_arches} noarch
- jboss-logging
ExclusiveArch: %{java_arches} noarch
- jboss-logging-tools
ExclusiveArch: %{java_arches} noarch
- jboss-parent
ExclusiveArch: %{java_arches} noarch
- jchardet
ExclusiveArch: %{java_arches} noarch
- jcip-annotations
ExclusiveArch: %{java_arches} noarch
- jctools
ExclusiveArch: %{java_arches} noarch
- jcuber
ExclusiveArch: %{java_arches} noarch
- jdeparser
ExclusiveArch: %{java_arches} noarch
- jdepend
ExclusiveArch: %{java_arches} noarch
- jdependency
ExclusiveArch: %{java_arches} noarch
- jdom
ExclusiveArch: %{java_arches} noarch
- jdom2
ExclusiveArch: %{java_arches} noarch
- jedit
ExclusiveArch: %{java_arches} noarch
- jericho-html
ExclusiveArch: %{java_arches} noarch
- jetbrains-annotations
ExclusiveArch: noarch %{java_arches}
- jetty
ExclusiveArch: %{java_arches} noarch
- jflex
ExclusiveArch: %{java_arches} noarch
- jfreechart
ExclusiveArch: %{java_arches} noarch
- jgit
ExclusiveArch: %{java_arches} noarch
- jglobus
ExclusiveArch: %{java_arches} noarch
- jgoodies-common
ExclusiveArch: %{java_arches} noarch
- jgoodies-forms
ExclusiveArch: %{java_arches} noarch
- jgoodies-looks
ExclusiveArch: %{java_arches} noarch
- jigawatts
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- jline
ExclusiveArch: %{java_arches}
- jline2
ExclusiveArch: %{java_arches} noarch
- jmock
ExclusiveArch: %{java_arches} noarch
- jmol
ExclusiveArch: %{java_arches} noarch
- jna
ExclusiveArch: %{java_arches}
- jneuroml-core
ExclusiveArch: %{java_arches} noarch
- jni-inchi
ExclusiveArch: %{java_arches}
- jol
ExclusiveArch: %{java_arches} noarch
- jolokia-jvm-agent
ExclusiveArch: %{java_arches} noarch
- jopt-simple
ExclusiveArch: %{java_arches} noarch
- jorbis
ExclusiveArch: %{java_arches} noarch
- jowl
ExclusiveArch: %{nodejs_arches} noarch
- jpanoramamaker
ExclusiveArch: %{java_arches} noarch
- jsch
ExclusiveArch: %{java_arches} noarch
- jsch-agent-proxy
ExclusiveArch: %{java_arches} noarch
- json_simple
ExclusiveArch: %{java_arches} noarch
- jsoup
ExclusiveArch: %{java_arches} noarch
- jsr-305
ExclusiveArch: %{java_arches} noarch
- jss
ExclusiveArch: %{java_arches}
- jssc
ExclusiveArch: %{java_arches}
- jtidy
ExclusiveArch: %{java_arches} noarch
- julia
ExclusiveArch: x86_64
- junit
ExclusiveArch: %{java_arches} noarch
- junit5
ExclusiveArch: %{java_arches} noarch
- juniversalchardet
ExclusiveArch: %{java_arches} noarch
- jzlib
ExclusiveArch: %{java_arches} noarch
- kaidan
ExclusiveArch: %{qt5_qtwebengine_arches}
- kchmviewer
ExclusiveArch: %{qt5_qtwebengine_arches}
- kernel
ExclusiveArch: noarch x86_64 s390x aarch64 ppc64le
ExclusiveArch: noarch i386 i686 x86_64 s390x aarch64 ppc64le
- keylime-agent-rust
ExclusiveArch: %{rust_arches}
- keyring-ima-signer
ExclusiveArch: %{rust_arches}
- kf5-akonadi-search
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-audiocd-kio
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kblog
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarcore
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarutils
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kitinerary
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-ktnef
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-libkdcraw
ExclusiveArch: x86_64 ppc64le %{arm}
- kicad
ExclusiveArch: x86_64 aarch64 ppc64le
- kiwix-desktop
ExclusiveArch: %{qt5_qtwebengine_arches}
- knot-resolver
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- knotes
ExclusiveArch: x86_64 %{arm}
- kubernetes
ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm}
- laf-plugin
ExclusiveArch: %{java_arches} noarch
- lazarus
ExclusiveArch: %{fpc_arches}
- lazpaint
ExclusiveArch: %{fpc_arches}
- ldapjdk
ExclusiveArch: %{java_arches} noarch
- ldc
ExclusiveArch: %{ldc_arches} ppc64le
- ldc1.32
ExclusiveArch: %{ldc_arches} ppc64le
- libbase
ExclusiveArch: %{java_arches} noarch
- libclc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x
- libcxl
ExclusiveArch: %{power64}
- libdfp
ExclusiveArch: ppc ppc64 ppc64le s390 s390x x86_64
- libdispatch
ExclusiveArch: x86_64 aarch64 ppc64le
- libfonts
ExclusiveArch: %{java_arches} noarch
- libformula
ExclusiveArch: %{java_arches} noarch
- libguestfs
ExclusiveArch: %{kernel_arches}
- libica
ExclusiveArch: s390 s390x
- libipt
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- libkgapi
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- libkrun
ExclusiveArch: x86_64 aarch64
- libkrunfw
ExclusiveArch: x86_64 aarch64
- liblayout
ExclusiveArch: %{java_arches} noarch
- libloader
ExclusiveArch: %{java_arches} noarch
- libnxz
ExclusiveArch: ppc64le
- libocxl
ExclusiveArch: ppc64le
- libpsm2
ExclusiveArch: x86_64
- libquentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- libreoffice-TexMaths
ExclusiveArch: %{java_arches}
- librepository
ExclusiveArch: %{java_arches} noarch
- libretro-desmume2015
ExclusiveArch: i686 x86_64
- librtas
ExclusiveArch: %{power64}
- libserializer
ExclusiveArch: %{java_arches} noarch
- libservicelog
ExclusiveArch: ppc %{power64}
- libsmbios
ExclusiveArch: x86_64 %{ix86}
- libunicode
ExclusiveArch: x86_64 aarch64
- libunwind
ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64
- libva-nvidia-driver
ExclusiveArch: %{x86_64} %{ix86} %{arm64} ppc64le
- libvirt-java
ExclusiveArch: %{java_arches} noarch
- libvma
ExclusiveArch: x86_64 ppc64le ppc64 aarch64
- libvmi
ExclusiveArch: x86_64
- libvpd
ExclusiveArch: %{power64}
- libxsmm
ExclusiveArch: x86_64
- libzdnn
ExclusiveArch: s390x
- libzfcphbaapi
ExclusiveArch: s390 s390x
- libzpc
ExclusiveArch: s390x
- llhttp
ExclusiveArch: %{nodejs_arches}
- log4j
ExclusiveArch: %{java_arches} noarch
- log4net
ExclusiveArch: %mono_arches
- lrmi
ExclusiveArch: %{ix86}
- lsvpd
ExclusiveArch: %{power64}
- luajit
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- lucene
ExclusiveArch: %{java_arches} noarch
- lujavrite
ExclusiveArch: %{java_arches}
- luxcorerender
ExclusiveArch: x86_64
- mactel-boot
ExclusiveArch: x86_64
- magicmirror
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-airnow
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-onthisday
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-singlestock
ExclusiveArch: %{nodejs_arches} noarch
- manifest-tool
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- mariadb-java-client
ExclusiveArch: %{java_arches} noarch
- marked
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- matrix-synapse
ExclusiveArch: %{rust_arches}
- maui-mauikit
ExclusiveArch: %{ix86} s390x aarch64 x86_64
- maven
ExclusiveArch: %{java_arches} noarch
- maven-antrun-plugin
ExclusiveArch: %{java_arches} noarch
- maven-archetype
ExclusiveArch: %{java_arches} noarch
- maven-archiver
ExclusiveArch: %{java_arches} noarch
- maven-artifact-transfer
ExclusiveArch: %{java_arches} noarch
- maven-assembly-plugin
ExclusiveArch: %{java_arches} noarch
- maven-bundle-plugin
ExclusiveArch: %{java_arches} noarch
- maven-clean-plugin
ExclusiveArch: %{java_arches} noarch
- maven-common-artifact-filters
ExclusiveArch: %{java_arches} noarch
- maven-compiler-plugin
ExclusiveArch: %{java_arches} noarch
- maven-dependency-analyzer
ExclusiveArch: %{java_arches} noarch
- maven-dependency-plugin
ExclusiveArch: %{java_arches} noarch
- maven-dependency-tree
ExclusiveArch: %{java_arches} noarch
- maven-doxia
ExclusiveArch: %{java_arches} noarch
- maven-doxia-sitetools
ExclusiveArch: %{java_arches} noarch
- maven-enforcer
ExclusiveArch: %{java_arches} noarch
- maven-file-management
ExclusiveArch: %{java_arches} noarch
- maven-filtering
ExclusiveArch: %{java_arches} noarch
- maven-invoker
ExclusiveArch: %{java_arches} noarch
- maven-invoker-plugin
ExclusiveArch: %{java_arches} noarch
- maven-jar-plugin
ExclusiveArch: %{java_arches} noarch
- maven-mapping
ExclusiveArch: %{java_arches} noarch
- maven-native
ExclusiveArch: %{java_arches} noarch
- maven-parent
ExclusiveArch: %{java_arches} noarch
- maven-patch-plugin
ExclusiveArch: %{java_arches} noarch
- maven-plugin-testing
ExclusiveArch: %{java_arches} noarch
- maven-plugin-tools
ExclusiveArch: %{java_arches} noarch
- maven-remote-resources-plugin
ExclusiveArch: %{java_arches} noarch
- maven-reporting-api
ExclusiveArch: %{java_arches} noarch
- maven-reporting-impl
ExclusiveArch: %{java_arches} noarch
- maven-resolver
ExclusiveArch: %{java_arches} noarch
- maven-resources-plugin
ExclusiveArch: %{java_arches} noarch
- maven-script-interpreter
ExclusiveArch: %{java_arches} noarch
- maven-shade-plugin
ExclusiveArch: %{java_arches} noarch
- maven-shared-incremental
ExclusiveArch: %{java_arches} noarch
- maven-shared-io
ExclusiveArch: %{java_arches} noarch
- maven-shared-utils
ExclusiveArch: %{java_arches} noarch
- maven-source-plugin
ExclusiveArch: %{java_arches} noarch
- maven-surefire
ExclusiveArch: %{java_arches} noarch
- maven-verifier
ExclusiveArch: %{java_arches} noarch
- maven-verifier-plugin
ExclusiveArch: %{java_arches} noarch
- maven-wagon
ExclusiveArch: %{java_arches} noarch
- maxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- mbpfan
ExclusiveArch: x86_64
- mcelog
ExclusiveArch: i686 x86_64
- mcrouter
ExclusiveArch: x86_64 aarch64 ppc64le
- mecab-java
ExclusiveArch: %java_arches
- mediaconch
ExclusiveArch: %{qt5_qtwebengine_arches}
- mellowplayer
ExclusiveArch: %{qt5_qtwebengine_arches}
- memkind
ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64
- memtest86+
ExclusiveArch: x86_64 %{ix86}
- merkuro
ExclusiveArch: %{qt5_qtwebengine_arches}
- microcode_ctl
ExclusiveArch: %{ix86} x86_64
- micropython
ExclusiveArch: %{arm} x86_64 riscv64
- miglayout
ExclusiveArch: %{java_arches} noarch
- mine_detector
ExclusiveArch: %{GPRbuild_arches}
- minetest
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mingw-libidn2
ExclusiveArch: %{ix86} x86_64 %{arm}
- mingw-wine-gecko
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- mkbootdisk
ExclusiveArch: %{ix86} sparc sparc64 x86_64
- moby-engine
ExclusiveArch: %{golang_arches}
- mockito
ExclusiveArch: %{java_arches} noarch
- mod_mono
ExclusiveArch: %mono_arches
- modello
ExclusiveArch: %{java_arches} noarch
- moditect
ExclusiveArch: %{java_arches} noarch
- module-build-service
ExclusiveArch: %{ix86} x86_64 noarch
- modulemaker-maven-plugin
ExclusiveArch: %{java_arches} noarch
- mojo-executor
ExclusiveArch: %{java_arches} noarch
- mojo-parent
ExclusiveArch: %{java_arches} noarch
- mokutil
ExclusiveArch: %{ix86} x86_64 aarch64 %{arm}
- mono
ExclusiveArch: %mono_arches
- mono-addins
ExclusiveArch: %mono_arches
- mono-basic
ExclusiveArch: %{mono_arches}
- mono-bouncycastle
ExclusiveArch: %mono_arches
- mono-cecil
ExclusiveArch: %mono_arches
- mono-cecil-flowanalysis
ExclusiveArch: %mono_arches
- mono-reflection
ExclusiveArch: %mono_arches
- mono-tools
ExclusiveArch: %mono_arches
- mono-zeroconf
ExclusiveArch: %mono_arches
- monodevelop
ExclusiveArch: %mono_arches
- monodevelop-debugger-gdb
ExclusiveArch: %{mono_arches}
- mrrescue
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- msr-tools
ExclusiveArch: %{ix86} x86_64
- msv
ExclusiveArch: %{java_arches} noarch
- mvfst
ExclusiveArch: x86_64 aarch64 ppc64le
- mxparser
ExclusiveArch: %{java_arches} noarch
- mysql-connector-java
ExclusiveArch: %{java_arches} noarch
- mysql-connector-net
ExclusiveArch: %{mono_arches}
- naev
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- naga
ExclusiveArch: %{java_arches} noarch
- nant
ExclusiveArch: %mono_arches
- nativejit
ExclusiveArch: x86_64
- nbc
ExclusiveArch: %{fpc_arches}
- nbdkit
ExclusiveArch: x86_64
- ndesk-dbus
ExclusiveArch: %{mono_arches}
- ndesk-dbus-glib
ExclusiveArch: %{mono_arches}
- nekohtml
ExclusiveArch: %{java_arches} noarch
- netavark
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- newtonsoft-json
ExclusiveArch: %{mono_arches}
- nodejs-acorn-object-spread
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-backbone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bash-language-server
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buble
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cjs-module-lexer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-generic-pool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-less
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-linefix
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nodemon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-packaging
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-replace-require-self
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-underscore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-undici
ExclusiveArch: %{nodejs_arches} noarch
- nodejs18
ExclusiveArch: %{nodejs_arches}
- nodejs20
ExclusiveArch: %{nodejs_arches}
- nom-tam-fits
ExclusiveArch: %{java_arches} noarch
- notify-sharp
ExclusiveArch: %{mono_arches}
- notify-sharp3
ExclusiveArch: %{mono_arches}
- nuget
ExclusiveArch: %{mono_arches}
- numatop
ExclusiveArch: x86_64 ppc64le
- nunit
ExclusiveArch: %{mono_arches}
- nunit2
ExclusiveArch: %{mono_arches}
- nvml
ExclusiveArch: x86_64 ppc64le
- objectweb-asm
ExclusiveArch: %{java_arches} noarch
- objenesis
ExclusiveArch: %{java_arches} noarch
- obs-service-rust2rpm
ExclusiveArch: %{rust_arches} noarch
- oci-seccomp-bpf-hook
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
ExclusiveArch: %{golang_arches_future}
- oidn
ExclusiveArch: x86_64
- olpc-utils
ExclusiveArch: %{ix86} %{arm}
- oneVPL
ExclusiveArch: x86_64
- oneVPL-intel-gpu
ExclusiveArch: x86_64
- oneapi-level-zero
ExclusiveArch: x86_64
- onednn
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- onedrive
ExclusiveArch: %{ldc_arches}
- ongres-scram
ExclusiveArch: %{java_arches} noarch
- ongres-stringprep
ExclusiveArch: %{java_arches} noarch
- opae
ExclusiveArch: x86_64
- opal-prd
ExclusiveArch: ppc64le
- open-vm-tools
ExclusiveArch: x86_64 aarch64
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: x86_64
- openblas
ExclusiveArch: %{openblas_arches}
- openjdk-asmtools
ExclusiveArch: %{java_arches} noarch
- openjdk-asmtools7
ExclusiveArch: %{java_arches} noarch
- openjfx
ExclusiveArch: %{java_arches}
- openjfx8
ExclusiveArch: x86_64
- openlibm
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64}
- openms
ExclusiveArch: %{qt5_qtwebengine_arches}
- openni
ExclusiveArch: x86_64 %{arm}
- openni-primesense
ExclusiveArch: %{ix86} x86_64 %{arm}
- openoffice.org-diafilter
ExclusiveArch: %{java_arches}
- openpgl
ExclusiveArch: aarch64 x86_64
- openssl-ibmca
ExclusiveArch: s390 s390x
- openstack-java-sdk
ExclusiveArch: %{java_arches} noarch
- opentest4j
ExclusiveArch: %{java_arches} noarch
- openvkl
ExclusiveArch: aarch64 x86_64
- optee_client
ExclusiveArch: aarch64
- optee_os
ExclusiveArch: aarch64
- options
ExclusiveArch: %{java_arches} noarch
- orthorobot
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- osgi-annotation
ExclusiveArch: %{java_arches} noarch
- osgi-compendium
ExclusiveArch: %{java_arches} noarch
- osgi-core
ExclusiveArch: %{java_arches} noarch
- pacemaker
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64 %{arm}
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- pageedit
ExclusiveArch: %{qt5_qtwebengine_arches}
- parserng
ExclusiveArch: %{java_arches} noarch
- pasdoc
ExclusiveArch: %{fpc_arches}
- pcc
ExclusiveArch: %{ix86} x86_64
- pcfi
ExclusiveArch: %{java_arches} noarch
- pcm
ExclusiveArch: %{ix86} x86_64
- pcmciautils
ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm}
- pdbg
ExclusiveArch: ppc64le
- pdfbox
ExclusiveArch: %{java_arches} noarch
- pdfmod
ExclusiveArch: %mono_arches
- pdftk-java
ExclusiveArch: %{java_arches} noarch
- pentaho-libxml
ExclusiveArch: %{java_arches} noarch
- pentaho-reporting-flow-engine
ExclusiveArch: %{java_arches} noarch
- perl-Dumbbench
ExclusiveArch: %{ix86} x86_64 noarch
- perl-Parse-DMIDecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- pesign
ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm}
- pesign-test-app
ExclusiveArch: x86_64
- picocli
ExclusiveArch: %{java_arches} noarch
- pinta
ExclusiveArch: %mono_arches
- pioneer
ExclusiveArch: %{ix86} x86_64
- plantuml
ExclusiveArch: %{java_arches} noarch
- plasma-dialer
ExclusiveArch: %{java_arches}
- playonlinux
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- plexus-archiver
ExclusiveArch: %{java_arches} noarch
- plexus-build-api
ExclusiveArch: %{java_arches} noarch
- plexus-build-api0
ExclusiveArch: %{java_arches} noarch
- plexus-cipher
ExclusiveArch: %{java_arches} noarch
- plexus-classworlds
ExclusiveArch: %{java_arches} noarch
- plexus-compiler
ExclusiveArch: %{java_arches} noarch
- plexus-component-api
ExclusiveArch: %{java_arches} noarch
- plexus-components-pom
ExclusiveArch: %{java_arches} noarch
- plexus-containers
ExclusiveArch: %{java_arches} noarch
- plexus-i18n
ExclusiveArch: %{java_arches} noarch
- plexus-interpolation
ExclusiveArch: %{java_arches} noarch
- plexus-io
ExclusiveArch: %{java_arches} noarch
- plexus-languages
ExclusiveArch: %{java_arches} noarch
- plexus-pom
ExclusiveArch: %{java_arches} noarch
- plexus-resources
ExclusiveArch: %{java_arches} noarch
- plexus-sec-dispatcher
ExclusiveArch: %{java_arches} noarch
- plexus-utils
ExclusiveArch: %{java_arches} noarch
- plexus-velocity
ExclusiveArch: %{java_arches} noarch
- podman
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- poppler-sharp
ExclusiveArch: %mono_arches
- popub
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- postgresql-jdbc
ExclusiveArch: %{java_arches} noarch
- powerpc-utils
ExclusiveArch: ppc %{power64}
- powerstat
ExclusiveArch: %{ix86} x86_64
- ppc64-diag
ExclusiveArch: ppc %{power64}
- procyon
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
- proguard
ExclusiveArch: %{java_arches} noarch
- prometheus-jmx-exporter
ExclusiveArch: %{java_arches} noarch
- prometheus-simpleclient-java
ExclusiveArch: %{java_arches} noarch
- proxygen
ExclusiveArch: x86_64 aarch64 ppc64le
- pveclib
ExclusiveArch: ppc %{power64}
- pyqtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- python-ast-monitor
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
- python-cryptography
ExclusiveArch: %{rust_arches}
- python-damo
ExclusiveArch: x86_64 aarch64 ppc64le s390x noarch
- python-etcd
ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- python-javaobj
ExclusiveArch: %{java_arches} noarch
- python-jnius
ExclusiveArch: %{java_arches}
- python-jupyter-polymake
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- python-openoffice
ExclusiveArch: noarch x86_64
- python-pyahocorasick
ExclusiveArch: x86_64 %{arm64} ppc64le
- python-pymoc
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-pyqt6-webengine
ExclusiveArch: aarch64 x86_64
- q4wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- qatengine
ExclusiveArch: x86_64
- qatzip
ExclusiveArch: x86_64
- qbe
ExclusiveArch: x86_64 aarch64
- qcint
ExclusiveArch: x86_64
- qclib
ExclusiveArch: s390 s390x
- qdox
ExclusiveArch: %{java_arches} noarch
- qemu-sanity-check
ExclusiveArch: %{kernel_arches}
- qevercloud
ExclusiveArch: %{qt5_qtwebengine_arches}
- qmapshack
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt4pas
ExclusiveArch: %{fpc_arches}
- qt5-qtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt6-qtwebengine
ExclusiveArch: aarch64 x86_64
- qt6-qtwebview
ExclusiveArch: aarch64 x86_64
- quantum-espresso
ExclusiveArch: x86_64 %{ix86} aarch64 %{power64}
- quentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- rEFInd
ExclusiveArch: %{efi}
- rachota
ExclusiveArch: %{java_arches} noarch
- rear
ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64
- reflections
ExclusiveArch: %{java_arches} noarch
- reg
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- regexp
ExclusiveArch: %{java_arches} noarch
- relaxng-datatype-java
ExclusiveArch: %{java_arches} noarch
- replacer
ExclusiveArch: %{java_arches} noarch
- reptyr
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- rescene
ExclusiveArch: %{mono_arches}
- resteasy
ExclusiveArch: %{java_arches} noarch
- restool
ExclusiveArch: aarch64
- restsharp
ExclusiveArch: %{mono_arches}
- retsnoop
ExclusiveArch: %{rust_arches}
- rhino
ExclusiveArch: %{java_arches} noarch
- river
ExclusiveArch: %{zig_arches}
- rkcommon
ExclusiveArch: x86_64 aarch64
- rocalution
ExclusiveArch: x86_64
- rocblas
ExclusiveArch: x86_64
- rocclr
ExclusiveArch: x86_64
- rocm-compilersupport
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-device-libs
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-rpm-macros
ExclusiveArch: x86_64
- rocm-runtime
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-smi
ExclusiveArch: x86_64 aarch64 ppc64le
- rocminfo
ExclusiveArch: x86_64 aarch64 ppc64le
- rocprim
ExclusiveArch: x86_64
- rocrand
ExclusiveArch: x86_64
- rocsparse
ExclusiveArch: x86_64
- rocthrust
ExclusiveArch: x86_64
- rpm-ostree
ExclusiveArch: %{rust_arches}
- rr
ExclusiveArch: %{ix86} x86_64 aarch64
- rssguard
ExclusiveArch: %{qt6_qtwebengine_arches}
- rstudio
ExclusiveArch: %{java_arches}
- rsyntaxtextarea
ExclusiveArch: %{java_arches} noarch
- rubygem-childprocess
ExclusiveArch: %{ix86} x86_64 noarch
- runc
ExclusiveArch: %{golang_arches_future}
- rundoc
ExclusiveArch: %{java_arches} noarch
- rust
ExclusiveArch: %{rust_arches}
- rust-brotli
ExclusiveArch: %{rust_arches}
- rust-compress-tools
ExclusiveArch: %{rust_arches}
- rust-coreos-installer
ExclusiveArch: %{rust_arches}
- rust-ctr
ExclusiveArch: %{rust_arches}
- rust-dashmap4
ExclusiveArch: %{rust_arches}
- rust-deflate
ExclusiveArch: %{rust_arches}
- rust-deflate0.8
ExclusiveArch: %{rust_arches}
- rust-drg
ExclusiveArch: %{rust_arches}
- rust-epoll
ExclusiveArch: %{rust_arches}
- rust-getch
ExclusiveArch: %{rust_arches}
- rust-gzip-header
ExclusiveArch: %{rust_arches}
- rust-hamming
ExclusiveArch: %{rust_arches}
- rust-hidapi
ExclusiveArch: %{rust_arches}
- rust-httparse
ExclusiveArch: %{rust_arches}
- rust-humantime-serde
ExclusiveArch: %{rust_arches}
- rust-hyperlocal
ExclusiveArch: %{rust_arches}
- rust-image0.23
ExclusiveArch: %{rust_arches}
- rust-inflate
ExclusiveArch: %{rust_arches}
- rust-jpeg-decoder0.1
ExclusiveArch: %{rust_arches}
- rust-k9
ExclusiveArch: %{rust_arches}
- rust-krunvm
ExclusiveArch: x86_64 aarch64
- rust-kstring
ExclusiveArch: %{rust_arches}
- rust-kvm-ioctls
ExclusiveArch: x86_64 aarch64
- rust-lebe
ExclusiveArch: %{rust_arches}
- rust-libslirp-sys
ExclusiveArch: %{rust_arches}
- rust-msru
ExclusiveArch: x86_64
- rust-nanorand
ExclusiveArch: %{rust_arches}
- rust-netstat2
ExclusiveArch: %{rust_arches}
- rust-onig
ExclusiveArch: %{rust_arches}
- rust-openat-ext
ExclusiveArch: %{rust_arches}
- rust-os_type
ExclusiveArch: %{rust_arches}
- rust-pager
ExclusiveArch: %{rust_arches}
- rust-pathsearch
ExclusiveArch: %{rust_arches}
- rust-pretty-bytes
ExclusiveArch: %{rust_arches}
- rust-pretty-hex
ExclusiveArch: %{rust_arches}
- rust-primal-bit
ExclusiveArch: %{rust_arches}
- rust-primal-check
ExclusiveArch: %{rust_arches}
- rust-primal-estimate
ExclusiveArch: %{rust_arches}
- rust-procfs0.9
ExclusiveArch: %{rust_arches}
- rust-psl-types
ExclusiveArch: %{rust_arches}
- rust-psm
ExclusiveArch: %{rust_arches}
- rust-pwd
ExclusiveArch: %{rust_arches}
- rust-rand_core
ExclusiveArch: %{rust_arches}
- rust-schemafy_core
ExclusiveArch: %{rust_arches}
- rust-schemafy_lib
ExclusiveArch: %{rust_arches}
- rust-seahash
ExclusiveArch: %{rust_arches}
- rust-serde-big-array
ExclusiveArch: %{rust_arches}
- rust-serde_qs
ExclusiveArch: %{rust_arches}
- rust-serde_yaml0.8
ExclusiveArch: %{rust_arches}
- rust-sev
ExclusiveArch: x86_64
- rust-sevctl
ExclusiveArch: x86_64
- rust-silver
ExclusiveArch: %{rust_arches}
- rust-sinit
ExclusiveArch: %{rust_arches}
- rust-snphost
ExclusiveArch: x86_64
- rust-ssh-key-dir
ExclusiveArch: %{rust_arches}
- rust-stacker
ExclusiveArch: %{rust_arches}
- rust-structopt
ExclusiveArch: %{rust_arches}
- rust-tiff0.6
ExclusiveArch: %{rust_arches}
- rust-totp-lite
ExclusiveArch: %{rust_arches}
- rust-tower-layer
ExclusiveArch: %{rust_arches}
- rust-tpm2-policy
ExclusiveArch: %{rust_arches}
- rust-unicode-normalization
ExclusiveArch: %{rust_arches}
- rust-unicode-xid
ExclusiveArch: %{rust_arches}
- rust-uriparse
ExclusiveArch: %{rust_arches}
- rust-uucore
ExclusiveArch: %{rust_arches}
- rust-varlink_generator
ExclusiveArch: %{rust_arches}
- rust-varlink_parser
ExclusiveArch: %{rust_arches}
- rust-virtio-bindings
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-vmm-sys-util
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-vtparse
ExclusiveArch: %{rust_arches}
- rust-web-ext-native-messaging
ExclusiveArch: %{rust_arches}
- rust-wezterm-color-types
ExclusiveArch: %{rust_arches}
- rust-wezterm-dynamic
ExclusiveArch: %{rust_arches}
- rust-wezterm-dynamic-derive
ExclusiveArch: %{rust_arches}
- rust-zbus1
ExclusiveArch: %{rust_arches}
- rust-zbus_macros1
ExclusiveArch: %{rust_arches}
- rust-zvariant2
ExclusiveArch: %{rust_arches}
- rust-zvariant_derive2
ExclusiveArch: %{rust_arches}
- rutabaga-gfx-ffi
ExclusiveArch: x86_64 aarch64
- sac
ExclusiveArch: %{java_arches} noarch
- safetyblanket
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- sat4j
ExclusiveArch: %{java_arches} noarch
- sbcl
ExclusiveArch: %{ix86} x86_64 aarch64 %{power64}
- sbd
ExclusiveArch: i686 x86_64 s390x aarch64 ppc64le
- sblim-cim-client
ExclusiveArch: %{java_arches} noarch
- sblim-cim-client2
ExclusiveArch: %{java_arches} noarch
- sbsigntools
ExclusiveArch: x86_64 aarch64 %{arm} %{ix86}
- scala
ExclusiveArch: %{java_arches} noarch
- scannotation
ExclusiveArch: %{java_arches} noarch
- sdljava
ExclusiveArch: %{java_arches}
- sdrangel
ExclusiveArch: %{qt5_qtwebengine_arches}
- sdsl-lite
ExclusiveArch: %{power64} x86_64 aarch64
- sdubby
ExclusiveArch: %{efi}
- seabios
ExclusiveArch: x86_64
- seadrive-gui
ExclusiveArch: %{qt5_qtwebengine_arches}
- seafile-client
ExclusiveArch: %{qt5_qtwebengine_arches}
- seamonkey
ExclusiveArch: x86_64
- seqan3
ExclusiveArch: %{power64} x86_64 aarch64
- sequence-library
ExclusiveArch: %{java_arches} noarch
- servicelog
ExclusiveArch: ppc %{power64}
- shaman
ExclusiveArch: %{java_arches} noarch
- sharpfont
ExclusiveArch: %mono_arches
- sharpziplib
ExclusiveArch: %{mono_arches}
- shim
ExclusiveArch: %{efi}
- shim-unsigned-aarch64
ExclusiveArch: aarch64
- shim-unsigned-x64
ExclusiveArch: x86_64
- sigil
ExclusiveArch: %{qt5_qtwebengine_arches}
- sigul
ExclusiveArch: x86_64
- singularity-ce
ExclusiveArch: %{go_arches}
- sisu
ExclusiveArch: %{java_arches} noarch
- sisu-mojos
ExclusiveArch: %{java_arches} noarch
- skopeo
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- skychart
ExclusiveArch: %{fpc_arches}
- slf4j
ExclusiveArch: %{java_arches} noarch
- slirp4netns
ExclusiveArch: %{golang_arches_future}
- snakeyaml
ExclusiveArch: %{java_arches} noarch
- snapd
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x}
- snip
ExclusiveArch: %{java_arches} noarch
- softnet-stat
ExclusiveArch: %{rust_arches}
- soup-sharp
ExclusiveArch: %{mono_arches}
- spacebar
ExclusiveArch: %{java_arches}
- sparkleshare
ExclusiveArch: %{mono_arches}
- spec-version-maven-plugin
ExclusiveArch: %{java_arches} noarch
- spicctrl
ExclusiveArch: %{ix86} x86_64
- spice
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- spice-parent
ExclusiveArch: %{java_arches} noarch
- springlobby
ExclusiveArch: %{ix86} x86_64
- spyder
ExclusiveArch: %{qt5_qtwebengine_arches}
- sqljet
ExclusiveArch: %{java_arches} noarch
- squeekboard
ExclusiveArch: %{rust_arches}
- startdde
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- stats-collect
ExclusiveArch: %{ix86} x86_64 noarch
- statsd
ExclusiveArch: %{nodejs_arches} noarch
- stratis-cli
ExclusiveArch: %{rust_arches} noarch
- stratisd
ExclusiveArch: %{rust_arches}
ExclusiveArch: %{rust_arches}
ExclusiveArch: %{rust_arches}
- string-template-maven-plugin
ExclusiveArch: %{java_arches} noarch
- stringtemplate
ExclusiveArch: %{java_arches} noarch
- stringtemplate4
ExclusiveArch: %{java_arches} noarch
- stripesnoop
ExclusiveArch: %{ix86} x86_64
- subscription-manager-cockpit
ExclusiveArch: %{nodejs_arches} noarch
- supercollider
ExclusiveArch: %{qt5_qtwebengine_arches}
- supermin
ExclusiveArch: %{kernel_arches}
- svnkit
ExclusiveArch: %{java_arches} noarch
- svt-vp9
ExclusiveArch: x86_64
- swift-lang
ExclusiveArch: x86_64 aarch64
- swiftlint
ExclusiveArch: x86_64 aarch64
- swing-layout
ExclusiveArch: %{java_arches} noarch
- sysbench
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64le s390x
- syslinux
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- system-rules
ExclusiveArch: %{java_arches} noarch
- systemd-boot
ExclusiveArch: %efi
- t-digest
ExclusiveArch: %{java_arches} noarch
- taglib-sharp
ExclusiveArch: %{mono_arches}
- tagsoup
ExclusiveArch: %{java_arches} noarch
- tarantool
ExclusiveArch: %{ix86} x86_64
- tboot
ExclusiveArch: %{ix86} x86_64
- tdlib
ExclusiveArch: x86_64 aarch64
- templates_parser
ExclusiveArch: %GPRbuild_arches
- ternimal
ExclusiveArch: %{rust_arches}
- testcloud
ExclusiveArch: %{kernel_arches} noarch
- testng
ExclusiveArch: %{java_arches} noarch
- texlive
ExclusiveArch: %{java_arches} noarch
- thermald
ExclusiveArch: %{ix86} x86_64
- tilix
ExclusiveArch: %{ldc_arches}
- tomboy
ExclusiveArch: %{mono_arches}
- tomcat
ExclusiveArch: %{java_arches} noarch
- tomcat-native
ExclusiveArch: %{java_arches}
- tomcat-taglibs-parent
ExclusiveArch: %{java_arches} noarch
- tomcatjss
ExclusiveArch: %{java_arches} noarch
- torbrowser-launcher
ExclusiveArch: %{ix86} x86_64
- treelayout
ExclusiveArch: %{java_arches} noarch
- trilead-ssh2
ExclusiveArch: %{java_arches} noarch
- truth
ExclusiveArch: %{java_arches} noarch
- tuned-profiles-nfv-host-bin
ExclusiveArch: %{ix86} x86_64
- typescript
ExclusiveArch: %{nodejs_arches} noarch
- uClibc
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
- ucx
ExclusiveArch: aarch64 ppc64le x86_64
- uglify-js
ExclusiveArch: %{nodejs_arches} noarch
- umr
ExclusiveArch: x86_64 aarch64 ppc64le
- unetbootin
ExclusiveArch: %{ix86} x86_64
- univocity-parsers
ExclusiveArch: %{java_arches} noarch
- ursa-major
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- usd
ExclusiveArch: aarch64 x86_64
- v8-314
ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64
- vakzination
ExclusiveArch: %{java_arches}
- valgrind
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
- vboot-utils
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- vecmath1.2
ExclusiveArch: %{java_arches} noarch
- velocity
ExclusiveArch: %{java_arches} noarch
- vim-go
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}}
- vim-syntastic
ExclusiveArch: %{java_arches} noarch
- virt-p2v
ExclusiveArch: x86_64
- virt-v2v
ExclusiveArch: x86_64
- virtiofsd
ExclusiveArch: %{rust_arches}
- virtualbox-guest-additions
ExclusiveArch: i686 x86_64
- vkd3d
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- vmaf
ExclusiveArch: x86_64
- voms-api-java
ExclusiveArch: %{java_arches} noarch
- voms-clients-java
ExclusiveArch: %{java_arches} noarch
- vrq
ExclusiveArch: %{ix86} x86_64
- wangle
ExclusiveArch: x86_64 aarch64 ppc64le
- warsow
ExclusiveArch: %{ix86} x86_64 %{arm}
- warsow-data
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{ix86} x86_64 %{arm}
- wasmedge
ExclusiveArch: x86_64 aarch64
- watchman
ExclusiveArch: x86_64 aarch64 ppc64le
- wdt
ExclusiveArch: x86_64 aarch64 ppc64le
- webkit2-sharp
ExclusiveArch: %mono_arches
- weld-parent
ExclusiveArch: %{java_arches} noarch
- why3
ExclusiveArch: %{ocaml_native_compiler}
- widevine-installer
ExclusiveArch: aarch64
- wine
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86}
- wine-dxvk
ExclusiveArch: %{ix86} x86_64
- winetricks
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- ws-commons-util
ExclusiveArch: %{java_arches} noarch
- wsdl4j
ExclusiveArch: %{java_arches} noarch
- wult
ExclusiveArch: x86_64
- wxMaxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
- x2goclient
ExclusiveArch: x86_64
- x86-simd-sort
ExclusiveArch: x86_64
- xalan-j2
ExclusiveArch: %{java_arches} noarch
- xbean
ExclusiveArch: %{java_arches} noarch
- xbyak
ExclusiveArch: x86_64
- xbyak_aarch64
ExclusiveArch: aarch64
- xe-guest-utilities-latest
ExclusiveArch: %{ix86} x86_64
- xen
ExclusiveArch: x86_64 aarch64
- xerces-j2
ExclusiveArch: %{java_arches} noarch
- xgap
ExclusiveArch: %{gap_arches}
- xml-commons-apis
ExclusiveArch: %{java_arches} noarch
- xml-commons-resolver
ExclusiveArch: %{java_arches} noarch
- xml-maven-plugin
ExclusiveArch: %{java_arches} noarch
- xmlada
ExclusiveArch: %{GPRbuild_arches}
- xmlgraphics-commons
ExclusiveArch: %{java_arches} noarch
- xmlpull
ExclusiveArch: %{java_arches} noarch
- xmlstreambuffer
ExclusiveArch: %{java_arches} noarch
- xmlunit
ExclusiveArch: %{java_arches} noarch
- xmvn
ExclusiveArch: %{java_arches} noarch
- xmvn-connector-ivy
ExclusiveArch: %{java_arches} noarch
- xmvn-generator
ExclusiveArch: %{java_arches}
- xnnpack
ExclusiveArch: x86_64 aarch64
- xorg-x11-drv-armsoc
ExclusiveArch: %{arm} aarch64
- xorg-x11-drv-intel
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-openchrome
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vesa
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vmware
ExclusiveArch: %{ix86} x86_64 ia64
- xsp
ExclusiveArch: %mono_arches
- xstream
ExclusiveArch: %{java_arches} noarch
- xz-java
ExclusiveArch: %{java_arches} noarch
- yarnpkg
ExclusiveArch: %{nodejs_arches} noarch
- zcfan
ExclusiveArch: x86_64
- zeal
ExclusiveArch: aarch64 x86_64
- zenon
ExclusiveArch: %{ocaml_native_compiler}
- zeromq-ada
ExclusiveArch: %{GPRbuild_arches}
- zig
ExclusiveArch: %{zig_arches}
- zlib-ada
ExclusiveArch: %{GPRbuild_arches}
- zlib-ng
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- zola
ExclusiveArch: %{rust_arches}
1
0
Architecture specific change in rpms/rust-askalono-cli.git
by githook-noreply＠fedoraproject.org 24 Nov '23
by githook-noreply＠fedoraproject.org 24 Nov '23
24 Nov '23
The package rpms/rust-askalono-cli.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-askalono-cli.git/commit/?id=65….
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 655b1a569c1f1c97235d0c90719ffd91c9861d92
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Fri Nov 24 14:22:01 2023 +0100
Update included SPDX license-list-data to version 3.22
diff --git a/.gitignore b/.gitignore
index be7aecc..96baf05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/askalono-cli-0.4.3.crate
/askalono-cli-0.4.4.crate
/askalono-cli-0.4.6.crate
+/askalono-cache-3.22.bin.zstd
diff --git a/LICENSE.dependencies b/LICENSE.dependencies
deleted file mode 100644
index 591b339..0000000
--- a/LICENSE.dependencies
+++ /dev/null
@@ -1,56 +0,0 @@
-Apache-2.0 OR BSL-1.0: ryu v1.0.11
-Apache-2.0 OR MIT: fnv v1.0.7
-Apache-2.0 OR MIT: structopt v0.2.18
-Apache-2.0 OR MIT: thread_local v1.1.4
-Apache-2.0: askalono v0.4.6
-Apache-2.0: askalono-cli v0.4.6
-MIT OR Apache-2.0 OR Zlib: tinyvec_macros v0.1.0
-MIT OR Apache-2.0: anyhow v1.0.59
-MIT OR Apache-2.0: bitflags v1.3.2
-MIT OR Apache-2.0: bstr v0.2.17
-MIT OR Apache-2.0: cfg-if v1.0.0
-MIT OR Apache-2.0: crossbeam-channel v0.5.6
-MIT OR Apache-2.0: crossbeam-deque v0.8.2
-MIT OR Apache-2.0: crossbeam-epoch v0.9.10
-MIT OR Apache-2.0: crossbeam-utils v0.8.11
-MIT OR Apache-2.0: either v1.7.0
-MIT OR Apache-2.0: env_logger v0.7.1
-MIT OR Apache-2.0: humantime v1.3.0
-MIT OR Apache-2.0: itoa v1.0.3
-MIT OR Apache-2.0: lazy_static v1.4.0
-MIT OR Apache-2.0: libc v0.2.127
-MIT OR Apache-2.0: log v0.4.17
-MIT OR Apache-2.0: num-traits v0.2.15
-MIT OR Apache-2.0: num_cpus v1.13.1
-MIT OR Apache-2.0: once_cell v1.13.0
-MIT OR Apache-2.0: quick-error v1.2.3
-MIT OR Apache-2.0: rayon v1.5.3
-MIT OR Apache-2.0: rayon-core v1.9.3
-MIT OR Apache-2.0: regex v1.6.0
-MIT OR Apache-2.0: regex-syntax v0.6.27
-MIT OR Apache-2.0: scopeguard v1.1.0
-MIT OR Apache-2.0: serde v1.0.141
-MIT OR Apache-2.0: serde_json v1.0.83
-MIT OR Apache-2.0: unicode-normalization v0.1.21
-MIT OR Apache-2.0: unicode-width v0.1.9
-MIT OR Apache-2.0: vec_map v0.8.2
-MIT OR Apache-2.0: zstd-safe v5.0.2
-MIT OR Apache-2.0: zstd-sys v2.0.1
-MIT: ansi_term v0.12.1
-MIT: atty v0.2.14
-MIT: clap v2.34.0
-MIT: memoffset v0.6.5
-MIT: rmp v0.8.11
-MIT: rmp-serde v0.14.3
-MIT: strsim v0.10.0
-MIT: textwrap v0.11.0
-MIT: zstd v0.11.2
-Unlicense OR MIT: aho-corasick v0.7.18
-Unlicense OR MIT: byteorder v1.4.3
-Unlicense OR MIT: globset v0.4.8
-Unlicense OR MIT: ignore v0.4.18
-Unlicense OR MIT: memchr v2.5.0
-Unlicense OR MIT: same-file v1.0.6
-Unlicense OR MIT: termcolor v1.1.3
-Unlicense OR MIT: walkdir v2.3.2
-Zlib OR Apache-2.0 OR MIT: tinyvec v1.6.0
diff --git a/README.md b/README.md
deleted file mode 100644
index 4dab879..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-askalono-cli
-
-The rust-askalono-cli package
\ No newline at end of file
diff --git a/rust-askalono-cli.spec b/rust-askalono-cli.spec
index 1b23149..e95dcae 100644
--- a/rust-askalono-cli.spec
+++ b/rust-askalono-cli.spec
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 22
+# Generated by rust2rpm 25
%bcond_without check
%global crate askalono-cli
@@ -8,22 +8,27 @@ Version: 0.4.6
Release: %autorelease
Summary: Tool to detect the contents of license files
-License: Apache-2.0
+# * askalono-cli: Apache-2.0
+# * spdx/license-list-data: CC0-1.0
+License: Apache-2.0 AND CC0-1.0
URL: https://crates.io/crates/askalono-cli
-Source0: %{crates_source}
-Source1: LICENSE.dependencies
+Source: %{crates_source}
+# updated SPDX license list data; generated with:
+# $ git clone https://github.com/spdx/license-list-data.git spdx-license-list -b v3.22 --depth 1
+# $ askalono cache load-spdx spdx-license-list/json/details
+# $ mv askalono-cache.bin.zstd askalono-cache-3.22.bin.zstd
+Source: askalono-cache-3.22.bin.zstd
-ExclusiveArch: %{rust_arches}
-
-BuildRequires: rust-packaging >= 21
+BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
-Tool to detect the contents of license files.}
+A tool to detect the contents of license files.}
%description %{_description}
%package -n %{crate}
Summary: %{summary}
+# (MIT OR Apache-2.0) AND Unicode-DFS-2016
# Apache-2.0
# Apache-2.0 OR BSL-1.0
# Apache-2.0 OR MIT
@@ -32,28 +37,33 @@ Summary: %{summary}
# MIT OR Apache-2.0 OR Zlib
# Unlicense OR MIT
# Zlib OR Apache-2.0 OR MIT
-License: Apache-2.0 AND MIT
+License: Apache-2.0 AND CC0-1.0 MIT AND Unicode-DFS-2016 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) AND (Unlicense OR MIT)
# LICENSE.dependencies contains a full license breakdown
+Provides: bundled(spdx-license-list-data) = 3.22
+
%description -n %{crate} %{_description}
%files -n %{crate}
%license LICENSE
-%license LICENSE.dependencies
%license NOTICE
+%license LICENSE.dependencies
%doc README.md
%{_bindir}/askalono
%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
-cp %{SOURCE1} .
+%autosetup -n %{crate}-%{version} -p1
%cargo_prep
+# update bundled SPDX license list data
+cp -pav %{SOURCE1} embedded-cache.bin.zstd
%generate_buildrequires
%cargo_generate_buildrequires -f diagnostics
%build
%cargo_build -f diagnostics
+%{cargo_license_summary -f diagnostics}
+%{cargo_license -f diagnostics} > LICENSE.dependencies
%install
%cargo_install -f diagnostics
diff --git a/rust2rpm.toml b/rust2rpm.toml
new file mode 100644
index 0000000..9e3294d
--- /dev/null
+++ b/rust2rpm.toml
@@ -0,0 +1,4 @@
+[features]
+enable = ["diagnostics"]
+
+
diff --git a/sources b/sources
index e58164c..3e0260d 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
SHA512 (askalono-cli-0.4.6.crate) = da19ce0e445798aa41d49eda709ea62a00805da1db5baaf47c02df07994cd88e821d996609853bfaf48c95268876b2c98e3b69be1953b306f8537d3a6bea72eb
+SHA512 (askalono-cache-3.22.bin.zstd) = 2dfcc0de285e5e43a531f79f08a5386049a9d4084b9c27df43ca5619fe357b4a9d6cf66c3ae33b2694e9d57b46c32e7e663aa73ddcb13b08c33e75ab732ec1cb
commit 8ad6af8198486dcc8604b8eba384ecd917e71b62
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 21 18:55:56 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
1
0
Architecture specific change in rpms/rust-askalono-cli.git
by githook-noreply＠fedoraproject.org 24 Nov '23
by githook-noreply＠fedoraproject.org 24 Nov '23
24 Nov '23
The package rpms/rust-askalono-cli.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-askalono-cli.git/commit/?id=65….
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 655b1a569c1f1c97235d0c90719ffd91c9861d92
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Fri Nov 24 14:22:01 2023 +0100
Update included SPDX license-list-data to version 3.22
diff --git a/.gitignore b/.gitignore
index be7aecc..96baf05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/askalono-cli-0.4.3.crate
/askalono-cli-0.4.4.crate
/askalono-cli-0.4.6.crate
+/askalono-cache-3.22.bin.zstd
diff --git a/LICENSE.dependencies b/LICENSE.dependencies
deleted file mode 100644
index 591b339..0000000
--- a/LICENSE.dependencies
+++ /dev/null
@@ -1,56 +0,0 @@
-Apache-2.0 OR BSL-1.0: ryu v1.0.11
-Apache-2.0 OR MIT: fnv v1.0.7
-Apache-2.0 OR MIT: structopt v0.2.18
-Apache-2.0 OR MIT: thread_local v1.1.4
-Apache-2.0: askalono v0.4.6
-Apache-2.0: askalono-cli v0.4.6
-MIT OR Apache-2.0 OR Zlib: tinyvec_macros v0.1.0
-MIT OR Apache-2.0: anyhow v1.0.59
-MIT OR Apache-2.0: bitflags v1.3.2
-MIT OR Apache-2.0: bstr v0.2.17
-MIT OR Apache-2.0: cfg-if v1.0.0
-MIT OR Apache-2.0: crossbeam-channel v0.5.6
-MIT OR Apache-2.0: crossbeam-deque v0.8.2
-MIT OR Apache-2.0: crossbeam-epoch v0.9.10
-MIT OR Apache-2.0: crossbeam-utils v0.8.11
-MIT OR Apache-2.0: either v1.7.0
-MIT OR Apache-2.0: env_logger v0.7.1
-MIT OR Apache-2.0: humantime v1.3.0
-MIT OR Apache-2.0: itoa v1.0.3
-MIT OR Apache-2.0: lazy_static v1.4.0
-MIT OR Apache-2.0: libc v0.2.127
-MIT OR Apache-2.0: log v0.4.17
-MIT OR Apache-2.0: num-traits v0.2.15
-MIT OR Apache-2.0: num_cpus v1.13.1
-MIT OR Apache-2.0: once_cell v1.13.0
-MIT OR Apache-2.0: quick-error v1.2.3
-MIT OR Apache-2.0: rayon v1.5.3
-MIT OR Apache-2.0: rayon-core v1.9.3
-MIT OR Apache-2.0: regex v1.6.0
-MIT OR Apache-2.0: regex-syntax v0.6.27
-MIT OR Apache-2.0: scopeguard v1.1.0
-MIT OR Apache-2.0: serde v1.0.141
-MIT OR Apache-2.0: serde_json v1.0.83
-MIT OR Apache-2.0: unicode-normalization v0.1.21
-MIT OR Apache-2.0: unicode-width v0.1.9
-MIT OR Apache-2.0: vec_map v0.8.2
-MIT OR Apache-2.0: zstd-safe v5.0.2
-MIT OR Apache-2.0: zstd-sys v2.0.1
-MIT: ansi_term v0.12.1
-MIT: atty v0.2.14
-MIT: clap v2.34.0
-MIT: memoffset v0.6.5
-MIT: rmp v0.8.11
-MIT: rmp-serde v0.14.3
-MIT: strsim v0.10.0
-MIT: textwrap v0.11.0
-MIT: zstd v0.11.2
-Unlicense OR MIT: aho-corasick v0.7.18
-Unlicense OR MIT: byteorder v1.4.3
-Unlicense OR MIT: globset v0.4.8
-Unlicense OR MIT: ignore v0.4.18
-Unlicense OR MIT: memchr v2.5.0
-Unlicense OR MIT: same-file v1.0.6
-Unlicense OR MIT: termcolor v1.1.3
-Unlicense OR MIT: walkdir v2.3.2
-Zlib OR Apache-2.0 OR MIT: tinyvec v1.6.0
diff --git a/README.md b/README.md
deleted file mode 100644
index 4dab879..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-askalono-cli
-
-The rust-askalono-cli package
\ No newline at end of file
diff --git a/rust-askalono-cli.spec b/rust-askalono-cli.spec
index 1b23149..e95dcae 100644
--- a/rust-askalono-cli.spec
+++ b/rust-askalono-cli.spec
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 22
+# Generated by rust2rpm 25
%bcond_without check
%global crate askalono-cli
@@ -8,22 +8,27 @@ Version: 0.4.6
Release: %autorelease
Summary: Tool to detect the contents of license files
-License: Apache-2.0
+# * askalono-cli: Apache-2.0
+# * spdx/license-list-data: CC0-1.0
+License: Apache-2.0 AND CC0-1.0
URL: https://crates.io/crates/askalono-cli
-Source0: %{crates_source}
-Source1: LICENSE.dependencies
+Source: %{crates_source}
+# updated SPDX license list data; generated with:
+# $ git clone https://github.com/spdx/license-list-data.git spdx-license-list -b v3.22 --depth 1
+# $ askalono cache load-spdx spdx-license-list/json/details
+# $ mv askalono-cache.bin.zstd askalono-cache-3.22.bin.zstd
+Source: askalono-cache-3.22.bin.zstd
-ExclusiveArch: %{rust_arches}
-
-BuildRequires: rust-packaging >= 21
+BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
-Tool to detect the contents of license files.}
+A tool to detect the contents of license files.}
%description %{_description}
%package -n %{crate}
Summary: %{summary}
+# (MIT OR Apache-2.0) AND Unicode-DFS-2016
# Apache-2.0
# Apache-2.0 OR BSL-1.0
# Apache-2.0 OR MIT
@@ -32,28 +37,33 @@ Summary: %{summary}
# MIT OR Apache-2.0 OR Zlib
# Unlicense OR MIT
# Zlib OR Apache-2.0 OR MIT
-License: Apache-2.0 AND MIT
+License: Apache-2.0 AND CC0-1.0 MIT AND Unicode-DFS-2016 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) AND (Unlicense OR MIT)
# LICENSE.dependencies contains a full license breakdown
+Provides: bundled(spdx-license-list-data) = 3.22
+
%description -n %{crate} %{_description}
%files -n %{crate}
%license LICENSE
-%license LICENSE.dependencies
%license NOTICE
+%license LICENSE.dependencies
%doc README.md
%{_bindir}/askalono
%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
-cp %{SOURCE1} .
+%autosetup -n %{crate}-%{version} -p1
%cargo_prep
+# update bundled SPDX license list data
+cp -pav %{SOURCE1} embedded-cache.bin.zstd
%generate_buildrequires
%cargo_generate_buildrequires -f diagnostics
%build
%cargo_build -f diagnostics
+%{cargo_license_summary -f diagnostics}
+%{cargo_license -f diagnostics} > LICENSE.dependencies
%install
%cargo_install -f diagnostics
diff --git a/rust2rpm.toml b/rust2rpm.toml
new file mode 100644
index 0000000..9e3294d
--- /dev/null
+++ b/rust2rpm.toml
@@ -0,0 +1,4 @@
+[features]
+enable = ["diagnostics"]
+
+
diff --git a/sources b/sources
index e58164c..3e0260d 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
SHA512 (askalono-cli-0.4.6.crate) = da19ce0e445798aa41d49eda709ea62a00805da1db5baaf47c02df07994cd88e821d996609853bfaf48c95268876b2c98e3b69be1953b306f8537d3a6bea72eb
+SHA512 (askalono-cache-3.22.bin.zstd) = 2dfcc0de285e5e43a531f79f08a5386049a9d4084b9c27df43ca5619fe357b4a9d6cf66c3ae33b2694e9d57b46c32e7e663aa73ddcb13b08c33e75ab732ec1cb
1
0
Architecture specific change in rpms/golang-github-apache-arrow.git
by githook-noreply＠fedoraproject.org 24 Nov '23
by githook-noreply＠fedoraproject.org 24 Nov '23
24 Nov '23
The package rpms/golang-github-apache-arrow.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-apache-arrow.git/comm…
https://src.fedoraproject.org/cgit/rpms/golang-github-apache-arrow.git/comm…
https://src.fedoraproject.org/cgit/rpms/golang-github-apache-arrow.git/comm….
Change:
-ExcludeArch: i686 ppc64le s390x
+ExcludeArch: i686 ppc64le s390x
+ExcludeArch: i686
Thanks.
Full change:
============
commit 4cbfa3274c05d42d94c2119861a68d8828507541
Author: W. Michael Petullo <mike(a)flyn.org>
Date: Wed Nov 8 12:21:12 2023 -0600
Bump release and update changelog
Signed-off-by: W. Michael Petullo <mike(a)flyn.org>
diff --git a/golang-github-apache-arrow.spec b/golang-github-apache-arrow.spec
index 3ac82a4..e230770 100644
--- a/golang-github-apache-arrow.spec
+++ b/golang-github-apache-arrow.spec
@@ -32,7 +32,7 @@ in-memory processing.}
go/parquet/cmd/parquet_reader/README.md
Name: %{goname}
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Cross-language development platform for in-memory data
License: Apache-2.0 and BSD-2-Clause and BSD-3-Clause BSD-3-Clause-Clear and BSL-1.0
@@ -74,6 +74,9 @@ done
%gopkgfiles
%changelog
+* Wed Nov 08 2023 W. Michael Petullo <mike(a)flyn.org> - 12.0.1-4
+- Follow lead of golang-github-aead-chacha20 to handle arch-specific deps
+
* Wed Nov 08 2023 W. Michael Petullo <mike(a)flyn.org> - 12.0.1-3
- Revise list of skipped checks
commit 57299056bffd9ab0d251649fda9077e054503742
Author: W. Michael Petullo <mike(a)flyn.org>
Date: Wed Nov 8 12:19:20 2023 -0600
Follow lead of golang-github-aead-chacha20 to handle arch-specific deps
Signed-off-by: W. Michael Petullo <mike(a)flyn.org>
diff --git a/golang-github-apache-arrow.spec b/golang-github-apache-arrow.spec
index a2a5085..3ac82a4 100644
--- a/golang-github-apache-arrow.spec
+++ b/golang-github-apache-arrow.spec
@@ -3,11 +3,9 @@
%bcond_without check
%endif
%global debug_package %{nil}
-
-# The i686 variant does not automatically pull in a dependency on
-# golang(golang.org/x/sys/cpu), and that leaves that noarch package different
-# than the others, which is not allowed. Just drop it.
-ExcludeArch: i686 ppc64le s390x
+# Avoid noarch package built differently on different architectures (see also
+# .../sys/cpu elsewhere):
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^golang\\(golang.org/x/sys/cpu\\)$
# https://github.com/apache/arrow
%global goipath github.com/apache/arrow/go
@@ -20,6 +18,9 @@ Version: 12.0.1
%global goaltipaths github.com/apache/arrow/go/v12
+%global godevelheader %{expand:
+Requires: golang(golang.org/x/sys/cpu)}
+
%global common_description %{expand:
Apache Arrow is a multi-language toolbox for accelerated data interchange and
in-memory processing.}
@@ -38,6 +39,8 @@ License: Apache-2.0 and BSD-2-Clause and BSD-3-Clause BSD-3-Clause-Clear
URL: %{gourl}
Source: %{gosource}
+BuildRequires: golang(golang.org/x/sys/cpu)
+
%description %{common_description}
%gopkg
commit bfd2ea68ecb712c7226744f8cdccebe8c3d6a4c3
Author: W. Michael Petullo <mike(a)flyn.org>
Date: Wed Nov 8 11:44:12 2023 -0600
ExcludeArch ppc64le and s390x too
Signed-off-by: W. Michael Petullo <mike(a)flyn.org>
diff --git a/golang-github-apache-arrow.spec b/golang-github-apache-arrow.spec
index 8caa12a..a2a5085 100644
--- a/golang-github-apache-arrow.spec
+++ b/golang-github-apache-arrow.spec
@@ -7,7 +7,7 @@
# The i686 variant does not automatically pull in a dependency on
# golang(golang.org/x/sys/cpu), and that leaves that noarch package different
# than the others, which is not allowed. Just drop it.
-ExcludeArch: i686
+ExcludeArch: i686 ppc64le s390x
# https://github.com/apache/arrow
%global goipath github.com/apache/arrow/go
commit c5ad0d5a1c83027fb8c9ccaa905c2e9716e48b5d
Author: W. Michael Petullo <mike(a)flyn.org>
Date: Wed Nov 8 10:46:59 2023 -0600
ExcludeArch i686, which is the only to require golang(golang.org/x/sys/cpu)
Signed-off-by: W. Michael Petullo <mike(a)flyn.org>
diff --git a/golang-github-apache-arrow.spec b/golang-github-apache-arrow.spec
index f696733..8caa12a 100644
--- a/golang-github-apache-arrow.spec
+++ b/golang-github-apache-arrow.spec
@@ -4,6 +4,11 @@
%endif
%global debug_package %{nil}
+# The i686 variant does not automatically pull in a dependency on
+# golang(golang.org/x/sys/cpu), and that leaves that noarch package different
+# than the others, which is not allowed. Just drop it.
+ExcludeArch: i686
+
# https://github.com/apache/arrow
%global goipath github.com/apache/arrow/go
Version: 12.0.1
commit d9683951398485b6c03bf923d1a4a85fe495cfea
Author: W. Michael Petullo <mike(a)flyn.org>
Date: Wed Nov 8 10:15:58 2023 -0600
Remove requires, as it did not fix problem
Signed-off-by: W. Michael Petullo <mike(a)flyn.org>
diff --git a/golang-github-apache-arrow.spec b/golang-github-apache-arrow.spec
index 4600289..f696733 100644
--- a/golang-github-apache-arrow.spec
+++ b/golang-github-apache-arrow.spec
@@ -4,8 +4,6 @@
%endif
%global debug_package %{nil}
-Requires: golang(golang.org/x/sys/cpu)
-
# https://github.com/apache/arrow
%global goipath github.com/apache/arrow/go
Version: 12.0.1
commit cb4a856eddd16a82e15a24bc77acc01a707a281a
Author: W. Michael Petullo <mike(a)flyn.org>
Date: Wed Nov 8 09:53:11 2023 -0600
Explicitly require golang(golang.org/x/sys/cpu)
Building without this resulted in:
BuildError: The following noarch package built differently on different
architectures: golang-github-apache-arrow-devel-12.0.1-3.fc40.noarch.rpm
rpmdiff output was:
added REQUIRES golang(golang.org/x/sys/cpu)
Signed-off-by: W. Michael Petullo <mike(a)flyn.org>
diff --git a/golang-github-apache-arrow.spec b/golang-github-apache-arrow.spec
index f696733..4600289 100644
--- a/golang-github-apache-arrow.spec
+++ b/golang-github-apache-arrow.spec
@@ -4,6 +4,8 @@
%endif
%global debug_package %{nil}
+Requires: golang(golang.org/x/sys/cpu)
+
# https://github.com/apache/arrow
%global goipath github.com/apache/arrow/go
Version: 12.0.1
commit ba0478ee67fdfadb05b3d7e30f51f49ff060d55b
Author: W. Michael Petullo <mike(a)flyn.org>
Date: Wed Nov 8 09:12:31 2023 -0600
Revise list of skipped checks
Signed-off-by: W. Michael Petullo <mike(a)flyn.org>
diff --git a/golang-github-apache-arrow.spec b/golang-github-apache-arrow.spec
index cb1fd64..f696733 100644
--- a/golang-github-apache-arrow.spec
+++ b/golang-github-apache-arrow.spec
@@ -26,7 +26,7 @@ in-memory processing.}
go/parquet/cmd/parquet_reader/README.md
Name: %{goname}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Cross-language development platform for in-memory data
License: Apache-2.0 and BSD-2-Clause and BSD-3-Clause BSD-3-Clause-Clear and BSL-1.0
@@ -57,12 +57,18 @@ for test in "TestFileEncryptionDecryption" "TestArrowReaderAdHocReadDecimals" \
; do
awk -i inplace '/^func.*'"$test"'\(/ { print; print "\tt.Skip(\"disabled failing test\")"; next}1' $(grep -rl $test)
done
-%gocheck -d github.com/apache/arrow/go/arrow/compute
+%gocheck \
+ -d github.com/apache/arrow/go/arrow/compute \
+ -d github.com/apache/arrow/go/parquet \
+ -d github.com/apache/arrow/go/parquet/pqarrow
%endif
%gopkgfiles
%changelog
+* Wed Nov 08 2023 W. Michael Petullo <mike(a)flyn.org> - 12.0.1-3
+- Revise list of skipped checks
+
* Mon Nov 06 2023 Mikel Olasagasti Uranga <mikel(a)olasagasti.info> - 12.0.1-2
- Use latest go2rpm template
- License SPDX migration and expand licenses
commit 0ea2f70ee0824ac0aefba7129ae631802abe5bcd
Author: Mikel Olasagasti Uranga <mikel(a)olasagasti.info>
Date: Mon Nov 6 18:39:21 2023 +0100
Update spec
- Use latest go2rpm template
- License SPDX migration and expand licenses
- Add goaltipath to arrow/v12
diff --git a/golang-github-apache-arrow.spec b/golang-github-apache-arrow.spec
index 0253751..cb1fd64 100644
--- a/golang-github-apache-arrow.spec
+++ b/golang-github-apache-arrow.spec
@@ -1,43 +1,49 @@
-# Generated by go2rpm
+# Generated by go2rpm 1.10.0
%ifarch x86_64
%bcond_without check
%endif
+%global debug_package %{nil}
-# https://github.com/apache/arrow/go/arrow
-%global goipath github.com/apache/arrow
+# https://github.com/apache/arrow
+%global goipath github.com/apache/arrow/go
Version: 12.0.1
%global tag apache-arrow-12.0.1
%global distprefix %{nil}
%gometa
+
+%global goaltipaths github.com/apache/arrow/go/v12
+
%global common_description %{expand:
-Apache Arrow is a cross-language development platform for in-memory data. It
-specifies a standardized language-independent columnar memory format for flat
-and hierarchical data, organized for efficient analytic operations on modern
-hardware. It also provides computational libraries and zero-copy streaming
-messaging and inter-process communication.}
+Apache Arrow is a multi-language toolbox for accelerated data interchange and
+in-memory processing.}
%global golicenses LICENSE.txt NOTICE.txt
-%global godocs _examples go/README.md
+%global godocs docs CHANGELOG.md README.md\\\
+ go/README.md _examples \\\
+ go/arrow/flight/flightsql/driver/README.md\\\
+ go/parquet/cmd/parquet_reader/README.md
Name: %{goname}
-Release: 9%{?dist}
+Release: 2%{?dist}
Summary: Cross-language development platform for in-memory data
-License: ASL 2.0
+License: Apache-2.0 and BSD-2-Clause and BSD-3-Clause BSD-3-Clause-Clear and BSL-1.0
URL: %{gourl}
-Source0: %{gosource}
+Source: %{gosource}
-%description
-%{common_description}
+%description %{common_description}
%gopkg
%prep
%goprep
+%autopatch -p1
+
# Remove files unrelated to the Go Library
find ./* -maxdepth 0 -type d -not -name "go" -and -not -name "_build" -exec rm -rf "{}" \;
+mv go/* .
%generate_buildrequires
%go_generate_buildrequires
@@ -47,12 +53,24 @@ find ./* -maxdepth 0 -type d -not -name "go" -and -not -name "_build" -exec rm -
%if %{with check}
%check
+for test in "TestFileEncryptionDecryption" "TestArrowReaderAdHocReadDecimals" \
+; do
+awk -i inplace '/^func.*'"$test"'\(/ { print; print "\tt.Skip(\"disabled failing test\")"; next}1' $(grep -rl $test)
+done
%gocheck -d github.com/apache/arrow/go/arrow/compute
%endif
%gopkgfiles
%changelog
+* Mon Nov 06 2023 Mikel Olasagasti Uranga <mikel(a)olasagasti.info> - 12.0.1-2
+- Use latest go2rpm template
+- License SPDX migration and expand licenses
+- Add goaltipath to arrow/v12
+
+* Wed Oct 04 2023 W. Michael Petullo <mike(a)flyn.org> - 12.0.1-1
+- Update to 12.0.1
+
* Thu Jul 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
commit e259958fa53772ef952744a85115902532c8a4d9
Author: W. Michael Petullo <mike(a)flyn.org>
Date: Wed Oct 4 17:06:55 2023 -0500
Update to 12.0.1
Signed-off-by: W. Michael Petullo <mike(a)flyn.org>
diff --git a/.gitignore b/.gitignore
index 7b1e4c0..6ecb8ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/arrow-apache-arrow-0.16.0.tar.gz
/arrow-apache-arrow-1.0.0.tar.gz
/arrow-apache-arrow-2.0.0.tar.gz
+/arrow-apache-arrow-12.0.1.tar.gz
diff --git a/golang-github-apache-arrow.spec b/golang-github-apache-arrow.spec
index 20f3687..0253751 100644
--- a/golang-github-apache-arrow.spec
+++ b/golang-github-apache-arrow.spec
@@ -5,8 +5,8 @@
# https://github.com/apache/arrow/go/arrow
%global goipath github.com/apache/arrow
-Version: 2.0.0
-%global tag apache-arrow-2.0.0
+Version: 12.0.1
+%global tag apache-arrow-12.0.1
%global distprefix %{nil}
%gometa
@@ -29,21 +29,6 @@ License: ASL 2.0
URL: %{gourl}
Source0: %{gosource}
-BuildRequires: golang(github.com/golang/protobuf/proto)
-BuildRequires: golang(github.com/google/flatbuffers/go)
-BuildRequires: golang(golang.org/x/xerrors)
-BuildRequires: golang(google.golang.org/grpc)
-BuildRequires: golang(google.golang.org/grpc/codes)
-BuildRequires: golang(google.golang.org/grpc/metadata)
-BuildRequires: golang(google.golang.org/grpc/status)
-BuildRequires: golang(google.golang.org/protobuf/reflect/protoreflect)
-BuildRequires: golang(google.golang.org/protobuf/runtime/protoimpl)
-
-%if %{with check}
-# Tests
-BuildRequires: golang(github.com/stretchr/testify/assert)
-%endif
-
%description
%{common_description}
@@ -54,12 +39,15 @@ BuildRequires: golang(github.com/stretchr/testify/assert)
# Remove files unrelated to the Go Library
find ./* -maxdepth 0 -type d -not -name "go" -and -not -name "_build" -exec rm -rf "{}" \;
+%generate_buildrequires
+%go_generate_buildrequires
+
%install
%gopkginstall
%if %{with check}
%check
-%gocheck
+%gocheck -d github.com/apache/arrow/go/arrow/compute
%endif
%gopkgfiles
diff --git a/sources b/sources
index 6b6d3cf..6385fcc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (arrow-apache-arrow-2.0.0.tar.gz) = 296c47896134878b0bb8f64c8f6d8e3eef99499097fe6239b6e3b9075620b21687600075b52dc7e1d5e4a5151ab5cf609c6443725b97a46112c2a7070f2a28f8
+SHA512 (arrow-apache-arrow-12.0.1.tar.gz) = 98b1fd68d85e3052e1c3d68b7bbb3920086126a6896c40390fb02388e45af3bbaeab56ca36ec58dad0693a4cacab8465af3bf018f684de93053f9769a8229874
1
0
New package excluding arches (1)
============================
- msv
ExclusiveArch: %{java_arches} noarch
Package that edited their arches constraints (1)
=============================================
- arianna
was ExclusiveArch: %{qt5_qtwebengine_arches}
is ExclusiveArch: %{qt6_qtwebengine_arches}
List of packages currently excluding arches (1134)
===========================================
- 0ad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- 90-Second-Portraits
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- BareBonesBrowserLaunch
ExclusiveArch: %{java_arches} noarch
- CFR
ExclusiveArch: %{java_arches} noarch
- CardManager
ExclusiveArch: %{java_arches} noarch
- GAPDoc
ExclusiveArch: %{gap_arches} noarch
- GoldenCheetah
ExclusiveArch: %{qt5_qtwebengine_arches}
- GtkAda
ExclusiveArch: %{GPRbuild_arches}
- GtkAda3
ExclusiveArch: %{GPRbuild_arches}
- IPAddress
ExclusiveArch: %{java_arches} noarch
- Mars
ExclusiveArch: %{java_arches} noarch
- OpenColorIO
ExclusiveArch: x86_64 ppc64le
- OpenImageIO
ExclusiveArch: x86_64 ppc64le
- OpenMolcas
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- OpenStego
ExclusiveArch: %{java_arches} noarch
- PragmARC
ExclusiveArch: %{GPRbuild_arches}
- R-V8
ExclusiveArch: %{nodejs_arches}
- R-rJava
ExclusiveArch: %{java_arches}
- RdRand
ExclusiveArch: %{ix86} x86_64
- RediSearch
ExclusiveArch: x86_64
- SLOF
ExclusiveArch: ppc64le
- YafaRay
ExclusiveArch: %{ix86} x86_64
- aardvark-dns
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- accel-config
ExclusiveArch: %{ix86} x86_64
- acpid
ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64
- ahven
ExclusiveArch: %{GPRbuild_arches}
- algobox
ExclusiveArch: %{qt5_qtwebengine_arches}
- american-fuzzy-lop
ExclusiveArch: %{ix86} x86_64 s390x
- anet
ExclusiveArch: %{GPRbuild_arches}
- ant
ExclusiveArch: %{java_arches} noarch
- ant-antunit
ExclusiveArch: %{java_arches} noarch
- ant-contrib
ExclusiveArch: %{java_arches} noarch
- antlr
ExclusiveArch: %{java_arches}
- antlr3
ExclusiveArch: %{java_arches}
- antlr4-project
ExclusiveArch: %{java_arches}
- antlrworks
ExclusiveArch: %{java_arches} noarch
- aopalliance
ExclusiveArch: %{java_arches} noarch
- apache-commons-beanutils
ExclusiveArch: %{java_arches} noarch
- apache-commons-cli
ExclusiveArch: %{java_arches} noarch
- apache-commons-codec
ExclusiveArch: %{java_arches} noarch
- apache-commons-collections
ExclusiveArch: %{java_arches} noarch
- apache-commons-collections4
ExclusiveArch: %{java_arches} noarch
- apache-commons-compress
ExclusiveArch: %{java_arches} noarch
- apache-commons-configuration
ExclusiveArch: %{java_arches} noarch
- apache-commons-digester
ExclusiveArch: %{java_arches} noarch
- apache-commons-exec
ExclusiveArch: %{java_arches} noarch
- apache-commons-io
ExclusiveArch: %{java_arches} noarch
- apache-commons-jexl
ExclusiveArch: %{java_arches} noarch
- apache-commons-jxpath
ExclusiveArch: %{java_arches} noarch
- apache-commons-lang3
ExclusiveArch: %{java_arches} noarch
- apache-commons-logging
ExclusiveArch: %{java_arches} noarch
- apache-commons-math
ExclusiveArch: %{java_arches} noarch
- apache-commons-modeler
ExclusiveArch: %{java_arches} noarch
- apache-commons-net
ExclusiveArch: %{java_arches} noarch
- apache-commons-parent
ExclusiveArch: %{java_arches} noarch
- apache-commons-pool
ExclusiveArch: %{java_arches} noarch
- apache-commons-vfs
ExclusiveArch: %{java_arches} noarch
- apache-ivy
ExclusiveArch: %{java_arches} noarch
- apache-parent
ExclusiveArch: %{java_arches} noarch
- apache-resource-bundles
ExclusiveArch: %{java_arches} noarch
- apache-sshd
ExclusiveArch: %{java_arches} noarch
- apiguardian
ExclusiveArch: %{java_arches} noarch
- apmd
ExclusiveArch: %{ix86}
- appstream-generator
ExclusiveArch: %{ldc_arches}
- aqute-bnd
ExclusiveArch: %{java_arches} noarch
- args4j
ExclusiveArch: %{java_arches} noarch
- arianna
ExclusiveArch: %{qt6_qtwebengine_arches}
- arm-trusted-firmware
ExclusiveArch: aarch64
- asmjit
ExclusiveArch: aarch64 x86_64
- assertj-core
ExclusiveArch: %{java_arches} noarch
- atinject
ExclusiveArch: %{java_arches} noarch
- aunit
ExclusiveArch: %GPRbuild_arches
- auto
ExclusiveArch: %{java_arches} noarch
- autolink-java
ExclusiveArch: noarch %{java_arches}
- avgtime
ExclusiveArch: %{ldc_arches}
- aws
ExclusiveArch: %GPRbuild_arches
- azure-cli
ExclusiveArch: %{java_arches} noarch
- batik
ExclusiveArch: %{java_arches} noarch
- bcal
ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x
- bcc
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
- bcel
ExclusiveArch: %{java_arches} noarch
- bcm283x-firmware
ExclusiveArch: aarch64
- beansbinding
ExclusiveArch: %{java_arches} noarch
- berusky2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips}
- beust-jcommander
ExclusiveArch: %{java_arches} noarch
- bibletime
ExclusiveArch: %{java_arches}
- biosdevname
ExclusiveArch: %{ix86} x86_64
- bless
ExclusiveArch: %mono_arches
- bodhi-server
ExclusiveArch: %{golang_arches_future}
- bolzplatz2006
ExclusiveArch: %{java_arches}
- bouncycastle
ExclusiveArch: %{java_arches} noarch
- box64
ExclusiveArch: aarch64 ppc64le x86_64
- bpftrace
ExclusiveArch: x86_64 %{power64} aarch64 s390x
- brazil
ExclusiveArch: %{java_arches} noarch
- bsf
ExclusiveArch: %{java_arches} noarch
- bsh
ExclusiveArch: %{java_arches} noarch
- build-helper-maven-plugin
ExclusiveArch: %{java_arches} noarch
- buildah
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- byebyebios
ExclusiveArch: x86_64
- byte-buddy
ExclusiveArch: %{java_arches} noarch
- byteman
ExclusiveArch: %{java_arches} noarch
- cachelib
ExclusiveArch: x86_64 aarch64 ppc64le
- caddy
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: %{golang_arches}
- caffe
ExclusiveArch: x86_64 aarch64 ppc64le
- calamares
ExclusiveArch: %{ix86} x86_64 aarch64
- calibre
ExclusiveArch: aarch64 x86_64
- cambozola
ExclusiveArch: %{java_arches} noarch
- canl-java
ExclusiveArch: %{java_arches} noarch
- catatonit
ExclusiveArch: aarch64 ppc64le s390x x86_64
ExclusiveArch: %{golang_arches_future}
- ccdciel
ExclusiveArch: %{fpc_arches}
- cdcollect
ExclusiveArch: %{mono_arches}
- cdi-api
ExclusiveArch: %{java_arches} noarch
- ceph
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- cglib
ExclusiveArch: %{java_arches} noarch
- chromium
ExclusiveArch: x86_64
ExclusiveArch: x86_64 aarch64
- cjdns
ExclusiveArch: %{nodejs_arches}
- classloader-leak-test-framework
ExclusiveArch: %{java_arches} noarch
- classpathless-compiler
ExclusiveArch: %{java_arches} noarch
- clevis-pin-tpm2
ExclusiveArch: %{rust_arches}
- clojure
ExclusiveArch: %{java_arches} noarch
- clojure-core-specs-alpha
ExclusiveArch: %{java_arches} noarch
- clojure-maven-plugin
ExclusiveArch: %{java_arches} noarch
- clojure-spec-alpha
ExclusiveArch: %{java_arches} noarch
- cmospwd
ExclusiveArch: %{ix86} x86_64
- cmrt
ExclusiveArch: %{ix86} x86_64 ia64
- codehaus-parent
ExclusiveArch: %{java_arches} noarch
- colorful
ExclusiveArch: %{fpc_arches}
- colossus
ExclusiveArch: %{java_arches} noarch
- conmon
ExclusiveArch: %{golang_arches_future}
- console-image-viewer
ExclusiveArch: %{java_arches} noarch
- containernetworking-plugins
ExclusiveArch: %{golang_arches}
- coq
ExclusiveArch: %{ocaml_native_compiler}
- cortado
ExclusiveArch: %{java_arches} noarch
- cpu-x
ExclusiveArch: i686 x86_64
- cpufetch
ExclusiveArch: %{arm} aarch64 x86_64 ppc ppc64 ppc64le
- cpuid
ExclusiveArch: %{ix86} x86_64
- cpuinfo
ExclusiveArch: x86_64 aarch64
- cqrlog
ExclusiveArch: %{fpc_arches}
- crash
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- crash-gcore-command
ExclusiveArch: aarch64 ppc64le x86_64
- crash-trace-command
ExclusiveArch: aarch64 ppc64le s390x x86_64
- credentials-fetcher
ExclusiveArch: x86_64 aarch64 s390x
- cri-o
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- cri-tools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- criu
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- crun
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le riscv64 s390x x86_64
- cryptlib
ExclusiveArch: x86_64 aarch64 ppc64le
- crypto-policies
ExclusiveArch: %{java_arches} noarch
- cryptobone
ExclusiveArch: x86_64 ppc64le aarch64
- csslint
ExclusiveArch: %{nodejs_arches} noarch
- daq
ExclusiveArch: x86_64 aarch64
- dbus-sharp
ExclusiveArch: %mono_arches
- dbus-sharp-glib
ExclusiveArch: %mono_arches
- decentxml
ExclusiveArch: %{java_arches} noarch
- deepin-daemon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- deepin-desktop-schemas
ExclusiveArch: %{go_arches}
- directory-maven-plugin
ExclusiveArch: %{java_arches} noarch
- dirgra
ExclusiveArch: %{java_arches} noarch
- disruptor
ExclusiveArch: %{java_arches} noarch
- ditaa
ExclusiveArch: %{java_arches} noarch
- dlm
ExclusiveArch: i686 x86_64
- dmidecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- dmtcp
ExclusiveArch: x86_64
- docker-distribution
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- dogtag-pki
ExclusiveArch: %{java_arches}
- dolphin-emu
ExclusiveArch: x86_64 aarch64
- dom4j
ExclusiveArch: %{java_arches} noarch
- dotnet6.0
ExclusiveArch: aarch64 x86_64 s390x
ExclusiveArch: x86_64
- dotnet7.0
ExclusiveArch: aarch64 ppc64le s390x x86_64
ExclusiveArch: x86_64
- doublecmd
ExclusiveArch: %{ix86} x86_64
- dpdk
ExclusiveArch: x86_64 i686 aarch64 ppc64le
- dub
ExclusiveArch: %{ldc_arches}
- dxvk-native
ExclusiveArch: %{ix86} x86_64
- dyninst
ExclusiveArch: %{ix86} x86_64 ppc64le aarch64
- e3
ExclusiveArch: %{ix86} x86_64
- easymock
ExclusiveArch: %{java_arches} noarch
- ecj
ExclusiveArch: %{java_arches} noarch
- eclipse-swt
ExclusiveArch: %{java_arches}
- ed25519-java
ExclusiveArch: %{java_arches} noarch
- edk2
ExclusiveArch: x86_64 aarch64 riscv64
- efibootmgr
ExclusiveArch: %{efi}
- efifs
ExclusiveArch: %{efi}
- efitools
ExclusiveArch: %{efi}
- efivar
ExclusiveArch: %{efi}
- elk
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- emacs-slime
ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64
- embree
ExclusiveArch: aarch64 x86_64
- embree3
ExclusiveArch: aarch64 x86_64
- enjarify
ExclusiveArch: %{java_arches} noarch
- enki
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
- envytools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- eric
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
- erlang-corba
ExclusiveArch: %{java_arches}
- esmi_ib_library
ExclusiveArch: x86_64
- eth-tools
ExclusiveArch: x86_64
- exec-maven-plugin
ExclusiveArch: %{java_arches} noarch
- external-editor-revived
ExclusiveArch: %{rust_arches}
- extra-enforcer-rules
ExclusiveArch: %{java_arches} noarch
- fasterxml-oss-parent
ExclusiveArch: %{java_arches} noarch
- fb303
ExclusiveArch: x86_64 aarch64 ppc64le
- fbthrift
ExclusiveArch: x86_64 aarch64 ppc64le
- fcitx-libpinyin
ExclusiveArch: %{qt5_qtwebengine_arches}
- fedora-dockerfiles
ExclusiveArch: %{go_arches}
- felix-parent
ExclusiveArch: %{java_arches} noarch
- felix-utils
ExclusiveArch: %{java_arches} noarch
- fernflower
ExclusiveArch: %{java_arches} noarch
- fes
ExclusiveArch: %{ix86} x86_64
- filedrop
ExclusiveArch: %{java_arches} noarch
- firecracker
ExclusiveArch: aarch64 x86_64
- fishbowl
ExclusiveArch: %{java_arches} noarch
- fizz
ExclusiveArch: x86_64 aarch64 ppc64le
- flexmark-java
ExclusiveArch: noarch %{java_arches}
- flocq
ExclusiveArch: %{ocaml_native_compiler}
- florist
ExclusiveArch: %{GPRbuild_arches}
- fluent-bit
ExclusiveArch: x86_64 aarch64
- flute
ExclusiveArch: %{java_arches} noarch
- folly
ExclusiveArch: x86_64 aarch64 ppc64le
- fop
ExclusiveArch: %{java_arches} noarch
- forge-parent
ExclusiveArch: %{java_arches} noarch
- fpc
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc64le
- frama-c
ExclusiveArch: %{ocaml_native_compiler}
- freecol
ExclusiveArch: %{java_arches} noarch
- freemarker
ExclusiveArch: %{java_arches} noarch
- freerouting
ExclusiveArch: %{java_arches} noarch
- frescobaldi
ExclusiveArch: %{qt5_qtwebengine_arches}
- frysk
ExclusiveArch: x86_64 ppc64
- fuse-overlayfs
ExclusiveArch: %{arm64} ppc64le s390x x86_64
- fusesource-pom
ExclusiveArch: %{java_arches} noarch
- fwts
ExclusiveArch: x86_64 %{arm} aarch64 s390x riscv64 %{power64}
- fwupd-efi
ExclusiveArch: x86_64 aarch64
- ga
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- gap
ExclusiveArch: %{gap_arches}
- gap-pkg-ace
ExclusiveArch: %{gap_arches}
- gap-pkg-aclib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-alnuth
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-atlasrep
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-autodoc
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-automata
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-autpgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-browse
ExclusiveArch: %{gap_arches}
- gap-pkg-caratinterface
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-circle
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-cohomolo
ExclusiveArch: %{gap_arches}
- gap-pkg-congruence
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-corelg
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crime
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crisp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crypting
ExclusiveArch: %{gap_arches}
- gap-pkg-cryst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crystcat
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-ctbllib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-curlinterface
ExclusiveArch: %{gap_arches}
- gap-pkg-cvec
ExclusiveArch: %{gap_arches}
- gap-pkg-datastructures
ExclusiveArch: %{gap_arches}
- gap-pkg-design
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-digraphs
ExclusiveArch: %{gap_arches}
- gap-pkg-edim
ExclusiveArch: %{gap_arches}
- gap-pkg-factint
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-ferret
ExclusiveArch: %{gap_arches}
- gap-pkg-fga
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-fining
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-float
ExclusiveArch: %{gap_arches}
- gap-pkg-format
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-forms
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-fr
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-francy
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-gbnp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-genss
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-grape
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-groupoids
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-grpconst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-guava
ExclusiveArch: %{gap_arches}
- gap-pkg-hap
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-hapcryst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-hecke
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-images
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-io
ExclusiveArch: %{gap_arches}
- gap-pkg-irredsol
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-json
ExclusiveArch: %{gap_arches}
- gap-pkg-jupyterkernel
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-jupyterviz
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-laguna
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liealgdb
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liepring
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liering
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-loops
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-lpres
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-mapclass
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-nautytracesinterface
ExclusiveArch: %{gap_arches}
- gap-pkg-nq
ExclusiveArch: %{gap_arches}
- gap-pkg-openmath
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-orb
ExclusiveArch: %{gap_arches}
- gap-pkg-polenta
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-polycyclic
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-polymaking
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-primgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-profiling
ExclusiveArch: %{gap_arches}
- gap-pkg-qpa
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-quagroup
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-radiroot
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-recog
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-repsn
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-resclasses
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-scscp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-semigroups
ExclusiveArch: %{gap_arches}
- gap-pkg-singular
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sla
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-smallgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-smallsemi
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sonata
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sophus
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-spinsym
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-standardff
ExclusiveArch: %{gap_arches}
- gap-pkg-tomlib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-toric
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-transgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-utils
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-uuid
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-xmod
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-zeromqinterface
ExclusiveArch: %{gap_arches}
- gappalib-coq
ExclusiveArch: %{ocaml_native_compiler}
- gbrainy
ExclusiveArch: %mono_arches
- gdb
ExclusiveArch: %{ix86} x86_64
- gdb-exploitable
ExclusiveArch: x86_64 i386
ExclusiveArch: x86_64 noarch
- gearhead1
ExclusiveArch: %{fpc_arches}
- gearhead2
ExclusiveArch: %{fpc_arches}
- ghdl
ExclusiveArch: %{GNAT_arches}
- ghostwriter
ExclusiveArch: %{qt5_qtwebengine_arches}
- gio-sharp
ExclusiveArch: %mono_arches
- gir-to-d
ExclusiveArch: %{ldc_arches}
- git-octopus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- gitqlient
ExclusiveArch: %{qt5_qtwebengine_arches}
- giver
ExclusiveArch: %{mono_arches}
- gkeyfile-sharp
ExclusiveArch: %mono_arches
- glibc32
ExclusiveArch: x86_64
- glibd
ExclusiveArch: %{ldc_arches}
- gnatcoll
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-bindings
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-db
ExclusiveArch: %{GPRbuild_arches}
- gnome-boxes
ExclusiveArch: x86_64
- gnome-desktop-sharp
ExclusiveArch: %mono_arches
- gnome-do
ExclusiveArch: %mono_arches
- gnome-keyring-sharp
ExclusiveArch: %mono_arches
- gnome-rdp
ExclusiveArch: %{mono_arches}
- gnome-sharp
ExclusiveArch: %mono_arches
- gnome-subtitles
ExclusiveArch: %mono_arches
- gnu-efi
ExclusiveArch: %{efi}
- go-bindata
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- godep
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang
ExclusiveArch: %{golang_arches}
- google-gson
ExclusiveArch: %{java_arches} noarch
- google-guice
ExclusiveArch: %{java_arches} noarch
- gotun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: x86_64
- goverlay
ExclusiveArch: %{fpc_arches}
- gprbuild
ExclusiveArch: %{GPRbuild_arches}
- gprolog
ExclusiveArch: x86_64 %{ix86} ppc alpha aarch64
- grafana
ExclusiveArch: %{grafana_arches}
- grafana-pcp
ExclusiveArch: %{grafanapcp_arches}
- gtk-sharp-beans
ExclusiveArch: %mono_arches
- gtk-sharp2
ExclusiveArch: %mono_arches
- gtk-sharp3
ExclusiveArch: %{mono_arches}
- gtkd
ExclusiveArch: %{ldc_arches}
- guava
ExclusiveArch: %{java_arches} noarch
- gudev-sharp
ExclusiveArch: %mono_arches
- guestfs-tools
ExclusiveArch: %{kernel_arches}
- gvisor-tap-vsock
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- hamcrest
ExclusiveArch: %{java_arches} noarch
- harec
ExclusiveArch: x86_64 aarch64
- hawtjni
ExclusiveArch: %{java_arches} noarch
- hedgewars
ExclusiveArch: %{fpc_arches}
- hibernate-jpa-2.0-api
ExclusiveArch: %{java_arches} noarch
- hid4java
ExclusiveArch: %{java_arches} noarch
- hipblas
ExclusiveArch: x86_64
- hipcub
ExclusiveArch: x86_64
- hipify
ExclusiveArch: x86_64
- hsakmt
ExclusiveArch: x86_64 aarch64 ppc64le
- httpcomponents-client
ExclusiveArch: %{java_arches} noarch
- httpcomponents-core
ExclusiveArch: %{java_arches} noarch
- httpcomponents-project
ExclusiveArch: %{java_arches} noarch
- hyena
ExclusiveArch: %{mono_arches}
- hyperscan
ExclusiveArch: x86_64
- hyperv-daemons
ExclusiveArch: i686 x86_64 aarch64
- icaro
ExclusiveArch: %{ix86} x86_64 noarch
- icedtea-web
ExclusiveArch: %{java_arches}
- icu4j
ExclusiveArch: %{java_arches} noarch
- imagej
ExclusiveArch: %{java_arches} noarch
- imhex
ExclusiveArch: x86_64 %{arm64}
- imvirt
ExclusiveArch: %{ix86} x86_64 ia64
- indistarter
ExclusiveArch: %{fpc_arches}
- infinipath-psm
ExclusiveArch: x86_64
- intel-cm-compiler
ExclusiveArch: i686 x86_64
- intel-cmt-cat
ExclusiveArch: x86_64
- intel-compute-runtime
ExclusiveArch: x86_64
- intel-gmmlib
ExclusiveArch: x86_64 i686
- intel-igc
ExclusiveArch: x86_64
- intel-ipp-crypto-mb
ExclusiveArch: x86_64
- intel-ipsec-mb
ExclusiveArch: x86_64
- intel-mediasdk
ExclusiveArch: x86_64
- intel-undervolt
ExclusiveArch: i386 x86_64
- ioport
ExclusiveArch: %{ix86} x86_64
- ipmctl
ExclusiveArch: x86_64
- ispc
ExclusiveArch: x86_64 aarch64
- iucode-tool
ExclusiveArch: %{ix86} x86_64
- iyfct
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- jFormatString
ExclusiveArch: %{java_arches} noarch
- jackson-annotations
ExclusiveArch: %{java_arches} noarch
- jackson-bom
ExclusiveArch: %{java_arches} noarch
- jackson-core
ExclusiveArch: %{java_arches} noarch
- jackson-databind
ExclusiveArch: %{java_arches} noarch
- jackson-dataformats-binary
ExclusiveArch: %{java_arches} noarch
- jackson-dataformats-text
ExclusiveArch: %{java_arches} noarch
- jackson-jaxrs-providers
ExclusiveArch: %{java_arches} noarch
- jackson-modules-base
ExclusiveArch: %{java_arches} noarch
- jackson-parent
ExclusiveArch: %{java_arches} noarch
- jacoco
ExclusiveArch: %{java_arches} noarch
- jacop
ExclusiveArch: %{java_arches} noarch
- jakarta-activation
ExclusiveArch: %{java_arches} noarch
- jakarta-activation1
ExclusiveArch: %{java_arches} noarch
- jakarta-annotations
ExclusiveArch: %{java_arches} noarch
- jakarta-el
ExclusiveArch: %{java_arches} noarch
- jakarta-interceptors
ExclusiveArch: %{java_arches} noarch
- jakarta-json
ExclusiveArch: %{java_arches} noarch
- jakarta-mail
ExclusiveArch: %{java_arches} noarch
- jakarta-mail1
ExclusiveArch: %{java_arches} noarch
- jakarta-oro
ExclusiveArch: %{java_arches} noarch
- jakarta-saaj
ExclusiveArch: %{java_arches} noarch
- jakarta-server-pages
ExclusiveArch: %{java_arches} noarch
- jakarta-servlet
ExclusiveArch: %{java_arches} noarch
- jakarta-xml-ws
ExclusiveArch: %{java_arches} noarch
- janino
ExclusiveArch: %{java_arches} noarch
- jansi
ExclusiveArch: %{java_arches}
- jansi-native
ExclusiveArch: %{java_arches}
- jansi1
ExclusiveArch: %{java_arches} noarch
- java-1.8.0-openjdk
ExclusiveArch: %{java_arches}
- java-1.8.0-openjdk-aarch32
ExclusiveArch: %{arm}
- java-1.8.0-openjdk-portable
ExclusiveArch: %{java_arches}
- java-11-openjdk
ExclusiveArch: %{java_arches}
- java-11-openjdk-portable
ExclusiveArch: %{java_arches}
- java-17-openjdk
ExclusiveArch: %{java_arches}
- java-17-openjdk-portable
ExclusiveArch: %{java_arches}
- java-diff-utils
ExclusiveArch: %{java_arches} noarch
- java-dirq
ExclusiveArch: %{java_arches} noarch
- java-jd-decompiler
ExclusiveArch: %{java_arches} noarch
- java-latest-openjdk
ExclusiveArch: %{java_arches}
- java-latest-openjdk-portable
ExclusiveArch: %{java_arches}
- java-runtime-decompiler
ExclusiveArch: %{java_arches} noarch
- java-scrypt
ExclusiveArch: %{java_arches} noarch
- java_cup
ExclusiveArch: %{java_arches} noarch
- javacc
ExclusiveArch: %{java_arches} noarch
- javacc-maven-plugin
ExclusiveArch: %{java_arches} noarch
- javaewah
ExclusiveArch: %{java_arches} noarch
- javapackages-bootstrap
ExclusiveArch: %{java_arches}
- javaparser
ExclusiveArch: %{java_arches} noarch
- javapoet
ExclusiveArch: %{java_arches} noarch
- javassist
ExclusiveArch: %{java_arches} noarch
- jaxb
ExclusiveArch: %{java_arches} noarch
- jaxb-api
ExclusiveArch: %{java_arches} noarch
- jaxb-api2
ExclusiveArch: %{java_arches} noarch
- jaxb-dtd-parser
ExclusiveArch: %{java_arches} noarch
- jaxb-fi
ExclusiveArch: %{java_arches} noarch
- jaxb-istack-commons
ExclusiveArch: %{java_arches} noarch
- jaxb-stax-ex
ExclusiveArch: %{java_arches} noarch
- jaxen
ExclusiveArch: %{java_arches} noarch
- jboss-jaxrs-2.0-api
ExclusiveArch: %{java_arches} noarch
- jboss-logging
ExclusiveArch: %{java_arches} noarch
- jboss-logging-tools
ExclusiveArch: %{java_arches} noarch
- jboss-parent
ExclusiveArch: %{java_arches} noarch
- jchardet
ExclusiveArch: %{java_arches} noarch
- jcip-annotations
ExclusiveArch: %{java_arches} noarch
- jctools
ExclusiveArch: %{java_arches} noarch
- jcuber
ExclusiveArch: %{java_arches} noarch
- jdeparser
ExclusiveArch: %{java_arches} noarch
- jdepend
ExclusiveArch: %{java_arches} noarch
- jdependency
ExclusiveArch: %{java_arches} noarch
- jdom
ExclusiveArch: %{java_arches} noarch
- jdom2
ExclusiveArch: %{java_arches} noarch
- jedit
ExclusiveArch: %{java_arches} noarch
- jericho-html
ExclusiveArch: %{java_arches} noarch
- jetbrains-annotations
ExclusiveArch: noarch %{java_arches}
- jetty
ExclusiveArch: %{java_arches} noarch
- jflex
ExclusiveArch: %{java_arches} noarch
- jfreechart
ExclusiveArch: %{java_arches} noarch
- jgit
ExclusiveArch: %{java_arches} noarch
- jglobus
ExclusiveArch: %{java_arches} noarch
- jgoodies-common
ExclusiveArch: %{java_arches} noarch
- jgoodies-forms
ExclusiveArch: %{java_arches} noarch
- jgoodies-looks
ExclusiveArch: %{java_arches} noarch
- jigawatts
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- jline
ExclusiveArch: %{java_arches}
- jline2
ExclusiveArch: %{java_arches} noarch
- jmock
ExclusiveArch: %{java_arches} noarch
- jmol
ExclusiveArch: %{java_arches} noarch
- jna
ExclusiveArch: %{java_arches}
- jneuroml-core
ExclusiveArch: %{java_arches} noarch
- jni-inchi
ExclusiveArch: %{java_arches}
- jol
ExclusiveArch: %{java_arches} noarch
- jolokia-jvm-agent
ExclusiveArch: %{java_arches} noarch
- jopt-simple
ExclusiveArch: %{java_arches} noarch
- jorbis
ExclusiveArch: %{java_arches} noarch
- jowl
ExclusiveArch: %{nodejs_arches} noarch
- jpanoramamaker
ExclusiveArch: %{java_arches} noarch
- jsch
ExclusiveArch: %{java_arches} noarch
- jsch-agent-proxy
ExclusiveArch: %{java_arches} noarch
- json_simple
ExclusiveArch: %{java_arches} noarch
- jsoup
ExclusiveArch: %{java_arches} noarch
- jsr-305
ExclusiveArch: %{java_arches} noarch
- jss
ExclusiveArch: %{java_arches}
- jssc
ExclusiveArch: %{java_arches}
- jtidy
ExclusiveArch: %{java_arches} noarch
- julia
ExclusiveArch: x86_64
- junit
ExclusiveArch: %{java_arches} noarch
- junit5
ExclusiveArch: %{java_arches} noarch
- juniversalchardet
ExclusiveArch: %{java_arches} noarch
- jzlib
ExclusiveArch: %{java_arches} noarch
- kaidan
ExclusiveArch: %{qt5_qtwebengine_arches}
- kchmviewer
ExclusiveArch: %{qt5_qtwebengine_arches}
- kernel
ExclusiveArch: noarch x86_64 s390x aarch64 ppc64le
ExclusiveArch: noarch i386 i686 x86_64 s390x aarch64 ppc64le
- keylime-agent-rust
ExclusiveArch: %{rust_arches}
- keyring-ima-signer
ExclusiveArch: %{rust_arches}
- kf5-akonadi-search
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-audiocd-kio
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kblog
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarcore
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarutils
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kitinerary
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-ktnef
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-libkdcraw
ExclusiveArch: x86_64 ppc64le %{arm}
- kicad
ExclusiveArch: x86_64 aarch64 ppc64le
- kiwix-desktop
ExclusiveArch: %{qt5_qtwebengine_arches}
- knot-resolver
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- knotes
ExclusiveArch: x86_64 %{arm}
- kubernetes
ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm}
- laf-plugin
ExclusiveArch: %{java_arches} noarch
- lazarus
ExclusiveArch: %{fpc_arches}
- lazpaint
ExclusiveArch: %{fpc_arches}
- ldapjdk
ExclusiveArch: %{java_arches} noarch
- ldc
ExclusiveArch: %{ldc_arches} ppc64le
- ldc1.32
ExclusiveArch: %{ldc_arches} ppc64le
- libbase
ExclusiveArch: %{java_arches} noarch
- libclc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x
- libcxl
ExclusiveArch: %{power64}
- libdfp
ExclusiveArch: ppc ppc64 ppc64le s390 s390x x86_64
- libdispatch
ExclusiveArch: x86_64 aarch64 ppc64le
- libfonts
ExclusiveArch: %{java_arches} noarch
- libformula
ExclusiveArch: %{java_arches} noarch
- libguestfs
ExclusiveArch: %{kernel_arches}
- libica
ExclusiveArch: s390 s390x
- libipt
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- libkgapi
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- libkrun
ExclusiveArch: x86_64 aarch64
- libkrunfw
ExclusiveArch: x86_64 aarch64
- liblayout
ExclusiveArch: %{java_arches} noarch
- libloader
ExclusiveArch: %{java_arches} noarch
- libnxz
ExclusiveArch: ppc64le
- libocxl
ExclusiveArch: ppc64le
- libpsm2
ExclusiveArch: x86_64
- libquentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- libreoffice-TexMaths
ExclusiveArch: %{java_arches}
- librepository
ExclusiveArch: %{java_arches} noarch
- libretro-desmume2015
ExclusiveArch: i686 x86_64
- librtas
ExclusiveArch: %{power64}
- libserializer
ExclusiveArch: %{java_arches} noarch
- libservicelog
ExclusiveArch: ppc %{power64}
- libsmbios
ExclusiveArch: x86_64 %{ix86}
- libunicode
ExclusiveArch: x86_64 aarch64
- libunwind
ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64
- libva-nvidia-driver
ExclusiveArch: %{x86_64} %{ix86} %{arm64} ppc64le
- libvirt-java
ExclusiveArch: %{java_arches} noarch
- libvma
ExclusiveArch: x86_64 ppc64le ppc64 aarch64
- libvmi
ExclusiveArch: x86_64
- libvpd
ExclusiveArch: %{power64}
- libxsmm
ExclusiveArch: x86_64
- libzdnn
ExclusiveArch: s390x
- libzfcphbaapi
ExclusiveArch: s390 s390x
- libzpc
ExclusiveArch: s390x
- llhttp
ExclusiveArch: %{nodejs_arches}
- log4j
ExclusiveArch: %{java_arches} noarch
- log4net
ExclusiveArch: %mono_arches
- lrmi
ExclusiveArch: %{ix86}
- lsvpd
ExclusiveArch: %{power64}
- luajit
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- lucene
ExclusiveArch: %{java_arches} noarch
- lujavrite
ExclusiveArch: %{java_arches}
- luxcorerender
ExclusiveArch: x86_64
- mactel-boot
ExclusiveArch: x86_64
- magicmirror
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-airnow
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-onthisday
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-singlestock
ExclusiveArch: %{nodejs_arches} noarch
- manifest-tool
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- mariadb-java-client
ExclusiveArch: %{java_arches} noarch
- marked
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- matrix-synapse
ExclusiveArch: %{rust_arches}
- maui-mauikit
ExclusiveArch: %{ix86} s390x aarch64 x86_64
- maven
ExclusiveArch: %{java_arches} noarch
- maven-antrun-plugin
ExclusiveArch: %{java_arches} noarch
- maven-archetype
ExclusiveArch: %{java_arches} noarch
- maven-archiver
ExclusiveArch: %{java_arches} noarch
- maven-artifact-transfer
ExclusiveArch: %{java_arches} noarch
- maven-assembly-plugin
ExclusiveArch: %{java_arches} noarch
- maven-bundle-plugin
ExclusiveArch: %{java_arches} noarch
- maven-clean-plugin
ExclusiveArch: %{java_arches} noarch
- maven-common-artifact-filters
ExclusiveArch: %{java_arches} noarch
- maven-compiler-plugin
ExclusiveArch: %{java_arches} noarch
- maven-dependency-analyzer
ExclusiveArch: %{java_arches} noarch
- maven-dependency-plugin
ExclusiveArch: %{java_arches} noarch
- maven-dependency-tree
ExclusiveArch: %{java_arches} noarch
- maven-doxia
ExclusiveArch: %{java_arches} noarch
- maven-doxia-sitetools
ExclusiveArch: %{java_arches} noarch
- maven-enforcer
ExclusiveArch: %{java_arches} noarch
- maven-file-management
ExclusiveArch: %{java_arches} noarch
- maven-filtering
ExclusiveArch: %{java_arches} noarch
- maven-invoker
ExclusiveArch: %{java_arches} noarch
- maven-invoker-plugin
ExclusiveArch: %{java_arches} noarch
- maven-jar-plugin
ExclusiveArch: %{java_arches} noarch
- maven-mapping
ExclusiveArch: %{java_arches} noarch
- maven-native
ExclusiveArch: %{java_arches} noarch
- maven-parent
ExclusiveArch: %{java_arches} noarch
- maven-patch-plugin
ExclusiveArch: %{java_arches} noarch
- maven-plugin-testing
ExclusiveArch: %{java_arches} noarch
- maven-plugin-tools
ExclusiveArch: %{java_arches} noarch
- maven-remote-resources-plugin
ExclusiveArch: %{java_arches} noarch
- maven-reporting-api
ExclusiveArch: %{java_arches} noarch
- maven-reporting-impl
ExclusiveArch: %{java_arches} noarch
- maven-resolver
ExclusiveArch: %{java_arches} noarch
- maven-resources-plugin
ExclusiveArch: %{java_arches} noarch
- maven-script-interpreter
ExclusiveArch: %{java_arches} noarch
- maven-shade-plugin
ExclusiveArch: %{java_arches} noarch
- maven-shared-incremental
ExclusiveArch: %{java_arches} noarch
- maven-shared-io
ExclusiveArch: %{java_arches} noarch
- maven-shared-utils
ExclusiveArch: %{java_arches} noarch
- maven-source-plugin
ExclusiveArch: %{java_arches} noarch
- maven-surefire
ExclusiveArch: %{java_arches} noarch
- maven-verifier
ExclusiveArch: %{java_arches} noarch
- maven-verifier-plugin
ExclusiveArch: %{java_arches} noarch
- maven-wagon
ExclusiveArch: %{java_arches} noarch
- maxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- mbpfan
ExclusiveArch: x86_64
- mcelog
ExclusiveArch: i686 x86_64
- mcrouter
ExclusiveArch: x86_64 aarch64 ppc64le
- mecab-java
ExclusiveArch: %java_arches
- mediaconch
ExclusiveArch: %{qt5_qtwebengine_arches}
- mellowplayer
ExclusiveArch: %{qt5_qtwebengine_arches}
- memkind
ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64
- memtest86+
ExclusiveArch: x86_64 %{ix86}
- merkuro
ExclusiveArch: %{qt5_qtwebengine_arches}
- microcode_ctl
ExclusiveArch: %{ix86} x86_64
- micropython
ExclusiveArch: %{arm} x86_64 riscv64
- miglayout
ExclusiveArch: %{java_arches} noarch
- mine_detector
ExclusiveArch: %{GPRbuild_arches}
- minetest
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mingw-libidn2
ExclusiveArch: %{ix86} x86_64 %{arm}
- mingw-wine-gecko
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- mkbootdisk
ExclusiveArch: %{ix86} sparc sparc64 x86_64
- moby-engine
ExclusiveArch: %{golang_arches}
- mockito
ExclusiveArch: %{java_arches} noarch
- mod_mono
ExclusiveArch: %mono_arches
- modello
ExclusiveArch: %{java_arches} noarch
- moditect
ExclusiveArch: %{java_arches} noarch
- module-build-service
ExclusiveArch: %{ix86} x86_64 noarch
- modulemaker-maven-plugin
ExclusiveArch: %{java_arches} noarch
- mojo-executor
ExclusiveArch: %{java_arches} noarch
- mojo-parent
ExclusiveArch: %{java_arches} noarch
- mokutil
ExclusiveArch: %{ix86} x86_64 aarch64 %{arm}
- mono
ExclusiveArch: %mono_arches
- mono-addins
ExclusiveArch: %mono_arches
- mono-basic
ExclusiveArch: %{mono_arches}
- mono-bouncycastle
ExclusiveArch: %mono_arches
- mono-cecil
ExclusiveArch: %mono_arches
- mono-cecil-flowanalysis
ExclusiveArch: %mono_arches
- mono-reflection
ExclusiveArch: %mono_arches
- mono-tools
ExclusiveArch: %mono_arches
- mono-zeroconf
ExclusiveArch: %mono_arches
- monodevelop
ExclusiveArch: %mono_arches
- monodevelop-debugger-gdb
ExclusiveArch: %{mono_arches}
- mrrescue
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- msr-tools
ExclusiveArch: %{ix86} x86_64
- msv
ExclusiveArch: %{java_arches} noarch
- mvfst
ExclusiveArch: x86_64 aarch64 ppc64le
- mxparser
ExclusiveArch: %{java_arches} noarch
- mysql-connector-java
ExclusiveArch: %{java_arches} noarch
- mysql-connector-net
ExclusiveArch: %{mono_arches}
- naev
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- naga
ExclusiveArch: %{java_arches} noarch
- nant
ExclusiveArch: %mono_arches
- nativejit
ExclusiveArch: x86_64
- nbc
ExclusiveArch: %{fpc_arches}
- nbdkit
ExclusiveArch: x86_64
- ndesk-dbus
ExclusiveArch: %{mono_arches}
- ndesk-dbus-glib
ExclusiveArch: %{mono_arches}
- nekohtml
ExclusiveArch: %{java_arches} noarch
- netavark
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- newtonsoft-json
ExclusiveArch: %{mono_arches}
- nodejs-acorn-object-spread
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-backbone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bash-language-server
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buble
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cjs-module-lexer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-generic-pool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-less
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-linefix
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nodemon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-packaging
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-replace-require-self
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-underscore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-undici
ExclusiveArch: %{nodejs_arches} noarch
- nodejs18
ExclusiveArch: %{nodejs_arches}
- nodejs20
ExclusiveArch: %{nodejs_arches}
- nom-tam-fits
ExclusiveArch: %{java_arches} noarch
- notify-sharp
ExclusiveArch: %{mono_arches}
- notify-sharp3
ExclusiveArch: %{mono_arches}
- nuget
ExclusiveArch: %{mono_arches}
- numatop
ExclusiveArch: x86_64 ppc64le
- nunit
ExclusiveArch: %{mono_arches}
- nunit2
ExclusiveArch: %{mono_arches}
- nvml
ExclusiveArch: x86_64 ppc64le
- objectweb-asm
ExclusiveArch: %{java_arches} noarch
- objenesis
ExclusiveArch: %{java_arches} noarch
- obs-service-rust2rpm
ExclusiveArch: %{rust_arches} noarch
- oci-seccomp-bpf-hook
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
ExclusiveArch: %{golang_arches_future}
- oidn
ExclusiveArch: x86_64
- olpc-utils
ExclusiveArch: %{ix86} %{arm}
- oneVPL
ExclusiveArch: x86_64
- oneVPL-intel-gpu
ExclusiveArch: x86_64
- oneapi-level-zero
ExclusiveArch: x86_64
- onednn
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- onedrive
ExclusiveArch: %{ldc_arches}
- ongres-scram
ExclusiveArch: %{java_arches} noarch
- ongres-stringprep
ExclusiveArch: %{java_arches} noarch
- opae
ExclusiveArch: x86_64
- opal-prd
ExclusiveArch: ppc64le
- open-vm-tools
ExclusiveArch: x86_64 aarch64
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: x86_64
- openblas
ExclusiveArch: %{openblas_arches}
- openjdk-asmtools
ExclusiveArch: %{java_arches} noarch
- openjdk-asmtools7
ExclusiveArch: %{java_arches} noarch
- openjfx
ExclusiveArch: %{java_arches}
- openjfx8
ExclusiveArch: x86_64
- openlibm
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64}
- openms
ExclusiveArch: %{qt5_qtwebengine_arches}
- openni
ExclusiveArch: x86_64 %{arm}
- openni-primesense
ExclusiveArch: %{ix86} x86_64 %{arm}
- openoffice.org-diafilter
ExclusiveArch: %{java_arches}
- openpgl
ExclusiveArch: aarch64 x86_64
- openssl-ibmca
ExclusiveArch: s390 s390x
- openstack-java-sdk
ExclusiveArch: %{java_arches} noarch
- opentest4j
ExclusiveArch: %{java_arches} noarch
- openvkl
ExclusiveArch: aarch64 x86_64
- optee_client
ExclusiveArch: aarch64
- optee_os
ExclusiveArch: aarch64
- options
ExclusiveArch: %{java_arches} noarch
- orthorobot
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- osgi-annotation
ExclusiveArch: %{java_arches} noarch
- osgi-compendium
ExclusiveArch: %{java_arches} noarch
- osgi-core
ExclusiveArch: %{java_arches} noarch
- pacemaker
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64 %{arm}
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- pageedit
ExclusiveArch: %{qt5_qtwebengine_arches}
- parserng
ExclusiveArch: %{java_arches} noarch
- pasdoc
ExclusiveArch: %{fpc_arches}
- pcc
ExclusiveArch: %{ix86} x86_64
- pcfi
ExclusiveArch: %{java_arches} noarch
- pcm
ExclusiveArch: %{ix86} x86_64
- pcmciautils
ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm}
- pdbg
ExclusiveArch: ppc64le
- pdfbox
ExclusiveArch: %{java_arches} noarch
- pdfmod
ExclusiveArch: %mono_arches
- pdftk-java
ExclusiveArch: %{java_arches} noarch
- pentaho-libxml
ExclusiveArch: %{java_arches} noarch
- pentaho-reporting-flow-engine
ExclusiveArch: %{java_arches} noarch
- perl-Dumbbench
ExclusiveArch: %{ix86} x86_64 noarch
- perl-Parse-DMIDecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- pesign
ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm}
- pesign-test-app
ExclusiveArch: x86_64
- picocli
ExclusiveArch: %{java_arches} noarch
- pinta
ExclusiveArch: %mono_arches
- pioneer
ExclusiveArch: %{ix86} x86_64
- plantuml
ExclusiveArch: %{java_arches} noarch
- plasma-dialer
ExclusiveArch: %{java_arches}
- playonlinux
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- plexus-archiver
ExclusiveArch: %{java_arches} noarch
- plexus-build-api
ExclusiveArch: %{java_arches} noarch
- plexus-build-api0
ExclusiveArch: %{java_arches} noarch
- plexus-cipher
ExclusiveArch: %{java_arches} noarch
- plexus-classworlds
ExclusiveArch: %{java_arches} noarch
- plexus-compiler
ExclusiveArch: %{java_arches} noarch
- plexus-component-api
ExclusiveArch: %{java_arches} noarch
- plexus-components-pom
ExclusiveArch: %{java_arches} noarch
- plexus-containers
ExclusiveArch: %{java_arches} noarch
- plexus-i18n
ExclusiveArch: %{java_arches} noarch
- plexus-interpolation
ExclusiveArch: %{java_arches} noarch
- plexus-io
ExclusiveArch: %{java_arches} noarch
- plexus-languages
ExclusiveArch: %{java_arches} noarch
- plexus-pom
ExclusiveArch: %{java_arches} noarch
- plexus-resources
ExclusiveArch: %{java_arches} noarch
- plexus-sec-dispatcher
ExclusiveArch: %{java_arches} noarch
- plexus-utils
ExclusiveArch: %{java_arches} noarch
- plexus-velocity
ExclusiveArch: %{java_arches} noarch
- podman
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- poppler-sharp
ExclusiveArch: %mono_arches
- popub
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- postgresql-jdbc
ExclusiveArch: %{java_arches} noarch
- powerpc-utils
ExclusiveArch: ppc %{power64}
- powerstat
ExclusiveArch: %{ix86} x86_64
- ppc64-diag
ExclusiveArch: ppc %{power64}
- procyon
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
- proguard
ExclusiveArch: %{java_arches} noarch
- prometheus-jmx-exporter
ExclusiveArch: %{java_arches} noarch
- prometheus-simpleclient-java
ExclusiveArch: %{java_arches} noarch
- proxygen
ExclusiveArch: x86_64 aarch64 ppc64le
- pveclib
ExclusiveArch: ppc %{power64}
- pyqtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- python-ast-monitor
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
- python-cryptography
ExclusiveArch: %{rust_arches}
- python-damo
ExclusiveArch: x86_64 aarch64 ppc64le s390x noarch
- python-etcd
ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- python-javaobj
ExclusiveArch: %{java_arches} noarch
- python-jnius
ExclusiveArch: %{java_arches}
- python-jupyter-polymake
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- python-openoffice
ExclusiveArch: noarch x86_64
- python-pyahocorasick
ExclusiveArch: x86_64 %{arm64} ppc64le
- python-pymoc
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-pyqt6-webengine
ExclusiveArch: aarch64 x86_64
- q4wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- qatengine
ExclusiveArch: x86_64
- qatzip
ExclusiveArch: x86_64
- qbe
ExclusiveArch: x86_64 aarch64
- qcint
ExclusiveArch: x86_64
- qclib
ExclusiveArch: s390 s390x
- qdox
ExclusiveArch: %{java_arches} noarch
- qemu-sanity-check
ExclusiveArch: %{kernel_arches}
- qevercloud
ExclusiveArch: %{qt5_qtwebengine_arches}
- qmapshack
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt4pas
ExclusiveArch: %{fpc_arches}
- qt5-qtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt6-qtwebengine
ExclusiveArch: aarch64 x86_64
- qt6-qtwebview
ExclusiveArch: aarch64 x86_64
- quantum-espresso
ExclusiveArch: x86_64 %{ix86} aarch64 %{power64}
- quentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- rEFInd
ExclusiveArch: %{efi}
- rachota
ExclusiveArch: %{java_arches} noarch
- rear
ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64
- reflections
ExclusiveArch: %{java_arches} noarch
- reg
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- regexp
ExclusiveArch: %{java_arches} noarch
- relaxng-datatype-java
ExclusiveArch: %{java_arches} noarch
- replacer
ExclusiveArch: %{java_arches} noarch
- reptyr
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- rescene
ExclusiveArch: %{mono_arches}
- resteasy
ExclusiveArch: %{java_arches} noarch
- restool
ExclusiveArch: aarch64
- restsharp
ExclusiveArch: %{mono_arches}
- retsnoop
ExclusiveArch: %{rust_arches}
- rhino
ExclusiveArch: %{java_arches} noarch
- river
ExclusiveArch: %{zig_arches}
- rkcommon
ExclusiveArch: x86_64 aarch64
- rocalution
ExclusiveArch: x86_64
- rocblas
ExclusiveArch: x86_64
- rocclr
ExclusiveArch: x86_64
- rocm-compilersupport
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-device-libs
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-rpm-macros
ExclusiveArch: x86_64
- rocm-runtime
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-smi
ExclusiveArch: x86_64 aarch64 ppc64le
- rocminfo
ExclusiveArch: x86_64 aarch64 ppc64le
- rocprim
ExclusiveArch: x86_64
- rocrand
ExclusiveArch: x86_64
- rocsparse
ExclusiveArch: x86_64
- rocthrust
ExclusiveArch: x86_64
- rpm-ostree
ExclusiveArch: %{rust_arches}
- rr
ExclusiveArch: %{ix86} x86_64 aarch64
- rssguard
ExclusiveArch: %{qt6_qtwebengine_arches}
- rstudio
ExclusiveArch: %{java_arches}
- rsyntaxtextarea
ExclusiveArch: %{java_arches} noarch
- rubygem-childprocess
ExclusiveArch: %{ix86} x86_64 noarch
- runc
ExclusiveArch: %{golang_arches_future}
- rundoc
ExclusiveArch: %{java_arches} noarch
- rust
ExclusiveArch: %{rust_arches}
- rust-askalono-cli
ExclusiveArch: %{rust_arches}
- rust-brotli
ExclusiveArch: %{rust_arches}
- rust-compress-tools
ExclusiveArch: %{rust_arches}
- rust-coreos-installer
ExclusiveArch: %{rust_arches}
- rust-ctr
ExclusiveArch: %{rust_arches}
- rust-dashmap4
ExclusiveArch: %{rust_arches}
- rust-deflate
ExclusiveArch: %{rust_arches}
- rust-deflate0.8
ExclusiveArch: %{rust_arches}
- rust-drg
ExclusiveArch: %{rust_arches}
- rust-epoll
ExclusiveArch: %{rust_arches}
- rust-getch
ExclusiveArch: %{rust_arches}
- rust-gzip-header
ExclusiveArch: %{rust_arches}
- rust-hamming
ExclusiveArch: %{rust_arches}
- rust-hidapi
ExclusiveArch: %{rust_arches}
- rust-httparse
ExclusiveArch: %{rust_arches}
- rust-humantime-serde
ExclusiveArch: %{rust_arches}
- rust-hyperlocal
ExclusiveArch: %{rust_arches}
- rust-image0.23
ExclusiveArch: %{rust_arches}
- rust-inflate
ExclusiveArch: %{rust_arches}
- rust-jpeg-decoder0.1
ExclusiveArch: %{rust_arches}
- rust-k9
ExclusiveArch: %{rust_arches}
- rust-krunvm
ExclusiveArch: x86_64 aarch64
- rust-kstring
ExclusiveArch: %{rust_arches}
- rust-kvm-ioctls
ExclusiveArch: x86_64 aarch64
- rust-lebe
ExclusiveArch: %{rust_arches}
- rust-libslirp-sys
ExclusiveArch: %{rust_arches}
- rust-msru
ExclusiveArch: x86_64
- rust-nanorand
ExclusiveArch: %{rust_arches}
- rust-netstat2
ExclusiveArch: %{rust_arches}
- rust-onig
ExclusiveArch: %{rust_arches}
- rust-openat-ext
ExclusiveArch: %{rust_arches}
- rust-os_type
ExclusiveArch: %{rust_arches}
- rust-pager
ExclusiveArch: %{rust_arches}
- rust-pathsearch
ExclusiveArch: %{rust_arches}
- rust-pretty-bytes
ExclusiveArch: %{rust_arches}
- rust-pretty-hex
ExclusiveArch: %{rust_arches}
- rust-primal-bit
ExclusiveArch: %{rust_arches}
- rust-primal-check
ExclusiveArch: %{rust_arches}
- rust-primal-estimate
ExclusiveArch: %{rust_arches}
- rust-procfs0.9
ExclusiveArch: %{rust_arches}
- rust-psl-types
ExclusiveArch: %{rust_arches}
- rust-psm
ExclusiveArch: %{rust_arches}
- rust-pwd
ExclusiveArch: %{rust_arches}
- rust-rand_core
ExclusiveArch: %{rust_arches}
- rust-schemafy_core
ExclusiveArch: %{rust_arches}
- rust-schemafy_lib
ExclusiveArch: %{rust_arches}
- rust-seahash
ExclusiveArch: %{rust_arches}
- rust-serde-big-array
ExclusiveArch: %{rust_arches}
- rust-serde_qs
ExclusiveArch: %{rust_arches}
- rust-serde_yaml0.8
ExclusiveArch: %{rust_arches}
- rust-sev
ExclusiveArch: x86_64
- rust-sevctl
ExclusiveArch: x86_64
- rust-silver
ExclusiveArch: %{rust_arches}
- rust-sinit
ExclusiveArch: %{rust_arches}
- rust-snphost
ExclusiveArch: x86_64
- rust-ssh-key-dir
ExclusiveArch: %{rust_arches}
- rust-stacker
ExclusiveArch: %{rust_arches}
- rust-structopt
ExclusiveArch: %{rust_arches}
- rust-tiff0.6
ExclusiveArch: %{rust_arches}
- rust-totp-lite
ExclusiveArch: %{rust_arches}
- rust-tower-layer
ExclusiveArch: %{rust_arches}
- rust-tpm2-policy
ExclusiveArch: %{rust_arches}
- rust-unicode-normalization
ExclusiveArch: %{rust_arches}
- rust-unicode-xid
ExclusiveArch: %{rust_arches}
- rust-uriparse
ExclusiveArch: %{rust_arches}
- rust-uucore
ExclusiveArch: %{rust_arches}
- rust-varlink_generator
ExclusiveArch: %{rust_arches}
- rust-varlink_parser
ExclusiveArch: %{rust_arches}
- rust-virtio-bindings
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-vmm-sys-util
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-vtparse
ExclusiveArch: %{rust_arches}
- rust-web-ext-native-messaging
ExclusiveArch: %{rust_arches}
- rust-wezterm-color-types
ExclusiveArch: %{rust_arches}
- rust-wezterm-dynamic
ExclusiveArch: %{rust_arches}
- rust-wezterm-dynamic-derive
ExclusiveArch: %{rust_arches}
- rust-zbus1
ExclusiveArch: %{rust_arches}
- rust-zbus_macros1
ExclusiveArch: %{rust_arches}
- rust-zvariant2
ExclusiveArch: %{rust_arches}
- rust-zvariant_derive2
ExclusiveArch: %{rust_arches}
- rutabaga-gfx-ffi
ExclusiveArch: x86_64 aarch64
- sac
ExclusiveArch: %{java_arches} noarch
- safetyblanket
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- sat4j
ExclusiveArch: %{java_arches} noarch
- sbcl
ExclusiveArch: %{ix86} x86_64 aarch64 %{power64}
- sbd
ExclusiveArch: i686 x86_64 s390x aarch64 ppc64le
- sblim-cim-client
ExclusiveArch: %{java_arches} noarch
- sblim-cim-client2
ExclusiveArch: %{java_arches} noarch
- sbsigntools
ExclusiveArch: x86_64 aarch64 %{arm} %{ix86}
- scala
ExclusiveArch: %{java_arches} noarch
- scannotation
ExclusiveArch: %{java_arches} noarch
- sdljava
ExclusiveArch: %{java_arches}
- sdrangel
ExclusiveArch: %{qt5_qtwebengine_arches}
- sdsl-lite
ExclusiveArch: %{power64} x86_64 aarch64
- sdubby
ExclusiveArch: %{efi}
- seabios
ExclusiveArch: x86_64
- seadrive-gui
ExclusiveArch: %{qt5_qtwebengine_arches}
- seafile-client
ExclusiveArch: %{qt5_qtwebengine_arches}
- seamonkey
ExclusiveArch: x86_64
- seqan3
ExclusiveArch: %{power64} x86_64 aarch64
- sequence-library
ExclusiveArch: %{java_arches} noarch
- servicelog
ExclusiveArch: ppc %{power64}
- shaman
ExclusiveArch: %{java_arches} noarch
- sharpfont
ExclusiveArch: %mono_arches
- sharpziplib
ExclusiveArch: %{mono_arches}
- shim
ExclusiveArch: %{efi}
- shim-unsigned-aarch64
ExclusiveArch: aarch64
- shim-unsigned-x64
ExclusiveArch: x86_64
- sigil
ExclusiveArch: %{qt5_qtwebengine_arches}
- sigul
ExclusiveArch: x86_64
- singularity-ce
ExclusiveArch: %{go_arches}
- sisu
ExclusiveArch: %{java_arches} noarch
- sisu-mojos
ExclusiveArch: %{java_arches} noarch
- skopeo
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- skychart
ExclusiveArch: %{fpc_arches}
- slf4j
ExclusiveArch: %{java_arches} noarch
- slirp4netns
ExclusiveArch: %{golang_arches_future}
- snakeyaml
ExclusiveArch: %{java_arches} noarch
- snapd
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x}
- snip
ExclusiveArch: %{java_arches} noarch
- softnet-stat
ExclusiveArch: %{rust_arches}
- soup-sharp
ExclusiveArch: %{mono_arches}
- spacebar
ExclusiveArch: %{java_arches}
- sparkleshare
ExclusiveArch: %{mono_arches}
- spec-version-maven-plugin
ExclusiveArch: %{java_arches} noarch
- spicctrl
ExclusiveArch: %{ix86} x86_64
- spice
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- spice-parent
ExclusiveArch: %{java_arches} noarch
- springlobby
ExclusiveArch: %{ix86} x86_64
- spyder
ExclusiveArch: %{qt5_qtwebengine_arches}
- sqljet
ExclusiveArch: %{java_arches} noarch
- squeekboard
ExclusiveArch: %{rust_arches}
- startdde
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- stats-collect
ExclusiveArch: %{ix86} x86_64 noarch
- statsd
ExclusiveArch: %{nodejs_arches} noarch
- stratis-cli
ExclusiveArch: %{rust_arches} noarch
- stratisd
ExclusiveArch: %{rust_arches}
ExclusiveArch: %{rust_arches}
ExclusiveArch: %{rust_arches}
- string-template-maven-plugin
ExclusiveArch: %{java_arches} noarch
- stringtemplate
ExclusiveArch: %{java_arches} noarch
- stringtemplate4
ExclusiveArch: %{java_arches} noarch
- stripesnoop
ExclusiveArch: %{ix86} x86_64
- subscription-manager-cockpit
ExclusiveArch: %{nodejs_arches} noarch
- supercollider
ExclusiveArch: %{qt5_qtwebengine_arches}
- supermin
ExclusiveArch: %{kernel_arches}
- svnkit
ExclusiveArch: %{java_arches} noarch
- svt-vp9
ExclusiveArch: x86_64
- swift-lang
ExclusiveArch: x86_64 aarch64
- swiftlint
ExclusiveArch: x86_64 aarch64
- swing-layout
ExclusiveArch: %{java_arches} noarch
- sysbench
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64le s390x
- syslinux
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- system-rules
ExclusiveArch: %{java_arches} noarch
- systemd-boot
ExclusiveArch: %efi
- t-digest
ExclusiveArch: %{java_arches} noarch
- taglib-sharp
ExclusiveArch: %{mono_arches}
- tagsoup
ExclusiveArch: %{java_arches} noarch
- tarantool
ExclusiveArch: %{ix86} x86_64
- tboot
ExclusiveArch: %{ix86} x86_64
- tdlib
ExclusiveArch: x86_64 aarch64
- templates_parser
ExclusiveArch: %GPRbuild_arches
- ternimal
ExclusiveArch: %{rust_arches}
- testcloud
ExclusiveArch: %{kernel_arches} noarch
- testng
ExclusiveArch: %{java_arches} noarch
- texlive
ExclusiveArch: %{java_arches} noarch
- thermald
ExclusiveArch: %{ix86} x86_64
- tilix
ExclusiveArch: %{ldc_arches}
- tomboy
ExclusiveArch: %{mono_arches}
- tomcat
ExclusiveArch: %{java_arches} noarch
- tomcat-native
ExclusiveArch: %{java_arches}
- tomcat-taglibs-parent
ExclusiveArch: %{java_arches} noarch
- tomcatjss
ExclusiveArch: %{java_arches} noarch
- torbrowser-launcher
ExclusiveArch: %{ix86} x86_64
- treelayout
ExclusiveArch: %{java_arches} noarch
- trilead-ssh2
ExclusiveArch: %{java_arches} noarch
- truth
ExclusiveArch: %{java_arches} noarch
- tuned-profiles-nfv-host-bin
ExclusiveArch: %{ix86} x86_64
- typescript
ExclusiveArch: %{nodejs_arches} noarch
- uClibc
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
- ucx
ExclusiveArch: aarch64 ppc64le x86_64
- uglify-js
ExclusiveArch: %{nodejs_arches} noarch
- umr
ExclusiveArch: x86_64 aarch64 ppc64le
- unetbootin
ExclusiveArch: %{ix86} x86_64
- univocity-parsers
ExclusiveArch: %{java_arches} noarch
- ursa-major
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- usd
ExclusiveArch: aarch64 x86_64
- v8-314
ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64
- vakzination
ExclusiveArch: %{java_arches}
- valgrind
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
- vboot-utils
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- vecmath1.2
ExclusiveArch: %{java_arches} noarch
- velocity
ExclusiveArch: %{java_arches} noarch
- vim-go
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}}
- vim-syntastic
ExclusiveArch: %{java_arches} noarch
- virt-p2v
ExclusiveArch: x86_64
- virt-v2v
ExclusiveArch: x86_64
- virtiofsd
ExclusiveArch: %{rust_arches}
- virtualbox-guest-additions
ExclusiveArch: i686 x86_64
- vkd3d
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- vmaf
ExclusiveArch: x86_64
- voms-api-java
ExclusiveArch: %{java_arches} noarch
- voms-clients-java
ExclusiveArch: %{java_arches} noarch
- vrq
ExclusiveArch: %{ix86} x86_64
- wangle
ExclusiveArch: x86_64 aarch64 ppc64le
- warsow
ExclusiveArch: %{ix86} x86_64 %{arm}
- warsow-data
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{ix86} x86_64 %{arm}
- wasmedge
ExclusiveArch: x86_64 aarch64
- watchman
ExclusiveArch: x86_64 aarch64 ppc64le
- wdt
ExclusiveArch: x86_64 aarch64 ppc64le
- webkit2-sharp
ExclusiveArch: %mono_arches
- weld-parent
ExclusiveArch: %{java_arches} noarch
- why3
ExclusiveArch: %{ocaml_native_compiler}
- widevine-installer
ExclusiveArch: aarch64
- wine
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86}
- wine-dxvk
ExclusiveArch: %{ix86} x86_64
- winetricks
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- ws-commons-util
ExclusiveArch: %{java_arches} noarch
- wsdl4j
ExclusiveArch: %{java_arches} noarch
- wult
ExclusiveArch: x86_64
- wxMaxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
- x2goclient
ExclusiveArch: x86_64
- x86-simd-sort
ExclusiveArch: x86_64
- xalan-j2
ExclusiveArch: %{java_arches} noarch
- xbean
ExclusiveArch: %{java_arches} noarch
- xbyak
ExclusiveArch: x86_64
- xbyak_aarch64
ExclusiveArch: aarch64
- xe-guest-utilities-latest
ExclusiveArch: %{ix86} x86_64
- xen
ExclusiveArch: x86_64 aarch64
- xerces-j2
ExclusiveArch: %{java_arches} noarch
- xgap
ExclusiveArch: %{gap_arches}
- xml-commons-apis
ExclusiveArch: %{java_arches} noarch
- xml-commons-resolver
ExclusiveArch: %{java_arches} noarch
- xml-maven-plugin
ExclusiveArch: %{java_arches} noarch
- xmlada
ExclusiveArch: %{GPRbuild_arches}
- xmlgraphics-commons
ExclusiveArch: %{java_arches} noarch
- xmlpull
ExclusiveArch: %{java_arches} noarch
- xmlstreambuffer
ExclusiveArch: %{java_arches} noarch
- xmlunit
ExclusiveArch: %{java_arches} noarch
- xmvn
ExclusiveArch: %{java_arches} noarch
- xmvn-connector-ivy
ExclusiveArch: %{java_arches} noarch
- xmvn-generator
ExclusiveArch: %{java_arches}
- xnnpack
ExclusiveArch: x86_64 aarch64
- xorg-x11-drv-armsoc
ExclusiveArch: %{arm} aarch64
- xorg-x11-drv-intel
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-openchrome
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vesa
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vmware
ExclusiveArch: %{ix86} x86_64 ia64
- xsp
ExclusiveArch: %mono_arches
- xstream
ExclusiveArch: %{java_arches} noarch
- xz-java
ExclusiveArch: %{java_arches} noarch
- yarnpkg
ExclusiveArch: %{nodejs_arches} noarch
- zcfan
ExclusiveArch: x86_64
- zeal
ExclusiveArch: aarch64 x86_64
- zenon
ExclusiveArch: %{ocaml_native_compiler}
- zeromq-ada
ExclusiveArch: %{GPRbuild_arches}
- zig
ExclusiveArch: %{zig_arches}
- zlib-ada
ExclusiveArch: %{GPRbuild_arches}
- zlib-ng
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- zola
ExclusiveArch: %{rust_arches}
1
0
23 Nov '23
The package rpms/phd2.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/phd2.git/commit/?id=e04b7fe386f77bc….
Change:
+ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit 1a2a1d93c3c68ac1ca9aa88b7a3851ed056838d2
Author: Mattia Verga <mattia.verga(a)proton.me>
Date: Thu Nov 23 19:10:43 2023 +0100
Update to stable 2.6.12 (fedora#2250966)
diff --git a/.gitignore b/.gitignore
index ab81096..f1a8b19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/phd2-2.6.10-purged.tar.xz
/phd2-2.6.11-purged.tar.xz
/phd2-a205f63238c8505cf641057d8d82734e51f9ab15-purged.tar.xz
+/phd2-2.6.12-purged.tar.xz
diff --git a/phd2.spec b/phd2.spec
index 6c842a8..bf04914 100644
--- a/phd2.spec
+++ b/phd2.spec
@@ -1,11 +1,11 @@
-#%%global gittag v2.6.11
-%global commit a205f63238c8505cf641057d8d82734e51f9ab15
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global date 20230212
+%global gittag v2.6.12
+#%%global commit a205f63238c8505cf641057d8d82734e51f9ab15
+#%%global shortcommit %%(c=%%{commit}; echo ${c:0:7})
+#%%global date 20230212
Name: phd2
%if "%{?gittag}"
-Version: 2.6.11
+Version: 2.6.12
%else
Version: 2.6.11^dev4^%{date}%{shortcommit}
%endif
diff --git a/sources b/sources
index 7861c66..961442d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (phd2-a205f63238c8505cf641057d8d82734e51f9ab15-purged.tar.xz) = 383fbed8f7770693e27b98210ad83baced7a24328f965bb3c4c2dd7a8eb0742496a086c418d2b38ea54e9b1882abd9e667978ff6ddddacd8c853e99337ea5d13
+SHA512 (phd2-2.6.12-purged.tar.xz) = c9855abcedec4522b9f259338f6c60f3d28264e2f5b0ca152e6669b2aa374a1d200b65ae97f8d62bbf71bb96c54e40cffeabbe73210617994a06baef54828699
commit bdc618a26e315506cbcaf2990feac56bac0e7721
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 21 03:59:31 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
commit e04b7fe386f77bcff3e3bc796558d4d2a19098b9
Author: Mattia Verga <mattia.verga(a)proton.me>
Date: Wed Feb 15 10:18:42 2023 +0100
Stop building on ix86
diff --git a/phd2.spec b/phd2.spec
index 92bf91b..6c842a8 100644
--- a/phd2.spec
+++ b/phd2.spec
@@ -30,6 +30,9 @@ Source1: generate-tarball.sh
# Do not force c++ std
Patch99: phd2_2.9.10_std_cflags.patch
+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+ExcludeArch: %{ix86}
+
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: dos2unix
1
0
Architecture specific change in rpms/libreoffice.git
by githook-noreply＠fedoraproject.org 23 Nov '23
by githook-noreply＠fedoraproject.org 23 Nov '23
23 Nov '23
The package rpms/libreoffice.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/libreoffice.git/commit/?id=f6147e46….
Change:
+%ifarch aarch64 s390x ppc64le
Thanks.
Full change:
============
commit 4d5b9e4cdd148cf6532c0856391fafd4b41184ef
Author: Gwyn Ciesla <gwync(a)protonmail.com>
Date: Wed Nov 15 12:15:49 2023 -0600
libcmis rebuild.
commit fcd0061f35ce420a8aaf05dc9d4b8718d5453132
Author: Gwyn Ciesla <gwync(a)protonmail.com>
Date: Tue Nov 14 08:12:38 2023 -0600
libcmis rebuild
diff --git a/0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch b/0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch
deleted file mode 100644
index 6e8c641..0000000
--- a/0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch
+++ /dev/null
@@ -1,1250 +0,0 @@
-From 2bf7bb98f7ed854ea382ab8340baad797787d984 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm(a)redhat.com>
-Date: Sat, 14 Aug 2021 21:43:19 +0100
-Subject: [PATCH] Revert "tdf#101630 - gdrive support w/oAuth and Drive API v3"
-
-This reverts commit b8b66a26f8f519a30b8e6b860a9247a8ffbb71cc.
----
- config_host/config_oauth2.h.in | 8 +-
- external/libcmis/UnpackedTarball_libcmis.mk | 2 -
- external/libcmis/libcmis_gdrive.patch.1 | 702 ------------------
- .../libcmis_oauth_pw_as_refreshtoken.patch.1 | 185 -----
- .../data/org/openoffice/Office/Common.xcu | 2 +-
- ucb/source/ucp/cmis/auth_provider.cxx | 130 +---
- ucb/source/ucp/cmis/auth_provider.hxx | 8 +-
- ucb/source/ucp/cmis/cmis_content.cxx | 23 +-
- ucb/source/ucp/cmis/cmis_repo_content.cxx | 4 +-
- 9 files changed, 55 insertions(+), 1009 deletions(-)
- delete mode 100644 external/libcmis/libcmis_gdrive.patch.1
- delete mode 100644 external/libcmis/libcmis_oauth_pw_as_refreshtoken.patch.1
-
-diff --git a/config_host/config_oauth2.h.in b/config_host/config_oauth2.h.in
-index 9945dda3dda5..a95015b41f3e 100644
---- a/config_host/config_oauth2.h.in
-+++ b/config_host/config_oauth2.h.in
-@@ -15,13 +15,13 @@
-
-
- /* Google Drive settings */
--#define GDRIVE_BASE_URL "https://www.googleapis.com/drive/v3"
-+#define GDRIVE_BASE_URL "https://www.googleapis.com/drive/v2"
- #define GDRIVE_CLIENT_ID ""
- #define GDRIVE_CLIENT_SECRET ""
--#define GDRIVE_AUTH_URL "https://accounts.google.com/o/oauth2/v2/auth"
--#define GDRIVE_TOKEN_URL "https://oauth2.googleapis.com/token"
-+#define GDRIVE_AUTH_URL "https://accounts.google.com/o/oauth2/auth"
-+#define GDRIVE_TOKEN_URL "https://accounts.google.com/o/oauth2/token"
- #define GDRIVE_REDIRECT_URI "urn:ietf:wg:oauth:2.0:oob"
--#define GDRIVE_SCOPE "https://www.googleapis.com/auth/drive.file"
-+#define GDRIVE_SCOPE "https://www.googleapis.com/auth/drive"
-
-
- /* Alfresco Cloud */
-diff --git a/external/libcmis/UnpackedTarball_libcmis.mk b/external/libcmis/UnpackedTarball_libcmis.mk
-index f48201d319d0..64d4af395f44 100644
---- a/external/libcmis/UnpackedTarball_libcmis.mk
-+++ b/external/libcmis/UnpackedTarball_libcmis.mk
-@@ -17,8 +17,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libcmis, \
- external/libcmis/libcmis-libxml2_compatibility.patch \
- external/libcmis/0001-rename-class-GetObject-to-avoid-name-clash-on-Window.patch \
- external/libcmis/libcmis_onedrive.patch \
-- external/libcmis/libcmis_oauth_pw_as_refreshtoken.patch.1 \
-- external/libcmis/libcmis_gdrive.patch.1 \
- external/libcmis/libcmis-boost-string.patch \
- ))
-
-diff --git a/external/libcmis/libcmis_gdrive.patch.1 b/external/libcmis/libcmis_gdrive.patch.1
-deleted file mode 100644
-index 24ff65d1ef15..000000000000
---- a/external/libcmis/libcmis_gdrive.patch.1
-+++ /dev/null
-@@ -1,702 +0,0 @@
--diff -ur libcmis.org/src/libcmis/gdrive-document.cxx libcmis/src/libcmis/gdrive-document.cxx
----- libcmis.org/src/libcmis/gdrive-document.cxx 2021-07-27 19:11:02.679247008 +0200
--+++ libcmis/src/libcmis/gdrive-document.cxx 2021-07-27 19:11:18.873246420 +0200
--@@ -145,23 +145,17 @@
-- {
-- if ( !os.get( ) )
-- throw libcmis::Exception( "Missing stream" );
--- if ( !isImmutable( ) )
--- throw libcmis::Exception( string ( "Document " + getId( )+
--- " is not editable" ) );
--- string putUrl = getUploadUrl( ) + getId( );
--- putUrl += "?uploadType=media";
---
--- // If it's a Google document, convert it
--- if ( isGoogleDoc( ) )
--- putUrl += "&convert=true";
--+
--+ string putUrl = GDRIVE_UPLOAD_LINK + getId( ) + "?uploadType=media";
--
-- // Upload stream
-- boost::shared_ptr< istream> is ( new istream ( os->rdbuf( ) ) );
-- vector <string> headers;
-- headers.push_back( string( "Content-Type: " ) + contentType );
--+ string res;
-- try
-- {
--- getSession()->httpPutRequest( putUrl, *is, headers );
--+ res = getSession()->httpPatchRequest( putUrl, *is, headers )->getStream()->str();
-- }
-- catch ( const CurlException& e )
-- {
--@@ -181,35 +175,10 @@
-- {
-- if ( !os.get( ) )
-- throw libcmis::Exception( "Missing stream" );
---
--- if ( !isImmutable( ) )
--- throw libcmis::Exception( string ( "Document " + getId( )+
--- " is not editable" ) );
--- string metaUrl = getUrl( );
---
--- // If it's a Google document, convert it
--- if ( isGoogleDoc( ) )
--- metaUrl += "?convert=true";
---
--- // Update file name meta information
--- if ( !fileName.empty( ) && fileName != getContentFilename( ) )
--- {
--- Json metaJson;
--- Json fileJson( fileName.c_str( ) );
--- metaJson.add("title", fileJson );
---
--- std::istringstream is( metaJson.toString( ) );
--- vector<string> headers;
--- headers.push_back( "Content-Type: application/json" );
--- try
--- {
--- getSession()->httpPutRequest( metaUrl, is, headers );
--- }
--- catch ( const CurlException& e )
--- {
--- throw e.getCmisException( );
--- }
--- }
--+
--+ // TODO: when would the filename need an update?
--+ if (!fileName.empty() && fileName != getContentFilename())
--+ std::cout << "filename change is not implemented in setContentStream" << std::endl;
--
-- // Upload stream
-- uploadStream( os, contentType );
--@@ -251,7 +220,7 @@
-- vector< libcmis::DocumentPtr > GDriveDocument::getAllVersions( )
-- {
-- vector< libcmis::DocumentPtr > revisions;
--- string versionUrl = getUrl( ) + "/revisions";
--+ string versionUrl = GDRIVE_METADATA_LINK + getId( ) + "/revisions";
-- // Run the http request to get the properties definition
-- string res;
-- try
--@@ -263,7 +232,7 @@
-- throw e.getCmisException( );
-- }
-- Json jsonRes = Json::parse( res );
--- Json::JsonVector objs = jsonRes["items"].getList( );
--+ Json::JsonVector objs = jsonRes["revisions"].getList( );
--
-- string parentId = getStringProperty( "cmis:parentId" );
--
--diff -ur libcmis.org/src/libcmis/gdrive-folder.cxx libcmis/src/libcmis/gdrive-folder.cxx
----- libcmis.org/src/libcmis/gdrive-folder.cxx 2021-07-27 19:11:02.678247008 +0200
--+++ libcmis/src/libcmis/gdrive-folder.cxx 2021-07-27 19:11:18.874246420 +0200
--@@ -62,8 +62,8 @@
-- // Instead of sending multiple queries for children,
-- // we send a single query to search for objects where parents
-- // include the folderID.
--- string query = getSession( )->getBindingUrl( ) +
--- "/files?q=\"" + getId( ) + "\"+in+parents+and+trashed+=+false";
--+ string query = GDRIVE_METADATA_LINK + "?q=\"" + getId( ) + "\"+in+parents+and+trashed+=+false" +
--+ "&fields=files(kind,id,name,parents,mimeType,createdTime,modifiedTime,thumbnailLink,size)";
--
-- string res;
-- try
--@@ -76,7 +76,7 @@
-- }
--
-- Json jsonRes = Json::parse( res );
--- Json::JsonVector objs = jsonRes["items"].getList( );
--+ Json::JsonVector objs = jsonRes["files"].getList( );
--
-- // Create children objects from Json objects
-- for(unsigned int i = 0; i < objs.size(); i++)
--@@ -95,7 +95,7 @@
-- string GDriveFolder::uploadProperties( Json properties )
-- {
-- // URL for uploading meta data
--- string metaUrl = getSession()->getBindingUrl() + "/files/";
--+ string metaUrl = GDRIVE_METADATA_LINK + "?fields=kind,id,name,parents,mimeType,createdTime,modifiedTime";
--
-- // add parents to the properties
-- properties.add( "parents", GdriveUtils::createJsonFromParentId( getId( ) ) );
--@@ -147,9 +147,15 @@
--
-- Json propsJson = GdriveUtils::toGdriveJson( properties );
--
--- // Add filename to properties
--- Json jsonFilename( fileName.c_str( ) );
--- propsJson.add( "title", jsonFilename );
--+ if(!fileName.empty()) {
--+ // use provided filename
--+ Json jsonFilename( fileName.c_str( ) );
--+
--+ propsJson.add( "name", jsonFilename );
--+ }
--+ if(!contentType.empty()) {
--+ propsJson.add( "mimeType", Json(contentType.c_str()));
--+ }
--
-- // Upload meta-datas
-- string res = uploadProperties( propsJson);
--@@ -171,12 +177,9 @@
-- libcmis::UnfileObjects::Type /*unfile*/,
-- bool /*continueOnError*/ )
-- {
--- // Object remove doesn't work with folder
--- // Using trash instead
-- try
-- {
--- istringstream is( "" );
--- getSession( )->httpPostRequest( getUrl( ) + "/trash", is, "" );
--+ getSession( )->httpDeleteRequest( GDRIVE_METADATA_LINK + getId( ) );
-- }
-- catch ( const CurlException& e )
-- {
--diff -ur libcmis.org/src/libcmis/gdrive-object.cxx libcmis/src/libcmis/gdrive-object.cxx
----- libcmis.org/src/libcmis/gdrive-object.cxx 2021-07-27 19:11:02.675247009 +0200
--+++ libcmis/src/libcmis/gdrive-object.cxx 2021-07-27 19:11:18.874246420 +0200
--@@ -89,8 +89,8 @@
-- property.reset( new GDriveProperty( it->first, it->second ) );
-- m_properties[ property->getPropertyType( )->getId()] = property;
--
--- // we map "title" to both "cmis:name" and "cmis:getContentStreamFileName"
--- if ( it->first == "title" )
--+ // we map "name" to both "cmis:name" and "cmis:getContentStreamFileName"
--+ if ( it->first == "name" )
-- {
-- property.reset( new GDriveProperty( "cmis:name", it->second) );
-- m_properties[ property->getPropertyType( )->getId()] = property;
--@@ -142,16 +142,13 @@
-- {
-- if ( m_renditions.empty( ) )
-- {
--- string downloadUrl = getStringProperty( "downloadUrl" );
--- if ( !downloadUrl.empty( ) )
--- {
--- string mimeType = getStringProperty( "cmis:contentStreamMimeType" );
--- if ( !mimeType.empty( ) )
--- {
--- RenditionPtr rendition(
--- new Rendition( mimeType, mimeType, mimeType, downloadUrl ));
--- m_renditions.push_back( rendition );
--- }
--+ string downloadUrl = GDRIVE_METADATA_LINK + getId( ) + "?alt=media";
--+ string mimeType = getStringProperty( "cmis:contentStreamMimeType" );
--+ if ( !mimeType.empty( ) )
--+ {
--+ RenditionPtr rendition(
--+ new Rendition( mimeType, mimeType, mimeType, downloadUrl ));
--+ m_renditions.push_back( rendition );
-- }
--
-- vector< string > exportLinks = getMultiStringProperty( "exportLinks" );
--@@ -192,7 +189,7 @@
-- {
-- vector< string > headers;
-- headers.push_back( "Content-Type: application/json" );
--- response = getSession( )->httpPutRequest( getUrl( ), is, headers );
--+ response = getSession( )->httpPatchRequest( getUrl( ), is, headers );
-- }
-- catch ( const CurlException& e )
-- {
--@@ -228,7 +225,7 @@
-- {
-- try
-- {
--- getSession( )->httpDeleteRequest( getUrl( ) );
--+ getSession( )->httpDeleteRequest( GDRIVE_METADATA_LINK + getId( ) );
-- }
-- catch ( const CurlException& e )
-- {
--@@ -239,8 +236,8 @@
-- void GDriveObject::move( FolderPtr /*source*/, FolderPtr destination )
-- {
-- Json parentsJson;
--- Json parentsValue = GdriveUtils::createJsonFromParentId( destination->getId( ) );
--- parentsJson.add( "parents", parentsValue );
--+ parentsJson.add( "addParents", Json(destination->getId( ).c_str()) );
--+ parentsJson.add( "removeParents", Json(getStringProperty( "cmis:parentId" ).c_str()) );
--
-- istringstream is( parentsJson.toString( ) );
-- libcmis::HttpResponsePtr response;
--@@ -248,7 +245,7 @@
-- {
-- vector< string > headers;
-- headers.push_back( "Content-Type: application/json" );
--- response = getSession( )->httpPutRequest( getUrl( ), is, headers );
--+ response = getSession( )->httpPatchRequest( getUrl( ), is, headers );
-- }
-- catch ( const CurlException& e )
-- {
--@@ -262,12 +259,10 @@
--
-- string GDriveObject::getUrl( )
-- {
--- return getSession( )->getBindingUrl( ) + "/files/" + getId( );
---}
---
---string GDriveObject::getUploadUrl( )
---{
--- return GDRIVE_UPLOAD_LINKS;
--+ // thumbnailLink causes some operations to fail with internal server error,
--+ // see https://issuetracker.google.com/issues/36760667
--+ return GDRIVE_METADATA_LINK + getId( ) +
--+ "?fields=kind,id,name,parents,mimeType,createdTime,modifiedTime,size";
-- }
--
-- vector< string> GDriveObject::getMultiStringProperty( const string& propertyName )
--diff -ur libcmis.org/src/libcmis/gdrive-repository.cxx libcmis/src/libcmis/gdrive-repository.cxx
----- libcmis.org/src/libcmis/gdrive-repository.cxx 2021-07-27 19:11:02.676247009 +0200
--+++ libcmis/src/libcmis/gdrive-repository.cxx 2021-07-27 19:11:18.874246420 +0200
--@@ -35,7 +35,7 @@
-- m_name = "Google Drive";
-- m_description = "Google Drive repository";
-- m_productName = "Google Drive";
--- m_productVersion = "v2";
--+ m_productVersion = "v3";
-- m_rootId = "root";
--
-- m_capabilities[ ACL ] = "discover";
--diff -ur libcmis.org/src/libcmis/gdrive-session.cxx libcmis/src/libcmis/gdrive-session.cxx
----- libcmis.org/src/libcmis/gdrive-session.cxx 2021-07-27 19:11:02.675247009 +0200
--+++ libcmis/src/libcmis/gdrive-session.cxx 2021-07-27 19:11:18.874246420 +0200
--@@ -124,9 +124,13 @@
--
-- libcmis::ObjectPtr GDriveSession::getObject( string objectId )
-- {
--+ if(objectId == "root") {
--+ return getRootFolder();
--+ }
-- // Run the http request to get the properties definition
-- string res;
--- string objectLink = m_bindingUrl + "/files/" + objectId;
--+ string objectLink = GDRIVE_METADATA_LINK + objectId +
--+ "?fields=kind,id,name,parents,mimeType,createdTime,modifiedTime,thumbnailLink,size";
-- try
-- {
-- res = httpGetRequest( objectLink )->getStream()->str();
--@@ -188,9 +192,10 @@
-- {
-- // Normal child case
-- // Ask for the ID of the child if there is any
--- string childIdUrl = m_bindingUrl + "/files/" + objectId +
--- "/children/?q=title+=+'" + segment +
--- "'&fields=items:id";
--+ // somewhat flawed as names are not necessarily unique in GDrive...
--+ string query = libcmis::escape("'" + objectId + "' in parents and trashed = false and name='" + segment + "'");
--+
--+ string childIdUrl = m_bindingUrl + "/files/?q=" + query + "&fields=files(id)";
--
-- string res;
-- try
--@@ -204,7 +209,7 @@
-- Json jsonRes = Json::parse( res );
--
-- // Did we get an id?
--- Json::JsonVector items = jsonRes["items"].getList();
--+ Json::JsonVector items = jsonRes["files"].getList();
-- if ( items.empty( ) )
-- throw libcmis::Exception( "Object not found: " + path, "objectNotFound" );
--
--@@ -219,6 +224,27 @@
-- return getObject( objectId );
-- }
--
--+libcmis::FolderPtr GDriveSession::getRootFolder()
--+{
--+ // permissions/scope with just drive.file don't allow to get it with the "root" alias/by its actual object-ID
--+ Json propsJson;
--+
--+ // GDrive folder is a file with a different mime type.
--+ string mimeType = GDRIVE_FOLDER_MIME_TYPE;
--+
--+ // Add mimetype to the propsJson
--+ Json jsonMimeType( mimeType.c_str( ) );
--+ propsJson.add( "mimeType", jsonMimeType );
--+ propsJson.add( "id", "root" );
--+
--+ // Upload meta-datas
--+ propsJson.add("cmis:name", "VirtualRoot");
--+
--+ libcmis::FolderPtr folderPtr( new GDriveFolder( this, propsJson ) );
--+
--+ return folderPtr;
--+}
--+
-- libcmis::ObjectTypePtr GDriveSession::getType( string id )
-- {
-- libcmis::ObjectTypePtr type( new GdriveObjectType( id ) );
--diff -ur libcmis.org/src/libcmis/gdrive-session.hxx libcmis/src/libcmis/gdrive-session.hxx
----- libcmis.org/src/libcmis/gdrive-session.hxx 2021-07-27 19:11:02.675247009 +0200
--+++ libcmis/src/libcmis/gdrive-session.hxx 2021-07-27 19:11:18.875246420 +0200
--@@ -57,6 +57,8 @@
--
-- virtual std::vector< libcmis::ObjectTypePtr > getBaseTypes( );
--
--+ virtual libcmis::FolderPtr getRootFolder();
--+
-- virtual std::string getRefreshToken();
--
-- private:
--diff -ur libcmis.org/src/libcmis/gdrive-utils.cxx libcmis/src/libcmis/gdrive-utils.cxx
----- libcmis.org/src/libcmis/gdrive-utils.cxx 2021-07-27 19:11:02.677247008 +0200
--+++ libcmis/src/libcmis/gdrive-utils.cxx 2021-07-27 19:11:18.875246420 +0200
--@@ -44,17 +44,17 @@
-- convertedKey = "cmis:createdBy";
-- else if ( key == "description" )
-- convertedKey = "cmis:description";
--- else if ( key == "createdDate" )
--+ else if ( key == "createdTime" )
-- convertedKey = "cmis:creationDate";
-- else if ( key == "lastModifyingUserName" )
-- convertedKey = "cmis:lastModifiedBy";
--- else if ( key == "modifiedDate" )
--+ else if ( key == "modifiedTime" )
-- convertedKey = "cmis:lastModificationDate";
--- else if ( key == "title" )
--+ else if ( key == "name" )
-- convertedKey = "cmis:contentStreamFileName";
-- else if ( key == "mimeType" )
-- convertedKey = "cmis:contentStreamMimeType";
--- else if ( key == "fileSize" )
--+ else if ( key == "size" )
-- convertedKey = "cmis:contentStreamLength";
-- else if ( key == "editable" )
-- convertedKey = "cmis:isImmutable";
--@@ -72,21 +72,21 @@
-- else if ( key == "cmis:createdBy" )
-- convertedKey = "ownerNames";
-- else if ( key == "cmis:creationDate" )
--- convertedKey = "createdDate";
--+ convertedKey = "createdTime";
-- else if ( key == "cmis:description" )
-- convertedKey = "description";
-- else if ( key == "cmis:lastModifiedBy" )
-- convertedKey = "lastModifyingUserName";
-- else if ( key == "cmis:lastModificationDate" )
--- convertedKey = "modifiedDate";
--+ convertedKey = "modifiedTime";
-- else if ( key == "cmis:contentStreamFileName" )
--- convertedKey = "title";
--+ convertedKey = "name";
-- else if ( key == "cmis:name" )
--- convertedKey = "title";
--+ convertedKey = "name";
-- else if ( key == "cmis:contentStreamMimeType" )
-- convertedKey = "mimeType";
-- else if ( key == "cmis:contentStreamLength" )
--- convertedKey = "fileSize";
--+ convertedKey = "size";
-- else if ( key == "cmis:isImmutable" )
-- convertedKey = "editable";
-- else if ( key == "cmis:parentId" )
--@@ -124,9 +124,9 @@
-- bool GdriveUtils::checkUpdatable( const string& key )
-- {
-- // taken from https://developers.google.com/drive/v2/reference/files
--- bool updatable = ( key == "title" ||
--+ bool updatable = ( key == "name" ||
-- key == "description" ||
--- key == "modifiedDate" ||
--+ key == "modifiedTime" ||
-- key == "lastViewedByMeDate" );
-- return updatable;
-- }
--@@ -143,18 +143,11 @@
--
-- Json GdriveUtils::createJsonFromParentId( const string& parentId )
-- {
--- Json parentValue( parentId.c_str( ) );
---
-- // parents is a Json array
-- Json firstParent;
--- firstParent.add( "id", parentValue );
---
--- Json::JsonVector parents;
--- parents.insert( parents.begin( ), firstParent );
--+ firstParent.add( Json( parentId.c_str() ) );
--
--- Json parentsValue( parents );
---
--- return parentsValue;
--+ return firstParent;
-- }
--
-- vector< string > GdriveUtils::parseGdriveProperty( string key, Json json )
--diff -ur libcmis.org/src/libcmis/gdrive-utils.hxx libcmis/src/libcmis/gdrive-utils.hxx
----- libcmis.org/src/libcmis/gdrive-utils.hxx 2021-07-27 19:11:02.677247008 +0200
--+++ libcmis/src/libcmis/gdrive-utils.hxx 2021-07-27 19:11:18.875246420 +0200
--@@ -35,7 +35,8 @@
-- #include "json-utils.hxx"
--
-- static const std::string GDRIVE_FOLDER_MIME_TYPE = "application/vnd.google-apps.folder" ;
---static const std::string GDRIVE_UPLOAD_LINKS = "https://www.googleapis.com/upload/drive/v2/files/";
--+static const std::string GDRIVE_UPLOAD_LINK = "https://www.googleapis.com/upload/drive/v3/files/";
--+static const std::string GDRIVE_METADATA_LINK = "https://www.googleapis.com/drive/v3/files/";
--
-- class GdriveUtils
-- {
--diff -ur libcmis.org/src/libcmis/oauth2-handler.cxx libcmis/src/libcmis/oauth2-handler.cxx
----- libcmis.org/src/libcmis/oauth2-handler.cxx 2021-07-27 19:11:02.676247009 +0200
--+++ libcmis/src/libcmis/oauth2-handler.cxx 2021-07-27 19:11:18.875246420 +0200
--@@ -92,8 +92,11 @@
-- "code=" + authCode +
-- "&client_id=" + m_data->getClientId() +
-- "&redirect_uri=" + m_data->getRedirectUri() +
--- "&scope=" + libcmis::escape( m_data->getScope() ) +
-- "&grant_type=authorization_code" ;
--+ if(boost::starts_with(m_data->getTokenUrl(), "https://oauth2.googleapis.com/"))
--+ post += "&client_secret=" + m_data->getClientSecret();
--+ else
--+ post += "&scope=" + libcmis::escape( m_data->getScope() );
--
-- istringstream is( post );
--
--@@ -104,7 +107,7 @@
-- resp = m_session->httpPostRequest ( m_data->getTokenUrl(), is,
-- "application/x-www-form-urlencoded" );
-- }
--- catch ( const CurlException& )
--+ catch ( const CurlException& e)
-- {
-- throw libcmis::Exception(
-- "Couldn't get tokens from the authorization code ");
--@@ -122,6 +125,8 @@
-- "refresh_token=" + m_refresh +
-- "&client_id=" + m_data->getClientId() +
-- "&grant_type=refresh_token" ;
--+ if(boost::starts_with(m_data->getTokenUrl(), "https://oauth2.googleapis.com/"))
--+ post += "&client_secret=" + m_data->getClientSecret();
--
-- istringstream is( post );
-- libcmis::HttpResponsePtr resp;
--@@ -130,7 +135,7 @@
-- resp = m_session->httpPostRequest( m_data->getTokenUrl( ), is,
-- "application/x-www-form-urlencoded" );
-- }
--- catch (const CurlException& )
--+ catch (const CurlException& e )
-- {
-- throw libcmis::Exception( "Couldn't refresh token ");
-- }
--diff -ur libcmis.org/src/libcmis/oauth2-providers.cxx libcmis/src/libcmis/oauth2-providers.cxx
----- libcmis.org/src/libcmis/oauth2-providers.cxx 2021-07-27 19:11:02.679247008 +0200
--+++ libcmis/src/libcmis/oauth2-providers.cxx 2021-07-27 19:11:18.886246420 +0200
--@@ -80,172 +80,8 @@
--
-- }
--
---string OAuth2Providers::OAuth2Gdrive( HttpSession* session, const string& authUrl,
--- const string& username, const string& password )
---{
--- /* This member function implements 'Google OAuth 2.0'
--- *
--- * The interaction is carried out by libcmis, with no web browser involved.
--- *
--- * Normal sequence (without 2FA) is:
--- * 1) a get to activate login page
--- * receive first login page, html format
--- * 2) subsequent post to sent email
--- * receive html page for password input
--- * 3) subsequent post to send password
--- * receive html page for application consent
--- * 4) subsequent post to send a consent for the application
--- * receive a single-use authorization code
--- * this code is returned as a string
--- *
--- * Sequence with 2FA is:
--- * 1) a get to activate login page
--- * receive first login page, html format
--- * 2) subsequent post to sent email
--- * receive html page for password input
--- * 3) subsequent post to send password
--- * receive html page for pin input
--- * 3b) subsequent post to send pin number
--- * receive html page for application consent
--- * 4) subsequent post to send a consent for the application
--- * receive a single-use authorization code
--- * this code is returned as a string
--- */
---
--- static const string CONTENT_TYPE( "application/x-www-form-urlencoded" );
--- // STEP 1: get login page
--- string res;
--- try
--- {
--- // send the first get, receive the html login page
--- res = session->httpGetRequest( authUrl )->getStream( )->str( );
--- }
--- catch ( const CurlException& )
--- {
--- return string( );
--- }
---
--- // STEP 2: send email
---
--- string loginEmailPost, loginEmailLink;
--- if ( !parseResponse( res.c_str( ), loginEmailPost, loginEmailLink ) )
--- return string( );
---
--- loginEmailPost += "Email=";
--- loginEmailPost += escapeForm( username );
---
--- istringstream loginEmailIs( loginEmailPost );
--- string loginEmailRes;
--- try
--- {
--- // send a post with user email, receive the html page for password input
--- loginEmailRes = session->httpPostRequest ( loginEmailLink, loginEmailIs, CONTENT_TYPE )
--- ->getStream( )->str( );
--- }
--- catch ( const CurlException& )
--- {
--- return string( );
--- }
---
--- // STEP 3: password page
---
--- string loginPasswdPost, loginPasswdLink;
--- if ( !parseResponse( loginEmailRes.c_str( ), loginPasswdPost, loginPasswdLink ) )
--- return string( );
---
--- loginPasswdPost += "Passwd=";
--- loginPasswdPost += escapeForm( password );
---
--- istringstream loginPasswdIs( loginPasswdPost );
--- string loginPasswdRes;
--- try
--- {
--- // send a post with user password, receive the application consent page
--- loginPasswdRes = session->httpPostRequest ( loginPasswdLink, loginPasswdIs, CONTENT_TYPE )
--- ->getStream( )->str( );
--- }
--- catch ( const CurlException& )
--- {
--- return string( );
--- }
---
--- string approvalPost, approvalLink;
--- if ( !parseResponse( loginPasswdRes. c_str( ), approvalPost, approvalLink) )
--- return string( );
---
--- // when 2FA is enabled, link doesn't start with 'http'
--- if ( approvalLink.compare(0, 4, "http") != 0 )
--- {
--- // STEP 3b: 2 Factor Authentication, pin code request
---
--- string loginChallengePost( approvalPost );
--- string loginChallengeLink( approvalLink );
---
--- libcmis::OAuth2AuthCodeProvider fallbackProvider = libcmis::SessionFactory::getOAuth2AuthCodeProvider( );
--- unique_ptr< char, void (*)( void * ) > pin{ fallbackProvider( "", "", "" ), free };
---
--- if( !pin )
--- {
--- // unset OAuth2AuthCode Provider to avoid showing pin request again in the HttpSession::oauth2Authenticate
--- libcmis::SessionFactory::setOAuth2AuthCodeProvider( NULL );
--- return string( );
--- }
---
--- loginChallengeLink = "https://accounts.google.com" + loginChallengeLink;
--- loginChallengePost += string( PIN_INPUT_NAME ) + "=";
--- loginChallengePost += string( pin.get() );
---
--- istringstream loginChallengeIs( loginChallengePost );
--- string loginChallengeRes;
--- try
--- {
--- // send a post with pin, receive the application consent page
--- loginChallengeRes = session->httpPostRequest ( loginChallengeLink, loginChallengeIs, CONTENT_TYPE )
--- ->getStream( )->str( );
--- }
--- catch ( const CurlException& )
--- {
--- return string( );
--- }
---
--- approvalPost = string();
--- approvalLink = string();
---
--- if ( !parseResponse( loginChallengeRes. c_str( ), approvalPost, approvalLink) )
--- return string( );
--- }
--- else if( approvalLink.compare( "https://accounts.google.com/ServiceLoginAuth" ) == 0 )
--- {
--- // wrong password,
--- // unset OAuth2AuthCode Provider to avoid showing pin request again in the HttpSession::oauth2Authenticate
--- libcmis::SessionFactory::setOAuth2AuthCodeProvider( NULL );
--- return string( );
--- }
---
--- // STEP 4: allow libcmis to access google drive
--- approvalPost += "submit_access=true";
---
--- istringstream approvalIs( approvalPost );
--- string approvalRes;
--- try
--- {
--- // send a post with application consent
--- approvalRes = session->httpPostRequest ( approvalLink, approvalIs,
--- CONTENT_TYPE) ->getStream( )->str( );
--- }
--- catch ( const CurlException& e )
--- {
--- throw e.getCmisException( );
--- }
---
--- // Take the authentication code from the text bar
--- string code = parseCode( approvalRes.c_str( ) );
---
--- return code;
---}
---
---string OAuth2Providers::OAuth2Onedrive( HttpSession* /*session*/, const string& /*authUrl*/,
--- const string& /*username*/, const string& /*password*/ )
--+string OAuth2Providers::OAuth2Dummy( HttpSession* /*session*/, const string& /*authUrl*/,
--+ const string& /*username*/, const string& /*password*/ )
-- {
-- return string( );
-- }
--@@ -314,12 +150,8 @@
-- // For Alfresco in the cloud, only match the hostname as there can be several
-- // binding URLs created with it.
-- return OAuth2Alfresco;
--- else if ( boost::starts_with( url, "https://www.googleapis.com/drive/v2" ) )
--- return OAuth2Gdrive;
--- else if ( boost::starts_with( url, "https://graph.microsoft.com/v1.0" ) )
--- return OAuth2Onedrive;
--
--- return OAuth2Gdrive;
--+ return OAuth2Dummy;
-- }
--
-- int OAuth2Providers::parseResponse ( const char* response, string& post, string& link )
--diff -ur libcmis.org/src/libcmis/oauth2-providers.hxx libcmis/src/libcmis/oauth2-providers.hxx
----- libcmis.org/src/libcmis/oauth2-providers.hxx 2021-07-27 19:11:02.678247008 +0200
--+++ libcmis/src/libcmis/oauth2-providers.hxx 2021-07-27 19:11:18.886246420 +0200
--@@ -39,12 +39,8 @@
-- class OAuth2Providers
-- {
-- public :
--- static std::string OAuth2Gdrive( HttpSession* session, const std::string& authUrl,
--+ static std::string OAuth2Dummy( HttpSession* session, const std::string& authUrl,
-- const std::string& username, const std::string& password );
---
--- static std::string OAuth2Onedrive( HttpSession* session, const std::string& authUrl,
--- const std::string& username, const std::string& password );
---
-- static std::string OAuth2Alfresco( HttpSession* session, const std::string& authUrl,
-- const std::string& username, const std::string& password );
--
--diff -ur libcmis.org/src/libcmis/session-factory.cxx libcmis/src/libcmis/session-factory.cxx
----- libcmis.org/src/libcmis/session-factory.cxx 2021-07-27 19:11:02.679247008 +0200
--+++ libcmis/src/libcmis/session-factory.cxx 2021-07-27 19:11:18.886246420 +0200
--@@ -66,7 +66,7 @@
-- if ( !bindingUrl.empty( ) )
-- {
-- // Try the special cases based on the binding URL
--- if ( bindingUrl == "https://www.googleapis.com/drive/v2" )
--+ if ( bindingUrl == "https://www.googleapis.com/drive/v3" )
-- {
-- session = new GDriveSession( bindingUrl, username, password,
-- oauth2, verbose );
-diff --git a/external/libcmis/libcmis_oauth_pw_as_refreshtoken.patch.1 b/external/libcmis/libcmis_oauth_pw_as_refreshtoken.patch.1
-deleted file mode 100644
-index a8cb06509421..000000000000
---- a/external/libcmis/libcmis_oauth_pw_as_refreshtoken.patch.1
-+++ /dev/null
-@@ -1,185 +0,0 @@
--diff -ur libcmis.org/inc/libcmis/session.hxx libcmis/inc/libcmis/session.hxx
----- libcmis.org/inc/libcmis/session.hxx 2021-07-27 19:09:42.580249917 +0200
--+++ libcmis/inc/libcmis/session.hxx 2021-07-27 19:10:02.368249199 +0200
--@@ -95,6 +95,8 @@
-- certificate exception feature available on common web browser.
-- */
-- virtual void setNoSSLCertificateCheck( bool noCheck ) = 0;
--+
--+ virtual std::string getRefreshToken() { return ""; };
-- };
-- }
--
--diff -ur libcmis.org/src/libcmis/gdrive-session.cxx libcmis/src/libcmis/gdrive-session.cxx
----- libcmis.org/src/libcmis/gdrive-session.cxx 2021-07-27 19:09:42.581249917 +0200
--+++ libcmis/src/libcmis/gdrive-session.cxx 2021-07-27 19:10:02.369249198 +0200
--@@ -70,6 +70,46 @@
-- {
-- }
--
--+
--+void GDriveSession::setOAuth2Data( libcmis::OAuth2DataPtr oauth2 )
--+{
--+ m_oauth2Handler = new OAuth2Handler( this, oauth2 );
--+ m_oauth2Handler->setOAuth2Parser( OAuth2Providers::getOAuth2Parser( getBindingUrl( ) ) );
--+
--+ oauth2Authenticate( );
--+}
--+
--+void GDriveSession::oauth2Authenticate()
--+{
--+ // treat the supplied password as refresh token
--+ if (!m_password.empty())
--+ {
--+ try
--+ {
--+ m_inOAuth2Authentication = true;
--+
--+ m_oauth2Handler->setRefreshToken(m_password);
--+ // Try to get new access tokens using the stored refreshtoken
--+ m_oauth2Handler->refresh();
--+ m_inOAuth2Authentication = false;
--+ }
--+ catch (const CurlException &e)
--+ {
--+ m_inOAuth2Authentication = false;
--+ // refresh token expired or invalid, trigger initial auth (that in turn will hit the fallback with copy'n'paste method)
--+ BaseSession::oauth2Authenticate();
--+ }
--+ }
--+ else
--+ {
--+ BaseSession::oauth2Authenticate();
--+ }
--+}
--+
--+string GDriveSession::getRefreshToken() {
--+ return HttpSession::getRefreshToken();
--+}
--+
-- libcmis::RepositoryPtr GDriveSession::getRepository( )
-- {
-- // Return a dummy repository since GDrive doesn't have that notion
--diff -ur libcmis.org/src/libcmis/gdrive-session.hxx libcmis/src/libcmis/gdrive-session.hxx
----- libcmis.org/src/libcmis/gdrive-session.hxx 2021-07-27 19:09:42.583249917 +0200
--+++ libcmis/src/libcmis/gdrive-session.hxx 2021-07-27 19:10:02.369249198 +0200
--@@ -57,8 +57,14 @@
--
-- virtual std::vector< libcmis::ObjectTypePtr > getBaseTypes( );
--
--+ virtual std::string getRefreshToken();
--+
-- private:
-- GDriveSession( );
--+
--+ virtual void setOAuth2Data( libcmis::OAuth2DataPtr oauth2 );
--+
--+ void oauth2Authenticate( );
-- };
--
-- #endif /* _GDRIVE_SESSION_HXX_ */
--diff -ur libcmis.org/src/libcmis/http-session.hxx libcmis/src/libcmis/http-session.hxx
----- libcmis.org/src/libcmis/http-session.hxx 2021-07-27 19:09:42.582249917 +0200
--+++ libcmis/src/libcmis/http-session.hxx 2021-07-27 19:10:02.369249198 +0200
--@@ -148,7 +148,7 @@
--
-- void setNoSSLCertificateCheck( bool noCheck );
--
--- std::string getRefreshToken( );
--+ virtual std::string getRefreshToken( );
--
-- protected:
-- HttpSession( );
--diff -ur libcmis.org/src/libcmis/oauth2-handler.cxx libcmis/src/libcmis/oauth2-handler.cxx
----- libcmis.org/src/libcmis/oauth2-handler.cxx 2021-07-27 19:09:42.582249917 +0200
--+++ libcmis/src/libcmis/oauth2-handler.cxx 2021-07-27 19:10:02.369249198 +0200
--@@ -158,6 +158,11 @@
-- return m_refresh;
-- }
--
--+void OAuth2Handler::setRefreshToken( string refreshToken )
--+{
--+ m_refresh = refreshToken;
--+}
--+
-- string OAuth2Handler::getHttpHeader( )
-- {
-- string header;
--diff -ur libcmis.org/src/libcmis/oauth2-handler.hxx libcmis/src/libcmis/oauth2-handler.hxx
----- libcmis.org/src/libcmis/oauth2-handler.hxx 2021-07-27 19:09:42.582249917 +0200
--+++ libcmis/src/libcmis/oauth2-handler.hxx 2021-07-27 19:10:02.370249198 +0200
--@@ -61,6 +61,7 @@
--
-- std::string getAccessToken( ) ;
-- std::string getRefreshToken( ) ;
--+ void setRefreshToken( std::string refreshToken ) ;
--
-- // adding HTTP auth header
-- std::string getHttpHeader( ) ;
--diff -ur libcmis.org/src/libcmis/onedrive-session.cxx libcmis/src/libcmis/onedrive-session.cxx
----- libcmis.org/src/libcmis/onedrive-session.cxx 2021-07-27 19:09:42.583249917 +0200
--+++ libcmis/src/libcmis/onedrive-session.cxx 2021-07-27 19:10:02.370249198 +0200
--@@ -68,6 +68,45 @@
-- {
-- }
--
--+void OneDriveSession::setOAuth2Data( libcmis::OAuth2DataPtr oauth2 )
--+{
--+ m_oauth2Handler = new OAuth2Handler( this, oauth2 );
--+ m_oauth2Handler->setOAuth2Parser( OAuth2Providers::getOAuth2Parser( getBindingUrl( ) ) );
--+
--+ oauth2Authenticate( );
--+}
--+
--+void OneDriveSession::oauth2Authenticate()
--+{
--+ // treat the supplied password as refresh token
--+ if (!m_password.empty())
--+ {
--+ try
--+ {
--+ m_inOAuth2Authentication = true;
--+
--+ m_oauth2Handler->setRefreshToken(m_password);
--+ // Try to get new access tokens using the stored refreshtoken
--+ m_oauth2Handler->refresh();
--+ m_inOAuth2Authentication = false;
--+ }
--+ catch (const CurlException &e)
--+ {
--+ m_inOAuth2Authentication = false;
--+ // refresh token expired or invalid, trigger initial auth (that in turn will hit the fallback with copy'n'paste method)
--+ BaseSession::oauth2Authenticate();
--+ }
--+ }
--+ else
--+ {
--+ BaseSession::oauth2Authenticate();
--+ }
--+}
--+
--+string OneDriveSession::getRefreshToken() {
--+ return HttpSession::getRefreshToken();
--+}
--+
-- libcmis::RepositoryPtr OneDriveSession::getRepository( )
-- {
-- // Return a dummy repository since OneDrive doesn't have that notion
--diff -ur libcmis.org/src/libcmis/onedrive-session.hxx libcmis/src/libcmis/onedrive-session.hxx
----- libcmis.org/src/libcmis/onedrive-session.hxx 2021-07-27 19:09:42.583249917 +0200
--+++ libcmis/src/libcmis/onedrive-session.hxx 2021-07-27 19:10:02.370249198 +0200
--@@ -62,8 +62,14 @@
--
-- bool isAPathMatch( Json objectJson, std::string path );
--
--+ virtual std::string getRefreshToken();
--+
-- private:
-- OneDriveSession( );
--+
--+ virtual void setOAuth2Data( libcmis::OAuth2DataPtr oauth2 );
--+
--+ void oauth2Authenticate( );
-- };
--
-- #endif /* _ONEDRIVE_SESSION_HXX_ */
-diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
-index f543b6ebb3c9..24be0a7f2830 100644
---- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
-+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
-@@ -434,7 +434,7 @@
- </prop>
- <prop oor:name="CmisServersUrls">
- <value>
-- <it>https://www.googleapis.com/drive/v3</it>
-+ <it>https://www.googleapis.com/drive/v2</it>
- <it>https://graph.microsoft.com/v1.0</it>
- <it>https://api.alfresco.com/cmis/versions/1.0/atom/</it>
- <it></it>
-diff --git a/ucb/source/ucp/cmis/auth_provider.cxx b/ucb/source/ucp/cmis/auth_provider.cxx
-index c3f99f5f3de5..0f5f45596adc 100644
---- a/ucb/source/ucp/cmis/auth_provider.cxx
-+++ b/ucb/source/ucp/cmis/auth_provider.cxx
-@@ -11,10 +11,7 @@
- #define STD_TO_OUSTR( str ) OUString( str.c_str(), str.length( ), RTL_TEXTENCODING_UTF8 )
-
- #include <com/sun/star/task/XInteractionHandler.hpp>
--#include <com/sun/star/task/PasswordContainer.hpp>
--#include <com/sun/star/task/XPasswordContainer2.hpp>
-
--#include <comphelper/processfactory.hxx>
- #include <ucbhelper/simpleauthenticationrequest.hxx>
- #include <ucbhelper/authenticationfallback.hxx>
-
-@@ -66,91 +63,6 @@ namespace cmis
- return false;
- }
-
-- std::string AuthProvider::getRefreshToken(std::string& rUsername)
-- {
-- std::string refreshToken;
-- const css::uno::Reference<css::ucb::XCommandEnvironment> xEnv = getXEnv();
-- if (xEnv.is())
-- {
-- uno::Reference<task::XInteractionHandler> xIH = xEnv->getInteractionHandler();
--
-- if (rUsername.empty())
-- {
-- rtl::Reference<ucbhelper::SimpleAuthenticationRequest> xRequest
-- = new ucbhelper::SimpleAuthenticationRequest(
-- m_sUrl, m_sBindingUrl,
-- ucbhelper::SimpleAuthenticationRequest::EntityType::ENTITY_NA, OUString(),
-- ucbhelper::SimpleAuthenticationRequest::EntityType::ENTITY_MODIFY,
-- STD_TO_OUSTR(rUsername),
-- ucbhelper::SimpleAuthenticationRequest::EntityType::ENTITY_NA, OUString());
-- xIH->handle(xRequest);
--
-- rtl::Reference<ucbhelper::InteractionContinuation> xSelection
-- = xRequest->getSelection();
--
-- if (xSelection.is())
-- {
-- // Handler handled the request.
-- uno::Reference<task::XInteractionAbort> xAbort(xSelection.get(),
-- uno::UNO_QUERY);
-- if (!xAbort.is())
-- {
-- const rtl::Reference<ucbhelper::InteractionSupplyAuthentication>& xSupp
-- = xRequest->getAuthenticationSupplier();
--
-- rUsername = OUSTR_TO_STDSTR(xSupp->getUserName());
-- }
-- }
-- }
--
-- uno::Reference<uno::XComponentContext> xContext
-- = ::comphelper::getProcessComponentContext();
-- uno::Reference<task::XPasswordContainer2> xMasterPasswd
-- = task::PasswordContainer::create(xContext);
-- if (xMasterPasswd->hasMasterPassword())
-- {
-- xMasterPasswd->authorizateWithMasterPassword(xIH);
-- }
-- if (xMasterPasswd->isPersistentStoringAllowed())
-- {
-- task::UrlRecord aRec
-- = xMasterPasswd->findForName(m_sBindingUrl, STD_TO_OUSTR(rUsername), xIH);
-- if (aRec.UserList.hasElements() && aRec.UserList[0].Passwords.hasElements())
-- refreshToken = OUSTR_TO_STDSTR(aRec.UserList[0].Passwords[0]);
-- }
-- }
-- return refreshToken;
-- }
--
-- bool AuthProvider::storeRefreshToken(const std::string& username, const std::string& password,
-- const std::string& refreshToken)
-- {
-- if (refreshToken.empty())
-- return false;
-- if (password == refreshToken)
-- return true;
-- const css::uno::Reference<css::ucb::XCommandEnvironment> xEnv = getXEnv();
-- if (xEnv.is())
-- {
-- uno::Reference<task::XInteractionHandler> xIH = xEnv->getInteractionHandler();
-- uno::Reference<uno::XComponentContext> xContext
-- = ::comphelper::getProcessComponentContext();
-- uno::Reference<task::XPasswordContainer2> xMasterPasswd
-- = task::PasswordContainer::create(xContext);
-- uno::Sequence<OUString> aPasswd{ STD_TO_OUSTR(refreshToken) };
-- if (xMasterPasswd->isPersistentStoringAllowed())
-- {
-- if (xMasterPasswd->hasMasterPassword())
-- {
-- xMasterPasswd->authorizateWithMasterPassword(xIH);
-- }
-- xMasterPasswd->addPersistent(m_sBindingUrl, STD_TO_OUSTR(username), aPasswd, xIH);
-- return true;
-- }
-- }
-- return false;
-- }
--
- css::uno::WeakReference< css::ucb::XCommandEnvironment> AuthProvider::sm_xEnv;
-
- void AuthProvider::setXEnv(const css::uno::Reference< css::ucb::XCommandEnvironment>& xEnv )
-@@ -163,7 +75,7 @@ namespace cmis
- return sm_xEnv;
- }
-
-- char* AuthProvider::copyWebAuthCodeFallback( const char* url,
-+ char* AuthProvider::onedriveAuthCodeFallback( const char* url,
- const char* /*username*/,
- const char* /*password*/ )
- {
-@@ -207,6 +119,46 @@ namespace cmis
-
- return strdup( "" );
- }
-+
-+ char* AuthProvider::gdriveAuthCodeFallback( const char* /*url*/,
-+ const char* /*username*/,
-+ const char* /*password*/ )
-+ {
-+ const css::uno::Reference<
-+ css::ucb::XCommandEnvironment> xEnv = getXEnv( );
-+
-+ if ( xEnv.is() )
-+ {
-+ uno::Reference< task::XInteractionHandler > xIH
-+ = xEnv->getInteractionHandler();
-+
-+ if ( xIH.is() )
-+ {
-+ rtl::Reference< ucbhelper::AuthenticationFallbackRequest > xRequest
-+ = new ucbhelper::AuthenticationFallbackRequest (
-+ "PIN:", "" );
-+
-+ xIH->handle( xRequest );
-+
-+ rtl::Reference< ucbhelper::InteractionContinuation > xSelection
-+ = xRequest->getSelection();
-+
-+ if ( xSelection.is() )
-+ {
-+ // Handler handled the request.
-+ const rtl::Reference< ucbhelper::InteractionAuthFallback >&
-+ xAuthFallback = xRequest->getAuthFallbackInter( );
-+ if ( xAuthFallback.is() )
-+ {
-+ OUString code = xAuthFallback->getCode( );
-+ return strdup( OUSTR_TO_STDSTR( code ).c_str( ) );
-+ }
-+ }
-+ }
-+ }
-+
-+ return strdup( "" );
-+ }
- }
-
- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-diff --git a/ucb/source/ucp/cmis/auth_provider.hxx b/ucb/source/ucp/cmis/auth_provider.hxx
-index 9092f3c6bd25..d9864c45b230 100644
---- a/ucb/source/ucp/cmis/auth_provider.hxx
-+++ b/ucb/source/ucp/cmis/auth_provider.hxx
-@@ -38,11 +38,11 @@ namespace cmis
-
- bool authenticationQuery( std::string& username, std::string& password ) override;
-
-- std::string getRefreshToken( std::string& username );
-- bool storeRefreshToken(const std::string& username, const std::string& password,
-- const std::string& refreshToken);
-+ static char* onedriveAuthCodeFallback( const char* url,
-+ const char* /*username*/,
-+ const char* /*password*/ );
-
-- static char* copyWebAuthCodeFallback( const char* url,
-+ static char* gdriveAuthCodeFallback( const char* /*url*/,
- const char* /*username*/,
- const char* /*password*/ );
-
-diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
-index 7980a1821bba..93f43f4540a6 100644
---- a/ucb/source/ucp/cmis/cmis_content.cxx
-+++ b/ucb/source/ucp/cmis/cmis_content.cxx
-@@ -343,15 +343,12 @@ namespace cmis
- auto rPassword = OUSTR_TO_STDSTR( m_aURL.getPassword( ) );
-
- bool bSkipInitialPWAuth = false;
-- if (m_aURL.getBindingUrl() == ONEDRIVE_BASE_URL
-- || m_aURL.getBindingUrl() == GDRIVE_BASE_URL)
-- {
-+ if ( m_aURL.getBindingUrl( ) == ONEDRIVE_BASE_URL ) {
- // skip the initial username and pw-auth prompt, the only supported method is the
- // auth-code-fallback one (login with your browser, copy code into the dialog)
- // TODO: if LO were to listen on localhost for the request, it would be much nicer
- // user experience
- bSkipInitialPWAuth = true;
-- rPassword = aAuthProvider.getRefreshToken(rUsername);
- }
-
- bool bIsDone = false;
-@@ -364,9 +361,7 @@ namespace cmis
- libcmis::OAuth2DataPtr oauth2Data;
- if ( m_aURL.getBindingUrl( ) == GDRIVE_BASE_URL )
- {
-- // reset the skip, so user gets a chance to cancel
-- bSkipInitialPWAuth = false;
-- libcmis::SessionFactory::setOAuth2AuthCodeProvider(AuthProvider::copyWebAuthCodeFallback);
-+ libcmis::SessionFactory::setOAuth2AuthCodeProvider(AuthProvider::gdriveAuthCodeFallback);
- oauth2Data = boost::make_shared<libcmis::OAuth2Data>(
- GDRIVE_AUTH_URL, GDRIVE_TOKEN_URL,
- GDRIVE_SCOPE, GDRIVE_REDIRECT_URI,
-@@ -379,9 +374,7 @@ namespace cmis
- ALFRESCO_CLOUD_CLIENT_ID, ALFRESCO_CLOUD_CLIENT_SECRET );
- if ( m_aURL.getBindingUrl( ) == ONEDRIVE_BASE_URL )
- {
-- // reset the skip, so user gets a chance to cancel
-- bSkipInitialPWAuth = false;
-- libcmis::SessionFactory::setOAuth2AuthCodeProvider(AuthProvider::copyWebAuthCodeFallback);
-+ libcmis::SessionFactory::setOAuth2AuthCodeProvider(AuthProvider::onedriveAuthCodeFallback);
- oauth2Data = boost::make_shared<libcmis::OAuth2Data>(
- ONEDRIVE_AUTH_URL, ONEDRIVE_TOKEN_URL,
- ONEDRIVE_SCOPE, ONEDRIVE_REDIRECT_URI,
-@@ -413,12 +406,6 @@ namespace cmis
- else
- {
- m_pProvider->registerSession(sSessionId, m_aURL.getUsername( ), m_pSession);
-- if (m_aURL.getBindingUrl() == ONEDRIVE_BASE_URL
-- || m_aURL.getBindingUrl() == GDRIVE_BASE_URL)
-- {
-- aAuthProvider.storeRefreshToken(rUsername, rPassword,
-- m_pSession->getRefreshToken());
-- }
- }
-
- bIsDone = true;
-@@ -426,10 +413,7 @@ namespace cmis
- catch( const libcmis::Exception & e )
- {
- if ( e.getType() != "permissionDenied" )
-- {
-- SAL_INFO("ucb.ucp.cmis", "Unexpected libcmis exception: " << e.what());
- throw;
-- }
- }
- }
- else
-@@ -521,7 +505,6 @@ namespace cmis
- }
- catch ( const libcmis::Exception& )
- {
-- SAL_INFO( "ucb.ucp.cmis", "object: " << OUSTR_TO_STDSTR(m_sObjectId));
- throw libcmis::Exception( "Object not found" );
- }
- }
-diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx
-index c55b670526b8..d2945ddeb8f5 100644
---- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
-+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
-@@ -168,7 +168,7 @@ namespace cmis
- libcmis::OAuth2DataPtr oauth2Data;
- if ( m_aURL.getBindingUrl( ) == GDRIVE_BASE_URL )
- {
-- libcmis::SessionFactory::setOAuth2AuthCodeProvider( AuthProvider::copyWebAuthCodeFallback );
-+ libcmis::SessionFactory::setOAuth2AuthCodeProvider( AuthProvider::gdriveAuthCodeFallback );
- oauth2Data = boost::make_shared<libcmis::OAuth2Data>(
- GDRIVE_AUTH_URL, GDRIVE_TOKEN_URL,
- GDRIVE_SCOPE, GDRIVE_REDIRECT_URI,
-@@ -181,7 +181,7 @@ namespace cmis
- ALFRESCO_CLOUD_CLIENT_ID, ALFRESCO_CLOUD_CLIENT_SECRET );
- if ( m_aURL.getBindingUrl( ) == ONEDRIVE_BASE_URL )
- {
-- libcmis::SessionFactory::setOAuth2AuthCodeProvider( AuthProvider::copyWebAuthCodeFallback );
-+ libcmis::SessionFactory::setOAuth2AuthCodeProvider( AuthProvider::onedriveAuthCodeFallback );
- oauth2Data = boost::make_shared<libcmis::OAuth2Data>(
- ONEDRIVE_AUTH_URL, ONEDRIVE_TOKEN_URL,
- ONEDRIVE_SCOPE, ONEDRIVE_REDIRECT_URI,
---
-2.33.1
-
commit 34c16421fd9459e73d33f4f21d0636dc1b67871c
Author: Gwyn Ciesla <gwync(a)protonmail.com>
Date: Tue Nov 7 21:29:52 2023 -0600
7.6.3.1
diff --git a/.gitignore b/.gitignore
index b923ebb..026e8fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,9 @@
/libreoffice-help-7.6.2.1.tar.xz.asc
/libreoffice-translations-7.6.2.1.tar.xz
/libreoffice-translations-7.6.2.1.tar.xz.asc
+/libreoffice-7.6.3.1.tar.xz
+/libreoffice-7.6.3.1.tar.xz.asc
+/libreoffice-help-7.6.3.1.tar.xz
+/libreoffice-help-7.6.3.1.tar.xz.asc
+/libreoffice-translations-7.6.3.1.tar.xz
+/libreoffice-translations-7.6.3.1.tar.xz.asc
diff --git a/717d27a.patch b/717d27a.patch
deleted file mode 100644
index 6a2b117..0000000
--- a/717d27a.patch
+++ /dev/null
@@ -1,1569 +0,0 @@
-From 717d27ae7bc42016aa3110dcbaf7c4c223bfe6c8 Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <caolan.mcnamara(a)collabora.com>
-Date: Mon, 09 Oct 2023 13:46:38 +0100
-Subject: [PATCH] upgrade to libcmis 0.6.0
-
-Change-Id: Ia22d2efca14b1f55f45a4ecb9c487591c3117e17
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157704
-Tested-by: Caolán McNamara <caolan.mcnamara(a)collabora.com>
-Reviewed-by: Caolán McNamara <caolan.mcnamara(a)collabora.com>
-(cherry picked from commit 4e1a5d693e408db170ccf4c84b49017056f289fa)
----
-
-diff --git a/configure.ac b/configure.ac
-index 90cf027..5942829 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -7537,7 +7537,7 @@
- dnl ===================================================================
- dnl Check for system libcmis
- dnl ===================================================================
--libo_CHECK_SYSTEM_MODULE([libcmis],[LIBCMIS],[libcmis-0.5 >= 0.5.2],enabled)
-+libo_CHECK_SYSTEM_MODULE([libcmis],[LIBCMIS],[libcmis-0.6 >= 0.6.0],enabled)
-
- dnl ===================================================================
- dnl C++11
-@@ -7563,28 +7563,12 @@
- fi
- save_CXXFLAGS=$CXXFLAGS
- CXXFLAGS="$CXXFLAGS $flag -Werror"
-- if test "$SYSTEM_LIBCMIS" = TRUE; then
-- CXXFLAGS="$CXXFLAGS -DSYSTEM_LIBCMIS $LIBCMIS_CFLAGS"
-- fi
- AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <algorithm>
- #include <functional>
- #include <vector>
-
-- #if defined SYSTEM_LIBCMIS
-- // See ucb/source/ucp/cmis/auth_provider.hxx:
-- #if !defined __clang__
-- #pragma GCC diagnostic push
-- #pragma GCC diagnostic ignored "-Wdeprecated"
-- #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
-- #endif
-- #include <libcmis/libcmis.hxx>
-- #if !defined __clang__
-- #pragma GCC diagnostic pop
-- #endif
-- #endif
--
- void f(std::vector<int> & v, std::function<bool(int, int)> fn) {
- std::sort(v.begin(), v.end(), fn);
- }
-diff --git a/download.lst b/download.lst
-index 823d535..ec214cb 100644
---- a/download.lst
-+++ b/download.lst
-@@ -60,8 +60,8 @@
- # three static lines
- # so that git cherry-pick
- # will not run into conflicts
--LIBCMIS_SHA256SUM := d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2
--LIBCMIS_TARBALL := libcmis-0.5.2.tar.xz
-+LIBCMIS_SHA256SUM := 56df575f78dacc21b4cec7cec73d671fd235f7c2010a8bb7940ef1413dc899fd
-+LIBCMIS_TARBALL := libcmis-0.6.0.tar.xz
- # three static lines
- # so that git cherry-pick
- # will not run into conflicts
-diff --git a/external/libcmis/0001-rename-class-GetObject-to-avoid-name-clash-on-Window.patch b/external/libcmis/0001-rename-class-GetObject-to-avoid-name-clash-on-Window.patch
-deleted file mode 100644
-index f82c82f..0000000
---- a/external/libcmis/0001-rename-class-GetObject-to-avoid-name-clash-on-Window.patch
-+++ /dev/null
-@@ -1,69 +0,0 @@
--From 219e6d6586c8280dfd9c4851cee0d14d68b6ad65 Mon Sep 17 00:00:00 2001
--From: David Tardon <dtardon(a)redhat.com>
--Date: Fri, 28 Dec 2018 15:26:28 +0100
--Subject: [PATCH] rename class GetObject to avoid name clash on Windows
--
-----
-- src/libcmis/ws-objectservice.cxx | 2 +-
-- src/libcmis/ws-requests.cxx | 2 +-
-- src/libcmis/ws-requests.hxx | 7 +++----
-- 3 files changed, 5 insertions(+), 6 deletions(-)
--
--diff --git a/src/libcmis/ws-objectservice.cxx b/src/libcmis/ws-objectservice.cxx
--index 9e40085..d57f3cc 100644
----- a/src/libcmis/ws-objectservice.cxx
--+++ b/src/libcmis/ws-objectservice.cxx
--@@ -71,7 +71,7 @@ libcmis::ObjectPtr ObjectService::getObject( string repoId, string id )
-- {
-- libcmis::ObjectPtr object;
--
--- class GetObject request( repoId, id );
--+ GetObjectRequest request( repoId, id );
-- vector< SoapResponsePtr > responses = m_session->soapRequest( m_url, request );
-- if ( responses.size( ) == 1 )
-- {
--diff --git a/src/libcmis/ws-requests.cxx b/src/libcmis/ws-requests.cxx
--index f8bc245..408d053 100644
----- a/src/libcmis/ws-requests.cxx
--+++ b/src/libcmis/ws-requests.cxx
--@@ -269,7 +269,7 @@ SoapResponsePtr GetTypeChildrenResponse::create( xmlNodePtr node, RelatedMultipa
-- return SoapResponsePtr( response );
-- }
--
---void GetObject::toXml( xmlTextWriterPtr writer )
--+void GetObjectRequest::toXml( xmlTextWriterPtr writer )
-- {
-- xmlTextWriterStartElement( writer, BAD_CAST( "cmism:getObject" ) );
-- xmlTextWriterWriteAttribute( writer, BAD_CAST( "xmlns:cmis" ), BAD_CAST( NS_CMIS_URL ) );
--diff --git a/src/libcmis/ws-requests.hxx b/src/libcmis/ws-requests.hxx
--index 2c4ae92..534d9a4 100644
----- a/src/libcmis/ws-requests.hxx
--+++ b/src/libcmis/ws-requests.hxx
--@@ -203,21 +203,20 @@ class GetTypeChildrenResponse : public SoapResponse
-- std::vector< libcmis::ObjectTypePtr > getChildren( ) { return m_children; }
-- };
--
---#undef GetObject
---class GetObject : public SoapRequest
--+class GetObjectRequest : public SoapRequest
-- {
-- private:
-- std::string m_repositoryId;
-- std::string m_id;
--
-- public:
--- GetObject( std::string repoId, std::string id ) :
--+ GetObjectRequest( std::string repoId, std::string id ) :
-- m_repositoryId( repoId ),
-- m_id( id )
-- {
-- }
--
--- ~GetObject( ) { }
--+ ~GetObjectRequest( ) { }
--
-- void toXml( xmlTextWriterPtr writer );
-- };
----
--2.19.2
--
-diff --git a/external/libcmis/UnpackedTarball_libcmis.mk b/external/libcmis/UnpackedTarball_libcmis.mk
-index f48201d..1c014d9 100644
---- a/external/libcmis/UnpackedTarball_libcmis.mk
-+++ b/external/libcmis/UnpackedTarball_libcmis.mk
-@@ -13,13 +13,4 @@
-
- $(eval $(call gb_UnpackedTarball_set_patchlevel,libcmis,1))
-
--$(eval $(call gb_UnpackedTarball_add_patches,libcmis, \
-- external/libcmis/libcmis-libxml2_compatibility.patch \
-- external/libcmis/0001-rename-class-GetObject-to-avoid-name-clash-on-Window.patch \
-- external/libcmis/libcmis_onedrive.patch \
-- external/libcmis/libcmis_oauth_pw_as_refreshtoken.patch.1 \
-- external/libcmis/libcmis_gdrive.patch.1 \
-- external/libcmis/libcmis-boost-string.patch \
--))
--
- # vim: set noet sw=4 ts=4:
-diff --git a/external/libcmis/libcmis-boost-string.patch b/external/libcmis/libcmis-boost-string.patch
-deleted file mode 100644
-index 247d38a..0000000
---- a/external/libcmis/libcmis-boost-string.patch
-+++ /dev/null
-@@ -1,11 +0,0 @@
----- a/src/libcmis/oauth2-handler.cxx
--+++ b/src/libcmis/oauth2-handler.cxx
--@@ -26,6 +26,8 @@
-- * instead of those above.
-- */
--
--+#include <boost/algorithm/string.hpp>
--+
-- #include "oauth2-handler.hxx"
--
-- #include <libcmis/session-factory.hxx>
-diff --git a/external/libcmis/libcmis-libxml2_compatibility.patch b/external/libcmis/libcmis-libxml2_compatibility.patch
-deleted file mode 100644
-index 240b85b..0000000
---- a/external/libcmis/libcmis-libxml2_compatibility.patch
-+++ /dev/null
-@@ -1,14 +0,0 @@
--# -*- Mode: Diff -*-
----- a/src/libcmis/oauth2-providers.cxx
--+++ b/src/libcmis/oauth2-providers.cxx
--@@ -34,6 +34,10 @@
--
-- using namespace std;
--
--+#if LIBXML_VERSION < 20621
--+#define HTML_PARSE_RECOVER 0
--+#endif
--+
-- namespace {
--
-- // Encodes the given data according to the application/x-www-form-urlencoded format, see
-diff --git a/external/libcmis/libcmis_gdrive.patch.1 b/external/libcmis/libcmis_gdrive.patch.1
-deleted file mode 100644
-index 24ff65d..0000000
---- a/external/libcmis/libcmis_gdrive.patch.1
-+++ /dev/null
-@@ -1,702 +0,0 @@
--diff -ur libcmis.org/src/libcmis/gdrive-document.cxx libcmis/src/libcmis/gdrive-document.cxx
----- libcmis.org/src/libcmis/gdrive-document.cxx 2021-07-27 19:11:02.679247008 +0200
--+++ libcmis/src/libcmis/gdrive-document.cxx 2021-07-27 19:11:18.873246420 +0200
--@@ -145,23 +145,17 @@
-- {
-- if ( !os.get( ) )
-- throw libcmis::Exception( "Missing stream" );
--- if ( !isImmutable( ) )
--- throw libcmis::Exception( string ( "Document " + getId( )+
--- " is not editable" ) );
--- string putUrl = getUploadUrl( ) + getId( );
--- putUrl += "?uploadType=media";
---
--- // If it's a Google document, convert it
--- if ( isGoogleDoc( ) )
--- putUrl += "&convert=true";
--+
--+ string putUrl = GDRIVE_UPLOAD_LINK + getId( ) + "?uploadType=media";
--
-- // Upload stream
-- boost::shared_ptr< istream> is ( new istream ( os->rdbuf( ) ) );
-- vector <string> headers;
-- headers.push_back( string( "Content-Type: " ) + contentType );
--+ string res;
-- try
-- {
--- getSession()->httpPutRequest( putUrl, *is, headers );
--+ res = getSession()->httpPatchRequest( putUrl, *is, headers )->getStream()->str();
-- }
-- catch ( const CurlException& e )
-- {
--@@ -181,35 +175,10 @@
-- {
-- if ( !os.get( ) )
-- throw libcmis::Exception( "Missing stream" );
---
--- if ( !isImmutable( ) )
--- throw libcmis::Exception( string ( "Document " + getId( )+
--- " is not editable" ) );
--- string metaUrl = getUrl( );
---
--- // If it's a Google document, convert it
--- if ( isGoogleDoc( ) )
--- metaUrl += "?convert=true";
---
--- // Update file name meta information
--- if ( !fileName.empty( ) && fileName != getContentFilename( ) )
--- {
--- Json metaJson;
--- Json fileJson( fileName.c_str( ) );
--- metaJson.add("title", fileJson );
---
--- std::istringstream is( metaJson.toString( ) );
--- vector<string> headers;
--- headers.push_back( "Content-Type: application/json" );
--- try
--- {
--- getSession()->httpPutRequest( metaUrl, is, headers );
--- }
--- catch ( const CurlException& e )
--- {
--- throw e.getCmisException( );
--- }
--- }
--+
--+ // TODO: when would the filename need an update?
--+ if (!fileName.empty() && fileName != getContentFilename())
--+ std::cout << "filename change is not implemented in setContentStream" << std::endl;
--
-- // Upload stream
-- uploadStream( os, contentType );
--@@ -251,7 +220,7 @@
-- vector< libcmis::DocumentPtr > GDriveDocument::getAllVersions( )
-- {
-- vector< libcmis::DocumentPtr > revisions;
--- string versionUrl = getUrl( ) + "/revisions";
--+ string versionUrl = GDRIVE_METADATA_LINK + getId( ) + "/revisions";
-- // Run the http request to get the properties definition
-- string res;
-- try
--@@ -263,7 +232,7 @@
-- throw e.getCmisException( );
-- }
-- Json jsonRes = Json::parse( res );
--- Json::JsonVector objs = jsonRes["items"].getList( );
--+ Json::JsonVector objs = jsonRes["revisions"].getList( );
--
-- string parentId = getStringProperty( "cmis:parentId" );
--
--diff -ur libcmis.org/src/libcmis/gdrive-folder.cxx libcmis/src/libcmis/gdrive-folder.cxx
----- libcmis.org/src/libcmis/gdrive-folder.cxx 2021-07-27 19:11:02.678247008 +0200
--+++ libcmis/src/libcmis/gdrive-folder.cxx 2021-07-27 19:11:18.874246420 +0200
--@@ -62,8 +62,8 @@
-- // Instead of sending multiple queries for children,
-- // we send a single query to search for objects where parents
-- // include the folderID.
--- string query = getSession( )->getBindingUrl( ) +
--- "/files?q=\"" + getId( ) + "\"+in+parents+and+trashed+=+false";
--+ string query = GDRIVE_METADATA_LINK + "?q=\"" + getId( ) + "\"+in+parents+and+trashed+=+false" +
--+ "&fields=files(kind,id,name,parents,mimeType,createdTime,modifiedTime,thumbnailLink,size)";
--
-- string res;
-- try
--@@ -76,7 +76,7 @@
-- }
--
-- Json jsonRes = Json::parse( res );
--- Json::JsonVector objs = jsonRes["items"].getList( );
--+ Json::JsonVector objs = jsonRes["files"].getList( );
--
-- // Create children objects from Json objects
-- for(unsigned int i = 0; i < objs.size(); i++)
--@@ -95,7 +95,7 @@
-- string GDriveFolder::uploadProperties( Json properties )
-- {
-- // URL for uploading meta data
--- string metaUrl = getSession()->getBindingUrl() + "/files/";
--+ string metaUrl = GDRIVE_METADATA_LINK + "?fields=kind,id,name,parents,mimeType,createdTime,modifiedTime";
--
-- // add parents to the properties
-- properties.add( "parents", GdriveUtils::createJsonFromParentId( getId( ) ) );
--@@ -147,9 +147,15 @@
--
-- Json propsJson = GdriveUtils::toGdriveJson( properties );
--
--- // Add filename to properties
--- Json jsonFilename( fileName.c_str( ) );
--- propsJson.add( "title", jsonFilename );
--+ if(!fileName.empty()) {
--+ // use provided filename
--+ Json jsonFilename( fileName.c_str( ) );
--+
--+ propsJson.add( "name", jsonFilename );
--+ }
--+ if(!contentType.empty()) {
--+ propsJson.add( "mimeType", Json(contentType.c_str()));
--+ }
--
-- // Upload meta-datas
-- string res = uploadProperties( propsJson);
--@@ -171,12 +177,9 @@
-- libcmis::UnfileObjects::Type /*unfile*/,
-- bool /*continueOnError*/ )
-- {
--- // Object remove doesn't work with folder
--- // Using trash instead
-- try
-- {
--- istringstream is( "" );
--- getSession( )->httpPostRequest( getUrl( ) + "/trash", is, "" );
--+ getSession( )->httpDeleteRequest( GDRIVE_METADATA_LINK + getId( ) );
-- }
-- catch ( const CurlException& e )
-- {
--diff -ur libcmis.org/src/libcmis/gdrive-object.cxx libcmis/src/libcmis/gdrive-object.cxx
----- libcmis.org/src/libcmis/gdrive-object.cxx 2021-07-27 19:11:02.675247009 +0200
--+++ libcmis/src/libcmis/gdrive-object.cxx 2021-07-27 19:11:18.874246420 +0200
--@@ -89,8 +89,8 @@
-- property.reset( new GDriveProperty( it->first, it->second ) );
-- m_properties[ property->getPropertyType( )->getId()] = property;
--
--- // we map "title" to both "cmis:name" and "cmis:getContentStreamFileName"
--- if ( it->first == "title" )
--+ // we map "name" to both "cmis:name" and "cmis:getContentStreamFileName"
--+ if ( it->first == "name" )
-- {
-- property.reset( new GDriveProperty( "cmis:name", it->second) );
-- m_properties[ property->getPropertyType( )->getId()] = property;
--@@ -142,16 +142,13 @@
-- {
-- if ( m_renditions.empty( ) )
-- {
--- string downloadUrl = getStringProperty( "downloadUrl" );
--- if ( !downloadUrl.empty( ) )
--- {
--- string mimeType = getStringProperty( "cmis:contentStreamMimeType" );
--- if ( !mimeType.empty( ) )
--- {
--- RenditionPtr rendition(
--- new Rendition( mimeType, mimeType, mimeType, downloadUrl ));
--- m_renditions.push_back( rendition );
--- }
--+ string downloadUrl = GDRIVE_METADATA_LINK + getId( ) + "?alt=media";
--+ string mimeType = getStringProperty( "cmis:contentStreamMimeType" );
--+ if ( !mimeType.empty( ) )
--+ {
--+ RenditionPtr rendition(
--+ new Rendition( mimeType, mimeType, mimeType, downloadUrl ));
--+ m_renditions.push_back( rendition );
-- }
--
-- vector< string > exportLinks = getMultiStringProperty( "exportLinks" );
--@@ -192,7 +189,7 @@
-- {
-- vector< string > headers;
-- headers.push_back( "Content-Type: application/json" );
--- response = getSession( )->httpPutRequest( getUrl( ), is, headers );
--+ response = getSession( )->httpPatchRequest( getUrl( ), is, headers );
-- }
-- catch ( const CurlException& e )
-- {
--@@ -228,7 +225,7 @@
-- {
-- try
-- {
--- getSession( )->httpDeleteRequest( getUrl( ) );
--+ getSession( )->httpDeleteRequest( GDRIVE_METADATA_LINK + getId( ) );
-- }
-- catch ( const CurlException& e )
-- {
--@@ -239,8 +236,8 @@
-- void GDriveObject::move( FolderPtr /*source*/, FolderPtr destination )
-- {
-- Json parentsJson;
--- Json parentsValue = GdriveUtils::createJsonFromParentId( destination->getId( ) );
--- parentsJson.add( "parents", parentsValue );
--+ parentsJson.add( "addParents", Json(destination->getId( ).c_str()) );
--+ parentsJson.add( "removeParents", Json(getStringProperty( "cmis:parentId" ).c_str()) );
--
-- istringstream is( parentsJson.toString( ) );
-- libcmis::HttpResponsePtr response;
--@@ -248,7 +245,7 @@
-- {
-- vector< string > headers;
-- headers.push_back( "Content-Type: application/json" );
--- response = getSession( )->httpPutRequest( getUrl( ), is, headers );
--+ response = getSession( )->httpPatchRequest( getUrl( ), is, headers );
-- }
-- catch ( const CurlException& e )
-- {
--@@ -262,12 +259,10 @@
--
-- string GDriveObject::getUrl( )
-- {
--- return getSession( )->getBindingUrl( ) + "/files/" + getId( );
---}
---
---string GDriveObject::getUploadUrl( )
---{
--- return GDRIVE_UPLOAD_LINKS;
--+ // thumbnailLink causes some operations to fail with internal server error,
--+ // see https://issuetracker.google.com/issues/36760667
--+ return GDRIVE_METADATA_LINK + getId( ) +
--+ "?fields=kind,id,name,parents,mimeType,createdTime,modifiedTime,size";
-- }
--
-- vector< string> GDriveObject::getMultiStringProperty( const string& propertyName )
--diff -ur libcmis.org/src/libcmis/gdrive-repository.cxx libcmis/src/libcmis/gdrive-repository.cxx
----- libcmis.org/src/libcmis/gdrive-repository.cxx 2021-07-27 19:11:02.676247009 +0200
--+++ libcmis/src/libcmis/gdrive-repository.cxx 2021-07-27 19:11:18.874246420 +0200
--@@ -35,7 +35,7 @@
-- m_name = "Google Drive";
-- m_description = "Google Drive repository";
-- m_productName = "Google Drive";
--- m_productVersion = "v2";
--+ m_productVersion = "v3";
-- m_rootId = "root";
--
-- m_capabilities[ ACL ] = "discover";
--diff -ur libcmis.org/src/libcmis/gdrive-session.cxx libcmis/src/libcmis/gdrive-session.cxx
----- libcmis.org/src/libcmis/gdrive-session.cxx 2021-07-27 19:11:02.675247009 +0200
--+++ libcmis/src/libcmis/gdrive-session.cxx 2021-07-27 19:11:18.874246420 +0200
--@@ -124,9 +124,13 @@
--
-- libcmis::ObjectPtr GDriveSession::getObject( string objectId )
-- {
--+ if(objectId == "root") {
--+ return getRootFolder();
--+ }
-- // Run the http request to get the properties definition
-- string res;
--- string objectLink = m_bindingUrl + "/files/" + objectId;
--+ string objectLink = GDRIVE_METADATA_LINK + objectId +
--+ "?fields=kind,id,name,parents,mimeType,createdTime,modifiedTime,thumbnailLink,size";
-- try
-- {
-- res = httpGetRequest( objectLink )->getStream()->str();
--@@ -188,9 +192,10 @@
-- {
-- // Normal child case
-- // Ask for the ID of the child if there is any
--- string childIdUrl = m_bindingUrl + "/files/" + objectId +
--- "/children/?q=title+=+'" + segment +
--- "'&fields=items:id";
--+ // somewhat flawed as names are not necessarily unique in GDrive...
--+ string query = libcmis::escape("'" + objectId + "' in parents and trashed = false and name='" + segment + "'");
--+
--+ string childIdUrl = m_bindingUrl + "/files/?q=" + query + "&fields=files(id)";
--
-- string res;
-- try
--@@ -204,7 +209,7 @@
-- Json jsonRes = Json::parse( res );
--
-- // Did we get an id?
--- Json::JsonVector items = jsonRes["items"].getList();
--+ Json::JsonVector items = jsonRes["files"].getList();
-- if ( items.empty( ) )
-- throw libcmis::Exception( "Object not found: " + path, "objectNotFound" );
--
--@@ -219,6 +224,27 @@
-- return getObject( objectId );
-- }
--
--+libcmis::FolderPtr GDriveSession::getRootFolder()
--+{
--+ // permissions/scope with just drive.file don't allow to get it with the "root" alias/by its actual object-ID
--+ Json propsJson;
--+
--+ // GDrive folder is a file with a different mime type.
--+ string mimeType = GDRIVE_FOLDER_MIME_TYPE;
--+
--+ // Add mimetype to the propsJson
--+ Json jsonMimeType( mimeType.c_str( ) );
--+ propsJson.add( "mimeType", jsonMimeType );
--+ propsJson.add( "id", "root" );
--+
--+ // Upload meta-datas
--+ propsJson.add("cmis:name", "VirtualRoot");
--+
--+ libcmis::FolderPtr folderPtr( new GDriveFolder( this, propsJson ) );
--+
--+ return folderPtr;
--+}
--+
-- libcmis::ObjectTypePtr GDriveSession::getType( string id )
-- {
-- libcmis::ObjectTypePtr type( new GdriveObjectType( id ) );
--diff -ur libcmis.org/src/libcmis/gdrive-session.hxx libcmis/src/libcmis/gdrive-session.hxx
----- libcmis.org/src/libcmis/gdrive-session.hxx 2021-07-27 19:11:02.675247009 +0200
--+++ libcmis/src/libcmis/gdrive-session.hxx 2021-07-27 19:11:18.875246420 +0200
--@@ -57,6 +57,8 @@
--
-- virtual std::vector< libcmis::ObjectTypePtr > getBaseTypes( );
--
--+ virtual libcmis::FolderPtr getRootFolder();
--+
-- virtual std::string getRefreshToken();
--
-- private:
--diff -ur libcmis.org/src/libcmis/gdrive-utils.cxx libcmis/src/libcmis/gdrive-utils.cxx
----- libcmis.org/src/libcmis/gdrive-utils.cxx 2021-07-27 19:11:02.677247008 +0200
--+++ libcmis/src/libcmis/gdrive-utils.cxx 2021-07-27 19:11:18.875246420 +0200
--@@ -44,17 +44,17 @@
-- convertedKey = "cmis:createdBy";
-- else if ( key == "description" )
-- convertedKey = "cmis:description";
--- else if ( key == "createdDate" )
--+ else if ( key == "createdTime" )
-- convertedKey = "cmis:creationDate";
-- else if ( key == "lastModifyingUserName" )
-- convertedKey = "cmis:lastModifiedBy";
--- else if ( key == "modifiedDate" )
--+ else if ( key == "modifiedTime" )
-- convertedKey = "cmis:lastModificationDate";
--- else if ( key == "title" )
--+ else if ( key == "name" )
-- convertedKey = "cmis:contentStreamFileName";
-- else if ( key == "mimeType" )
-- convertedKey = "cmis:contentStreamMimeType";
--- else if ( key == "fileSize" )
--+ else if ( key == "size" )
-- convertedKey = "cmis:contentStreamLength";
-- else if ( key == "editable" )
-- convertedKey = "cmis:isImmutable";
--@@ -72,21 +72,21 @@
-- else if ( key == "cmis:createdBy" )
-- convertedKey = "ownerNames";
-- else if ( key == "cmis:creationDate" )
--- convertedKey = "createdDate";
--+ convertedKey = "createdTime";
-- else if ( key == "cmis:description" )
-- convertedKey = "description";
-- else if ( key == "cmis:lastModifiedBy" )
-- convertedKey = "lastModifyingUserName";
-- else if ( key == "cmis:lastModificationDate" )
--- convertedKey = "modifiedDate";
--+ convertedKey = "modifiedTime";
-- else if ( key == "cmis:contentStreamFileName" )
--- convertedKey = "title";
--+ convertedKey = "name";
-- else if ( key == "cmis:name" )
--- convertedKey = "title";
--+ convertedKey = "name";
-- else if ( key == "cmis:contentStreamMimeType" )
-- convertedKey = "mimeType";
-- else if ( key == "cmis:contentStreamLength" )
--- convertedKey = "fileSize";
--+ convertedKey = "size";
-- else if ( key == "cmis:isImmutable" )
-- convertedKey = "editable";
-- else if ( key == "cmis:parentId" )
--@@ -124,9 +124,9 @@
-- bool GdriveUtils::checkUpdatable( const string& key )
-- {
-- // taken from https://developers.google.com/drive/v2/reference/files
--- bool updatable = ( key == "title" ||
--+ bool updatable = ( key == "name" ||
-- key == "description" ||
--- key == "modifiedDate" ||
--+ key == "modifiedTime" ||
-- key == "lastViewedByMeDate" );
-- return updatable;
-- }
--@@ -143,18 +143,11 @@
--
-- Json GdriveUtils::createJsonFromParentId( const string& parentId )
-- {
--- Json parentValue( parentId.c_str( ) );
---
-- // parents is a Json array
-- Json firstParent;
--- firstParent.add( "id", parentValue );
---
--- Json::JsonVector parents;
--- parents.insert( parents.begin( ), firstParent );
--+ firstParent.add( Json( parentId.c_str() ) );
--
--- Json parentsValue( parents );
---
--- return parentsValue;
--+ return firstParent;
-- }
--
-- vector< string > GdriveUtils::parseGdriveProperty( string key, Json json )
--diff -ur libcmis.org/src/libcmis/gdrive-utils.hxx libcmis/src/libcmis/gdrive-utils.hxx
----- libcmis.org/src/libcmis/gdrive-utils.hxx 2021-07-27 19:11:02.677247008 +0200
--+++ libcmis/src/libcmis/gdrive-utils.hxx 2021-07-27 19:11:18.875246420 +0200
--@@ -35,7 +35,8 @@
-- #include "json-utils.hxx"
--
-- static const std::string GDRIVE_FOLDER_MIME_TYPE = "application/vnd.google-apps.folder" ;
---static const std::string GDRIVE_UPLOAD_LINKS = "https://www.googleapis.com/upload/drive/v2/files/";
--+static const std::string GDRIVE_UPLOAD_LINK = "https://www.googleapis.com/upload/drive/v3/files/";
--+static const std::string GDRIVE_METADATA_LINK = "https://www.googleapis.com/drive/v3/files/";
--
-- class GdriveUtils
-- {
--diff -ur libcmis.org/src/libcmis/oauth2-handler.cxx libcmis/src/libcmis/oauth2-handler.cxx
----- libcmis.org/src/libcmis/oauth2-handler.cxx 2021-07-27 19:11:02.676247009 +0200
--+++ libcmis/src/libcmis/oauth2-handler.cxx 2021-07-27 19:11:18.875246420 +0200
--@@ -92,8 +92,11 @@
-- "code=" + authCode +
-- "&client_id=" + m_data->getClientId() +
-- "&redirect_uri=" + m_data->getRedirectUri() +
--- "&scope=" + libcmis::escape( m_data->getScope() ) +
-- "&grant_type=authorization_code" ;
--+ if(boost::starts_with(m_data->getTokenUrl(), "https://oauth2.googleapis.com/"))
--+ post += "&client_secret=" + m_data->getClientSecret();
--+ else
--+ post += "&scope=" + libcmis::escape( m_data->getScope() );
--
-- istringstream is( post );
--
--@@ -104,7 +107,7 @@
-- resp = m_session->httpPostRequest ( m_data->getTokenUrl(), is,
-- "application/x-www-form-urlencoded" );
-- }
--- catch ( const CurlException& )
--+ catch ( const CurlException& e)
-- {
-- throw libcmis::Exception(
-- "Couldn't get tokens from the authorization code ");
--@@ -122,6 +125,8 @@
-- "refresh_token=" + m_refresh +
-- "&client_id=" + m_data->getClientId() +
-- "&grant_type=refresh_token" ;
--+ if(boost::starts_with(m_data->getTokenUrl(), "https://oauth2.googleapis.com/"))
--+ post += "&client_secret=" + m_data->getClientSecret();
--
-- istringstream is( post );
-- libcmis::HttpResponsePtr resp;
--@@ -130,7 +135,7 @@
-- resp = m_session->httpPostRequest( m_data->getTokenUrl( ), is,
-- "application/x-www-form-urlencoded" );
-- }
--- catch (const CurlException& )
--+ catch (const CurlException& e )
-- {
-- throw libcmis::Exception( "Couldn't refresh token ");
-- }
--diff -ur libcmis.org/src/libcmis/oauth2-providers.cxx libcmis/src/libcmis/oauth2-providers.cxx
----- libcmis.org/src/libcmis/oauth2-providers.cxx 2021-07-27 19:11:02.679247008 +0200
--+++ libcmis/src/libcmis/oauth2-providers.cxx 2021-07-27 19:11:18.886246420 +0200
--@@ -80,172 +80,8 @@
--
-- }
--
---string OAuth2Providers::OAuth2Gdrive( HttpSession* session, const string& authUrl,
--- const string& username, const string& password )
---{
--- /* This member function implements 'Google OAuth 2.0'
--- *
--- * The interaction is carried out by libcmis, with no web browser involved.
--- *
--- * Normal sequence (without 2FA) is:
--- * 1) a get to activate login page
--- * receive first login page, html format
--- * 2) subsequent post to sent email
--- * receive html page for password input
--- * 3) subsequent post to send password
--- * receive html page for application consent
--- * 4) subsequent post to send a consent for the application
--- * receive a single-use authorization code
--- * this code is returned as a string
--- *
--- * Sequence with 2FA is:
--- * 1) a get to activate login page
--- * receive first login page, html format
--- * 2) subsequent post to sent email
--- * receive html page for password input
--- * 3) subsequent post to send password
--- * receive html page for pin input
--- * 3b) subsequent post to send pin number
--- * receive html page for application consent
--- * 4) subsequent post to send a consent for the application
--- * receive a single-use authorization code
--- * this code is returned as a string
--- */
---
--- static const string CONTENT_TYPE( "application/x-www-form-urlencoded" );
--- // STEP 1: get login page
--- string res;
--- try
--- {
--- // send the first get, receive the html login page
--- res = session->httpGetRequest( authUrl )->getStream( )->str( );
--- }
--- catch ( const CurlException& )
--- {
--- return string( );
--- }
---
--- // STEP 2: send email
---
--- string loginEmailPost, loginEmailLink;
--- if ( !parseResponse( res.c_str( ), loginEmailPost, loginEmailLink ) )
--- return string( );
---
--- loginEmailPost += "Email=";
--- loginEmailPost += escapeForm( username );
---
--- istringstream loginEmailIs( loginEmailPost );
--- string loginEmailRes;
--- try
--- {
--- // send a post with user email, receive the html page for password input
--- loginEmailRes = session->httpPostRequest ( loginEmailLink, loginEmailIs, CONTENT_TYPE )
--- ->getStream( )->str( );
--- }
--- catch ( const CurlException& )
--- {
--- return string( );
--- }
---
--- // STEP 3: password page
---
--- string loginPasswdPost, loginPasswdLink;
--- if ( !parseResponse( loginEmailRes.c_str( ), loginPasswdPost, loginPasswdLink ) )
--- return string( );
---
--- loginPasswdPost += "Passwd=";
--- loginPasswdPost += escapeForm( password );
---
--- istringstream loginPasswdIs( loginPasswdPost );
--- string loginPasswdRes;
--- try
--- {
--- // send a post with user password, receive the application consent page
--- loginPasswdRes = session->httpPostRequest ( loginPasswdLink, loginPasswdIs, CONTENT_TYPE )
--- ->getStream( )->str( );
--- }
--- catch ( const CurlException& )
--- {
--- return string( );
--- }
---
--- string approvalPost, approvalLink;
--- if ( !parseResponse( loginPasswdRes. c_str( ), approvalPost, approvalLink) )
--- return string( );
---
--- // when 2FA is enabled, link doesn't start with 'http'
--- if ( approvalLink.compare(0, 4, "http") != 0 )
--- {
--- // STEP 3b: 2 Factor Authentication, pin code request
---
--- string loginChallengePost( approvalPost );
--- string loginChallengeLink( approvalLink );
---
--- libcmis::OAuth2AuthCodeProvider fallbackProvider = libcmis::SessionFactory::getOAuth2AuthCodeProvider( );
--- unique_ptr< char, void (*)( void * ) > pin{ fallbackProvider( "", "", "" ), free };
---
--- if( !pin )
--- {
--- // unset OAuth2AuthCode Provider to avoid showing pin request again in the HttpSession::oauth2Authenticate
--- libcmis::SessionFactory::setOAuth2AuthCodeProvider( NULL );
--- return string( );
--- }
---
--- loginChallengeLink = "https://accounts.google.com" + loginChallengeLink;
--- loginChallengePost += string( PIN_INPUT_NAME ) + "=";
--- loginChallengePost += string( pin.get() );
---
--- istringstream loginChallengeIs( loginChallengePost );
--- string loginChallengeRes;
--- try
--- {
--- // send a post with pin, receive the application consent page
--- loginChallengeRes = session->httpPostRequest ( loginChallengeLink, loginChallengeIs, CONTENT_TYPE )
--- ->getStream( )->str( );
--- }
--- catch ( const CurlException& )
--- {
--- return string( );
--- }
---
--- approvalPost = string();
--- approvalLink = string();
---
--- if ( !parseResponse( loginChallengeRes. c_str( ), approvalPost, approvalLink) )
--- return string( );
--- }
--- else if( approvalLink.compare( "https://accounts.google.com/ServiceLoginAuth" ) == 0 )
--- {
--- // wrong password,
--- // unset OAuth2AuthCode Provider to avoid showing pin request again in the HttpSession::oauth2Authenticate
--- libcmis::SessionFactory::setOAuth2AuthCodeProvider( NULL );
--- return string( );
--- }
---
--- // STEP 4: allow libcmis to access google drive
--- approvalPost += "submit_access=true";
---
--- istringstream approvalIs( approvalPost );
--- string approvalRes;
--- try
--- {
--- // send a post with application consent
--- approvalRes = session->httpPostRequest ( approvalLink, approvalIs,
--- CONTENT_TYPE) ->getStream( )->str( );
--- }
--- catch ( const CurlException& e )
--- {
--- throw e.getCmisException( );
--- }
---
--- // Take the authentication code from the text bar
--- string code = parseCode( approvalRes.c_str( ) );
---
--- return code;
---}
---
---string OAuth2Providers::OAuth2Onedrive( HttpSession* /*session*/, const string& /*authUrl*/,
--- const string& /*username*/, const string& /*password*/ )
--+string OAuth2Providers::OAuth2Dummy( HttpSession* /*session*/, const string& /*authUrl*/,
--+ const string& /*username*/, const string& /*password*/ )
-- {
-- return string( );
-- }
--@@ -314,12 +150,8 @@
-- // For Alfresco in the cloud, only match the hostname as there can be several
-- // binding URLs created with it.
-- return OAuth2Alfresco;
--- else if ( boost::starts_with( url, "https://www.googleapis.com/drive/v2" ) )
--- return OAuth2Gdrive;
--- else if ( boost::starts_with( url, "https://graph.microsoft.com/v1.0" ) )
--- return OAuth2Onedrive;
--
--- return OAuth2Gdrive;
--+ return OAuth2Dummy;
-- }
--
-- int OAuth2Providers::parseResponse ( const char* response, string& post, string& link )
--diff -ur libcmis.org/src/libcmis/oauth2-providers.hxx libcmis/src/libcmis/oauth2-providers.hxx
----- libcmis.org/src/libcmis/oauth2-providers.hxx 2021-07-27 19:11:02.678247008 +0200
--+++ libcmis/src/libcmis/oauth2-providers.hxx 2021-07-27 19:11:18.886246420 +0200
--@@ -39,12 +39,8 @@
-- class OAuth2Providers
-- {
-- public :
--- static std::string OAuth2Gdrive( HttpSession* session, const std::string& authUrl,
--+ static std::string OAuth2Dummy( HttpSession* session, const std::string& authUrl,
-- const std::string& username, const std::string& password );
---
--- static std::string OAuth2Onedrive( HttpSession* session, const std::string& authUrl,
--- const std::string& username, const std::string& password );
---
-- static std::string OAuth2Alfresco( HttpSession* session, const std::string& authUrl,
-- const std::string& username, const std::string& password );
--
--diff -ur libcmis.org/src/libcmis/session-factory.cxx libcmis/src/libcmis/session-factory.cxx
----- libcmis.org/src/libcmis/session-factory.cxx 2021-07-27 19:11:02.679247008 +0200
--+++ libcmis/src/libcmis/session-factory.cxx 2021-07-27 19:11:18.886246420 +0200
--@@ -66,7 +66,7 @@
-- if ( !bindingUrl.empty( ) )
-- {
-- // Try the special cases based on the binding URL
--- if ( bindingUrl == "https://www.googleapis.com/drive/v2" )
--+ if ( bindingUrl == "https://www.googleapis.com/drive/v3" )
-- {
-- session = new GDriveSession( bindingUrl, username, password,
-- oauth2, verbose );
-diff --git a/external/libcmis/libcmis_oauth_pw_as_refreshtoken.patch.1 b/external/libcmis/libcmis_oauth_pw_as_refreshtoken.patch.1
-deleted file mode 100644
-index a8cb065..0000000
---- a/external/libcmis/libcmis_oauth_pw_as_refreshtoken.patch.1
-+++ /dev/null
-@@ -1,185 +0,0 @@
--diff -ur libcmis.org/inc/libcmis/session.hxx libcmis/inc/libcmis/session.hxx
----- libcmis.org/inc/libcmis/session.hxx 2021-07-27 19:09:42.580249917 +0200
--+++ libcmis/inc/libcmis/session.hxx 2021-07-27 19:10:02.368249199 +0200
--@@ -95,6 +95,8 @@
-- certificate exception feature available on common web browser.
-- */
-- virtual void setNoSSLCertificateCheck( bool noCheck ) = 0;
--+
--+ virtual std::string getRefreshToken() { return ""; };
-- };
-- }
--
--diff -ur libcmis.org/src/libcmis/gdrive-session.cxx libcmis/src/libcmis/gdrive-session.cxx
----- libcmis.org/src/libcmis/gdrive-session.cxx 2021-07-27 19:09:42.581249917 +0200
--+++ libcmis/src/libcmis/gdrive-session.cxx 2021-07-27 19:10:02.369249198 +0200
--@@ -70,6 +70,46 @@
-- {
-- }
--
--+
--+void GDriveSession::setOAuth2Data( libcmis::OAuth2DataPtr oauth2 )
--+{
--+ m_oauth2Handler = new OAuth2Handler( this, oauth2 );
--+ m_oauth2Handler->setOAuth2Parser( OAuth2Providers::getOAuth2Parser( getBindingUrl( ) ) );
--+
--+ oauth2Authenticate( );
--+}
--+
--+void GDriveSession::oauth2Authenticate()
--+{
--+ // treat the supplied password as refresh token
--+ if (!m_password.empty())
--+ {
--+ try
--+ {
--+ m_inOAuth2Authentication = true;
--+
--+ m_oauth2Handler->setRefreshToken(m_password);
--+ // Try to get new access tokens using the stored refreshtoken
--+ m_oauth2Handler->refresh();
--+ m_inOAuth2Authentication = false;
--+ }
--+ catch (const CurlException &e)
--+ {
--+ m_inOAuth2Authentication = false;
--+ // refresh token expired or invalid, trigger initial auth (that in turn will hit the fallback with copy'n'paste method)
--+ BaseSession::oauth2Authenticate();
--+ }
--+ }
--+ else
--+ {
--+ BaseSession::oauth2Authenticate();
--+ }
--+}
--+
--+string GDriveSession::getRefreshToken() {
--+ return HttpSession::getRefreshToken();
--+}
--+
-- libcmis::RepositoryPtr GDriveSession::getRepository( )
-- {
-- // Return a dummy repository since GDrive doesn't have that notion
--diff -ur libcmis.org/src/libcmis/gdrive-session.hxx libcmis/src/libcmis/gdrive-session.hxx
----- libcmis.org/src/libcmis/gdrive-session.hxx 2021-07-27 19:09:42.583249917 +0200
--+++ libcmis/src/libcmis/gdrive-session.hxx 2021-07-27 19:10:02.369249198 +0200
--@@ -57,8 +57,14 @@
--
-- virtual std::vector< libcmis::ObjectTypePtr > getBaseTypes( );
--
--+ virtual std::string getRefreshToken();
--+
-- private:
-- GDriveSession( );
--+
--+ virtual void setOAuth2Data( libcmis::OAuth2DataPtr oauth2 );
--+
--+ void oauth2Authenticate( );
-- };
--
-- #endif /* _GDRIVE_SESSION_HXX_ */
--diff -ur libcmis.org/src/libcmis/http-session.hxx libcmis/src/libcmis/http-session.hxx
----- libcmis.org/src/libcmis/http-session.hxx 2021-07-27 19:09:42.582249917 +0200
--+++ libcmis/src/libcmis/http-session.hxx 2021-07-27 19:10:02.369249198 +0200
--@@ -148,7 +148,7 @@
--
-- void setNoSSLCertificateCheck( bool noCheck );
--
--- std::string getRefreshToken( );
--+ virtual std::string getRefreshToken( );
--
-- protected:
-- HttpSession( );
--diff -ur libcmis.org/src/libcmis/oauth2-handler.cxx libcmis/src/libcmis/oauth2-handler.cxx
----- libcmis.org/src/libcmis/oauth2-handler.cxx 2021-07-27 19:09:42.582249917 +0200
--+++ libcmis/src/libcmis/oauth2-handler.cxx 2021-07-27 19:10:02.369249198 +0200
--@@ -158,6 +158,11 @@
-- return m_refresh;
-- }
--
--+void OAuth2Handler::setRefreshToken( string refreshToken )
--+{
--+ m_refresh = refreshToken;
--+}
--+
-- string OAuth2Handler::getHttpHeader( )
-- {
-- string header;
--diff -ur libcmis.org/src/libcmis/oauth2-handler.hxx libcmis/src/libcmis/oauth2-handler.hxx
----- libcmis.org/src/libcmis/oauth2-handler.hxx 2021-07-27 19:09:42.582249917 +0200
--+++ libcmis/src/libcmis/oauth2-handler.hxx 2021-07-27 19:10:02.370249198 +0200
--@@ -61,6 +61,7 @@
--
-- std::string getAccessToken( ) ;
-- std::string getRefreshToken( ) ;
--+ void setRefreshToken( std::string refreshToken ) ;
--
-- // adding HTTP auth header
-- std::string getHttpHeader( ) ;
--diff -ur libcmis.org/src/libcmis/onedrive-session.cxx libcmis/src/libcmis/onedrive-session.cxx
----- libcmis.org/src/libcmis/onedrive-session.cxx 2021-07-27 19:09:42.583249917 +0200
--+++ libcmis/src/libcmis/onedrive-session.cxx 2021-07-27 19:10:02.370249198 +0200
--@@ -68,6 +68,45 @@
-- {
-- }
--
--+void OneDriveSession::setOAuth2Data( libcmis::OAuth2DataPtr oauth2 )
--+{
--+ m_oauth2Handler = new OAuth2Handler( this, oauth2 );
--+ m_oauth2Handler->setOAuth2Parser( OAuth2Providers::getOAuth2Parser( getBindingUrl( ) ) );
--+
--+ oauth2Authenticate( );
--+}
--+
--+void OneDriveSession::oauth2Authenticate()
--+{
--+ // treat the supplied password as refresh token
--+ if (!m_password.empty())
--+ {
--+ try
--+ {
--+ m_inOAuth2Authentication = true;
--+
--+ m_oauth2Handler->setRefreshToken(m_password);
--+ // Try to get new access tokens using the stored refreshtoken
--+ m_oauth2Handler->refresh();
--+ m_inOAuth2Authentication = false;
--+ }
--+ catch (const CurlException &e)
--+ {
--+ m_inOAuth2Authentication = false;
--+ // refresh token expired or invalid, trigger initial auth (that in turn will hit the fallback with copy'n'paste method)
--+ BaseSession::oauth2Authenticate();
--+ }
--+ }
--+ else
--+ {
--+ BaseSession::oauth2Authenticate();
--+ }
--+}
--+
--+string OneDriveSession::getRefreshToken() {
--+ return HttpSession::getRefreshToken();
--+}
--+
-- libcmis::RepositoryPtr OneDriveSession::getRepository( )
-- {
-- // Return a dummy repository since OneDrive doesn't have that notion
--diff -ur libcmis.org/src/libcmis/onedrive-session.hxx libcmis/src/libcmis/onedrive-session.hxx
----- libcmis.org/src/libcmis/onedrive-session.hxx 2021-07-27 19:09:42.583249917 +0200
--+++ libcmis/src/libcmis/onedrive-session.hxx 2021-07-27 19:10:02.370249198 +0200
--@@ -62,8 +62,14 @@
--
-- bool isAPathMatch( Json objectJson, std::string path );
--
--+ virtual std::string getRefreshToken();
--+
-- private:
-- OneDriveSession( );
--+
--+ virtual void setOAuth2Data( libcmis::OAuth2DataPtr oauth2 );
--+
--+ void oauth2Authenticate( );
-- };
--
-- #endif /* _ONEDRIVE_SESSION_HXX_ */
-diff --git a/external/libcmis/libcmis_onedrive.patch b/external/libcmis/libcmis_onedrive.patch
-deleted file mode 100644
-index 60d7e7b..0000000
---- a/external/libcmis/libcmis_onedrive.patch
-+++ /dev/null
-@@ -1,445 +0,0 @@
--diff --git a/src/libcmis/http-session.cxx b/src/libcmis/http-session.cxx
--index 2638482..227667e 100644
----- a/src/libcmis/http-session.cxx
--+++ b/src/libcmis/http-session.cxx
--@@ -293,6 +293,94 @@ libcmis::HttpResponsePtr HttpSession::httpGetRequest( string url )
-- return response;
-- }
--
--+libcmis::HttpResponsePtr HttpSession::httpPatchRequest( string url, istream& is, vector< string > headers )
--+{
--+ checkOAuth2( url );
--+
--+ // Duplicate istream in case we need to retry
--+ string isStr( static_cast< stringstream const&>( stringstream( ) << is.rdbuf( ) ).str( ) );
--+
--+ istringstream isOriginal( isStr ), isBackup( isStr );
--+
--+ // Reset the handle for the request
--+ curl_easy_reset( m_curlHandle );
--+ initProtocols( );
--+
--+ libcmis::HttpResponsePtr response( new libcmis::HttpResponse( ) );
--+
--+ curl_easy_setopt( m_curlHandle, CURLOPT_WRITEFUNCTION, lcl_bufferData );
--+ curl_easy_setopt( m_curlHandle, CURLOPT_WRITEDATA, response->getData( ).get( ) );
--+
--+ curl_easy_setopt( m_curlHandle, CURLOPT_HEADERFUNCTION, &lcl_getHeaders );
--+ curl_easy_setopt( m_curlHandle, CURLOPT_WRITEHEADER, response.get() );
--+
--+ curl_easy_setopt( m_curlHandle, CURLOPT_MAXREDIRS, 20);
--+
--+ // Get the stream length
--+ is.seekg( 0, ios::end );
--+ long size = is.tellg( );
--+ is.seekg( 0, ios::beg );
--+ curl_easy_setopt( m_curlHandle, CURLOPT_INFILESIZE, size );
--+ curl_easy_setopt( m_curlHandle, CURLOPT_READDATA, &isOriginal );
--+ curl_easy_setopt( m_curlHandle, CURLOPT_READFUNCTION, lcl_readStream );
--+ curl_easy_setopt( m_curlHandle, CURLOPT_UPLOAD, 1 );
--+ curl_easy_setopt( m_curlHandle, CURLOPT_CUSTOMREQUEST, "PATCH" );
--+ curl_easy_setopt( m_curlHandle, CURLOPT_IOCTLFUNCTION, lcl_ioctlStream );
--+ curl_easy_setopt( m_curlHandle, CURLOPT_IOCTLDATA, &isOriginal );
--+
--+ // If we know for sure that 100-Continue won't be accepted,
--+ // don't even try with it to save one HTTP request.
--+ if ( m_no100Continue )
--+ headers.push_back( "Expect:" );
--+ try
--+ {
--+ httpRunRequest( url, headers );
--+ response->getData( )->finish();
--+ }
--+ catch ( const CurlException& )
--+ {
--+ long status = getHttpStatus( );
--+ /** If we had a HTTP 417 response, this is likely to be due to some
--+ HTTP 1.0 proxy / server not accepting the "Expect: 100-continue"
--+ header. Try to disable this header and try again.
--+ */
--+ if ( status == 417 && !m_no100Continue)
--+ {
--+ // Remember that we don't want 100-Continue for the future requests
--+ m_no100Continue = true;
--+ response = httpPutRequest( url, isBackup, headers );
--+ }
--+
--+ // If the access token is expired, we get 401 error,
--+ // Need to use the refresh token to get a new one.
--+ if ( status == 401 && !getRefreshToken( ).empty( ) && !m_refreshedToken )
--+ {
--+
--+ // Refresh the token
--+ oauth2Refresh();
--+
--+ // Resend the query
--+ try
--+ {
--+ // Avoid infinite recursive call
--+ m_refreshedToken = true;
--+ response = httpPutRequest( url, isBackup, headers );
--+ m_refreshedToken = false;
--+ }
--+ catch (const CurlException&)
--+ {
--+ m_refreshedToken = false;
--+ throw;
--+ }
--+ }
--+ // Has tried but failed
--+ if ( ( status != 417 || m_no100Continue ) &&
--+ ( status != 401 || getRefreshToken( ).empty( ) || m_refreshedToken ) ) throw;
--+ }
--+ m_refreshedToken = false;
--+ return response;
--+}
--+
-- libcmis::HttpResponsePtr HttpSession::httpPutRequest( string url, istream& is, vector< string > headers )
-- {
-- checkOAuth2( url );
--diff --git a/src/libcmis/http-session.hxx b/src/libcmis/http-session.hxx
--index 851d52d..29de64d 100644
----- a/src/libcmis/http-session.hxx
--+++ b/src/libcmis/http-session.hxx
--@@ -132,6 +132,9 @@ class HttpSession
-- virtual void setOAuth2Data( libcmis::OAuth2DataPtr oauth2 );
--
-- libcmis::HttpResponsePtr httpGetRequest( std::string url );
--+ libcmis::HttpResponsePtr httpPatchRequest( std::string url,
--+ std::istream& is,
--+ std::vector< std::string > headers );
-- libcmis::HttpResponsePtr httpPutRequest( std::string url,
-- std::istream& is,
-- std::vector< std::string > headers );
--diff --git a/src/libcmis/oauth2-handler.cxx b/src/libcmis/oauth2-handler.cxx
--index a3320e3..842769f 100644
----- a/src/libcmis/oauth2-handler.cxx
--+++ b/src/libcmis/oauth2-handler.cxx
--@@ -91,8 +91,8 @@ void OAuth2Handler::fetchTokens( string authCode )
-- string post =
-- "code=" + authCode +
-- "&client_id=" + m_data->getClientId() +
--- "&client_secret=" + m_data->getClientSecret() +
-- "&redirect_uri=" + m_data->getRedirectUri() +
--+ "&scope=" + libcmis::escape( m_data->getScope() ) +
-- "&grant_type=authorization_code" ;
--
-- istringstream is( post );
--@@ -121,7 +121,6 @@ void OAuth2Handler::refresh( )
-- string post =
-- "refresh_token=" + m_refresh +
-- "&client_id=" + m_data->getClientId() +
--- "&client_secret=" + m_data->getClientSecret() +
-- "&grant_type=refresh_token" ;
--
-- istringstream is( post );
--diff --git a/src/libcmis/oauth2-providers.cxx b/src/libcmis/oauth2-providers.cxx
--index 8cf9652..654021f 100644
----- a/src/libcmis/oauth2-providers.cxx
--+++ b/src/libcmis/oauth2-providers.cxx
--@@ -312,7 +312,7 @@ OAuth2Parser OAuth2Providers::getOAuth2Parser( const std::string& url )
-- return OAuth2Alfresco;
-- else if ( boost::starts_with( url, "https://www.googleapis.com/drive/v2" ) )
-- return OAuth2Gdrive;
--- else if ( boost::starts_with( url, "https://apis.live.net/v5.0" ) )
--+ else if ( boost::starts_with( url, "https://graph.microsoft.com/v1.0" ) )
-- return OAuth2Onedrive;
--
-- return OAuth2Gdrive;
--diff --git a/src/libcmis/onedrive-document.cxx b/src/libcmis/onedrive-document.cxx
--index f753b42..863a92f 100644
----- a/src/libcmis/onedrive-document.cxx
--+++ b/src/libcmis/onedrive-document.cxx
--@@ -73,7 +73,7 @@ boost::shared_ptr< istream > OneDriveDocument::getContentStream( string /*stream
-- boost::shared_ptr< istream > stream;
-- string streamUrl = getStringProperty( "source" );
-- if ( streamUrl.empty( ) )
--- throw libcmis::Exception( "can not found stream url" );
--+ throw libcmis::Exception( "could not find stream url" );
--
-- try
-- {
--@@ -89,15 +89,15 @@ boost::shared_ptr< istream > OneDriveDocument::getContentStream( string /*stream
-- void OneDriveDocument::setContentStream( boost::shared_ptr< ostream > os,
-- string /*contentType*/,
-- string fileName,
--- bool /*overwrite*/ )
--+ bool bReplaceExisting )
-- {
-- if ( !os.get( ) )
-- throw libcmis::Exception( "Missing stream" );
---
--+
-- string metaUrl = getUrl( );
--
-- // Update file name meta information
--- if ( !fileName.empty( ) && fileName != getContentFilename( ) )
--+ if ( bReplaceExisting && !fileName.empty( ) && fileName != getContentFilename( ) )
-- {
-- Json metaJson;
-- Json fileJson( fileName.c_str( ) );
--@@ -108,7 +108,7 @@ void OneDriveDocument::setContentStream( boost::shared_ptr< ostream > os,
-- headers.push_back( "Content-Type: application/json" );
-- try
-- {
--- getSession()->httpPutRequest( metaUrl, is, headers );
--+ getSession()->httpPatchRequest( metaUrl, is, headers );
-- }
-- catch ( const CurlException& e )
-- {
--@@ -117,9 +117,9 @@ void OneDriveDocument::setContentStream( boost::shared_ptr< ostream > os,
-- }
--
-- fileName = libcmis::escape( getStringProperty( "cmis:name" ) );
--- string putUrl = getSession( )->getBindingUrl( ) + "/" +
--- getStringProperty( "cmis:parentId" ) + "/files/" +
--- fileName + "?overwrite=true";
--+ string putUrl = getSession( )->getBindingUrl( ) + "/me/drive/items/" +
--+ getStringProperty( "cmis:parentId" ) + ":/" +
--+ fileName + ":/content";
--
-- // Upload stream
-- boost::shared_ptr< istream> is ( new istream ( os->rdbuf( ) ) );
--@@ -142,6 +142,7 @@ void OneDriveDocument::setContentStream( boost::shared_ptr< ostream > os,
-- libcmis::DocumentPtr OneDriveDocument::checkOut( )
-- {
-- // OneDrive doesn't have CheckOut, so just return the same document here
--+ // TODO: no longer true - onedrive now has checkout/checkin
-- libcmis::ObjectPtr obj = getSession( )->getObject( getId( ) );
-- libcmis::DocumentPtr checkout =
-- boost::dynamic_pointer_cast< libcmis::Document > ( obj );
--diff --git a/src/libcmis/onedrive-folder.cxx b/src/libcmis/onedrive-folder.cxx
--index a9ae694..c1980c8 100644
----- a/src/libcmis/onedrive-folder.cxx
--+++ b/src/libcmis/onedrive-folder.cxx
--@@ -57,7 +57,9 @@ OneDriveFolder::~OneDriveFolder( )
-- vector< libcmis::ObjectPtr > OneDriveFolder::getChildren( )
-- {
-- vector< libcmis::ObjectPtr > children;
--- string query = getSession( )->getBindingUrl( ) + "/" + getId( ) + "/files";
--+ // TODO: limited to 200 items by default - to get more one would have to
--+ // follow @odata.nextLink or change pagination size
--+ string query = getSession( )->getBindingUrl( ) + "/me/drive/items/" + getId( ) + "/children";
--
-- string res;
-- try
--@@ -70,7 +72,7 @@ vector< libcmis::ObjectPtr > OneDriveFolder::getChildren( )
-- }
--
-- Json jsonRes = Json::parse( res );
--- Json::JsonVector objs = jsonRes["data"].getList( );
--+ Json::JsonVector objs = jsonRes["value"].getList( );
--
-- // Create children objects from Json objects
-- for(unsigned int i = 0; i < objs.size(); i++)
--@@ -85,8 +87,7 @@ libcmis::FolderPtr OneDriveFolder::createFolder(
-- const PropertyPtrMap& properties )
-- {
-- Json propsJson = OneDriveUtils::toOneDriveJson( properties );
---
--- string uploadUrl = getSession( )->getBindingUrl( ) + "/" + getId( );
--+ string uploadUrl = getSession( )->getBindingUrl( ) + "/me/drive/items/" + getId( ) + "/children";
--
-- std::istringstream is( propsJson.toString( ) );
-- string response;
--@@ -126,9 +127,10 @@ libcmis::DocumentPtr OneDriveFolder::createDocument(
-- }
-- }
--
--+ // TODO: limited to 4MB, larger uploads need dedicated UploadSession
-- fileName = libcmis::escape( fileName );
--- string newDocUrl = getSession( )->getBindingUrl( ) + "/" +
--- getId( ) + "/files/" + fileName;
--+ string newDocUrl = getSession( )->getBindingUrl( ) + "/me/drive/items/" +
--+ getId( ) + ":/" + fileName + ":/content";
-- boost::shared_ptr< istream> is ( new istream ( os->rdbuf( ) ) );
-- vector< string > headers;
-- string res;
--diff --git a/src/libcmis/onedrive-object.cxx b/src/libcmis/onedrive-object.cxx
--index 976a97b..8deb591 100644
----- a/src/libcmis/onedrive-object.cxx
--+++ b/src/libcmis/onedrive-object.cxx
--@@ -65,7 +65,7 @@ void OneDriveObject::initializeFromJson ( Json json, string /*id*/, string /*nam
-- Json::JsonObject objs = json.getObjects( );
-- Json::JsonObject::iterator it;
-- PropertyPtr property;
--- bool isFolder = json["type"].toString( ) == "folder";
--+ bool isFolder = json["folder"].toString( ) != "";
-- for ( it = objs.begin( ); it != objs.end( ); ++it)
-- {
-- property.reset( new OneDriveProperty( it->first, it->second ) );
--@@ -74,7 +74,12 @@ void OneDriveObject::initializeFromJson ( Json json, string /*id*/, string /*nam
-- {
-- property.reset( new OneDriveProperty( "cmis:contentStreamFileName", it->second ) );
-- m_properties[ property->getPropertyType( )->getId()] = property;
--- }
--+ } else if ( it->first == "parentReference" ) {
--+ if (it->second["id"].toString() != "") {
--+ property.reset( new OneDriveProperty( "cmis:parentId", it->second["id"] ) );
--+ m_properties[ property->getPropertyType( )->getId()] = property;
--+ }
--+ }
-- }
--
-- m_refreshTimestamp = time( NULL );
--@@ -122,7 +127,7 @@ void OneDriveObject::remove( bool /*allVersions*/ )
--
-- string OneDriveObject::getUrl( )
-- {
--- return getSession( )->getBindingUrl( ) + "/" + getId( );
--+ return getSession( )->getBindingUrl( ) + "/me/drive/items/" + getId( );
-- }
--
-- string OneDriveObject::getUploadUrl( )
--@@ -152,7 +157,7 @@ libcmis::ObjectPtr OneDriveObject::updateProperties(
-- {
-- vector< string > headers;
-- headers.push_back( "Content-Type: application/json" );
--- response = getSession( )->httpPutRequest( getUrl( ), is, headers );
--+ response = getSession( )->httpPatchRequest( getUrl( ), is, headers );
-- }
-- catch ( const CurlException& e )
-- {
--diff --git a/src/libcmis/onedrive-repository.cxx b/src/libcmis/onedrive-repository.cxx
--index 3eaac9c..b01f5c2 100644
----- a/src/libcmis/onedrive-repository.cxx
--+++ b/src/libcmis/onedrive-repository.cxx
--@@ -35,7 +35,7 @@ OneDriveRepository::OneDriveRepository( ) :
-- m_description = "One Drive repository";
-- m_productName = "One Drive";
-- m_productVersion = "v5";
--- m_rootId = "me/skydrive";
--+ m_rootId = "/me/drive/root";
--
-- m_capabilities[ ACL ] = "discover";
-- m_capabilities[ AllVersionsSearchable ] = "true";
--diff --git a/src/libcmis/onedrive-session.cxx b/src/libcmis/onedrive-session.cxx
--index c6f4270..a603278 100644
----- a/src/libcmis/onedrive-session.cxx
--+++ b/src/libcmis/onedrive-session.cxx
--@@ -79,7 +79,9 @@ libcmis::ObjectPtr OneDriveSession::getObject( string objectId )
-- {
-- // Run the http request to get the properties definition
-- string res;
--- string objectLink = m_bindingUrl + "/" + objectId;
--+ string objectLink = m_bindingUrl + "/me/drive/items/" + objectId;
--+ if (objectId == getRootId())
--+ objectLink = m_bindingUrl + objectId;
-- try
-- {
-- res = httpGetRequest( objectLink )->getStream()->str();
--@@ -95,12 +97,11 @@ libcmis::ObjectPtr OneDriveSession::getObject( string objectId )
-- libcmis::ObjectPtr OneDriveSession::getObjectFromJson( Json& jsonRes )
-- {
-- libcmis::ObjectPtr object;
--- string kind = jsonRes["type"].toString( );
--- if ( kind == "folder" || kind == "album" )
--+ if ( jsonRes["folder"].toString() != "" )
-- {
-- object.reset( new OneDriveFolder( this, jsonRes ) );
-- }
--- else if ( kind == "file" )
--+ else if ( jsonRes["file"].toString() != "" )
-- {
-- object.reset( new OneDriveDocument( this, jsonRes ) );
-- }
--@@ -113,44 +114,18 @@ libcmis::ObjectPtr OneDriveSession::getObjectFromJson( Json& jsonRes )
--
-- libcmis::ObjectPtr OneDriveSession::getObjectByPath( string path )
-- {
--- string id;
--- if ( path == "/" )
--- {
--- id = "me/skydrive";
--- }
--- else
--+ string res;
--+ string objectQuery = m_bindingUrl + "/me/drive/root:" + libcmis::escape( path );
--+ try
-- {
--- path = "/SkyDrive" + path;
--- size_t pos = path.rfind("/");
--- string name = libcmis::escape( path.substr( pos + 1, path.size( ) ) );
--- string res;
--- string objectQuery = m_bindingUrl + "/me/skydrive/search?q=" + name;
--- try
--- {
--- res = httpGetRequest( objectQuery )->getStream( )->str( );
--- }
--- catch ( const CurlException& e )
--- {
--- throw e.getCmisException( );
--- }
--- Json jsonRes = Json::parse( res );
--- Json::JsonVector objs = jsonRes["data"].getList( );
---
--- // Searching for a match in the path to the object
--- for ( unsigned int i = 0; i < objs.size( ); i++ )
--- {
--- if ( isAPathMatch( objs[i], path ) )
--- {
--- id = objs[i]["id"].toString( );
--- break;
--- }
--- }
--+ res = httpGetRequest( objectQuery )->getStream( )->str( );
-- }
--- if ( id.empty( ) )
--+ catch ( const CurlException& e )
-- {
--- throw libcmis::Exception( "No file could be found" );
--+ throw libcmis::Exception( "No file could be found for path " + path + ": " + e.what() );
-- }
--- return getObject( id );
--+ Json jsonRes = Json::parse( res );
--+ return getObjectFromJson( jsonRes );
-- }
--
-- bool OneDriveSession::isAPathMatch( Json objectJson, string path )
--diff --git a/src/libcmis/onedrive-utils.cxx b/src/libcmis/onedrive-utils.cxx
--index dc6ec5d..17ed324 100644
----- a/src/libcmis/onedrive-utils.cxx
--+++ b/src/libcmis/onedrive-utils.cxx
--@@ -44,16 +44,16 @@ string OneDriveUtils::toCmisKey( const string& key )
-- convertedKey = "cmis:createdBy";
-- else if ( key == "description" )
-- convertedKey = "cmis:description";
--- else if ( key == "created_time" )
--+ else if ( key == "createdDateTime" )
-- convertedKey = "cmis:creationDate";
--- else if ( key == "updated_time" )
--+ else if ( key == "lastModifiedDateTime" )
-- convertedKey = "cmis:lastModificationDate";
-- else if ( key == "name" )
-- convertedKey = "cmis:name";
-- else if ( key == "size" )
-- convertedKey = "cmis:contentStreamLength";
--- else if ( key == "parent_id" )
--- convertedKey = "cmis:parentId";
--+ else if ( key == "@microsoft.graph.downloadUrl" )
--+ convertedKey = "source";
-- else convertedKey = key;
-- return convertedKey;
-- }
--@@ -75,8 +75,6 @@ string OneDriveUtils::toOneDriveKey( const string& key )
-- convertedKey = "name";
-- else if ( key == "cmis:contentStreamLength" )
-- convertedKey = "file_size";
--- else if ( key == "cmis:parentId" )
--- convertedKey = "parent_id";
-- else convertedKey = key;
-- return convertedKey;
-- }
--diff --git a/src/libcmis/session-factory.cxx b/src/libcmis/session-factory.cxx
--index ba55cd9..e740afb 100644
----- a/src/libcmis/session-factory.cxx
--+++ b/src/libcmis/session-factory.cxx
--@@ -71,7 +71,7 @@ namespace libcmis
-- session = new GDriveSession( bindingUrl, username, password,
-- oauth2, verbose );
-- }
--- else if ( bindingUrl == "https://apis.live.net/v5.0" )
--+ else if ( bindingUrl == "https://graph.microsoft.com/v1.0" )
-- {
-- session = new OneDriveSession( bindingUrl, username, password,
-- oauth2, verbose);
-diff --git a/ucb/source/ucp/cmis/auth_provider.hxx b/ucb/source/ucp/cmis/auth_provider.hxx
-index 1768c12..af1a420 100644
---- a/ucb/source/ucp/cmis/auth_provider.hxx
-+++ b/ucb/source/ucp/cmis/auth_provider.hxx
-@@ -8,15 +8,7 @@
- */
- #pragma once
-
--#if defined __GNUC__ && !defined __clang__
--#pragma GCC diagnostic push
--#pragma GCC diagnostic ignored "-Wdeprecated"
--#pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
--#endif
- #include <libcmis/libcmis.hxx>
--#if defined __GNUC__ && !defined __clang__
--#pragma GCC diagnostic pop
--#endif
-
- #include <com/sun/star/ucb/XCommandEnvironment.hpp>
- #include <cppuhelper/weakref.hxx>
diff --git a/libreoffice.spec b/libreoffice.spec
index 2b6597e..fa6dfd4 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1,5 +1,5 @@
# download path contains version without the last (fourth) digit
-%global libo_version 7.6.2
+%global libo_version 7.6.3
# Should contain .alphaX / .betaX, if this is pre-release (actually
# pre-RC) version. The pre-release string is part of tarball file names,
# so we need a way to define it easily at one place.
@@ -280,7 +280,7 @@ Patch3: 0001-default-to-sifr-for-gnome-light-mode.patch
# backported
Patch4: 0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch
Patch5: limit-tests-giving-dubious-results-to-x86_64.patch
-Patch6: 717d27a.patch
+Patch6: pdfdoc.patch
# not upstreamed
# fix FTB in ppc64le from sharkcz
# https://lists.freedesktop.org/archives/libreoffice/2023-August/090870.html
diff --git a/pdfdoc.patch b/pdfdoc.patch
new file mode 100644
index 0000000..43c814f
--- /dev/null
+++ b/pdfdoc.patch
@@ -0,0 +1,22 @@
+--- libreoffice-7.6.3.1/sw/qa/core/text/itrform2.cxx 2023-11-02 16:37:04.000000000 -0500
++++ core/sw/qa/core/text/itrform2.cxx 2023-11-07 10:31:14.018505043 -0600
+@@ -124,6 +124,10 @@
+
+ // Then make sure all the expected text is there on page 2:
+ std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument = parsePDFExport();
++ if (!pPdfDocument)
++ {
++ return;
++ }
+ std::unique_ptr<vcl::pdf::PDFiumPage> pPage2 = pPdfDocument->openPage(1);
+ int nTextCount = 0;
+ for (int i = 0; i < pPage2->getObjectCount(); ++i)
+@@ -143,7 +147,7 @@
+
+ CPPUNIT_TEST_FIXTURE(Test, testSplitFlyAnchorLeftMargin)
+ {
+- // Given a document with a floating table, anchor para is followed by an other para with a left
++ // Given a document with a floating table, anchor para is followed by another para with a left
+ // margin:
+ createSwDoc("floattable-anchor-left-margin.docx");
+
diff --git a/sources b/sources
index 9a74a16..6a445fe 100644
--- a/sources
+++ b/sources
@@ -1,12 +1,12 @@
+SHA512 (libreoffice-7.6.3.1.tar.xz) = 3ce56e96889be565438e4646a662711899bfa1b65a3c80e478a283481594dbd4428bee4193c3034f2422f297c4e3bc45e7af87d4d54172b0d5a2dcb143189a0d
+SHA512 (libreoffice-7.6.3.1.tar.xz.asc) = 900dec2eaa586abfde851f968bd38444654b9ed33b4258ddc681b999e2755ca39df8dbc7350fafb11be0828811fc221fbf2cfefb0a207216506141d105655cd7
+SHA512 (libreoffice-help-7.6.3.1.tar.xz) = a364c458b2152fd0ebbfd607d11eb290dbbd9e4c6cb06f11a90d8563638c72365351404eac84c8d08626446cb4e11a6bd23876d94bca77c205b70c6564507c6d
+SHA512 (libreoffice-help-7.6.3.1.tar.xz.asc) = b659db1ef3ea2d3b26132230271923b4fe9b707fe066932d02e80c004ea8d3b51472dd0ce7a346af712d691eab122f3650e7f1950180d6dd0ed0e8ed28b03da3
+SHA512 (libreoffice-translations-7.6.3.1.tar.xz) = 5b309b3b6f69628cd2af21a00834281f1deb037b14d8acbc9e8e7933eea56c9488692f5ec283a5086d9ab1487bdb663185e268fd2aa8e310a4db717c7d367c57
+SHA512 (libreoffice-translations-7.6.3.1.tar.xz.asc) = 95722443ba2985a0b58bc29b18a4fa9227d8c33c2e21341444a148833ce4737c127385a8e05f124a0d3bfbbf160ba8863094c9980a8dc904004f743c8604280e
SHA512 (17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
SHA512 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
SHA512 (f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = 6a6d131dad5191614950a49323ae6d9385afe331983c1c85fde82ce6ee816051d95dde9ef90658b8f0a8a0a21754e72ff724bf41f6b96c046b7b4c2660f7095b
SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd
SHA512 (dtoa-20180411.tgz) = 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
-SHA512 (libreoffice-7.6.2.1.tar.xz) = 4b209c444437c067bbc08c5b7d0273fa32675a19afc15751a403e1ee024795fe87aecf64de193203ee4f84f5b7ae8d547cde4ed9aced4efd3d6743af65ac6896
-SHA512 (libreoffice-7.6.2.1.tar.xz.asc) = 0278e6e92971ce9d68f21056f0539c38a6a3def6269daf9263d3ed54bddd4761dea0cc2646b3dfff237a92d2bdb958339aee641651d67aa27d179f94ad26c480
-SHA512 (libreoffice-help-7.6.2.1.tar.xz) = 8fda9424a5ff5fbe0317e08d91504b75e3075d13d3f9b65aa21cdbc53578b1dda40b14168becc577b972eefb09a8255a5ce00322277714274c8adf6975f08a61
-SHA512 (libreoffice-help-7.6.2.1.tar.xz.asc) = 46a4546cbee7a7c66df3ebeda99674e5369aaae169c3ab8691d71a9ef5d59189df88084832991afd9d3928584ad83de8f060f452a1d78b2ef229e537eff5cd1d
-SHA512 (libreoffice-translations-7.6.2.1.tar.xz) = 4cecbc09d648ee751ca7bbcfa61b8ec174ac71aae7255c6359af5f6cbff019cc4ad5b6b4ca757329907175b13ce57e5afaa70355a9bfc48e86f6ccf8d0b7e80d
-SHA512 (libreoffice-translations-7.6.2.1.tar.xz.asc) = 936f34adf6648526db69efb968e66095430e8f5f7fbff241a64f44844dfb4eab2571e2813c39da52103054f72ebf08662b0f1c5d02a0876180dc138090ef6dfe
commit f6147e467a71d27384db0c1cedbb1e55be069455
Author: Mattia Verga <mattia.verga(a)tiscali.it>
Date: Fri Oct 6 09:02:13 2023 +0200
re-enable a bunch of tests that were previously failing
diff --git a/libreoffice.spec b/libreoffice.spec
index 1754bea..2b6597e 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1025,25 +1025,19 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch500 -p1
%endif
-%ifarch aarch64 s390x
+%ifarch aarch64 s390x ppc64le
%patch501 -p1
%endif
# Temporarily disable failing tests
%ifarch ppc64le
-sed -i -e /CppunitTest_sc_array_functions_test/d sc/Module_sc.mk
-sed -i -e /CppunitTest_sc_addin_functions_test/d sc/Module_sc.mk
-sed -i -e /CppunitTest_sc_financial_functions_test/d sc/Module_sc.mk
-sed -i -e /CppunitTest_sc_statistical_functions_test/d sc/Module_sc.mk
-sed -i -e /CppunitTest_dbaccess_hsqldb_test/d dbaccess/Module_dbaccess.mk
sed -i -e s/CppunitTest_dbaccess_RowSetClones// dbaccess/Module_dbaccess.mk
%endif
%ifarch aarch64
# Nothing to do
%endif
%ifarch s390x
-sed -i -e /CppunitTest_sc_array_functions_test/d sc/Module_sc.mk
-sed -i -e /CppunitTest_sc_addin_functions_test/d sc/Module_sc.mk
+# SwMacrosTest::testVba fails
sed -i -e s/CppunitTest_sw_macros_test// sw/Module_sw.mk
# https://bugs.documentfoundation.org/show_bug.cgi?id=125978
sed -i -e s/CustomTarget_uno_test// testtools/Module_testtools.mk
commit bd3d35cb6f58ab827155efe806cf9b7067810466
Author: Gwyn Ciesla <gwync(a)protonmail.com>
Date: Thu Oct 12 00:32:43 2023 -0500
libcmis rebuild
diff --git a/717d27a.patch b/717d27a.patch
new file mode 100644
index 0000000..6a2b117
--- /dev/null
+++ b/717d27a.patch
@@ -0,0 +1,1569 @@
+From 717d27ae7bc42016aa3110dcbaf7c4c223bfe6c8 Mon Sep 17 00:00:00 2001
+From: Caolán McNamara <caolan.mcnamara(a)collabora.com>
+Date: Mon, 09 Oct 2023 13:46:38 +0100
+Subject: [PATCH] upgrade to libcmis 0.6.0
+
+Change-Id: Ia22d2efca14b1f55f45a4ecb9c487591c3117e17
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157704
+Tested-by: Caolán McNamara <caolan.mcnamara(a)collabora.com>
+Reviewed-by: Caolán McNamara <caolan.mcnamara(a)collabora.com>
+(cherry picked from commit 4e1a5d693e408db170ccf4c84b49017056f289fa)
+---
+
+diff --git a/configure.ac b/configure.ac
+index 90cf027..5942829 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7537,7 +7537,7 @@
+ dnl ===================================================================
+ dnl Check for system libcmis
+ dnl ===================================================================
+-libo_CHECK_SYSTEM_MODULE([libcmis],[LIBCMIS],[libcmis-0.5 >= 0.5.2],enabled)
++libo_CHECK_SYSTEM_MODULE([libcmis],[LIBCMIS],[libcmis-0.6 >= 0.6.0],enabled)
+
+ dnl ===================================================================
+ dnl C++11
+@@ -7563,28 +7563,12 @@
+ fi
+ save_CXXFLAGS=$CXXFLAGS
+ CXXFLAGS="$CXXFLAGS $flag -Werror"
+- if test "$SYSTEM_LIBCMIS" = TRUE; then
+- CXXFLAGS="$CXXFLAGS -DSYSTEM_LIBCMIS $LIBCMIS_CFLAGS"
+- fi
+ AC_LANG_PUSH([C++])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <algorithm>
+ #include <functional>
+ #include <vector>
+
+- #if defined SYSTEM_LIBCMIS
+- // See ucb/source/ucp/cmis/auth_provider.hxx:
+- #if !defined __clang__
+- #pragma GCC diagnostic push
+- #pragma GCC diagnostic ignored "-Wdeprecated"
+- #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
+- #endif
+- #include <libcmis/libcmis.hxx>
+- #if !defined __clang__
+- #pragma GCC diagnostic pop
+- #endif
+- #endif
+-
+ void f(std::vector<int> & v, std::function<bool(int, int)> fn) {
+ std::sort(v.begin(), v.end(), fn);
+ }
+diff --git a/download.lst b/download.lst
+index 823d535..ec214cb 100644
+--- a/download.lst
++++ b/download.lst
+@@ -60,8 +60,8 @@
+ # three static lines
+ # so that git cherry-pick
+ # will not run into conflicts
+-LIBCMIS_SHA256SUM := d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2
+-LIBCMIS_TARBALL := libcmis-0.5.2.tar.xz
++LIBCMIS_SHA256SUM := 56df575f78dacc21b4cec7cec73d671fd235f7c2010a8bb7940ef1413dc899fd
++LIBCMIS_TARBALL := libcmis-0.6.0.tar.xz
+ # three static lines
+ # so that git cherry-pick
+ # will not run into conflicts
+diff --git a/external/libcmis/0001-rename-class-GetObject-to-avoid-name-clash-on-Window.patch b/external/libcmis/0001-rename-class-GetObject-to-avoid-name-clash-on-Window.patch
+deleted file mode 100644
+index f82c82f..0000000
+--- a/external/libcmis/0001-rename-class-GetObject-to-avoid-name-clash-on-Window.patch
++++ /dev/null
+@@ -1,69 +0,0 @@
+-From 219e6d6586c8280dfd9c4851cee0d14d68b6ad65 Mon Sep 17 00:00:00 2001
+-From: David Tardon <dtardon(a)redhat.com>
+-Date: Fri, 28 Dec 2018 15:26:28 +0100
+-Subject: [PATCH] rename class GetObject to avoid name clash on Windows
+-
+----
+- src/libcmis/ws-objectservice.cxx | 2 +-
+- src/libcmis/ws-requests.cxx | 2 +-
+- src/libcmis/ws-requests.hxx | 7 +++----
+- 3 files changed, 5 insertions(+), 6 deletions(-)
+-
+-diff --git a/src/libcmis/ws-objectservice.cxx b/src/libcmis/ws-objectservice.cxx
+-index 9e40085..d57f3cc 100644
+---- a/src/libcmis/ws-objectservice.cxx
+-+++ b/src/libcmis/ws-objectservice.cxx
+-@@ -71,7 +71,7 @@ libcmis::ObjectPtr ObjectService::getObject( string repoId, string id )
+- {
+- libcmis::ObjectPtr object;
+-
+-- class GetObject request( repoId, id );
+-+ GetObjectRequest request( repoId, id );
+- vector< SoapResponsePtr > responses = m_session->soapRequest( m_url, request );
+- if ( responses.size( ) == 1 )
+- {
+-diff --git a/src/libcmis/ws-requests.cxx b/src/libcmis/ws-requests.cxx
+-index f8bc245..408d053 100644
+---- a/src/libcmis/ws-requests.cxx
+-+++ b/src/libcmis/ws-requests.cxx
+-@@ -269,7 +269,7 @@ SoapResponsePtr GetTypeChildrenResponse::create( xmlNodePtr node, RelatedMultipa
+- return SoapResponsePtr( response );
+- }
+-
+--void GetObject::toXml( xmlTextWriterPtr writer )
+-+void GetObjectRequest::toXml( xmlTextWriterPtr writer )
+- {
+- xmlTextWriterStartElement( writer, BAD_CAST( "cmism:getObject" ) );
+- xmlTextWriterWriteAttribute( writer, BAD_CAST( "xmlns:cmis" ), BAD_CAST( NS_CMIS_URL ) );
+-diff --git a/src/libcmis/ws-requests.hxx b/src/libcmis/ws-requests.hxx
+-index 2c4ae92..534d9a4 100644
+---- a/src/libcmis/ws-requests.hxx
+-+++ b/src/libcmis/ws-requests.hxx
+-@@ -203,21 +203,20 @@ class GetTypeChildrenResponse : public SoapResponse
+- std::vector< libcmis::ObjectTypePtr > getChildren( ) { return m_children; }
+- };
+-
+--#undef GetObject
+--class GetObject : public SoapRequest
+-+class GetObjectRequest : public SoapRequest
+- {
+- private:
+- std::string m_repositoryId;
+- std::string m_id;
+-
+- public:
+-- GetObject( std::string repoId, std::string id ) :
+-+ GetObjectRequest( std::string repoId, std::string id ) :
+- m_repositoryId( repoId ),
+- m_id( id )
+- {
+- }
+-
+-- ~GetObject( ) { }
+-+ ~GetObjectRequest( ) { }
+-
+- void toXml( xmlTextWriterPtr writer );
+- };
+---
+-2.19.2
+-
+diff --git a/external/libcmis/UnpackedTarball_libcmis.mk b/external/libcmis/UnpackedTarball_libcmis.mk
+index f48201d..1c014d9 100644
+--- a/external/libcmis/UnpackedTarball_libcmis.mk
++++ b/external/libcmis/UnpackedTarball_libcmis.mk
+@@ -13,13 +13,4 @@
+
+ $(eval $(call gb_UnpackedTarball_set_patchlevel,libcmis,1))
+
+-$(eval $(call gb_UnpackedTarball_add_patches,libcmis, \
+- external/libcmis/libcmis-libxml2_compatibility.patch \
+- external/libcmis/0001-rename-class-GetObject-to-avoid-name-clash-on-Window.patch \
+- external/libcmis/libcmis_onedrive.patch \
+- external/libcmis/libcmis_oauth_pw_as_refreshtoken.patch.1 \
+- external/libcmis/libcmis_gdrive.patch.1 \
+- external/libcmis/libcmis-boost-string.patch \
+-))
+-
+ # vim: set noet sw=4 ts=4:
+diff --git a/external/libcmis/libcmis-boost-string.patch b/external/libcmis/libcmis-boost-string.patch
+deleted file mode 100644
+index 247d38a..0000000
+--- a/external/libcmis/libcmis-boost-string.patch
++++ /dev/null
+@@ -1,11 +0,0 @@
+---- a/src/libcmis/oauth2-handler.cxx
+-+++ b/src/libcmis/oauth2-handler.cxx
+-@@ -26,6 +26,8 @@
+- * instead of those above.
+- */
+-
+-+#include <boost/algorithm/string.hpp>
+-+
+- #include "oauth2-handler.hxx"
+-
+- #include <libcmis/session-factory.hxx>
+diff --git a/external/libcmis/libcmis-libxml2_compatibility.patch b/external/libcmis/libcmis-libxml2_compatibility.patch
+deleted file mode 100644
+index 240b85b..0000000
+--- a/external/libcmis/libcmis-libxml2_compatibility.patch
++++ /dev/null
+@@ -1,14 +0,0 @@
+-# -*- Mode: Diff -*-
+---- a/src/libcmis/oauth2-providers.cxx
+-+++ b/src/libcmis/oauth2-providers.cxx
+-@@ -34,6 +34,10 @@
+-
+- using namespace std;
+-
+-+#if LIBXML_VERSION < 20621
+-+#define HTML_PARSE_RECOVER 0
+-+#endif
+-+
+- namespace {
+-
+- // Encodes the given data according to the application/x-www-form-urlencoded format, see
+diff --git a/external/libcmis/libcmis_gdrive.patch.1 b/external/libcmis/libcmis_gdrive.patch.1
+deleted file mode 100644
+index 24ff65d..0000000
+--- a/external/libcmis/libcmis_gdrive.patch.1
++++ /dev/null
+@@ -1,702 +0,0 @@
+-diff -ur libcmis.org/src/libcmis/gdrive-document.cxx libcmis/src/libcmis/gdrive-document.cxx
+---- libcmis.org/src/libcmis/gdrive-document.cxx 2021-07-27 19:11:02.679247008 +0200
+-+++ libcmis/src/libcmis/gdrive-document.cxx 2021-07-27 19:11:18.873246420 +0200
+-@@ -145,23 +145,17 @@
+- {
+- if ( !os.get( ) )
+- throw libcmis::Exception( "Missing stream" );
+-- if ( !isImmutable( ) )
+-- throw libcmis::Exception( string ( "Document " + getId( )+
+-- " is not editable" ) );
+-- string putUrl = getUploadUrl( ) + getId( );
+-- putUrl += "?uploadType=media";
+--
+-- // If it's a Google document, convert it
+-- if ( isGoogleDoc( ) )
+-- putUrl += "&convert=true";
+-+
+-+ string putUrl = GDRIVE_UPLOAD_LINK + getId( ) + "?uploadType=media";
+-
+- // Upload stream
+- boost::shared_ptr< istream> is ( new istream ( os->rdbuf( ) ) );
+- vector <string> headers;
+- headers.push_back( string( "Content-Type: " ) + contentType );
+-+ string res;
+- try
+- {
+-- getSession()->httpPutRequest( putUrl, *is, headers );
+-+ res = getSession()->httpPatchRequest( putUrl, *is, headers )->getStream()->str();
+- }
+- catch ( const CurlException& e )
+- {
+-@@ -181,35 +175,10 @@
+- {
+- if ( !os.get( ) )
+- throw libcmis::Exception( "Missing stream" );
+--
+-- if ( !isImmutable( ) )
+-- throw libcmis::Exception( string ( "Document " + getId( )+
+-- " is not editable" ) );
+-- string metaUrl = getUrl( );
+--
+-- // If it's a Google document, convert it
+-- if ( isGoogleDoc( ) )
+-- metaUrl += "?convert=true";
+--
+-- // Update file name meta information
+-- if ( !fileName.empty( ) && fileName != getContentFilename( ) )
+-- {
+-- Json metaJson;
+-- Json fileJson( fileName.c_str( ) );
+-- metaJson.add("title", fileJson );
+--
+-- std::istringstream is( metaJson.toString( ) );
+-- vector<string> headers;
+-- headers.push_back( "Content-Type: application/json" );
+-- try
+-- {
+-- getSession()->httpPutRequest( metaUrl, is, headers );
+-- }
+-- catch ( const CurlException& e )
+-- {
+-- throw e.getCmisException( );
+-- }
+-- }
+-+
+-+ // TODO: when would the filename need an update?
+-+ if (!fileName.empty() && fileName != getContentFilename())
+-+ std::cout << "filename change is not implemented in setContentStream" << std::endl;
+-
+- // Upload stream
+- uploadStream( os, contentType );
+-@@ -251,7 +220,7 @@
+- vector< libcmis::DocumentPtr > GDriveDocument::getAllVersions( )
+- {
+- vector< libcmis::DocumentPtr > revisions;
+-- string versionUrl = getUrl( ) + "/revisions";
+-+ string versionUrl = GDRIVE_METADATA_LINK + getId( ) + "/revisions";
+- // Run the http request to get the properties definition
+- string res;
+- try
+-@@ -263,7 +232,7 @@
+- throw e.getCmisException( );
+- }
+- Json jsonRes = Json::parse( res );
+-- Json::JsonVector objs = jsonRes["items"].getList( );
+-+ Json::JsonVector objs = jsonRes["revisions"].getList( );
+-
+- string parentId = getStringProperty( "cmis:parentId" );
+-
+-diff -ur libcmis.org/src/libcmis/gdrive-folder.cxx libcmis/src/libcmis/gdrive-folder.cxx
+---- libcmis.org/src/libcmis/gdrive-folder.cxx 2021-07-27 19:11:02.678247008 +0200
+-+++ libcmis/src/libcmis/gdrive-folder.cxx 2021-07-27 19:11:18.874246420 +0200
+-@@ -62,8 +62,8 @@
+- // Instead of sending multiple queries for children,
+- // we send a single query to search for objects where parents
+- // include the folderID.
+-- string query = getSession( )->getBindingUrl( ) +
+-- "/files?q=\"" + getId( ) + "\"+in+parents+and+trashed+=+false";
+-+ string query = GDRIVE_METADATA_LINK + "?q=\"" + getId( ) + "\"+in+parents+and+trashed+=+false" +
+-+ "&fields=files(kind,id,name,parents,mimeType,createdTime,modifiedTime,thumbnailLink,size)";
+-
+- string res;
+- try
+-@@ -76,7 +76,7 @@
+- }
+-
+- Json jsonRes = Json::parse( res );
+-- Json::JsonVector objs = jsonRes["items"].getList( );
+-+ Json::JsonVector objs = jsonRes["files"].getList( );
+-
+- // Create children objects from Json objects
+- for(unsigned int i = 0; i < objs.size(); i++)
+-@@ -95,7 +95,7 @@
+- string GDriveFolder::uploadProperties( Json properties )
+- {
+- // URL for uploading meta data
+-- string metaUrl = getSession()->getBindingUrl() + "/files/";
+-+ string metaUrl = GDRIVE_METADATA_LINK + "?fields=kind,id,name,parents,mimeType,createdTime,modifiedTime";
+-
+- // add parents to the properties
+- properties.add( "parents", GdriveUtils::createJsonFromParentId( getId( ) ) );
+-@@ -147,9 +147,15 @@
+-
+- Json propsJson = GdriveUtils::toGdriveJson( properties );
+-
+-- // Add filename to properties
+-- Json jsonFilename( fileName.c_str( ) );
+-- propsJson.add( "title", jsonFilename );
+-+ if(!fileName.empty()) {
+-+ // use provided filename
+-+ Json jsonFilename( fileName.c_str( ) );
+-+
+-+ propsJson.add( "name", jsonFilename );
+-+ }
+-+ if(!contentType.empty()) {
+-+ propsJson.add( "mimeType", Json(contentType.c_str()));
+-+ }
+-
+- // Upload meta-datas
+- string res = uploadProperties( propsJson);
+-@@ -171,12 +177,9 @@
+- libcmis::UnfileObjects::Type /*unfile*/,
+- bool /*continueOnError*/ )
+- {
+-- // Object remove doesn't work with folder
+-- // Using trash instead
+- try
+- {
+-- istringstream is( "" );
+-- getSession( )->httpPostRequest( getUrl( ) + "/trash", is, "" );
+-+ getSession( )->httpDeleteRequest( GDRIVE_METADATA_LINK + getId( ) );
+- }
+- catch ( const CurlException& e )
+- {
+-diff -ur libcmis.org/src/libcmis/gdrive-object.cxx libcmis/src/libcmis/gdrive-object.cxx
+---- libcmis.org/src/libcmis/gdrive-object.cxx 2021-07-27 19:11:02.675247009 +0200
+-+++ libcmis/src/libcmis/gdrive-object.cxx 2021-07-27 19:11:18.874246420 +0200
+-@@ -89,8 +89,8 @@
+- property.reset( new GDriveProperty( it->first, it->second ) );
+- m_properties[ property->getPropertyType( )->getId()] = property;
+-
+-- // we map "title" to both "cmis:name" and "cmis:getContentStreamFileName"
+-- if ( it->first == "title" )
+-+ // we map "name" to both "cmis:name" and "cmis:getContentStreamFileName"
+-+ if ( it->first == "name" )
+- {
+- property.reset( new GDriveProperty( "cmis:name", it->second) );
+- m_properties[ property->getPropertyType( )->getId()] = property;
+-@@ -142,16 +142,13 @@
+- {
+- if ( m_renditions.empty( ) )
+- {
+-- string downloadUrl = getStringProperty( "downloadUrl" );
+-- if ( !downloadUrl.empty( ) )
+-- {
+-- string mimeType = getStringProperty( "cmis:contentStreamMimeType" );
+-- if ( !mimeType.empty( ) )
+-- {
+-- RenditionPtr rendition(
+-- new Rendition( mimeType, mimeType, mimeType, downloadUrl ));
+-- m_renditions.push_back( rendition );
+-- }
+-+ string downloadUrl = GDRIVE_METADATA_LINK + getId( ) + "?alt=media";
+-+ string mimeType = getStringProperty( "cmis:contentStreamMimeType" );
+-+ if ( !mimeType.empty( ) )
+-+ {
+-+ RenditionPtr rendition(
+-+ new Rendition( mimeType, mimeType, mimeType, downloadUrl ));
+-+ m_renditions.push_back( rendition );
+- }
+-
+- vector< string > exportLinks = getMultiStringProperty( "exportLinks" );
+-@@ -192,7 +189,7 @@
+- {
+- vector< string > headers;
+- headers.push_back( "Content-Type: application/json" );
+-- response = getSession( )->httpPutRequest( getUrl( ), is, headers );
+-+ response = getSession( )->httpPatchRequest( getUrl( ), is, headers );
+- }
+- catch ( const CurlException& e )
+- {
+-@@ -228,7 +225,7 @@
+- {
+- try
+- {
+-- getSession( )->httpDeleteRequest( getUrl( ) );
+-+ getSession( )->httpDeleteRequest( GDRIVE_METADATA_LINK + getId( ) );
+- }
+- catch ( const CurlException& e )
+- {
+-@@ -239,8 +236,8 @@
+- void GDriveObject::move( FolderPtr /*source*/, FolderPtr destination )
+- {
+- Json parentsJson;
+-- Json parentsValue = GdriveUtils::createJsonFromParentId( destination->getId( ) );
+-- parentsJson.add( "parents", parentsValue );
+-+ parentsJson.add( "addParents", Json(destination->getId( ).c_str()) );
+-+ parentsJson.add( "removeParents", Json(getStringProperty( "cmis:parentId" ).c_str()) );
+-
+- istringstream is( parentsJson.toString( ) );
+- libcmis::HttpResponsePtr response;
+-@@ -248,7 +245,7 @@
+- {
+- vector< string > headers;
+- headers.push_back( "Content-Type: application/json" );
+-- response = getSession( )->httpPutRequest( getUrl( ), is, headers );
+-+ response = getSession( )->httpPatchRequest( getUrl( ), is, headers );
+- }
+- catch ( const CurlException& e )
+- {
+-@@ -262,12 +259,10 @@
+-
+- string GDriveObject::getUrl( )
+- {
+-- return getSession( )->getBindingUrl( ) + "/files/" + getId( );
+--}
+--
+--string GDriveObject::getUploadUrl( )
+--{
+-- return GDRIVE_UPLOAD_LINKS;
+-+ // thumbnailLink causes some operations to fail with internal server error,
+-+ // see https://issuetracker.google.com/issues/36760667
+-+ return GDRIVE_METADATA_LINK + getId( ) +
+-+ "?fields=kind,id,name,parents,mimeType,createdTime,modifiedTime,size";
+- }
+-
+- vector< string> GDriveObject::getMultiStringProperty( const string& propertyName )
+-diff -ur libcmis.org/src/libcmis/gdrive-repository.cxx libcmis/src/libcmis/gdrive-repository.cxx
+---- libcmis.org/src/libcmis/gdrive-repository.cxx 2021-07-27 19:11:02.676247009 +0200
+-+++ libcmis/src/libcmis/gdrive-repository.cxx 2021-07-27 19:11:18.874246420 +0200
+-@@ -35,7 +35,7 @@
+- m_name = "Google Drive";
+- m_description = "Google Drive repository";
+- m_productName = "Google Drive";
+-- m_productVersion = "v2";
+-+ m_productVersion = "v3";
+- m_rootId = "root";
+-
+- m_capabilities[ ACL ] = "discover";
+-diff -ur libcmis.org/src/libcmis/gdrive-session.cxx libcmis/src/libcmis/gdrive-session.cxx
+---- libcmis.org/src/libcmis/gdrive-session.cxx 2021-07-27 19:11:02.675247009 +0200
+-+++ libcmis/src/libcmis/gdrive-session.cxx 2021-07-27 19:11:18.874246420 +0200
+-@@ -124,9 +124,13 @@
+-
+- libcmis::ObjectPtr GDriveSession::getObject( string objectId )
+- {
+-+ if(objectId == "root") {
+-+ return getRootFolder();
+-+ }
+- // Run the http request to get the properties definition
+- string res;
+-- string objectLink = m_bindingUrl + "/files/" + objectId;
+-+ string objectLink = GDRIVE_METADATA_LINK + objectId +
+-+ "?fields=kind,id,name,parents,mimeType,createdTime,modifiedTime,thumbnailLink,size";
+- try
+- {
+- res = httpGetRequest( objectLink )->getStream()->str();
+-@@ -188,9 +192,10 @@
+- {
+- // Normal child case
+- // Ask for the ID of the child if there is any
+-- string childIdUrl = m_bindingUrl + "/files/" + objectId +
+-- "/children/?q=title+=+'" + segment +
+-- "'&fields=items:id";
+-+ // somewhat flawed as names are not necessarily unique in GDrive...
+-+ string query = libcmis::escape("'" + objectId + "' in parents and trashed = false and name='" + segment + "'");
+-+
+-+ string childIdUrl = m_bindingUrl + "/files/?q=" + query + "&fields=files(id)";
+-
+- string res;
+- try
+-@@ -204,7 +209,7 @@
+- Json jsonRes = Json::parse( res );
+-
+- // Did we get an id?
+-- Json::JsonVector items = jsonRes["items"].getList();
+-+ Json::JsonVector items = jsonRes["files"].getList();
+- if ( items.empty( ) )
+- throw libcmis::Exception( "Object not found: " + path, "objectNotFound" );
+-
+-@@ -219,6 +224,27 @@
+- return getObject( objectId );
+- }
+-
+-+libcmis::FolderPtr GDriveSession::getRootFolder()
+-+{
+-+ // permissions/scope with just drive.file don't allow to get it with the "root" alias/by its actual object-ID
+-+ Json propsJson;
+-+
+-+ // GDrive folder is a file with a different mime type.
+-+ string mimeType = GDRIVE_FOLDER_MIME_TYPE;
+-+
+-+ // Add mimetype to the propsJson
+-+ Json jsonMimeType( mimeType.c_str( ) );
+-+ propsJson.add( "mimeType", jsonMimeType );
+-+ propsJson.add( "id", "root" );
+-+
+-+ // Upload meta-datas
+-+ propsJson.add("cmis:name", "VirtualRoot");
+-+
+-+ libcmis::FolderPtr folderPtr( new GDriveFolder( this, propsJson ) );
+-+
+-+ return folderPtr;
+-+}
+-+
+- libcmis::ObjectTypePtr GDriveSession::getType( string id )
+- {
+- libcmis::ObjectTypePtr type( new GdriveObjectType( id ) );
+-diff -ur libcmis.org/src/libcmis/gdrive-session.hxx libcmis/src/libcmis/gdrive-session.hxx
+---- libcmis.org/src/libcmis/gdrive-session.hxx 2021-07-27 19:11:02.675247009 +0200
+-+++ libcmis/src/libcmis/gdrive-session.hxx 2021-07-27 19:11:18.875246420 +0200
+-@@ -57,6 +57,8 @@
+-
+- virtual std::vector< libcmis::ObjectTypePtr > getBaseTypes( );
+-
+-+ virtual libcmis::FolderPtr getRootFolder();
+-+
+- virtual std::string getRefreshToken();
+-
+- private:
+-diff -ur libcmis.org/src/libcmis/gdrive-utils.cxx libcmis/src/libcmis/gdrive-utils.cxx
+---- libcmis.org/src/libcmis/gdrive-utils.cxx 2021-07-27 19:11:02.677247008 +0200
+-+++ libcmis/src/libcmis/gdrive-utils.cxx 2021-07-27 19:11:18.875246420 +0200
+-@@ -44,17 +44,17 @@
+- convertedKey = "cmis:createdBy";
+- else if ( key == "description" )
+- convertedKey = "cmis:description";
+-- else if ( key == "createdDate" )
+-+ else if ( key == "createdTime" )
+- convertedKey = "cmis:creationDate";
+- else if ( key == "lastModifyingUserName" )
+- convertedKey = "cmis:lastModifiedBy";
+-- else if ( key == "modifiedDate" )
+-+ else if ( key == "modifiedTime" )
+- convertedKey = "cmis:lastModificationDate";
+-- else if ( key == "title" )
+-+ else if ( key == "name" )
+- convertedKey = "cmis:contentStreamFileName";
+- else if ( key == "mimeType" )
+- convertedKey = "cmis:contentStreamMimeType";
+-- else if ( key == "fileSize" )
+-+ else if ( key == "size" )
+- convertedKey = "cmis:contentStreamLength";
+- else if ( key == "editable" )
+- convertedKey = "cmis:isImmutable";
+-@@ -72,21 +72,21 @@
+- else if ( key == "cmis:createdBy" )
+- convertedKey = "ownerNames";
+- else if ( key == "cmis:creationDate" )
+-- convertedKey = "createdDate";
+-+ convertedKey = "createdTime";
+- else if ( key == "cmis:description" )
+- convertedKey = "description";
+- else if ( key == "cmis:lastModifiedBy" )
+- convertedKey = "lastModifyingUserName";
+- else if ( key == "cmis:lastModificationDate" )
+-- convertedKey = "modifiedDate";
+-+ convertedKey = "modifiedTime";
+- else if ( key == "cmis:contentStreamFileName" )
+-- convertedKey = "title";
+-+ convertedKey = "name";
+- else if ( key == "cmis:name" )
+-- convertedKey = "title";
+-+ convertedKey = "name";
+- else if ( key == "cmis:contentStreamMimeType" )
+- convertedKey = "mimeType";
+- else if ( key == "cmis:contentStreamLength" )
+-- convertedKey = "fileSize";
+-+ convertedKey = "size";
+- else if ( key == "cmis:isImmutable" )
+- convertedKey = "editable";
+- else if ( key == "cmis:parentId" )
+-@@ -124,9 +124,9 @@
+- bool GdriveUtils::checkUpdatable( const string& key )
+- {
+- // taken from https://developers.google.com/drive/v2/reference/files
+-- bool updatable = ( key == "title" ||
+-+ bool updatable = ( key == "name" ||
+- key == "description" ||
+-- key == "modifiedDate" ||
+-+ key == "modifiedTime" ||
+- key == "lastViewedByMeDate" );
+- return updatable;
+- }
+-@@ -143,18 +143,11 @@
+-
+- Json GdriveUtils::createJsonFromParentId( const string& parentId )
+- {
+-- Json parentValue( parentId.c_str( ) );
+--
+- // parents is a Json array
+- Json firstParent;
+-- firstParent.add( "id", parentValue );
+--
+-- Json::JsonVector parents;
+-- parents.insert( parents.begin( ), firstParent );
+-+ firstParent.add( Json( parentId.c_str() ) );
+-
+-- Json parentsValue( parents );
+--
+-- return parentsValue;
+-+ return firstParent;
+- }
+-
+- vector< string > GdriveUtils::parseGdriveProperty( string key, Json json )
+-diff -ur libcmis.org/src/libcmis/gdrive-utils.hxx libcmis/src/libcmis/gdrive-utils.hxx
+---- libcmis.org/src/libcmis/gdrive-utils.hxx 2021-07-27 19:11:02.677247008 +0200
+-+++ libcmis/src/libcmis/gdrive-utils.hxx 2021-07-27 19:11:18.875246420 +0200
+-@@ -35,7 +35,8 @@
+- #include "json-utils.hxx"
+-
+- static const std::string GDRIVE_FOLDER_MIME_TYPE = "application/vnd.google-apps.folder" ;
+--static const std::string GDRIVE_UPLOAD_LINKS = "https://www.googleapis.com/upload/drive/v2/files/";
+-+static const std::string GDRIVE_UPLOAD_LINK = "https://www.googleapis.com/upload/drive/v3/files/";
+-+static const std::string GDRIVE_METADATA_LINK = "https://www.googleapis.com/drive/v3/files/";
+-
+- class GdriveUtils
+- {
+-diff -ur libcmis.org/src/libcmis/oauth2-handler.cxx libcmis/src/libcmis/oauth2-handler.cxx
+---- libcmis.org/src/libcmis/oauth2-handler.cxx 2021-07-27 19:11:02.676247009 +0200
+-+++ libcmis/src/libcmis/oauth2-handler.cxx 2021-07-27 19:11:18.875246420 +0200
+-@@ -92,8 +92,11 @@
+- "code=" + authCode +
+- "&client_id=" + m_data->getClientId() +
+- "&redirect_uri=" + m_data->getRedirectUri() +
+-- "&scope=" + libcmis::escape( m_data->getScope() ) +
+- "&grant_type=authorization_code" ;
+-+ if(boost::starts_with(m_data->getTokenUrl(), "https://oauth2.googleapis.com/"))
+-+ post += "&client_secret=" + m_data->getClientSecret();
+-+ else
+-+ post += "&scope=" + libcmis::escape( m_data->getScope() );
+-
+- istringstream is( post );
+-
+-@@ -104,7 +107,7 @@
+- resp = m_session->httpPostRequest ( m_data->getTokenUrl(), is,
+- "application/x-www-form-urlencoded" );
+- }
+-- catch ( const CurlException& )
+-+ catch ( const CurlException& e)
+- {
+- throw libcmis::Exception(
+- "Couldn't get tokens from the authorization code ");
+-@@ -122,6 +125,8 @@
+- "refresh_token=" + m_refresh +
+- "&client_id=" + m_data->getClientId() +
+- "&grant_type=refresh_token" ;
+-+ if(boost::starts_with(m_data->getTokenUrl(), "https://oauth2.googleapis.com/"))
+-+ post += "&client_secret=" + m_data->getClientSecret();
+-
+- istringstream is( post );
+- libcmis::HttpResponsePtr resp;
+-@@ -130,7 +135,7 @@
+- resp = m_session->httpPostRequest( m_data->getTokenUrl( ), is,
+- "application/x-www-form-urlencoded" );
+- }
+-- catch (const CurlException& )
+-+ catch (const CurlException& e )
+- {
+- throw libcmis::Exception( "Couldn't refresh token ");
+- }
+-diff -ur libcmis.org/src/libcmis/oauth2-providers.cxx libcmis/src/libcmis/oauth2-providers.cxx
+---- libcmis.org/src/libcmis/oauth2-providers.cxx 2021-07-27 19:11:02.679247008 +0200
+-+++ libcmis/src/libcmis/oauth2-providers.cxx 2021-07-27 19:11:18.886246420 +0200
+-@@ -80,172 +80,8 @@
+-
+- }
+-
+--string OAuth2Providers::OAuth2Gdrive( HttpSession* session, const string& authUrl,
+-- const string& username, const string& password )
+--{
+-- /* This member function implements 'Google OAuth 2.0'
+-- *
+-- * The interaction is carried out by libcmis, with no web browser involved.
+-- *
+-- * Normal sequence (without 2FA) is:
+-- * 1) a get to activate login page
+-- * receive first login page, html format
+-- * 2) subsequent post to sent email
+-- * receive html page for password input
+-- * 3) subsequent post to send password
+-- * receive html page for application consent
+-- * 4) subsequent post to send a consent for the application
+-- * receive a single-use authorization code
+-- * this code is returned as a string
+-- *
+-- * Sequence with 2FA is:
+-- * 1) a get to activate login page
+-- * receive first login page, html format
+-- * 2) subsequent post to sent email
+-- * receive html page for password input
+-- * 3) subsequent post to send password
+-- * receive html page for pin input
+-- * 3b) subsequent post to send pin number
+-- * receive html page for application consent
+-- * 4) subsequent post to send a consent for the application
+-- * receive a single-use authorization code
+-- * this code is returned as a string
+-- */
+--
+-- static const string CONTENT_TYPE( "application/x-www-form-urlencoded" );
+-- // STEP 1: get login page
+-- string res;
+-- try
+-- {
+-- // send the first get, receive the html login page
+-- res = session->httpGetRequest( authUrl )->getStream( )->str( );
+-- }
+-- catch ( const CurlException& )
+-- {
+-- return string( );
+-- }
+--
+-- // STEP 2: send email
+--
+-- string loginEmailPost, loginEmailLink;
+-- if ( !parseResponse( res.c_str( ), loginEmailPost, loginEmailLink ) )
+-- return string( );
+--
+-- loginEmailPost += "Email=";
+-- loginEmailPost += escapeForm( username );
+--
+-- istringstream loginEmailIs( loginEmailPost );
+-- string loginEmailRes;
+-- try
+-- {
+-- // send a post with user email, receive the html page for password input
+-- loginEmailRes = session->httpPostRequest ( loginEmailLink, loginEmailIs, CONTENT_TYPE )
+-- ->getStream( )->str( );
+-- }
+-- catch ( const CurlException& )
+-- {
+-- return string( );
+-- }
+--
+-- // STEP 3: password page
+--
+-- string loginPasswdPost, loginPasswdLink;
+-- if ( !parseResponse( loginEmailRes.c_str( ), loginPasswdPost, loginPasswdLink ) )
+-- return string( );
+--
+-- loginPasswdPost += "Passwd=";
+-- loginPasswdPost += escapeForm( password );
+--
+-- istringstream loginPasswdIs( loginPasswdPost );
+-- string loginPasswdRes;
+-- try
+-- {
+-- // send a post with user password, receive the application consent page
+-- loginPasswdRes = session->httpPostRequest ( loginPasswdLink, loginPasswdIs, CONTENT_TYPE )
+-- ->getStream( )->str( );
+-- }
+-- catch ( const CurlException& )
+-- {
+-- return string( );
+-- }
+--
+-- string approvalPost, approvalLink;
+-- if ( !parseResponse( loginPasswdRes. c_str( ), approvalPost, approvalLink) )
+-- return string( );
+--
+-- // when 2FA is enabled, link doesn't start with 'http'
+-- if ( approvalLink.compare(0, 4, "http") != 0 )
+-- {
+-- // STEP 3b: 2 Factor Authentication, pin code request
+--
+-- string loginChallengePost( approvalPost );
+-- string loginChallengeLink( approvalLink );
+--
+-- libcmis::OAuth2AuthCodeProvider fallbackProvider = libcmis::SessionFactory::getOAuth2AuthCodeProvider( );
+-- unique_ptr< char, void (*)( void * ) > pin{ fallbackProvider( "", "", "" ), free };
+--
+-- if( !pin )
+-- {
+-- // unset OAuth2AuthCode Provider to avoid showing pin request again in the HttpSession::oauth2Authenticate
+-- libcmis::SessionFactory::setOAuth2AuthCodeProvider( NULL );
+-- return string( );
+-- }
+--
+-- loginChallengeLink = "https://accounts.google.com" + loginChallengeLink;
+-- loginChallengePost += string( PIN_INPUT_NAME ) + "=";
+-- loginChallengePost += string( pin.get() );
+--
+-- istringstream loginChallengeIs( loginChallengePost );
+-- string loginChallengeRes;
+-- try
+-- {
+-- // send a post with pin, receive the application consent page
+-- loginChallengeRes = session->httpPostRequest ( loginChallengeLink, loginChallengeIs, CONTENT_TYPE )
+-- ->getStream( )->str( );
+-- }
+-- catch ( const CurlException& )
+-- {
+-- return string( );
+-- }
+--
+-- approvalPost = string();
+-- approvalLink = string();
+--
+-- if ( !parseResponse( loginChallengeRes. c_str( ), approvalPost, approvalLink) )
+-- return string( );
+-- }
+-- else if( approvalLink.compare( "https://accounts.google.com/ServiceLoginAuth" ) == 0 )
+-- {
+-- // wrong password,
+-- // unset OAuth2AuthCode Provider to avoid showing pin request again in the HttpSession::oauth2Authenticate
+-- libcmis::SessionFactory::setOAuth2AuthCodeProvider( NULL );
+-- return string( );
+-- }
+--
+-- // STEP 4: allow libcmis to access google drive
+-- approvalPost += "submit_access=true";
+--
+-- istringstream approvalIs( approvalPost );
+-- string approvalRes;
+-- try
+-- {
+-- // send a post with application consent
+-- approvalRes = session->httpPostRequest ( approvalLink, approvalIs,
+-- CONTENT_TYPE) ->getStream( )->str( );
+-- }
+-- catch ( const CurlException& e )
+-- {
+-- throw e.getCmisException( );
+-- }
+--
+-- // Take the authentication code from the text bar
+-- string code = parseCode( approvalRes.c_str( ) );
+--
+-- return code;
+--}
+--
+--string OAuth2Providers::OAuth2Onedrive( HttpSession* /*session*/, const string& /*authUrl*/,
+-- const string& /*username*/, const string& /*password*/ )
+-+string OAuth2Providers::OAuth2Dummy( HttpSession* /*session*/, const string& /*authUrl*/,
+-+ const string& /*username*/, const string& /*password*/ )
+- {
+- return string( );
+- }
+-@@ -314,12 +150,8 @@
+- // For Alfresco in the cloud, only match the hostname as there can be several
+- // binding URLs created with it.
+- return OAuth2Alfresco;
+-- else if ( boost::starts_with( url, "https://www.googleapis.com/drive/v2" ) )
+-- return OAuth2Gdrive;
+-- else if ( boost::starts_with( url, "https://graph.microsoft.com/v1.0" ) )
+-- return OAuth2Onedrive;
+-
+-- return OAuth2Gdrive;
+-+ return OAuth2Dummy;
+- }
+-
+- int OAuth2Providers::parseResponse ( const char* response, string& post, string& link )
+-diff -ur libcmis.org/src/libcmis/oauth2-providers.hxx libcmis/src/libcmis/oauth2-providers.hxx
+---- libcmis.org/src/libcmis/oauth2-providers.hxx 2021-07-27 19:11:02.678247008 +0200
+-+++ libcmis/src/libcmis/oauth2-providers.hxx 2021-07-27 19:11:18.886246420 +0200
+-@@ -39,12 +39,8 @@
+- class OAuth2Providers
+- {
+- public :
+-- static std::string OAuth2Gdrive( HttpSession* session, const std::string& authUrl,
+-+ static std::string OAuth2Dummy( HttpSession* session, const std::string& authUrl,
+- const std::string& username, const std::string& password );
+--
+-- static std::string OAuth2Onedrive( HttpSession* session, const std::string& authUrl,
+-- const std::string& username, const std::string& password );
+--
+- static std::string OAuth2Alfresco( HttpSession* session, const std::string& authUrl,
+- const std::string& username, const std::string& password );
+-
+-diff -ur libcmis.org/src/libcmis/session-factory.cxx libcmis/src/libcmis/session-factory.cxx
+---- libcmis.org/src/libcmis/session-factory.cxx 2021-07-27 19:11:02.679247008 +0200
+-+++ libcmis/src/libcmis/session-factory.cxx 2021-07-27 19:11:18.886246420 +0200
+-@@ -66,7 +66,7 @@
+- if ( !bindingUrl.empty( ) )
+- {
+- // Try the special cases based on the binding URL
+-- if ( bindingUrl == "https://www.googleapis.com/drive/v2" )
+-+ if ( bindingUrl == "https://www.googleapis.com/drive/v3" )
+- {
+- session = new GDriveSession( bindingUrl, username, password,
+- oauth2, verbose );
+diff --git a/external/libcmis/libcmis_oauth_pw_as_refreshtoken.patch.1 b/external/libcmis/libcmis_oauth_pw_as_refreshtoken.patch.1
+deleted file mode 100644
+index a8cb065..0000000
+--- a/external/libcmis/libcmis_oauth_pw_as_refreshtoken.patch.1
++++ /dev/null
+@@ -1,185 +0,0 @@
+-diff -ur libcmis.org/inc/libcmis/session.hxx libcmis/inc/libcmis/session.hxx
+---- libcmis.org/inc/libcmis/session.hxx 2021-07-27 19:09:42.580249917 +0200
+-+++ libcmis/inc/libcmis/session.hxx 2021-07-27 19:10:02.368249199 +0200
+-@@ -95,6 +95,8 @@
+- certificate exception feature available on common web browser.
+- */
+- virtual void setNoSSLCertificateCheck( bool noCheck ) = 0;
+-+
+-+ virtual std::string getRefreshToken() { return ""; };
+- };
+- }
+-
+-diff -ur libcmis.org/src/libcmis/gdrive-session.cxx libcmis/src/libcmis/gdrive-session.cxx
+---- libcmis.org/src/libcmis/gdrive-session.cxx 2021-07-27 19:09:42.581249917 +0200
+-+++ libcmis/src/libcmis/gdrive-session.cxx 2021-07-27 19:10:02.369249198 +0200
+-@@ -70,6 +70,46 @@
+- {
+- }
+-
+-+
+-+void GDriveSession::setOAuth2Data( libcmis::OAuth2DataPtr oauth2 )
+-+{
+-+ m_oauth2Handler = new OAuth2Handler( this, oauth2 );
+-+ m_oauth2Handler->setOAuth2Parser( OAuth2Providers::getOAuth2Parser( getBindingUrl( ) ) );
+-+
+-+ oauth2Authenticate( );
+-+}
+-+
+-+void GDriveSession::oauth2Authenticate()
+-+{
+-+ // treat the supplied password as refresh token
+-+ if (!m_password.empty())
+-+ {
+-+ try
+-+ {
+-+ m_inOAuth2Authentication = true;
+-+
+-+ m_oauth2Handler->setRefreshToken(m_password);
+-+ // Try to get new access tokens using the stored refreshtoken
+-+ m_oauth2Handler->refresh();
+-+ m_inOAuth2Authentication = false;
+-+ }
+-+ catch (const CurlException &e)
+-+ {
+-+ m_inOAuth2Authentication = false;
+-+ // refresh token expired or invalid, trigger initial auth (that in turn will hit the fallback with copy'n'paste method)
+-+ BaseSession::oauth2Authenticate();
+-+ }
+-+ }
+-+ else
+-+ {
+-+ BaseSession::oauth2Authenticate();
+-+ }
+-+}
+-+
+-+string GDriveSession::getRefreshToken() {
+-+ return HttpSession::getRefreshToken();
+-+}
+-+
+- libcmis::RepositoryPtr GDriveSession::getRepository( )
+- {
+- // Return a dummy repository since GDrive doesn't have that notion
+-diff -ur libcmis.org/src/libcmis/gdrive-session.hxx libcmis/src/libcmis/gdrive-session.hxx
+---- libcmis.org/src/libcmis/gdrive-session.hxx 2021-07-27 19:09:42.583249917 +0200
+-+++ libcmis/src/libcmis/gdrive-session.hxx 2021-07-27 19:10:02.369249198 +0200
+-@@ -57,8 +57,14 @@
+-
+- virtual std::vector< libcmis::ObjectTypePtr > getBaseTypes( );
+-
+-+ virtual std::string getRefreshToken();
+-+
+- private:
+- GDriveSession( );
+-+
+-+ virtual void setOAuth2Data( libcmis::OAuth2DataPtr oauth2 );
+-+
+-+ void oauth2Authenticate( );
+- };
+-
+- #endif /* _GDRIVE_SESSION_HXX_ */
+-diff -ur libcmis.org/src/libcmis/http-session.hxx libcmis/src/libcmis/http-session.hxx
+---- libcmis.org/src/libcmis/http-session.hxx 2021-07-27 19:09:42.582249917 +0200
+-+++ libcmis/src/libcmis/http-session.hxx 2021-07-27 19:10:02.369249198 +0200
+-@@ -148,7 +148,7 @@
+-
+- void setNoSSLCertificateCheck( bool noCheck );
+-
+-- std::string getRefreshToken( );
+-+ virtual std::string getRefreshToken( );
+-
+- protected:
+- HttpSession( );
+-diff -ur libcmis.org/src/libcmis/oauth2-handler.cxx libcmis/src/libcmis/oauth2-handler.cxx
+---- libcmis.org/src/libcmis/oauth2-handler.cxx 2021-07-27 19:09:42.582249917 +0200
+-+++ libcmis/src/libcmis/oauth2-handler.cxx 2021-07-27 19:10:02.369249198 +0200
+-@@ -158,6 +158,11 @@
+- return m_refresh;
+- }
+-
+-+void OAuth2Handler::setRefreshToken( string refreshToken )
+-+{
+-+ m_refresh = refreshToken;
+-+}
+-+
+- string OAuth2Handler::getHttpHeader( )
+- {
+- string header;
+-diff -ur libcmis.org/src/libcmis/oauth2-handler.hxx libcmis/src/libcmis/oauth2-handler.hxx
+---- libcmis.org/src/libcmis/oauth2-handler.hxx 2021-07-27 19:09:42.582249917 +0200
+-+++ libcmis/src/libcmis/oauth2-handler.hxx 2021-07-27 19:10:02.370249198 +0200
+-@@ -61,6 +61,7 @@
+-
+- std::string getAccessToken( ) ;
+- std::string getRefreshToken( ) ;
+-+ void setRefreshToken( std::string refreshToken ) ;
+-
+- // adding HTTP auth header
+- std::string getHttpHeader( ) ;
+-diff -ur libcmis.org/src/libcmis/onedrive-session.cxx libcmis/src/libcmis/onedrive-session.cxx
+---- libcmis.org/src/libcmis/onedrive-session.cxx 2021-07-27 19:09:42.583249917 +0200
+-+++ libcmis/src/libcmis/onedrive-session.cxx 2021-07-27 19:10:02.370249198 +0200
+-@@ -68,6 +68,45 @@
+- {
+- }
+-
+-+void OneDriveSession::setOAuth2Data( libcmis::OAuth2DataPtr oauth2 )
+-+{
+-+ m_oauth2Handler = new OAuth2Handler( this, oauth2 );
+-+ m_oauth2Handler->setOAuth2Parser( OAuth2Providers::getOAuth2Parser( getBindingUrl( ) ) );
+-+
+-+ oauth2Authenticate( );
+-+}
+-+
+-+void OneDriveSession::oauth2Authenticate()
+-+{
+-+ // treat the supplied password as refresh token
+-+ if (!m_password.empty())
+-+ {
+-+ try
+-+ {
+-+ m_inOAuth2Authentication = true;
+-+
+-+ m_oauth2Handler->setRefreshToken(m_password);
+-+ // Try to get new access tokens using the stored refreshtoken
+-+ m_oauth2Handler->refresh();
+-+ m_inOAuth2Authentication = false;
+-+ }
+-+ catch (const CurlException &e)
+-+ {
+-+ m_inOAuth2Authentication = false;
+-+ // refresh token expired or invalid, trigger initial auth (that in turn will hit the fallback with copy'n'paste method)
+-+ BaseSession::oauth2Authenticate();
+-+ }
+-+ }
+-+ else
+-+ {
+-+ BaseSession::oauth2Authenticate();
+-+ }
+-+}
+-+
+-+string OneDriveSession::getRefreshToken() {
+-+ return HttpSession::getRefreshToken();
+-+}
+-+
+- libcmis::RepositoryPtr OneDriveSession::getRepository( )
+- {
+- // Return a dummy repository since OneDrive doesn't have that notion
+-diff -ur libcmis.org/src/libcmis/onedrive-session.hxx libcmis/src/libcmis/onedrive-session.hxx
+---- libcmis.org/src/libcmis/onedrive-session.hxx 2021-07-27 19:09:42.583249917 +0200
+-+++ libcmis/src/libcmis/onedrive-session.hxx 2021-07-27 19:10:02.370249198 +0200
+-@@ -62,8 +62,14 @@
+-
+- bool isAPathMatch( Json objectJson, std::string path );
+-
+-+ virtual std::string getRefreshToken();
+-+
+- private:
+- OneDriveSession( );
+-+
+-+ virtual void setOAuth2Data( libcmis::OAuth2DataPtr oauth2 );
+-+
+-+ void oauth2Authenticate( );
+- };
+-
+- #endif /* _ONEDRIVE_SESSION_HXX_ */
+diff --git a/external/libcmis/libcmis_onedrive.patch b/external/libcmis/libcmis_onedrive.patch
+deleted file mode 100644
+index 60d7e7b..0000000
+--- a/external/libcmis/libcmis_onedrive.patch
++++ /dev/null
+@@ -1,445 +0,0 @@
+-diff --git a/src/libcmis/http-session.cxx b/src/libcmis/http-session.cxx
+-index 2638482..227667e 100644
+---- a/src/libcmis/http-session.cxx
+-+++ b/src/libcmis/http-session.cxx
+-@@ -293,6 +293,94 @@ libcmis::HttpResponsePtr HttpSession::httpGetRequest( string url )
+- return response;
+- }
+-
+-+libcmis::HttpResponsePtr HttpSession::httpPatchRequest( string url, istream& is, vector< string > headers )
+-+{
+-+ checkOAuth2( url );
+-+
+-+ // Duplicate istream in case we need to retry
+-+ string isStr( static_cast< stringstream const&>( stringstream( ) << is.rdbuf( ) ).str( ) );
+-+
+-+ istringstream isOriginal( isStr ), isBackup( isStr );
+-+
+-+ // Reset the handle for the request
+-+ curl_easy_reset( m_curlHandle );
+-+ initProtocols( );
+-+
+-+ libcmis::HttpResponsePtr response( new libcmis::HttpResponse( ) );
+-+
+-+ curl_easy_setopt( m_curlHandle, CURLOPT_WRITEFUNCTION, lcl_bufferData );
+-+ curl_easy_setopt( m_curlHandle, CURLOPT_WRITEDATA, response->getData( ).get( ) );
+-+
+-+ curl_easy_setopt( m_curlHandle, CURLOPT_HEADERFUNCTION, &lcl_getHeaders );
+-+ curl_easy_setopt( m_curlHandle, CURLOPT_WRITEHEADER, response.get() );
+-+
+-+ curl_easy_setopt( m_curlHandle, CURLOPT_MAXREDIRS, 20);
+-+
+-+ // Get the stream length
+-+ is.seekg( 0, ios::end );
+-+ long size = is.tellg( );
+-+ is.seekg( 0, ios::beg );
+-+ curl_easy_setopt( m_curlHandle, CURLOPT_INFILESIZE, size );
+-+ curl_easy_setopt( m_curlHandle, CURLOPT_READDATA, &isOriginal );
+-+ curl_easy_setopt( m_curlHandle, CURLOPT_READFUNCTION, lcl_readStream );
+-+ curl_easy_setopt( m_curlHandle, CURLOPT_UPLOAD, 1 );
+-+ curl_easy_setopt( m_curlHandle, CURLOPT_CUSTOMREQUEST, "PATCH" );
+-+ curl_easy_setopt( m_curlHandle, CURLOPT_IOCTLFUNCTION, lcl_ioctlStream );
+-+ curl_easy_setopt( m_curlHandle, CURLOPT_IOCTLDATA, &isOriginal );
+-+
+-+ // If we know for sure that 100-Continue won't be accepted,
+-+ // don't even try with it to save one HTTP request.
+-+ if ( m_no100Continue )
+-+ headers.push_back( "Expect:" );
+-+ try
+-+ {
+-+ httpRunRequest( url, headers );
+-+ response->getData( )->finish();
+-+ }
+-+ catch ( const CurlException& )
+-+ {
+-+ long status = getHttpStatus( );
+-+ /** If we had a HTTP 417 response, this is likely to be due to some
+-+ HTTP 1.0 proxy / server not accepting the "Expect: 100-continue"
+-+ header. Try to disable this header and try again.
+-+ */
+-+ if ( status == 417 && !m_no100Continue)
+-+ {
+-+ // Remember that we don't want 100-Continue for the future requests
+-+ m_no100Continue = true;
+-+ response = httpPutRequest( url, isBackup, headers );
+-+ }
+-+
+-+ // If the access token is expired, we get 401 error,
+-+ // Need to use the refresh token to get a new one.
+-+ if ( status == 401 && !getRefreshToken( ).empty( ) && !m_refreshedToken )
+-+ {
+-+
+-+ // Refresh the token
+-+ oauth2Refresh();
+-+
+-+ // Resend the query
+-+ try
+-+ {
+-+ // Avoid infinite recursive call
+-+ m_refreshedToken = true;
+-+ response = httpPutRequest( url, isBackup, headers );
+-+ m_refreshedToken = false;
+-+ }
+-+ catch (const CurlException&)
+-+ {
+-+ m_refreshedToken = false;
+-+ throw;
+-+ }
+-+ }
+-+ // Has tried but failed
+-+ if ( ( status != 417 || m_no100Continue ) &&
+-+ ( status != 401 || getRefreshToken( ).empty( ) || m_refreshedToken ) ) throw;
+-+ }
+-+ m_refreshedToken = false;
+-+ return response;
+-+}
+-+
+- libcmis::HttpResponsePtr HttpSession::httpPutRequest( string url, istream& is, vector< string > headers )
+- {
+- checkOAuth2( url );
+-diff --git a/src/libcmis/http-session.hxx b/src/libcmis/http-session.hxx
+-index 851d52d..29de64d 100644
+---- a/src/libcmis/http-session.hxx
+-+++ b/src/libcmis/http-session.hxx
+-@@ -132,6 +132,9 @@ class HttpSession
+- virtual void setOAuth2Data( libcmis::OAuth2DataPtr oauth2 );
+-
+- libcmis::HttpResponsePtr httpGetRequest( std::string url );
+-+ libcmis::HttpResponsePtr httpPatchRequest( std::string url,
+-+ std::istream& is,
+-+ std::vector< std::string > headers );
+- libcmis::HttpResponsePtr httpPutRequest( std::string url,
+- std::istream& is,
+- std::vector< std::string > headers );
+-diff --git a/src/libcmis/oauth2-handler.cxx b/src/libcmis/oauth2-handler.cxx
+-index a3320e3..842769f 100644
+---- a/src/libcmis/oauth2-handler.cxx
+-+++ b/src/libcmis/oauth2-handler.cxx
+-@@ -91,8 +91,8 @@ void OAuth2Handler::fetchTokens( string authCode )
+- string post =
+- "code=" + authCode +
+- "&client_id=" + m_data->getClientId() +
+-- "&client_secret=" + m_data->getClientSecret() +
+- "&redirect_uri=" + m_data->getRedirectUri() +
+-+ "&scope=" + libcmis::escape( m_data->getScope() ) +
+- "&grant_type=authorization_code" ;
+-
+- istringstream is( post );
+-@@ -121,7 +121,6 @@ void OAuth2Handler::refresh( )
+- string post =
+- "refresh_token=" + m_refresh +
+- "&client_id=" + m_data->getClientId() +
+-- "&client_secret=" + m_data->getClientSecret() +
+- "&grant_type=refresh_token" ;
+-
+- istringstream is( post );
+-diff --git a/src/libcmis/oauth2-providers.cxx b/src/libcmis/oauth2-providers.cxx
+-index 8cf9652..654021f 100644
+---- a/src/libcmis/oauth2-providers.cxx
+-+++ b/src/libcmis/oauth2-providers.cxx
+-@@ -312,7 +312,7 @@ OAuth2Parser OAuth2Providers::getOAuth2Parser( const std::string& url )
+- return OAuth2Alfresco;
+- else if ( boost::starts_with( url, "https://www.googleapis.com/drive/v2" ) )
+- return OAuth2Gdrive;
+-- else if ( boost::starts_with( url, "https://apis.live.net/v5.0" ) )
+-+ else if ( boost::starts_with( url, "https://graph.microsoft.com/v1.0" ) )
+- return OAuth2Onedrive;
+-
+- return OAuth2Gdrive;
+-diff --git a/src/libcmis/onedrive-document.cxx b/src/libcmis/onedrive-document.cxx
+-index f753b42..863a92f 100644
+---- a/src/libcmis/onedrive-document.cxx
+-+++ b/src/libcmis/onedrive-document.cxx
+-@@ -73,7 +73,7 @@ boost::shared_ptr< istream > OneDriveDocument::getContentStream( string /*stream
+- boost::shared_ptr< istream > stream;
+- string streamUrl = getStringProperty( "source" );
+- if ( streamUrl.empty( ) )
+-- throw libcmis::Exception( "can not found stream url" );
+-+ throw libcmis::Exception( "could not find stream url" );
+-
+- try
+- {
+-@@ -89,15 +89,15 @@ boost::shared_ptr< istream > OneDriveDocument::getContentStream( string /*stream
+- void OneDriveDocument::setContentStream( boost::shared_ptr< ostream > os,
+- string /*contentType*/,
+- string fileName,
+-- bool /*overwrite*/ )
+-+ bool bReplaceExisting )
+- {
+- if ( !os.get( ) )
+- throw libcmis::Exception( "Missing stream" );
+--
+-+
+- string metaUrl = getUrl( );
+-
+- // Update file name meta information
+-- if ( !fileName.empty( ) && fileName != getContentFilename( ) )
+-+ if ( bReplaceExisting && !fileName.empty( ) && fileName != getContentFilename( ) )
+- {
+- Json metaJson;
+- Json fileJson( fileName.c_str( ) );
+-@@ -108,7 +108,7 @@ void OneDriveDocument::setContentStream( boost::shared_ptr< ostream > os,
+- headers.push_back( "Content-Type: application/json" );
+- try
+- {
+-- getSession()->httpPutRequest( metaUrl, is, headers );
+-+ getSession()->httpPatchRequest( metaUrl, is, headers );
+- }
+- catch ( const CurlException& e )
+- {
+-@@ -117,9 +117,9 @@ void OneDriveDocument::setContentStream( boost::shared_ptr< ostream > os,
+- }
+-
+- fileName = libcmis::escape( getStringProperty( "cmis:name" ) );
+-- string putUrl = getSession( )->getBindingUrl( ) + "/" +
+-- getStringProperty( "cmis:parentId" ) + "/files/" +
+-- fileName + "?overwrite=true";
+-+ string putUrl = getSession( )->getBindingUrl( ) + "/me/drive/items/" +
+-+ getStringProperty( "cmis:parentId" ) + ":/" +
+-+ fileName + ":/content";
+-
+- // Upload stream
+- boost::shared_ptr< istream> is ( new istream ( os->rdbuf( ) ) );
+-@@ -142,6 +142,7 @@ void OneDriveDocument::setContentStream( boost::shared_ptr< ostream > os,
+- libcmis::DocumentPtr OneDriveDocument::checkOut( )
+- {
+- // OneDrive doesn't have CheckOut, so just return the same document here
+-+ // TODO: no longer true - onedrive now has checkout/checkin
+- libcmis::ObjectPtr obj = getSession( )->getObject( getId( ) );
+- libcmis::DocumentPtr checkout =
+- boost::dynamic_pointer_cast< libcmis::Document > ( obj );
+-diff --git a/src/libcmis/onedrive-folder.cxx b/src/libcmis/onedrive-folder.cxx
+-index a9ae694..c1980c8 100644
+---- a/src/libcmis/onedrive-folder.cxx
+-+++ b/src/libcmis/onedrive-folder.cxx
+-@@ -57,7 +57,9 @@ OneDriveFolder::~OneDriveFolder( )
+- vector< libcmis::ObjectPtr > OneDriveFolder::getChildren( )
+- {
+- vector< libcmis::ObjectPtr > children;
+-- string query = getSession( )->getBindingUrl( ) + "/" + getId( ) + "/files";
+-+ // TODO: limited to 200 items by default - to get more one would have to
+-+ // follow @odata.nextLink or change pagination size
+-+ string query = getSession( )->getBindingUrl( ) + "/me/drive/items/" + getId( ) + "/children";
+-
+- string res;
+- try
+-@@ -70,7 +72,7 @@ vector< libcmis::ObjectPtr > OneDriveFolder::getChildren( )
+- }
+-
+- Json jsonRes = Json::parse( res );
+-- Json::JsonVector objs = jsonRes["data"].getList( );
+-+ Json::JsonVector objs = jsonRes["value"].getList( );
+-
+- // Create children objects from Json objects
+- for(unsigned int i = 0; i < objs.size(); i++)
+-@@ -85,8 +87,7 @@ libcmis::FolderPtr OneDriveFolder::createFolder(
+- const PropertyPtrMap& properties )
+- {
+- Json propsJson = OneDriveUtils::toOneDriveJson( properties );
+--
+-- string uploadUrl = getSession( )->getBindingUrl( ) + "/" + getId( );
+-+ string uploadUrl = getSession( )->getBindingUrl( ) + "/me/drive/items/" + getId( ) + "/children";
+-
+- std::istringstream is( propsJson.toString( ) );
+- string response;
+-@@ -126,9 +127,10 @@ libcmis::DocumentPtr OneDriveFolder::createDocument(
+- }
+- }
+-
+-+ // TODO: limited to 4MB, larger uploads need dedicated UploadSession
+- fileName = libcmis::escape( fileName );
+-- string newDocUrl = getSession( )->getBindingUrl( ) + "/" +
+-- getId( ) + "/files/" + fileName;
+-+ string newDocUrl = getSession( )->getBindingUrl( ) + "/me/drive/items/" +
+-+ getId( ) + ":/" + fileName + ":/content";
+- boost::shared_ptr< istream> is ( new istream ( os->rdbuf( ) ) );
+- vector< string > headers;
+- string res;
+-diff --git a/src/libcmis/onedrive-object.cxx b/src/libcmis/onedrive-object.cxx
+-index 976a97b..8deb591 100644
+---- a/src/libcmis/onedrive-object.cxx
+-+++ b/src/libcmis/onedrive-object.cxx
+-@@ -65,7 +65,7 @@ void OneDriveObject::initializeFromJson ( Json json, string /*id*/, string /*nam
+- Json::JsonObject objs = json.getObjects( );
+- Json::JsonObject::iterator it;
+- PropertyPtr property;
+-- bool isFolder = json["type"].toString( ) == "folder";
+-+ bool isFolder = json["folder"].toString( ) != "";
+- for ( it = objs.begin( ); it != objs.end( ); ++it)
+- {
+- property.reset( new OneDriveProperty( it->first, it->second ) );
+-@@ -74,7 +74,12 @@ void OneDriveObject::initializeFromJson ( Json json, string /*id*/, string /*nam
+- {
+- property.reset( new OneDriveProperty( "cmis:contentStreamFileName", it->second ) );
+- m_properties[ property->getPropertyType( )->getId()] = property;
+-- }
+-+ } else if ( it->first == "parentReference" ) {
+-+ if (it->second["id"].toString() != "") {
+-+ property.reset( new OneDriveProperty( "cmis:parentId", it->second["id"] ) );
+-+ m_properties[ property->getPropertyType( )->getId()] = property;
+-+ }
+-+ }
+- }
+-
+- m_refreshTimestamp = time( NULL );
+-@@ -122,7 +127,7 @@ void OneDriveObject::remove( bool /*allVersions*/ )
+-
+- string OneDriveObject::getUrl( )
+- {
+-- return getSession( )->getBindingUrl( ) + "/" + getId( );
+-+ return getSession( )->getBindingUrl( ) + "/me/drive/items/" + getId( );
+- }
+-
+- string OneDriveObject::getUploadUrl( )
+-@@ -152,7 +157,7 @@ libcmis::ObjectPtr OneDriveObject::updateProperties(
+- {
+- vector< string > headers;
+- headers.push_back( "Content-Type: application/json" );
+-- response = getSession( )->httpPutRequest( getUrl( ), is, headers );
+-+ response = getSession( )->httpPatchRequest( getUrl( ), is, headers );
+- }
+- catch ( const CurlException& e )
+- {
+-diff --git a/src/libcmis/onedrive-repository.cxx b/src/libcmis/onedrive-repository.cxx
+-index 3eaac9c..b01f5c2 100644
+---- a/src/libcmis/onedrive-repository.cxx
+-+++ b/src/libcmis/onedrive-repository.cxx
+-@@ -35,7 +35,7 @@ OneDriveRepository::OneDriveRepository( ) :
+- m_description = "One Drive repository";
+- m_productName = "One Drive";
+- m_productVersion = "v5";
+-- m_rootId = "me/skydrive";
+-+ m_rootId = "/me/drive/root";
+-
+- m_capabilities[ ACL ] = "discover";
+- m_capabilities[ AllVersionsSearchable ] = "true";
+-diff --git a/src/libcmis/onedrive-session.cxx b/src/libcmis/onedrive-session.cxx
+-index c6f4270..a603278 100644
+---- a/src/libcmis/onedrive-session.cxx
+-+++ b/src/libcmis/onedrive-session.cxx
+-@@ -79,7 +79,9 @@ libcmis::ObjectPtr OneDriveSession::getObject( string objectId )
+- {
+- // Run the http request to get the properties definition
+- string res;
+-- string objectLink = m_bindingUrl + "/" + objectId;
+-+ string objectLink = m_bindingUrl + "/me/drive/items/" + objectId;
+-+ if (objectId == getRootId())
+-+ objectLink = m_bindingUrl + objectId;
+- try
+- {
+- res = httpGetRequest( objectLink )->getStream()->str();
+-@@ -95,12 +97,11 @@ libcmis::ObjectPtr OneDriveSession::getObject( string objectId )
+- libcmis::ObjectPtr OneDriveSession::getObjectFromJson( Json& jsonRes )
+- {
+- libcmis::ObjectPtr object;
+-- string kind = jsonRes["type"].toString( );
+-- if ( kind == "folder" || kind == "album" )
+-+ if ( jsonRes["folder"].toString() != "" )
+- {
+- object.reset( new OneDriveFolder( this, jsonRes ) );
+- }
+-- else if ( kind == "file" )
+-+ else if ( jsonRes["file"].toString() != "" )
+- {
+- object.reset( new OneDriveDocument( this, jsonRes ) );
+- }
+-@@ -113,44 +114,18 @@ libcmis::ObjectPtr OneDriveSession::getObjectFromJson( Json& jsonRes )
+-
+- libcmis::ObjectPtr OneDriveSession::getObjectByPath( string path )
+- {
+-- string id;
+-- if ( path == "/" )
+-- {
+-- id = "me/skydrive";
+-- }
+-- else
+-+ string res;
+-+ string objectQuery = m_bindingUrl + "/me/drive/root:" + libcmis::escape( path );
+-+ try
+- {
+-- path = "/SkyDrive" + path;
+-- size_t pos = path.rfind("/");
+-- string name = libcmis::escape( path.substr( pos + 1, path.size( ) ) );
+-- string res;
+-- string objectQuery = m_bindingUrl + "/me/skydrive/search?q=" + name;
+-- try
+-- {
+-- res = httpGetRequest( objectQuery )->getStream( )->str( );
+-- }
+-- catch ( const CurlException& e )
+-- {
+-- throw e.getCmisException( );
+-- }
+-- Json jsonRes = Json::parse( res );
+-- Json::JsonVector objs = jsonRes["data"].getList( );
+--
+-- // Searching for a match in the path to the object
+-- for ( unsigned int i = 0; i < objs.size( ); i++ )
+-- {
+-- if ( isAPathMatch( objs[i], path ) )
+-- {
+-- id = objs[i]["id"].toString( );
+-- break;
+-- }
+-- }
+-+ res = httpGetRequest( objectQuery )->getStream( )->str( );
+- }
+-- if ( id.empty( ) )
+-+ catch ( const CurlException& e )
+- {
+-- throw libcmis::Exception( "No file could be found" );
+-+ throw libcmis::Exception( "No file could be found for path " + path + ": " + e.what() );
+- }
+-- return getObject( id );
+-+ Json jsonRes = Json::parse( res );
+-+ return getObjectFromJson( jsonRes );
+- }
+-
+- bool OneDriveSession::isAPathMatch( Json objectJson, string path )
+-diff --git a/src/libcmis/onedrive-utils.cxx b/src/libcmis/onedrive-utils.cxx
+-index dc6ec5d..17ed324 100644
+---- a/src/libcmis/onedrive-utils.cxx
+-+++ b/src/libcmis/onedrive-utils.cxx
+-@@ -44,16 +44,16 @@ string OneDriveUtils::toCmisKey( const string& key )
+- convertedKey = "cmis:createdBy";
+- else if ( key == "description" )
+- convertedKey = "cmis:description";
+-- else if ( key == "created_time" )
+-+ else if ( key == "createdDateTime" )
+- convertedKey = "cmis:creationDate";
+-- else if ( key == "updated_time" )
+-+ else if ( key == "lastModifiedDateTime" )
+- convertedKey = "cmis:lastModificationDate";
+- else if ( key == "name" )
+- convertedKey = "cmis:name";
+- else if ( key == "size" )
+- convertedKey = "cmis:contentStreamLength";
+-- else if ( key == "parent_id" )
+-- convertedKey = "cmis:parentId";
+-+ else if ( key == "@microsoft.graph.downloadUrl" )
+-+ convertedKey = "source";
+- else convertedKey = key;
+- return convertedKey;
+- }
+-@@ -75,8 +75,6 @@ string OneDriveUtils::toOneDriveKey( const string& key )
+- convertedKey = "name";
+- else if ( key == "cmis:contentStreamLength" )
+- convertedKey = "file_size";
+-- else if ( key == "cmis:parentId" )
+-- convertedKey = "parent_id";
+- else convertedKey = key;
+- return convertedKey;
+- }
+-diff --git a/src/libcmis/session-factory.cxx b/src/libcmis/session-factory.cxx
+-index ba55cd9..e740afb 100644
+---- a/src/libcmis/session-factory.cxx
+-+++ b/src/libcmis/session-factory.cxx
+-@@ -71,7 +71,7 @@ namespace libcmis
+- session = new GDriveSession( bindingUrl, username, password,
+- oauth2, verbose );
+- }
+-- else if ( bindingUrl == "https://apis.live.net/v5.0" )
+-+ else if ( bindingUrl == "https://graph.microsoft.com/v1.0" )
+- {
+- session = new OneDriveSession( bindingUrl, username, password,
+- oauth2, verbose);
+diff --git a/ucb/source/ucp/cmis/auth_provider.hxx b/ucb/source/ucp/cmis/auth_provider.hxx
+index 1768c12..af1a420 100644
+--- a/ucb/source/ucp/cmis/auth_provider.hxx
++++ b/ucb/source/ucp/cmis/auth_provider.hxx
+@@ -8,15 +8,7 @@
+ */
+ #pragma once
+
+-#if defined __GNUC__ && !defined __clang__
+-#pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wdeprecated"
+-#pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
+-#endif
+ #include <libcmis/libcmis.hxx>
+-#if defined __GNUC__ && !defined __clang__
+-#pragma GCC diagnostic pop
+-#endif
+
+ #include <com/sun/star/ucb/XCommandEnvironment.hpp>
+ #include <cppuhelper/weakref.hxx>
diff --git a/libreoffice.spec b/libreoffice.spec
index 3e0e796..1754bea 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -174,7 +174,7 @@ BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(libabw-0.1)
BuildRequires: pkgconfig(libcdr-0.1)
BuildRequires: pkgconfig(libclucene-core)
-BuildRequires: pkgconfig(libcmis-0.5)
+BuildRequires: pkgconfig(libcmis-0.6)
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(libetonyek-0.1)
BuildRequires: pkgconfig(libexttextcat)
@@ -276,11 +276,11 @@ Patch1: 0001-disble-tip-of-the-day-dialog-by-default.patch
# rhbz#1736810 disable opencl by default again
Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch
# backported
-Patch3: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch
-Patch4: 0001-default-to-sifr-for-gnome-light-mode.patch
+Patch3: 0001-default-to-sifr-for-gnome-light-mode.patch
# backported
-Patch5: 0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch
-Patch6: limit-tests-giving-dubious-results-to-x86_64.patch
+Patch4: 0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch
+Patch5: limit-tests-giving-dubious-results-to-x86_64.patch
+Patch6: 717d27a.patch
# not upstreamed
# fix FTB in ppc64le from sharkcz
# https://lists.freedesktop.org/archives/libreoffice/2023-August/090870.html
@@ -1132,8 +1132,6 @@ touch autogen.lastrun
--without-fonts \
--without-lxml \
--without-system-libfixmath \
- --with-gdrive-client-secret="GYWrDtzyZQZ0_g5YoBCC6F0I" \
- --with-gdrive-client-id="457862564325.apps.googleusercontent.com" \
--enable-python=system \
--with-idlc-cpp=cpp \
--disable-scripting-beanshell --disable-scripting-javascript \
commit 39e6203641e8fdfbe19c86e287a33c5132ced328
Author: Mattia Verga <mattia.verga(a)tiscali.it>
Date: Thu Oct 5 08:45:21 2023 +0200
Convert to %autorelease and %autochangelog
[skip changelog]
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..c2b9088
--- /dev/null
+++ b/changelog
@@ -0,0 +1,2757 @@
+* Sun Oct 01 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.2.1-2
+- Add patch 501 for failing tests on aarc64 and s390x
+
+* Sat Sep 30 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.2.1-1
+- 7.6.2.1
+
+* Fri Sep 08 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1:7.6.1.2-1
+- 7.6.1.2
+
+* Mon Sep 04 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.1.1-2
+- Unbundle dragonbox
+
+* Mon Aug 28 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1:7.6.1.1-1
+- 7.6.1.1
+
+* Sun Aug 27 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.0.3-4
+- Remove test exclusions from aarch64
+- Link aarch64 executable with standard -g level
+
+* Wed Aug 23 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.0.3-3
+- Disable other failing tests under s390x
+- Add patch to fix FTB under ppc64le
+
+* Tue Aug 15 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.0.3-2
+- Disable unreliable test under s390x
+- Try verbose make if first build attempt fails
+
+* Sun Aug 13 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.0.3-1
+- 7.6.0.3
+
+* Wed Aug 02 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1:7.5.5.2-2
+- Poppler rebuild.
+
+* Mon Jul 31 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1:7.5.5.2-1
+- 7.5.5.2
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:7.5.4.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jul 11 2023 František Zatloukal <fzatlouk(a)redhat.com> - 1:7.5.4.2-4
+- Rebuilt for ICU 73.2
+
+* Fri Jun 30 2023 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1:7.5.4.2-3
+- Make Java optional. Fixes rhbz#2084071.
+
+* Mon Jun 19 2023 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 1:7.5.4.2-2
+- Backport upstream fix for testSignDocument_PEM_PDF test failure
+- Enable test again
+
+* Fri Jun 16 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1:7.5.4.2-1
+- 7.5.4.2
+- Drop 0001-tdf-155161-Always-embed-fonts-with-CFF2-table-as-PDF.patch, upstreamed.
+
+* Thu Jun 15 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1:7.5.3.2-4
+- Disable tests temporarily to resolve FTBFS.
+
+* Thu Jun 15 2023 Python Maint <python-maint(a)redhat.com> - 1:7.5.3.2-3
+- Rebuilt for Python 3.12
+
+* Tue May 09 2023 Caolán McNamara <caolanm(a)redhat.com> - 1:7.5.3.2-2
+- rhbz#2192915 Japanese font not printed
+
+* Thu May 04 2023 Caolán McNamara <caolanm(a)redhat.com> - 1:7.5.3.2-1
+- latest version
+
+* Fri Mar 31 2023 Caolán McNamara <caolanm(a)redhat.com> - 1:7.5.2.2-1
+- latest version
+
+* Wed Mar 22 2023 Stephan Bergmann <sbergman(a)redhat.com> - 1:7.5.1.2-4
+- Resolves: rhbz#2171265 Failure to start with junk in program/services/
+
+* Fri Mar 10 2023 Caolán McNamara <caolanm(a)redhat.com> - 1:7.5.1.2-3
+- Use sifr/sifr_dark for gnome,
+ https://pagure.io/fedora-workstation/issue/361
+
+* Thu Mar 09 2023 Caolán McNamara <caolanm(a)redhat.com> - 1:7.5.1.2-2
+- fix gray background in kf5 print preview
+
+* Thu Mar 02 2023 Caolán McNamara <caolanm(a)redhat.com> - 1:7.5.1.2-1
+- latest version
+
+* Fri Feb 24 2023 Caolán McNamara <caolanm(a)redhat.com> - 1:7.5.0.3-4
+- Rebuild for zxing-cpp 2.0.0
+
+* Mon Feb 20 2023 Jonathan Wakely <jwakely(a)redhat.com> - 1:7.5.0.3-3
+- Rebuilt for Boost 1.81
+
+* Mon Feb 06 2023 Marek Kasik <mkasik(a)redhat.com> - 1:7.5.0.3-2
+- Rebuild for poppler-23.02.0
+
+* Thu Feb 02 2023 Caolán McNamara <caolanm(a)redhat.com> - 1:7.5.0.3-1
+- 7.5.0 release
+
+* Fri Jan 20 2023 Caolán McNamara <caolanm(a)redhat.com> - 1:7.5.0.2-1
+- 7.5.0 beta
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:7.4.4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jan 12 2023 Caolán McNamara <caolanm(a)redhat.com> - 1:7.4.4.2-1
+- 7.4.4 release
+
+* Sat Dec 31 2022 Pete Walter <pwalter(a)fedoraproject.org> - 1:7.4.3.2-4
+- Rebuild for ICU 72
+
+* Fri Dec 16 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.4.3.2-3
+- fix License syntax "and/or" -> "AND/OR"
+
+* Tue Dec 06 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.4.3.2-2
+- add BuildRequires on hunspell-en-US for testTdf124603
+
+* Thu Nov 17 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.4.3.2-1
+- 7.4.3 release
+
+* Thu Nov 17 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.4.2.3-2
+- Resolves: rhbz#2143431 fix autofilter missing search entry
+
+* Thu Oct 13 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.4.2.3-1
+- 7.4.2 release
+
+* Fri Sep 16 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.4.1.2-1
+- 7.4.1 release
+
+* Thu Aug 18 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.4.0.3-1
+- 7.4.0 release
+
+* Tue Aug 09 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.4.0.2-1
+- 7.4rc2
+
+* Wed Aug 03 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.3.5.2-3
+- Rebuilt for poppler 22.08.0
+
+* Tue Aug 02 2022 Frantisek Zatloukal <fzatlouk(a)redhat.com> - 1:7.3.5.2-2
+- Rebuilt for ICU 71.1
+
+* Thu Jul 21 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.3.5.2-1
+- latest version
+
+* Tue Jul 19 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.3.4.2-5
+- rhbz#2104072 build on i686 without java support
+
+* Mon Jul 11 2022 Stephan Bergmann <sbergman(a)redhat.com> - 1:7.3.4.2-4
+- Resolves: rhbz#2104545 Avoid call to utl::IsYounger if possible
+
+* Thu Jun 23 2022 Parag Nemade <pnemade AT redhat DOT com> - 1:7.3.4.2-3
+- Fix Requires: hunspell-pt-BR and hyphen-pt-BR for libreoffice-langpack-pt-BR
+
+* Mon Jun 13 2022 Python Maint <python-maint(a)redhat.com> - 1:7.3.4.2-2
+- Rebuilt for Python 3.11
+
+* Thu Jun 09 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.3.4.2-1
+- 7.3.4 release
+
+* Wed May 04 2022 Thomas Rodgers <trodgers(a)redhat.com> - 1:7.3.3.2-2
+- Rebuilt for Boost 1.78
+
+* Mon May 02 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.3.3.2-1
+- 7.3.3 release
+
+* Tue Apr 05 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.3.2.2-1
+- 7.3.2 release
+
+* Mon Mar 14 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.3.1.3-4
+- tdf#144862 use resolution independent text rendering
+
+* Tue Mar 08 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.3.1.3-3
+- rhbz#2061598 No Icons Launcher of LibreOffice Apps in Raspberry Pi
+
+* Mon Mar 07 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.3.1.3-2
+- rhbz#2061268 finally drop the dependency on the dejavu fonts
+
+* Sat Mar 05 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.3.1.3-1
+- 7.3.1 release
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek(a)redhat.com> - 1:7.3.0.3-3
+- Rebuilt for java-17-openjdk as system jdk
+
+* Sat Feb 05 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.3.0.3-2
+- reenable tests
+
+* Wed Feb 02 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.3.0.3-1
+- 7.3.0 release
+- drop conditionals for rhel < 9
+- drop conditionals for fedora < 36
+
+* Tue Feb 01 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.5.2-5
+- Related: rhbz#2029810 set NoDisplay=true for .desktop on s390x/aarch64
+- Related: rhbz#2029810 don't Require any vclplug for s390x/aarch64
+
+* Mon Jan 24 2022 Parag Nemade <pnemade AT redhat DOT com> - 1:7.2.5.2-4
+- Update hunspell dictionary directory path
+ https://fedoraproject.org/wiki/Changes/Hunspell_dictionary_dir_change
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:7.2.5.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jan 13 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.5.2-2
+- rebuild for rebase of poppler to 22.01.0
+
+* Thu Jan 06 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.5.2-1
+- upgrade to 7.2.5
+
+* Mon Dec 13 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.4.1-2
+- Resolves: rhbz#2028991 fix insert, object, QR code
+
+* Mon Dec 06 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.4.1-1
+- upgrade to 7.2.4
+
+* Fri Nov 19 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.3.2-1
+- upgrade to 7.2.3 (likely will fix rhbz#2022410)
+
+* Tue Oct 12 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.2.2-3
+- Icon=document-new shouldn't get prefixed to become
+ Icon=libreoffice-document-new
+
+* Fri Oct 08 2021 Kalev Lember <klember(a)redhat.com> - 1:7.2.2.2-2
+- Use -g1 on arm builders as well
+
+* Thu Oct 07 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.2.2-1
+- upgrade to 7.2.2 (likely will fix rhbz#2011384)
+
+* Tue Oct 05 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.1.2-4
+- rhbz#2010520 move libroffice.jar to noarch java location
+
+* Wed Sep 22 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.1.2-3
+- reenable make check for s390x
+
+* Fri Sep 10 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.1.2-2
+- remove obscure rhino and bsh scripting for fedora >= 36 like in rhel
+
+* Thu Sep 09 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.1.2-1
+- upgrade to 7.2.1
+
+* Sat Aug 21 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.0.4-3
+- fix arm32 uno bridge
+
+* Fri Aug 20 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.0.4-2
+- s390x firebird is available again
+
+* Mon Aug 16 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.0.4-1
+- upgrade to 7.2.0
+
+* Sat Aug 14 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.0.3-1
+- prep upgrade to 7.2.0
+
+* Thu Aug 12 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.5.2-5
+- replace use of ucpp with gcc cpp
+- Resolves: tdf#132739 two html style tags where there should be just one
+
+* Sat Aug 07 2021 Jonathan Wakely <jwakely(a)redhat.com> - 1:7.1.5.2-4
+- Rebuilt for Boost 1.76
+
+* Wed Aug 04 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.5.2-3
+- rebuild for poppler rebase to 21.07.0
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:7.1.5.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Sun Jul 18 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.5.2-1
+- latest version
+- drop merged patches
+
+* Wed Jul 14 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.4.2-3
+- Related: rhbz#1980800 allow convert to csv to write each sheet to
+ a separate file
+
+* Wed Jun 30 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.4.2-2
+- Remove unused DOCTYPE from odk/examples xcu file
+- drop bsh buildrequires in rhel
+
+* Wed Jun 09 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.4.2-1
+- latest version
+- replace 'badfuncs' of inet_addr and inet_ntoa
+- allow system firebird-4
+
+* Fri Jun 04 2021 Python Maint <python-maint(a)redhat.com> - 1:7.1.3.2-5
+- Rebuilt for Python 3.10
+
+* Wed Jun 02 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.3.2-4
+- gtk3: workaround missing gdk_threads_enter calls in gio errordialog callback
+
+* Mon May 31 2021 Stephan Bergmann <sbergman(a)redhat.com> - 1:7.1.3.2-3
+- Resolves: rhbz#1965975 Adapt to "libstdc++: Implement LWG 1203 for rvalue iostreams"
+- Resolves: rhbz#1965975 Adapt to hamcrest-2.2-3.fc35.noarch.rpm
+
+* Thu May 20 2021 Pete Walter <pwalter(a)fedoraproject.org> - 1:7.1.3.2-2
+- Rebuild for ICU 69
+
+* Thu May 06 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.3.2-1
+- latest version
+
+* Wed May 05 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.2.2-4
+- Resolves: rhbz#1956977 Impress crashes on switch from commenting to slide sorter
+- Resolves: rhbz#1957034 fix assertion on avmedia volumne control
+
+* Thu Apr 29 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.2.2-3
+- Resolves: rhbz#1955013 build libreoffice-langpack-fy for libreoffice
+
+* Mon Apr 12 2021 Stephan Bergmann <sbergman(a)redhat.com> - 1:7.1.2.2-2
+- Related: rhbz#1895921 Get rid of apache-commons-logging
+
+* Thu Apr 01 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.2.2-1
+- latest version
+
+* Wed Mar 24 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.1.2-2
+- tdf#141197 expose gtk-widgets inside vcl-containers to atk hierarchy
+
+* Thu Mar 04 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.1.2-1
+- latest version
+
+* Mon Feb 08 2021 Pavel Raiskup <praiskup(a)redhat.com> - 1:7.1.0.3-3
+- rebuild for libpq ABI fix rhbz#1908268
+
+* Fri Feb 05 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.0.3-2
+- use classic brand
+
+* Wed Feb 03 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.0.3-1
+- bump to 7.1.0 series
+- drop integrated 0001-rhbz-1870501-crash-on-reexport-of-odg.patch
+- drop integrated 0001-rhbz-1882616-move-cursor-one-step-at-a-time-in-the-d.patch
+- drop integrated 0001-export-HYPERLINK-target-in-html-clipboard-export.patch
+- drop integrated 0001-gcc11.patch
+- drop integrated 0001-disable-tests-that-don-t-work-without-pdfium.patch
+- drop integrated 0001-rhbz-1913828-SfxViewFrame-Current-can-return-null.patch
+- drop integrated 0001-Upgrade-liborcus-to-0.16.0.patch
+
+* Thu Jan 28 2021 Stephan Bergmann <sbergman(a)redhat.com> - 1:7.0.4.2-9
+- Make libreoffice-bsh, libreoffice-rhino depend on full java
+
+* Wed Jan 27 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.4.2-8
+- drop unneeded BuildRequires: gdb
+
+* Wed Jan 27 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.4.2-7
+- Resolves: rhbz#1916539 text not wrapping in right hand help brower pane
+
+* Mon Jan 25 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.4.2-6
+- really rebuild for Boost 1.75
+
+* Fri Jan 22 2021 Jonathan Wakely <jwakely(a)redhat.com> - 1:7.0.4.2-5
+- Rebuilt for Boost 1.75
+
+* Fri Jan 15 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.4.2-4
+- rebuild for poppler
+
+* Mon Jan 11 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.4.2-3
+- Resolves: rhbz#1913828 SfxViewFrame::Current() can return null
+
+* Sun Dec 20 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.4.2-2
+- workaround for make check failure
+
+* Wed Dec 09 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.4.2-1
+- latest version
+
+* Wed Dec 02 2020 Thierry Vignaud <tv(a)mageia.org> 1:7.0.4.1-1
+- Update to 7.0.4 RC1
+
+* Tue Nov 24 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.3.1-4
+- Resolves: rhbz#1900937 fix null deref in non-pdfium build
+
+* Mon Nov 23 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.3.1-3
+- Resolves: rhbz#1900428 don't crash on invalid index used in StarBasic macro
+
+* Tue Nov 03 2020 Jeff Law <law(a)redhat.com> - 1:7.0.3.1-2
+- Fix missing #include for gcc-11
+
+* Thu Oct 29 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.3.1-1
+- latest version
+
+* Sun Oct 25 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.2.2-3
+- Resolves: rhbz#1891326 suggest package install of the best pt-* langpack
+
+* Sat Oct 24 18:45:56 CEST 2020 David Tardon <dtardon(a)redhat.com> - 1:7.0.2.2-2
+- fix upgrade from Fedora 32
+
+* Sat Oct 10 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.2.2-1
+- latest version
+
+* Tue Oct 06 2020 Rex Dieter <rdieter(a)fedoraproject.org> - 1:7.0.1.2-7
+- -kf5: enable Supplements: (%%name-core and plasma-workspace)
+
+* Tue Sep 29 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.1.2-6
+- export HYPERLINK target in html clipboard export
+
+* Fri Sep 25 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.1.2-5
+- Resolves: rhbz#1882616 IM cursor pos problem with emojis in writer
+
+* Thu Sep 24 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.1.2-4
+- upgrade liborcus
+
+* Fri Sep 04 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.1.2-3
+- rhbz#1875377 prefer Cantarell-Regular to Cantarell-VF
+
+* Thu Sep 03 2020 Merlin Mathesius <mmathesi(a)redhat.com> - 1:7.0.1.2-2
+- Rebase RHEL patch to disable libe-book support to libreoffice-7.0
+- Add BR perl(base)
+
+* Tue Sep 01 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.1.2-1
+- 7.0.1 RC2
+
+* Fri Aug 21 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.1.1-3
+- rhbz#1870501 crash on reexport of odg
+
+* Fri Aug 21 2020 Stephan Bergmann <sbergman(a)redhat.com> 1:7.0.1.1-2
+- Build the binary UNO bridge with -fno-lto
+
+* Thu Aug 20 2020 Thierry Vignaud <tvignaud(a)redhat.com> 1:7.0.1.1-1
+- 7.0.1 RC1
+
+* Thu Aug 06 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.0.3-1
+- 7.0.0
+
+* Wed Aug 05 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:6.4.5.2-6
+- Resolves: rhbz#1745771
+ + drop the GTK3-KF5 VCL plugin (formerly subpackage kf5)
+ + rename the current -kde5 subpackage (the Qt5/KF5 VCL plugin) to -kf5
+
+* Wed Jul 29 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:6.4.5.2-5
+- Resolves: rhbz#1861794 missing csv fixed width handles
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:6.4.5.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Jul 25 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:6.4.5.2-3
+- Related: rhbz#1859588 workaround vcldemo ICE
+- add py_byte_compile call for
+ https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompila…
+
+* Tue Jul 14 2020 Jiri Vanek <jvanek(a)redhat.com> - 1:6.4.5.2-2
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Sat Jul 11 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:6.4.5.2-1
+- latest stable
+
+* Sat Jul 11 2020 Jiri Vanek <jvanek(a)redhat.com> - 1:6.4.4.2-4
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Sat May 30 2020 Jonathan Wakely <jwakely(a)redhat.com> - 1:6.4.4.2-3
+- Rebuilt for Boost 1.73
+
+* Tue May 26 2020 Miro Hrončok <mhroncok(a)redhat.com> - 1:6.4.4.2-2
+- Rebuilt for Python 3.9
+
+* Thu May 21 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:6.4.4.2-1
+- latest stable
+
+* Sun May 17 2020 Pete Walter <pwalter(a)fedoraproject.org> - 1:6.4.3.2-2
+- Rebuild for ICU 67
+
+* Thu Apr 16 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:6.4.3.2-1
+- latest stable
+
+* Mon Mar 30 2020 Thierry Vignaud <tvgnaud(a)mredhat.com> 1:6.4.2.2-1
+- 6.4.2.2
+
+* Mon Mar 23 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:6.4.1.2-4
+- help->license->license doesn't do anything
+
+* Fri Mar 20 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:6.4.1.2-3
+- disable tip-of-the-day dialog by default
+
+* Wed Mar 18 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:6.4.1.2-2
+- rhbz#1776774 make math subpackage just a superficial package for
+ math launcher
+
+* Tue Feb 25 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:6.4.1.2-1
+- 6.4.1 beta 2
+
+* Mon Feb 10 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:6.4.0.3-2
+- rhbz#1793632 make draw subpackage just a superficial package for
+ draw launcher
+
+* Wed Jan 29 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:6.4.0.3-1
+- latest release
+
+* Wed Jan 22 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.4.2-1
+- latest stable release
+
+* Fri Jan 17 2020 Marek Kasik <mkasik(a)redhat.com> - 1:6.3.3.2-6
+- Rebuild for poppler-0.84.0
+
+* Fri Jan 17 2020 Marek Kasik <mkasik(a)redhat.com> - 1:6.3.3.2-5
+- Rebuild for poppler-0.84.0
+
+* Wed Nov 27 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.3.2-4
+- rhbz#1776774 undo rhbz#156677 and stop customizing math.desktop
+
+* Mon Nov 18 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.3.2-3
+- rhbz#1773525 fix find&replace search save limit
+
+* Sat Nov 02 2019 Pete Walter <pwalter(a)fedoraproject.org> - 1:6.3.3.2-2
+- Rebuild for ICU 65
+
+* Thu Oct 24 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.3.2-1
+- latest stable release
+
+* Thu Sep 26 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.2.2-1
+- latest stable release
+
+* Thu Sep 05 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.1.2-1
+- latest stable release
+
+* Sat Aug 31 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.0.4-6
+- Related: rhbz#1747596 see if a depend on firebird from just base is
+ sufficient
+
+* Thu Aug 29 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.0.4-5
+- Resolves: rhbz#1736810 disable opencl by default again
+
+* Sun Aug 25 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.0.4-4
+- Resolves: rhbz#1744876 firebird not an automatically dependency
+
+* Wed Aug 21 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.0.4-3
+- Resolves: rhbz#1743894 make build with mdds-1.5
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok(a)redhat.com> - 1:6.3.0.4-2
+- Rebuilt for Python 3.8
+
+* Thu Aug 08 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.0.4-1
+- upgrade to RC4
+
+* Tue Aug 06 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.0.3-1
+- upgrade to RC3
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:6.3.0.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Jul 19 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.0.1-2
+- missing ldap support
+- kde4 support is gone, replace with kde5
+
+* Tue Jul 16 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.0.1-1
+- move rawhide to 6.3.0
+
+* Tue Jul 16 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.5.2-1
+- latest stable
+
+* Fri Jun 14 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.4.2-5
+- Resolves: rhbz#1720483 make all app rpms depend on pdfimport
+
+* Tue Jun 11 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.4.2-4
+- Resolves: rhbz#1667039 drop Requires: font(:lang=XX) requires in
+ favor of langpacks
+
+* Mon Jun 10 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.4.2-3
+- Related: rhbz#1718063 look for pkg-config python-version-embed
+
+* Fri Jun 07 2019 Stephan Bergmann <sbergman(a)redhat.com> - 1:6.2.4.2-2
+- Resolves: rhbz#1718063 adapt to upcoming Python 3.8
+
+* Thu May 30 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.4.2-1
+- latest stable version
+
+* Sun May 26 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.3.2-5
+- Resolves: rhbz#1713827 protect against null ViewShell
+- Resolves: rhbz#1713908 stop disabling firebird-sdbc
+
+* Thu May 23 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.3.2-4
+- Resolves: rhbz#1712823 crash in extended tooltips over pattern editor
+- Resolves: rhbz#1711143 calc not rounding time calculation correctly
+
+* Tue May 21 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.3.2-3
+- rebuild for e-d-s
+
+* Thu May 02 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.3.2-2
+- add Esperanto
+
+* Tue Apr 30 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.3.2-1
+- latest stable release
+
+* Fri Apr 26 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.2.2-6
+- Related: rhbz#1703375 disable bsh and rhino for rhel
+
+* Thu Apr 25 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.2.2-5
+- Resolves: rhbz#1702810 Prepare for upcoming libebook
+
+* Sat Apr 13 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.2.2-4
+- tdf#119890 followup Forbid HOME to be the default dir for templates
+
+* Fri Apr 12 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.2.2-3
+- Resolves: rhbz#1699347 __glibcxx_requires_subscript-enabled enabled
+
+* Thu Apr 04 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.2.2-2
+- Related: rhbz#1692584 mythes-de is available again
+
+* Tue Apr 02 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.2.2-1
+- latest stable release
+
+* Wed Mar 27 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.1.2-6
+- Resolves: rhbz#1693388 mythes-de got retired so is unavailable
+
+* Thu Mar 21 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.1.2-5
+- Resolves: rhbz#1690732 basic font variation support
+
+* Wed Mar 20 2019 Stephan Bergmann <sbergman(a)redhat.com> - 1:6.2.1.2-4
+- Resolves: rhbz#1687589 KDE4 gpoll_wrapper can be called with SolarMutex locked
+
+* Tue Mar 12 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.1.2-3
+- currency menu too narrow
+
+* Thu Mar 07 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.1.2-2
+- bump n-v-r
+
+* Sat Mar 02 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.1.2-1
+- latest stable
+
+* Mon Feb 25 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.0.3-4
+- Related: rhbz#1678319 workaround weird compilation result
+
+* Thu Feb 21 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.0.3-3
+- menu of currency combobox is too wide
+
+* Thu Feb 21 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.0.3-2
+- Resolves: tdf#122623 theme unwanted tab into invisibilty
+
+* Thu Feb 07 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.0.3-1
+- latest version
+
+* Fri Feb 01 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.1.4.2-5
+- Resolves: rhbz#1671340 extended tooltips not working in impress navigator
+
+* Thu Jan 31 2019 Kalev Lember <klember(a)redhat.com> - 1:6.1.4.2-4
+- Rebuilt for Boost 1.69
+
+* Sat Jan 26 2019 Marek Kasik <mkasik(a)redhat.com> - 1:6.1.4.2-3
+- Additional fixes needed for rebuild
+
+* Fri Jan 25 2019 Marek Kasik <mkasik(a)redhat.com> - 1:6.1.4.2-2
+- Rebuild for poppler-0.73.0
+
+* Mon Jan 07 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.1.4.2-1
+- latest version
+- Resolves: rhbz#1662616 crash in macro dialog editor
+- Resolves: rhbz#1662512 a11y freeze in calc
+
+* Tue Dec 04 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.1.2.1-8
+- Resolves: rhbz#1639174 desire to block en-help install
+
+* Tue Nov 20 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.1.2.1-7
+- Resolves: rhbz#1651469 improve obsoletes
+
+* Wed Nov 14 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 1:6.1.2-6
+- -kf5 subpackage: include support for --enable-gtk3-kde5 (#1647233)
+- -kde4: adjust summary/description s/KDE/KDE4/
+
+* Tue Nov 13 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.1.2.1-5
+- Rebuild for hunspell 1.7.0
+
+* Thu Nov 08 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.1.2.1-4
+- drop gtk2 support and obsolete it
+
+* Wed Nov 07 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.1.2.1-3
+- drop rhel 7 conditionals
+
+* Tue Oct 30 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.1.2.1-2
+- Related: rhbz#1644128 gtk tooltip problems
+
+* Wed Oct 10 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.1.2.1-1
+- latest version
+- rhbz#1637848 keep Supplements but not Recommends
+
+* Fri Sep 14 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.1.1.2-1
+- latest version
+
+* Sun Sep 02 2018 David Tardon <dtardon(a)redhat.com> - 1:6.1.0.3-2
+- rebuild for liborcus 0.14.0
+
+* Thu Aug 16 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.1.0.3-1
+- 6.1.X series
+
+* Tue Aug 14 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.6.2-1
+- latest version
+
+* Tue Jul 31 2018 Florian Weimer <fweimer(a)redhat.com> - 1:6.0.6.1-7
+- Rebuild with fixed binutils
+
+* Thu Jul 26 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.6.1-6
+- Related: rhbz#1602589 fix/silence more covscan warnings
+
+* Fri Jul 20 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.6.1-5
+- implement export of underline in outlined font for simple case
+
+* Wed Jul 18 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.6.1-4
+- Resolves: rhbz#1602589 fix covscan issues
+
+* Tue Jul 17 2018 Eike Rathke <erack(a)redhat.com> - 1:6.0.6.1-3
+- Upgrade to ICU 61.1
+- Upgrade to ICU 62.1
+
+* Tue Jul 17 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.6.1-2
+- Resolves: rhbz#1601882 fails to build with --nocheck
+
+* Tue Jul 17 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.6.1-1
+- latest 6.0 release
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:6.0.5.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jul 10 2018 Pete Walter <pwalter(a)fedoraproject.org> - 1:6.0.5.2-2
+- Rebuild for ICU 62
+
+* Fri Jun 22 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.5.2-1
+- latest 6.0 release
+- fix for ICU 61
+- fix for Python 3.7
+
+* Tue Jun 19 2018 Miro Hrončok <mhroncok(a)redhat.com> - 1:6.0.4.2-5
+- Rebuilt for Python 3.7
+
+* Tue Jun 05 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.4.2-4
+- Resolves: rhbz#1581028 endless font widget update
+
+* Tue Jun 05 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.4.2-3
+- use weak deps for fedora only
+
+* Mon May 28 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.4.2-2
+- Resolves: rhbz#1582324 crash after merging writer table cells
+
+* Fri May 25 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.4.2-1
+- latest 6.0 release
+
+* Wed May 9 2018 Stephan Bergmann <sbergman(a)redhat.com> - 1:6.0.3.2-10
+- Fix a potential crash when using the dconf configuration backend
+
+* Sat May 5 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.3.2-9
+- tdf#117413 char doubling in calc under X
+
+* Fri May 4 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.3.2-8
+- rhbz#1575000 CVE-2018-10583 allow embedded links to smb resources
+ to be blocked
+
+* Thu May 3 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.3.2-7
+- rhbz#1573845 won't start without at least Langpack-en-US.xcd
+
+* Mon Apr 30 2018 Pete Walter <pwalter(a)fedoraproject.org> - 1:6.0.3.2-6
+- Rebuild for ICU 61.1
+
+* Tue Apr 24 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.3.2-5
+- Resolves: tdf#116951 rhbz#1569331 start is G_MAXINT
+
+* Thu Apr 19 2018 Stephan Bergmann <sbergman(a)redhat.com> - 1:6.0.3.2-4
+- Resolves: rhbz#1568579 LibreOffice --headless zombie process
+- Related: rhbz#1569331 end should be in terms of unicode chars, not bytes
+
+* Tue Apr 17 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.3.2-3
+- Related: rhbz#1396729 use cairo_surface_create_similar
+
+* Tue Apr 10 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.3.2-2
+- finally drop bundled xmlsec1
+
+* Thu Mar 29 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.3.2-1
+- latest version
+
+* Thu Mar 29 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.3.1-3
+- Related: rhbz#1066844 drop libreofficekit requires
+
+* Fri Mar 23 2018 Marek Kasik <mkasik(a)redhat.com> - 1:6.0.3.1-2
+- Rebuild for poppler-0.63.0
+
+* Thu Mar 22 2018 David Tardon <dtardon(a)redhat.com> - 1:6.0.3.1-1
+- update to 6.0.3 rc1
+
+* Fri Mar 16 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.2.1-3
+- Resolves: rhbz#1392145 ensure titlebar close button matches 'outside' direction
+
+* Fri Mar 16 2018 Stephan Bergmann <sbergman(a)redhat.com> - 1:6.0.2.1-2
+- lib dir missing from libreoffice-sdk
+
+* Fri Feb 23 2018 David Tardon <dtardon(a)redhat.com> - 1:6.0.2.1-1
+- update to 6.0.2 rc1
+
+* Wed Feb 14 2018 David Tardon <dtardon(a)redhat.com> - 1:6.0.1.1-2
+- rebuild for poppler 0.62.0
+
+* Fri Feb 09 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.1.1-1
+- latest stable
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:6.0.0.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Feb 06 2018 Stephan Bergmann <sbergman(a)redhat.com> - 1:6.0.0.3-2-UNBUILT
+- Resolves: rhbz#1541486 Base table dialog title shown in wrong language
+
+* Sun Feb 04 2018 David Tardon <dtardon(a)redhat.com> - 1:6.0.0.3-1
+- update to 6.0.0 rc3
+
+* Wed Jan 31 2018 Michael Stahl <mstahl(a)fedoraproject.org> - 1:6.0.0.2-3
+- add lots of .abignore files to restrict abipkgdiff to shared objects
+ that actually have a stable ABI
+
+* Tue Jan 30 2018 Björn Esser <besser82(a)fedoraproject.org> - 1:6.0.0.2-2
+- Rebuilt for Boost 1.66.0
+
+* Fri Jan 12 2018 David Tardon <dtardon(a)redhat.com> - 1:6.0.0.2-1
+- update to 6.0.0 rc2
+
+* Tue Jan 09 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.0.1-3
+- bump to Modify2 for app_id so install hint says 'LibreOffice wants to install'
+
+* Thu Dec 21 2017 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.0.1-2
+- request langpack for autodetected desired ui locale via packagekit
+
+* Wed Dec 20 2017 David Tardon <dtardon(a)redhat.com> - 1:6.0.0.1-1
+- update to 6.0.0 rc1
+
+* Thu Dec 14 2017 David Tardon <dtardon(a)redhat.com> - 1:6.0.0.0-8.beta2
+- update to 6.0.0 beta2
+
+* Mon Dec 04 2017 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.0.0-7.beta1
+- Rebuild for hunspell 1.6.2
+
+* Thu Nov 30 2017 Pete Walter <pwalter(a)fedoraproject.org> - 1:6.0.0.0-6.beta1
+- Rebuild for ICU 60.1
+
+* Sat Nov 25 2017 David Tardon <dtardon(a)redhat.com> - 1:6.0.0.0-5.beta1
+- update to 6.0.0 beta1
+
+* Wed Nov 22 2017 Eike Rathke <erack(a)redhat.com> - 1:6.0.0.0-4.alpha1
+- prepare for build with ICU 60.1
+
+* Mon Nov 20 2017 David Tardon <dtardon(a)redhat.com> - 1:6.0.0.0-3.alpha1
+- rebuild for liborcus 0.13.1
+
+* Wed Nov 08 2017 David Tardon <dtardon(a)redhat.com> - 1:6.0.0.0-2.alpha1
+- rebuild for poppler 0.61.0
+
+* Thu Nov 02 2017 David Tardon <dtardon(a)redhat.com> - 1:6.0.0.0-1.alpha1
+- update to 6.0.0 alpha1
+- update location of appdata files
+- use weak dependencies
+- mark bundled packages
+
+* Tue Oct 17 2017 David Tardon <dtardon(a)redhat.com> - 1:5.4.3.1-1
+- update to 5.4.3 rc1
+
+* Fri Oct 06 2017 David Tardon <dtardon(a)redhat.com> - 1:5.4.2.2-3
+- rebuild for poppler 0.60.1
+
+* Sun Oct 01 2017 Thierry Vignaud <tvignaud(a)redhat.com> - 1:5.4.2.2-2
+- fix libreoffice wrapper
+
+* Wed Sep 27 2017 David Tardon <dtardon(a)redhat.com> - 1:5.4.2.2-1
+- update to 5.4.2 rc2
+
+* Mon Sep 18 2017 David Tardon <dtardon(a)redhat.com> - 1:5.4.2.1-1
+- update to 5.4.2 rc1
+
+* Tue Sep 12 2017 David Tardon <dtardon(a)redhat.com> - 1:5.4.1.2-3
+- Resolves: rhbz#1490318 do not use versioned Supplements
+
+* Fri Sep 08 2017 David Tardon <dtardon(a)redhat.com> - 1:5.4.1.2-2
+- rebuild for poppler 0.59.0
+
+* Sun Aug 27 2017 David Tardon <dtardon(a)redhat.com> - 1:5.4.1.2-1
+- update to 5.4.1 rc2
+
+* Fri Aug 11 2017 Caolán McNamara <caolanm(a)redhat.com> - 1:5.4.0.3-5
+- implement char highlighting ui for graphics styles
+
+* Thu Aug 03 2017 David Tardon <dtardon(a)redhat.com> - 1:5.4.0.3-4
+- rebuild for poppler 0.57.0
+
+* Mon Jul 31 2017 Kalev Lember <klember(a)redhat.com> - 1:5.4.0.3-3
+- Enable the s390x build again
+
+* Mon Jul 31 2017 Kalev Lember <klember(a)redhat.com> - 1:5.4.0.3-2
+- Temporarily disable the build on s390x
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:5.4.0.3-1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Jul 21 2017 Kalev Lember <klember(a)redhat.com> - 1:5.4.0.2-2
+- Rebuilt for Boost 1.64
+
+* Fri Jul 07 2017 David Tardon <dtardon(a)redhat.com> - 1:5.4.0.2-1
+- update to 5.4.0 rc2
+
+* Fri Jun 23 2017 David Tardon <dtardon(a)redhat.com> - 1:5.4.0.1-1
+- update to 5.4.0 rc1
+
+* Wed Jun 07 2017 David Tardon <dtardon(a)redhat.com> - 1:5.4.0.0-3.beta2
+- update to 5.4.0 beta2
+
+* Sun May 21 2017 David Tardon <dtardon(a)redhat.com> - 1:5.4.0.0-2.beta1
+- update to 5.4.0 beta1
+
+* Tue May 02 2017 David Tardon <dtardon(a)redhat.com> - 1:5.4.0.0-1.alpha1
+- update to 5.4.0 alpha1
+
+* Wed Apr 19 2017 David Tardon <dtardon(a)redhat.com> - 1:5.3.3.1-1
+- update to 5.3.3 rc1
+
+* Wed Mar 29 2017 David Tardon <dtardon(a)redhat.com> - 1:5.3.2.2-1
+- update to 5.3.2 rc2
+
+* Tue Mar 28 2017 David Tardon <dtardon(a)redhat.com> - 1:5.3.2.1-3
+- rebuild for poppler 0.53.0
+
+* Mon Mar 27 2017 Caolán McNamara <caolanm(a)redhat.com> - 1:5.3.2.1-2
+- Resolves: rhbz#1432468 disable opencl by default
+
+* Sun Mar 19 2017 David Tardon <dtardon(a)redhat.com> - 1:5.3.2.1-1
+- update to 5.3.2 rc1
+
+* Mon Mar 13 2017 Caolán McNamara <caolanm(a)redhat.com> - 1:5.3.1.2-2
+- Resolves: rhbz#1431189 add Indonesian langpack
+
+* Thu Mar 09 2017 David Tardon <dtardon(a)redhat.com> - 1:5.3.1.2-1
+- update to 5.3.1 rc2
+
+* Thu Feb 23 2017 David Tardon <dtardon(a)redhat.com> - 1:5.3.1.1-1
+- update to 5.3.1 rc1
+
+* Tue Feb 07 2017 Björn Esser <besser82(a)fedoraproject.org> - 1:5.3.0.3-3
+- Rebuilt for Boost 1.63
+
+* Thu Feb 02 2017 Caolán McNamara <caolanm(a)redhat.com> - 1:5.3.0.3-2
+- Resolves: rhbz#1409401 add depend on gtksink gstreamer1 element
+
+* Fri Jan 27 2017 David Tardon <dtardon(a)redhat.com> - 1:5.3.0.3-1
+- update to 5.3.0 rc3
+
+* Wed Jan 18 2017 David Tardon <dtardon(a)redhat.com> - 1:5.3.0.2-1
+- update to 5.3.0 rc2
+- temp. disable building of help on ARM to fix build
+
+* Tue Jan 10 2017 David Tardon <dtardon(a)redhat.com> - 1:5.3.0.1-1
+- update to 5.3.0 rc1
+
+* Tue Dec 27 2016 Caolán McNamara <caolanm(a)redhat.com> - 1:5.3.0.0-8.beta1
+- try arm build
+
+* Thu Dec 22 2016 Miro Hrončok <mhroncok(a)redhat.com> - 1:5.3.0.0-7.beta2
+- Rebuild for Python 3.6
+
+* Mon Dec 19 2016 Miro Hrončok <mhroncok(a)redhat.com> - 1:5.3.0.0-6.beta2
+- Rebuild for Python 3.6
+
+* Thu Dec 15 2016 David Tardon <dtardon(a)redhat.com> - 1:5.3.0.0-5.beta2
+- update to 5.3.0 beta2
+
+* Tue Dec 13 2016 Caolán McNamara <caolanm(a)redhat.com> - 1:5.3.0.0-4.beta1
+- rebuild for hunspell-1.5.4
+
+* Wed Nov 23 2016 David Tardon <dtardon(a)redhat.com> - 1:5.3.0.0-3.beta1
+- update to 5.3.0 beta1
+
+* Tue Nov 08 2016 David Tardon <dtardon(a)redhat.com> - 1:5.3.0.0-2.alpha1
+- allow abrt to work again
+
+* Sat Oct 22 2016 David Tardon <dtardon(a)redhat.com> - 1:5.3.0.0-1.alpha1
+- update to 5.3.0 alpha1
+
+* Fri Oct 21 2016 Marek Kasik <mkasik(a)redhat.com> - 1:5.2.3.1-2
+- Rebuild for poppler-0.48.0
+
+* Sat Oct 15 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.3.1-1
+- update to 5.2.3 rc1
+
+* Fri Oct 07 2016 Stephan Bergmann <sbergman(a)redhat.com> - 1:5.2.2.2-3
+- Resolves: rhbz#1382401 broken export of emojis to HTML
+
+* Thu Sep 29 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.2.2-2
+- rebuild for liborcus 0.12
+
+* Wed Sep 21 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.2.2-1
+- update to 5.2.2 rc2
+
+* Wed Sep 21 2016 Caolán McNamara <caolanm(a)redhat.com> - 1:5.2.2.1-5
+- Related: rhbz#1362451 apply patch
+
+* Tue Sep 20 2016 Caolán McNamara <caolanm(a)redhat.com> - 1:5.2.2.1-4
+- Related: rhbz#1362451 avoid recursive ownerchanged signal during ownerchange
+
+* Mon Sep 19 2016 Caolán McNamara <caolanm(a)redhat.com> - 1:5.2.2.1-3
+- Related: rhbz#1373933 do less on style-updated
+- Related: rhbz#1353069 don't clear XATTR_FILL from in use styles
+
+* Fri Sep 16 2016 Caolán McNamara <caolanm(a)redhat.com> - 1:5.2.2.1-2
+- Resolves: rhbz#1373933 gtk 3.21 emits way too many "style-set" signals
+
+* Wed Sep 14 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.2.1-1
+- update to 5.2.2 rc1
+
+* Tue Sep 13 2016 Stephan Bergmann <sbergman(a)redhat.com> - 1:5.2.1.2-3
+- enable dconf support for Fleet Commander
+
+* Mon Sep 05 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.1.2-2
+- Resolves: rhbz#1247399 install public jars according to packaging guidelines
+- Resolves: rhbz#1363874 install LibreOfficeKit headers
+
+* Fri Aug 26 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.1.2-1
+- update to 5.2.1 rc2
+
+* Thu Aug 11 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.1.1-1
+- update to 5.2.1 rc1
+
+* Fri Jul 29 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.0.4-1
+- update to 5.2.0 rc4
+
+* Thu Jul 21 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.0.3-1
+- update to 5.2.0 rc3
+
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:5.2.0.2-4
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Pa…
+
+* Mon Jul 18 2016 Marek Kasik <mkasik(a)redhat.com> - 1:5.2.0.2-3
+- Rebuild for poppler-0.45.0
+
+* Thu Jul 07 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.0.2-2
+- remove obsolete wiki-publisher requires apache-commons-*
+
+* Thu Jul 07 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.0.2-1
+- update to 5.2.0 rc2
+- Resolves: rhbz#1351292 fix switching of modes in Impress
+
+* Tue Jun 28 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.0.1-2
+- Resolves: rhbz#1341064 fix test on big endian systems
+
+* Wed Jun 22 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.0.1-1
+- update to 5.1.0 rc1
+- Resolves: rhbz#1343752 wrong radiobutton and checkbutton behavior in
+ "view" menu
+- Resolves: rhbz#1349261 do not pull in all variants of english dicts
+
+* Thu Jun 09 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.0.0-8.beta2
+- update to 5.2.0 beta2
+
+* Thu May 26 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.0.0-7.beta1
+- update to 5.2.0 beta1
+
+* Mon May 16 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.0.0-6.alpha1
+- Resolves: rhbz#1327847 remove multilib conflicts in .desktop files
+
+* Fri May 13 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.0.0-5.alpha1
+- rebuild for mdds 1.2.0
+- Resolves: rhbz#1325858 fix build on 64-bit secondary arches
+
+* Tue May 10 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.0.0-4.alpha1
+- Resolves: rhbz#1333899 recommended pkgs are omitted from default
+ installation
+
+* Tue May 3 2016 Marek Kasik <mkasik(a)redhat.com> - 1:5.2.0.0-3.alpha1
+- Rebuild for poppler-0.43.0
+
+* Mon May 02 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.0.0-2.alpha1
+- Resolves: rhbz#1326602 leakage of removed background image set in master slide
+
+* Fri Apr 22 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.0.0-1.alpha1
+- update to 5.2.0 alpha1
+
+* Thu Apr 21 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.3.1-1
+- update to 5.1.3 rc1
+- Resolves: tdf#91778 drawing the background over an active cursor
+
+* Mon Apr 18 2016 Caolán McNamara <caolanm(a)redhat.com> - 1:5.1.2.1-6
+- rebuild for hunspell 1.4.0
+
+* Fri Apr 15 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.2.1-5
+- rebuild for ICU 57.1
+
+* Thu Apr 07 2016 Caolán McNamara <caolanm(a)redhat.com> - 1:5.1.2.1-4
+- gtk3: fix combobox and listbox
+
+* Wed Mar 30 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.2.1-3
+- support both glade and glade3
+
+* Mon Mar 21 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.2.1-2
+- Resolves: rhbz#1319458 avoid rich deps in Requires
+
+* Wed Mar 16 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.2.1-1
+- update to 5.1.2 rc1
+- split VCL plugins into subpackages
+- rename libreoffice-kde to libreoffice-kde4
+- only recommend fonts
+- remove hard dependency on English spell checker and auto-correction
+ rules
+- disable quickstarter
+- move icons and other system-integration stuff to a noarch subpackage
+- disable browser plugin in preparation for its removal in 5.2
+
+* Wed Mar 09 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.1.3-2
+- update for liborcus 0.11.0
+
+* Thu Mar 03 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.1.3-1
+- update to 5.1.1 rc3
+
+* Fri Feb 26 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.1.2-1
+- update to 5.1.1 rc2
+
+* Mon Feb 22 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.1.1-5
+- Resolves: rhbz#1310527 add langpack deps
+
+* Tue Feb 16 2016 Caolán McNamara <caolanm(a)redhat.com> - 1:5.1.1.1-4
+- video playback under wayland with gstreamer gtksink
+
+* Mon Feb 15 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.1.1-3
+- rebuild for openCOLLADA soname change
+
+* Sun Feb 14 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.1.1-2
+- switch to mdds 1.x
+
+* Thu Feb 11 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.1.1-1
+- update to 5.1.1 rc1
+- Resolves: rhbz#1303007 add noarch Provides too
+
+* Thu Feb 11 2016 Caolán McNamara <caolanm(a)redhat.com> - 1:5.1.0.3-3
+- rework gtk3 themeing to work with latest gtk
+
+* Tue Feb 02 2016 Caolán McNamara <caolanm(a)redhat.com> - 1:5.1.0.3-2
+- Resolves: rhbz#1303619 nothing provides java-devel(x86_64)
+
+* Wed Jan 27 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.0.3-1
+- update to 5.1.0 rc3
+- Resolves: rhbz#1168757 Selecting multiple slides is not reflected in Print
+ dialog
+
+* Fri Jan 22 2016 Marek Kasik <mkasik(a)redhat.com> - 1:5.1.0.2-5
+- Rebuild for poppler-0.40.0
+
+* Mon Jan 18 2016 Jonathan Wakely <jwakely(a)redhat.com> - 1:5.1.0.2-4
+- Rebuilt for Boost 1.60
+
+* Sat Jan 16 2016 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 1:5.1.0.2-3
+- Remove arch-specific dependency for font subpackage as it is noarch
+
+* Thu Jan 14 2016 Adam Jackson <ajax(a)redhat.com> - 1:5.1.0.2-2
+- Rebuild for glew 1.13
+
+* Thu Jan 14 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.0.2-1
+- update to 5.1.0 rc2
+
+* Thu Dec 17 2015 Bastien Nocera <bnocera(a)redhat.com> 1:5.1.0.1-2
+- Add GLSL files missing from the package
+- Split up inclusion of latin Serbian files to avoid duplicate listing
+
+* Wed Dec 16 2015 David Tardon <dtardon(a)redhat.com> - 1:5.1.0.1-1
+- update to 5.1.0 rc1
+
+* Mon Dec 14 2015 David Tardon <dtardon(a)redhat.com> - 1:5.1.0.0-11.beta2
+- backport more upstream fixes for libreofficekit
+- fix unit test on i686
+
+* Wed Dec 09 2015 David Tardon <dtardon(a)redhat.com> - 1:5.1.0.0-10.beta2
+- backport upstream fixes for libreofficekit
+
+* Fri Dec 04 2015 David Tardon <dtardon(a)redhat.com> - 1:5.1.0.0-9.beta2
+- update to 5.1.0 beta2
+
+* Thu Dec 03 2015 Caolán McNamara <caolanm(a)redhat.com> - 1:5.1.0.0-8.beta1
+- enable and bundle libreofficekit introspection
+
+* Thu Nov 26 2015 David Tardon <dtardon(a)redhat.com> - 1:5.1.0.0-7.beta1
+- update to 5.1.0 beta1
+
+* Tue Nov 10 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:5.1.0.0-6.alpha1
+- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
+
+* Thu Nov 05 2015 David Tardon <dtardon(a)redhat.com> - 1:5.1.0.0-5.alpha1
+- Related: rhbz#1276061 build failure on ppc64
+
+* Tue Nov 03 2015 David Tardon <dtardon(a)redhat.com> - 1:5.1.0.0-4.alpha1
+- Resolves: rhbz#1276061 build failure on ppc64
+
+* Wed Oct 28 2015 David Tardon <dtardon(a)redhat.com> - 1:5.1.0.0-3.alpha1
+- rebuild for ICU 56.1
+
+* Tue Oct 27 2015 Eike Rathke <erack(a)redhat.com> - 1:5.1.0.0-2.alpha1
+- prepare to enable build with ICU 56
+
+* Mon Oct 19 2015 David Tardon <dtardon(a)redhat.com> - 1:5.1.0.0-1.alpha1
+- update to 5.1.0 alpha1
+
+* Mon Oct 12 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.3.1-1
+- update to 5.0.3 rc1
+
+* Thu Oct 08 2015 Caolán McNamara <caolanm(a)redhat.com> - 1:5.0.2.2-4
+- Resolves: rhbz#1269593 declare support for vnd.libreoffice.cmis:// URLs
+
+* Wed Sep 30 2015 Caolán McNamara <caolanm(a)redhat.com> - 1:5.0.2.2-3
+- implement save slide background for impress
+
+* Mon Sep 28 2015 Caolán McNamara <caolanm(a)redhat.com> - 1:5.0.2.2-2
+- Resolves: tdf#93461 captions laid out behind images
+
+* Thu Sep 17 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.2.2-1
+- update to 5.0.2 rc2
+
+* Sat Sep 05 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.2.1-1
+- update to 5.0.2 rc1
+
+* Sat Aug 22 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.1.2-1
+- update to 5.0.1 rc2
+
+* Tue Aug 11 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.1.1-1
+- update to 5.0.1 rc1
+
+* Wed Aug 05 2015 Jonathan Wakely <jwakely(a)redhat.com> 5.0.0.5-2
+- Rebuilt for Boost 1.58
+
+* Mon Aug 03 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.0.5-1
+- update to 5.0.0 rc5
+
+* Wed Jul 29 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:5.0.0.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
+
+* Sat Jul 25 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.0.4-1
+- update to 5.0.0 rc4
+
+* Fri Jul 24 2015 Adam Williamson <awilliam(a)redhat.com> - 1:5.0.0.3-3
+- rebuild for Boost 1.58 (for real this time)
+
+* Wed Jul 22 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.0.3-2
+- rebuild for Boost 1.58
+
+* Fri Jul 10 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.0.3-1
+- update to 5.0.0 rc3
+
+* Sun Jun 28 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.0.2-1
+- update to 5.0.0 rc2
+
+* Sun Jun 21 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.0.1-1
+- update to 5.0.0 rc1
+
+* Fri Jun 19 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.0.0-8.beta3
+- Resolves: rhbz#1233420 crash on auto-fill
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:5.0.0.0-7.beta3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Wed Jun 10 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.0.0-6.beta3
+- update to 5.0.0 beta3
+
+* Tue Jun 09 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.0.0-5.beta2
+- update to 5.0.0 beta2
+
+* Mon Jun 08 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.0.0-4.beta1
+- rebuild for poppler 0.33
+
+* Wed May 20 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.0.0-3.beta1
+- update to 5.0.0 beta1
+
+* Sat May 16 2015 Kalev Lember <kalevlember(a)gmail.com> - 1:5.0.0.0-2.alpha1
+- Resolves: rhbz#1215800 install symbolic icons
+
+* Sun Apr 19 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.0.0-1.alpha1
+- update to 5.0.0 alpha1
+
+* Tue Apr 14 2015 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.4.2.2-3
+- Resolves: rhbz#1197614 crash when updating extension
+- Resolves: rhbz#1134285 redundant user/password request for WebDAV access
+
+* Mon Mar 30 2015 Richard Hughes <rhughes(a)redhat.com> - 1:4.4.2.2-2
+- Use better AppData screenshots
+
+* Thu Mar 26 2015 David Tardon <dtardon(a)redhat.com> - 1:4.4.2.2-1
+- update to 4.4.2 rc2
+
+* Thu Mar 12 2015 David Tardon <dtardon(a)redhat.com> - 1:4.4.2.1-1
+- update to 4.2.2 rc1
+
+* Mon Feb 23 2015 David Tardon <dtardon(a)redhat.com> - 1:4.4.1.2-1
+- update to 4.4.1 rc2
+
+* Tue Feb 10 2015 David Tardon <dtardon(a)redhat.com> - 1:4.4.1.1-1
+- update to 4.4.1 rc1
+
+* Thu Jan 29 2015 David Tardon <dtardon(a)redhat.com> - 1:4.4.0.3-5
+- fix build on s390
+
+* Wed Jan 28 2015 Petr Machata <pmachata(a)redhat.com> - 1:4.4.0.3-4
+- Rebuild for boost 1.57.0
+
+* Wed Jan 28 2015 Petr Machata <pmachata(a)redhat.com> - 1:4.4.0.3-3
+- Rebuild for boost 1.57.0
+
+* Fri Jan 23 2015 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.4.0.3-2
+- Related: rhbz#1185307 get search for Hamcrest unstuck
+
+* Fri Jan 23 2015 David Tardon <dtardon(a)redhat.com> - 1:4.4.0.3-1
+- update to 4.4.0 rc3
+
+* Fri Jan 23 2015 Marek Kasik <mkasik(a)redhat.com> - 1:4.4.0.2-4
+- Rebuild (poppler-0.30.0)
+
+* Thu Jan 22 2015 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.4.0.2-3
+- Resolves: rhbz#1184582 crash in grammar checking thread
+
+* Mon Jan 19 2015 David Tardon <dtardon(a)redhat.com> - 1:4.4.0.2-2
+- Resolves: rhbz#1180114 writerfilter: don't crash on w:customXmlDelRangeStart
+ etc.
+- Resolves: rhbz#1175027 fix life cycle of SwConnectionDisposedListener_Impl
+
+* Fri Jan 09 2015 David Tardon <dtardon(a)redhat.com> - 1:4.4.0.2-1
+- update to 4.4.0 rc2
+
+* Wed Jan 07 2015 Caolán McNamara <caolanm(a)redhat.com> - 1:4.4.0.1-2
+- Resolves: rhbz#1177547 system autocorr files not detected
+
+* Sun Dec 21 2014 David Tardon <dtardon(a)redhat.com> - 1:4.4.0.1-1
+- update to 4.4.0 rc1
+
+* Fri Dec 12 2014 David Tardon <dtardon(a)redhat.com> - 1:4.4.0.0-6.beta2
+- Resolves: rhbz#1116534 crash when pasting over a formula
+
+* Sat Dec 06 2014 David Tardon <dtardon(a)redhat.com> - 1:4.4.0.0-5.beta2
+- update to 4.4.0 beta2
+- move officehelper.py to pyuno package so it can be imported from python
+
+* Tue Dec 02 2014 David Tardon <dtardon(a)redhat.com> - 1:4.4.0.0-4.beta1
+- add Provides: libreoffice-headless; packages are depending on it
+
+* Thu Nov 27 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.4.0.0-3.beta1
+- Resolves: rhbz#1165444 abrt crash with NULL pView
+
+* Thu Nov 27 2014 Marek Kasik <mkasik(a)redhat.com> - 1:4.4.0.0-2.beta1
+- Rebuild (poppler-0.28.1)
+
+* Sat Nov 22 2014 David Tardon <dtardon(a)redhat.com> - 1:4.4.0.0-1.beta1
+- update to 4.4.0 beta1
+
+* Fri Nov 21 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.4.1-6
+- Resolves: fdo#86466 Wrong background color shown in impress table
+
+* Thu Nov 20 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.4.1-5
+- Resolves: rhbz#1164551 we want to ensure that a libjvm.so is available
+ but we have no firm interest in which one that is
+
+* Wed Nov 19 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.4.1-4
+- Resolves: rhbz#1165740 arbitrarily backport some rtf crash fixes
+
+* Mon Nov 17 2014 Michael Stahl <mstahl(a)redhat.com>- 1:4.3.4.1-3
+- set VCL.WM.ShouldSwitchWorkspace to false to avoid virtual desktop switching
+
+* Thu Nov 13 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.4.1-2
+- fix impress table layout cache wrt wrong table selection border
+
+* Tue Nov 11 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.4.1-1
+- update to 4.3.4 rc1
+
+* Tue Nov 11 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.3.2-6
+- strip hard coded numbering off outline master previews
+
+* Mon Nov 10 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.3.2-5
+- Resolves: rhbz#1161238 sync PRESOBJ_OUTLINE para depth on load
+
+* Thu Nov 06 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.3.2-4
+- Resolves: fdo#60712 Inherits cell styles in inserting rows/columns
+- implement toggling off removeable master elements with delete
+- Resolves: fdo#78151 change underlying style on toggling bullets on/off in master view
+
+* Thu Nov 06 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.3.2-3
+- Resolves: fdo#76581 copy-and-paste -> slideshow crash in presenter console
+
+* Wed Nov 05 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.3.2-2
+- Resolves: fdo#37559 revert adding extra dummy polygons
+
+* Tue Oct 28 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.3.2-1
+- update to 4.3.3 rc2
+
+* Sun Oct 19 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.3.1-2
+- enable support for 3-D models
+
+* Thu Oct 09 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.3.1-1
+- update to 4.3.3 rc1
+
+* Wed Oct 08 2014 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.3.2.2-5
+- Resolves: rhbz#1054952 bad access of smb URLs on KDE
+
+* Tue Sep 23 2014 Richard Hughes <richard(a)hughsie.com> - 1:4.3.2.2-4
+- move appdata files to desktop files, where the belong
+
+* Tue Sep 23 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.2.2-3
+- Resolves: rhbz#1054952 cannot access smb URLs on KDE
+
+* Tue Sep 23 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.2.2-2
+- make brochure printing of impress/draw work out of the box
+- Resolves: rhbz#1133863 fix looping layout
+
+* Mon Sep 22 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.2.2-1
+- update to 4.3.2 rc2
+
+* Wed Sep 17 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.2.1-3
+- make n-up printing of impress notes work out of the box
+
+* Wed Sep 17 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.2.1-2
+- Resolves: fdo#80911 don't swap notes page width height
+
+* Fri Sep 12 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.2.1-1
+- update to 4.3.2 rc1
+
+* Wed Sep 10 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.1.2-5
+- create a master document template type
+
+* Tue Sep 09 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.1.2-4
+- Resolves: fdo#82496 Change picture option with right click in writer
+
+* Fri Sep 05 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.1.2-3
+- build for aarch64
+
+* Fri Aug 29 2014 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.3.1.2-2
+- Resolves: rhbz#1098693 AArch64 port
+
+* Wed Aug 27 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.1.2-1
+- update to 4.3.1 rc2
+
+* Tue Aug 26 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.1.1-8
+- Related: rhbz#1131425 ure only needs jre-headless
+
+* Tue Aug 26 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.1.1-7
+- rebuild for ICU 53.1
+
+* Fri Aug 22 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.1.1-6
+- Resolves: rhbz#1131425 move libjawt-using office bean into a subpackage
+- Resolves: rhbz#1125588 port LibreOffice to ppc64le
+
+* Tue Aug 19 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.1.1-5
+- Resolves: rhbz#1131425 try java-headless instead of java
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:4.3.1.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Aug 16 2014 Rex Dieter <rdieter(a)fedoraproject.org> 1:4.3.1.1-3
+- update mime scriptlets
+
+* Fri Aug 15 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.1.1-2
+- Related: rhbz#1130264 crash in media playback on s390x
+
+* Sun Aug 10 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.1.1-1
+- update to 4.3.1 rc1
+
+* Mon Jul 28 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.4-1
+- update to 4.3.0 rc4
+
+* Fri Jul 25 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.3-4
+- Resolves: rhbz#1121254 crash when using font selector after adding new font
+
+* Fri Jul 25 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.0.3-3
+- Resolves: rhbz#1122868 landscape printing is broken
+
+* Thu Jul 24 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.3-2
+- avoid image loss in Impress after auto-save
+
+* Wed Jul 16 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.1-1
+- update to 4.3.0 rc3
+
+* Tue Jul 08 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.2-2
+- avoid problems detecting HTML files with xls extension
+
+* Wed Jul 02 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.2-1
+- update to 4.3.0 rc2
+
+* Tue Jun 17 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.1-1
+- update to 4.3.0 rc1
+
+* Mon Jun 09 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.0-9.beta2
+- Resolves: rhbz#1105376 FlatODF import/export does not work unless
+ libreoffice-xsltfilter is installed
+
+* Wed Jun 04 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.0-8.beta2
+- update to 4.3.0 beta2
+
+* Thu May 29 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.0-7.beta1
+- fix some fallout from the import libs rebase
+
+* Wed May 28 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.0-6.beta1
+- switch to librevenge-based import libs
+
+* Tue May 27 2014 Kalev Lember <kalevlember(a)gmail.com> - 1:4.3.0.0-5.beta1
+- Rebuild for boost 1.55.0
+
+* Mon May 26 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.0-4.beta1
+- unblock build on ARM
+
+* Fri May 23 2014 Petr Machata <pmachata(a)redhat.com> - 1:4.3.0.0-3.beta1
+- Rebuild for boost 1.55.0
+
+* Fri May 23 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.0-2.beta1
+- rebuild for boost 1.55.0
+
+* Wed May 21 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.0-1.beta1
+- update to 4.3.0 beta1
+
+* Fri May 16 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.4.2-14
+- render smart-art with a vector format so it can be scaled nicely
+- fix leak on pasting metafiles into office
+- fix leak on pasting draw items into office
+- fix another leak on scaling metric items
+
+* Thu May 15 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.4.2-13
+- fix SDK doc generation with doxygen 1.8.7
+
+* Wed May 14 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.4.2-12
+- rebuild for new poppler
+
+* Mon May 12 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.4.2-11
+- Resolves: rhbz#1096747 format->page crash on html doc
+
+* Mon May 12 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.4.2-10
+- Resolves: fdo#78119 bad july (červenec) month name support in czech
+ localization
+
+* Mon May 12 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.4.2-9
+- Resolves: rhbz#1096486 avoid access to nonexisting parent
+- Resolves: rhbz#1096295 hard to distinguish slides in slide pane
+
+* Fri May 09 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.4.2-8
+- Resolves: rhbz#1071604 Draw depends on files from libreoffice-impress, crashes
+ without them
+
+* Fri May 09 2014 Eike Rathke <erack(a)redhat.com> - 1:4.2.4.2-7
+- Resolves: fdo#77509 memory corruption / crash in Consolidate
+
+* Thu May 08 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.4.2-6
+- center current slide after changing zoom
+- add a status bar icon to fit slide to window
+- Related: fdo#50697 reset the cache timeout on GetGraphic
+
+* Thu May 08 2014 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.2.4.2-5
+- Resolves: rhbz#1092589 Thoroughly check whether JRE is still present
+
+* Tue May 06 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.4.2-4
+- clip over-long comments
+
+* Thu May 01 2014 Eike Rathke <erack(a)redhat.com> - 1:4.2.4.2-3
+- Resolves: fdo#78294 default null-date for document import is 1899-12-30
+
+* Thu May 01 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.4.2-2
+- better scaling of notes-using pages
+
+* Wed Apr 30 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.4.2-1
+- update to 4.2.4 rc2
+
+* Fri Apr 25 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.4.1-7
+- Related: rhbz#1032774 disable autoexit when switching monitors
+
+* Thu Apr 24 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.4.1-6
+- Resolves: fdo#37130 use 10pt Default style font for comments
+- Resolves: fdo#60040 crash after undoing master page
+- vertically center printout when including comments
+
+* Wed Apr 23 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.4.1-5
+- add a 'format all comments' feature
+
+* Tue Apr 22 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.4.1-4
+- Resolves: rhbz#1089377 crash on loading a specific rtf
+
+* Tue Apr 22 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.4.1-3
+- sometimes tables in impress don't resize when adding rows
+- Resolves: fdo#71423 crash while editing Impress tables
+
+* Fri Apr 18 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.4.1-2
+- every 2nd print job is incorrectly flagged as failed
+- Related: rhbz#1088625 PresenterPaintManager seen as NULL
+
+* Thu Apr 17 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.4.1-1
+- update to 4.2.4 rc1
+
+* Wed Apr 16 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.3.3-6
+- install man pages
+- Resolves: rhbz#1086714 overlarge pixmap
+
+* Wed Apr 16 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.3.3-5
+- Resolves: fdo#36815 enable printing WYSIWYG sidewindow comments
+
+* Sat Apr 12 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.3.3-4
+- drop filtering of provides again
+
+* Sat Apr 12 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.3.3-3
+- Related: rhbz#1081176 don't jump to cursor pos when we don't want to
+
+* Fri Apr 11 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.3.3-2
+- Resolves: rhbz#1081176 don't jump to cursor pos when we don't want to
+- Related: rhbz#1085916 kde startup woes
+
+* Sat Apr 05 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.3.3-1
+- update to 4.2.3 rc3
+
+* Tue Apr 01 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.3.2-3
+- Related: rhbz#1075951 abrt crash in MSWordExportBase
+
+* Mon Mar 31 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.3.2-2
+- Resolves: rhbz#1080196 mdds/multi_type_vector_itr.hpp update_node():
+ soffice.bin killed by SIGSEGV
+
+* Wed Mar 26 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.3.2-1
+- update to 4.2.3 rc2
+
+* Tue Mar 25 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.3.1-2
+- Resolves: rhbz#1077780 crash on loading a specific docx
+
+* Mon Mar 17 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.3.1-1
+- update to 4.2.3 rc1
+
+* Fri Mar 14 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.2.1-7
+- Related: rhbz#1076264 intermittent a11y crash in calc
+
+* Mon Mar 10 2014 Michael Stahl <mstahl(a)redhat.com> - 1:4.2.2.1-6
+- Resolves: rhbz#988516: DOCX import: fix context stack when importing header
+- Resolves: rhbz#1072553: Fix deselection problems of template view
+- Resolves: rhbz#1072607: fix crash in SvxRuler::MouseMove()
+- Resolves: rhbz#1043551: sw: avoid division-by-0 in Text Grid painting code
+- RTF import: import field parameters
+- RTF import: fix spurious page breaks at doc end
+
+* Tue Mar 04 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.2.1-5
+- Related: rhbz#1065807 wizards should find the right wizards subdir
+ of Template_internal, who knew this stuff was so fragile
+
+* Mon Mar 03 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.2.1-4
+- Related: rhbz#1065807 wizards should look in Template_internal
+
+* Fri Feb 28 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.2.1-3
+- Resolves: rhbz#1007697 Update on a Window deletes itself
+
+* Fri Feb 28 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.2.1-2
+- Related: rhbz#1065807 don't throw with no "Templates" dir under KDE
+
+* Thu Feb 27 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.2.1-1
+- update to 4.2.2 rc1
+
+* Thu Feb 27 2014 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.2.1.1-4
+- Resolves: fdo#75540 spadmin does not start
+
+* Thu Feb 27 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.1.1-3
+- Resolves: rhbz#1057977 do not crash when fonts are updated
+
+* Tue Feb 25 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.1.1-2
+- Resolves: rhbz#1065807 search XDG defined "Templates" dir
+
+* Thu Feb 13 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.1.1-1
+- update to 4.2.1 rc1
+
+* Thu Feb 13 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.0.4-4
+- rebuild for new ICU
+
+* Thu Feb 06 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.0.4-3
+- Resolves: rhbz#1017379 libreoffice impress imports animated motion paths
+ incorrectly from powerpoint
+- Resolves: fdo#33852 Custom animation (Motionpath Left) isn't being
+ imported correctly from .ppt
+
+* Thu Jan 30 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.0.4-2
+- split LibreLogo into a separate subpackage
+- create a metapackage depending on all subpackages containing filters,
+ for use of packages like unoconv
+
+* Tue Jan 28 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.0.4-1
+- update to 4.2.0 rc4
+
+* Fri Jan 24 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.0.3-3
+- enable EOT support
+- fix PPC build
+
+* Thu Jan 23 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.0.3-2
+- stop showing math and startcenter in menu (again)
+
+* Wed Jan 22 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.0.3-1
+- update to 4.2.0 rc3
+
+* Mon Jan 13 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.0.2-2
+- Related: rhbz#1047871 conditional formatting doesn't fit on screen
+
+* Thu Jan 09 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.0.2-1
+- update to 4.2.0 rc2
+- Resolves: rhbz#1049543 Include AppData files in packages
+
+* Tue Jan 07 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.0.1-1
+- 4.2.0 rc1
+
+* Wed Dec 11 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.0.0-3.beta2
+- Resolves: rhbz#1040291 Change language name from "Oriya" to "Odia"
+
+* Wed Dec 04 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.0.0-2.beta2
+- update to 4.2.0 beta2
+- Related: rhbz#1032774 bodge around reported NULL
+- Resolves: rhbz#1035092 no shortcut key for Italian 'Tools' menu
+- Resolves: rhbz#912529 Kerkis SmallCaps shown instead of Kerkis Regular
+- Resolves: rhbz#1038189 refresh printer list when print dialog launched
+- openssl no longer required to build
+
+* Thu Nov 21 2013 David Tardon <dtardon(a)redhat.com> - 1:4.2.0.0-1.beta1
+- switch to 4.2.0
+
+* Wed Nov 20 2013 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.1.3.2-5
+- Resolves: rhbz#1031989 Accept --pt in addition to deprecated -pt
+- Related: rhbz#1014990 valgrind reports uninitialized variables
+
+* Sun Nov 03 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.3.2-4
+- adapt for libmwaw 0.2
+
+* Thu Oct 31 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.3.2-3
+- Resolves: fdo#56209 reviving FilterFormulaParser
+
+* Thu Oct 31 2013 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.1.3.2-2
+- Resolves: fdo#67725 unoidl::AggregatingCursor must wrap modules for aggregation
+- Resolves: rhbz#1021915 force menubar menus to be up/down only
+- Resolves: rhbz#1025201 Incorrect rendering of Devanagari short i
+
+* Wed Oct 23 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.3.2-1
+- 4.1.3 rc2
+- Resolves: rhbz#1022094 libreoffice-4.1.3.1-1 was built without
+ langpacks
+
+* Mon Oct 21 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.3.1-2
+- Resolves: rhbz#1020712 wrong default CTL font shown in editengine
+- Resolves: rhbz#919070 display -1 means span all screens
+
+
+* Wed Oct 16 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.3.1-1
+- 4.1.3 rc1
+
+* Mon Oct 07 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.2.3-4
+- Resolves: rhbz#1001768: fix various a11y deadlocks and crashes
+- Resolves: rhbz#1016022 fix cut from impress and paste to writer
+- Resolves: rhbz#1003179 fix AUTOFMT related crashes in Writer Undo
+
+* Mon Oct 07 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.2.3-3
+- Resolves: rhbz#1015281 crash on clicking custom animation
+- Resolves: rhbz#996162 crash with no bullet font
+
+* Wed Oct 02 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.2.3-2
+- Resolves: rhbz#1013480 crash in EditLineList::operator[]
+- Resolves: rhbz#1014010 crash on start up
+- Resolves: rhbz#1013844 encrypted OOo 1.0 files don't reopen
+
+* Mon Sep 30 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.2.3-1
+- 4.1.2 rc3
+
+* Fri Sep 20 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.2.2-1
+- 4.1.2 rc2
+
+* Tue Sep 17 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.2.1-3
+- add select sheet menu to calc prev/next area
+- Resolves: rhbz#988104 crash on certain pptx
+
+* Thu Sep 12 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.2.1-2
+- Resolves: rhbz#1006850 crash in SwCommentRuler
+
+* Thu Sep 05 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.2.1-1
+- 4.1.2 rc1
+
+* Tue Sep 03 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.1.2-3
+- Resolves: rhbz#993963 NULL m_pWindow on firefox close plugin window
+
+* Fri Aug 23 2013 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.1.1.2-2
+- Resolves: rhbz#1000150, Do not call exit upon XIOError
+
+* Thu Aug 22 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.1.2-1
+- 4.1.1 rc2
+- Related: rhbz#895690 Always try to do a mount when opening a file via GIO
+- Resolves: rhbz#998136 wrong index to gWidgetData
+- Resolves: rhbz#998046 store last size/position of the base windows
+
+* Mon Aug 19 2013 Marek Kasik <mkasik(a)redhat.com> - 1:4.1.1.1-2
+- Rebuild (poppler-0.24.0)
+
+* Fri Aug 09 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.1.1-1
+- 4.1.1 rc1
+
+* Fri Aug 09 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.0.4-6
+- Resolves: fdo#67743 user autocorr file not written
+
+* Tue Jul 30 2013 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.1.0.4-5
+- Resolves: rhbz#989246 Honor user's JavaDriverClass override in mysql driver
+- Resolves: fdo#67045 fix several nasty screen selection issues
+
+* Tue Jul 30 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.0.4-4
+- Resolves: rhbz#989686 Fix crash with stripping whitespace from toc entries
+
+* Mon Jul 29 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.4-3
+- make libwpd-based filters work correctly with newest libwpd
+
+* Sun Jul 28 2013 Petr Machata <pmachata(a)redhat.com> - 1:4.1.0.4-2
+- Rebuild for boost 1.54.0
+
+* Wed Jul 24 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.4-1
+- 4.1.0 rc4
+
+* Mon Jul 22 2013 Eike Rathke <erack(a)redhat.com> - 1:4.1.0.3-2
+- force rebuild with icu-50.1.2-7
+
+* Thu Jul 18 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.3-1
+- 4.1.0 rc3
+- Resolves: fdo#48835 GNOME3 app menu
+
+* Thu Jul 18 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.0.2-5
+- silence scary gcc warning
+- fdo#66924 switching to master view is broken
+
+* Tue Jul 16 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.2-4
+- bump release
+
+* Fri Jul 12 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.2-3
+- Resolves: rhbz#983809 libreoffice-base misses deps on needed java packages
+
+* Thu Jul 11 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.2-2
+- Resolves: rhbz#980387 Exporting a odg to jpg or tiff generates error
+
+* Thu Jul 04 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.2-1
+- 4.1.0 rc2
+
+* Mon Jul 01 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.0.1-8
+- Resolves: rhbz#979758 crash on Diagrammen in LibreOffice help page
+
+* Thu Jun 27 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.1-7
+- bump revision
+
+* Mon Jun 24 2013 Marek Kasik <mkasik(a)redhat.com> - 1:4.1.0.1-6
+- Rebuild (poppler-0.22.5)
+
+* Mon Jun 24 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.1-5
+- fix build on big endian archs
+
+* Mon Jun 24 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.1-4
+- put glade catalog into an extra packgae
+
+* Sun Jun 23 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.0.1-3
+- Resolves: rhbz#976304 gallery elements may not insert
+
+* Wed Jun 19 2013 Dennis Gilmore <dennis(a)ausil.us> - 1:4.1.0.1-2
+- fix _smp_mflags macro useage
+
+* Wed Jun 19 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.1-1
+- 4.1.0 rc1
+- Related: rhbz#971321 failing tests on ppc and s390
+
+* Sun Jun 16 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.0-9.beta2
+- Resolves: rhbz#971321 failing tests on ppc and s390
+- Resolves: rhbz#974062 incorrect rendering of text in outline blocks in
+ Impress
+
+* Fri Jun 07 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.0-8.beta2
+- Related: rhbz#971795 go back to BR: harfbuzz-devel
+
+* Fri Jun 07 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.0-7.beta2
+- Resolves: rhbz#971230 Use BR: harfbuzz-icu-devel
+
+* Wed Jun 05 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.0-7.beta1
+- 4.1.0 beta2
+
+* Wed Jun 05 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.0.0-6.beta1
+- Related: rhbz#968892 discard impossible languages for Oriya script
+
+* Tue Jun 04 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.0.0-5.beta1
+- Resolves: rhbz#968892 block entire grapheme together for glyph fallback
+- Related: rhbz#968892 discard impossible languages for glyph fallback
+
+* Fri May 31 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.0.0-4.beta1
+- Resolves: rhbz#968976 fix dropdown list autosizing
+
+* Thu May 30 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.0-3.beta1
+- build fix for s390
+
+* Fri May 24 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.0-2.beta1
+- 4.1.0 beta1
+
+* Fri May 24 2013 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.0.3.3-3
+- Resolves: rhbz#961460 can't save WebDAV (davs) files
+
+* Thu May 16 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.0.3.3-2
+- Resolves: rhbz#963276 font options cache crash
+
+* Fri May 03 2013 David Tardon <dtardon(a)redhat.com> - 1:4.0.3.3-1
+- 4.0.3 rc3
+
+* Tue Apr 30 2013 David Tardon <dtardon(a)redhat.com> - 1:4.0.3.2-1
+- 4.0.3 rc2
+
+* Mon Apr 22 2013 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.0.3.1-2
+- Resolves: rhbz#954991 Avoid static data (causing trouble at exit)
+
+* Thu Apr 18 2013 David Tardon <dtardon(a)redhat.com> - 1:4.0.3.1-1
+- 4.0.3 rc1
+- Resolves: rhbz#867808 do not throw UNO exceptions by pointer in C++
+
+* Tue Apr 16 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.0.2.2-4
+- Resolves: rhbz#927223 syntax highlighting crash
+
+* Mon Apr 08 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.0.2.2-3
+- Resolves: rhbz#949238 div by zero on pagedown in 0 width panel
+
+* Fri Apr 05 2013 Kalev Lember <kalevlember(a)gmail.com> - 1:4.0.2.2-2
+- Resolves: rhbz#949106 libreoffice drags in both openjdk 1.7.0 and 1.8.0
+
+* Thu Mar 28 2013 David Tardon <dtardon(a)redhat.com> - 1:4.0.2.2-1
+- 4.0.2 rc2
+- Resolves: rhbz#876742 manipulation with larger tables in impress is
+ very slow
+
+* Fri Mar 15 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.0.2.1-2
+- Resolves: rhbz#906137 slide show inverts outputs
+
+* Fri Mar 15 2013 David Tardon <dtardon(a)redhat.com> - 1:4.0.2.1-1
+- 4.0.2 rc1
+- Resolves: rhbz#921716 Build Breton language pack
+
+* Wed Mar 13 2013 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.0.1.2-4
+- Resolves: rhbz#895690 failure saving to gvfs mounts
+
+* Tue Mar 12 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.0.1.2-3
+- Resolves: rhbz#920697 presentation not always full-screen
+
+* Thu Mar 07 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.0.1.2-2
+- Related: rhbz#902884 check for NULL GetSelectedMasterPage
+- Resolves: fdo#61241 force area page to size itself
+- Resolves: fdo#61656 use order and orientation combobox
+- Resolves: fdo#56031 RSID attr changes drop content changes
+
+* Thu Feb 28 2013 David Tardon <dtardon(a)redhat.com> - 1:4.0.1.2-1
+- 4.0.1 rc2
+
+* Tue Feb 26 2013 Eike Rathke <erack(a)redhat.com> - 1:4.0.0.3-8
+- do not access vector elements beyond size, rhbz#847519 related
+- Resolves: rhbz#742780 let make OPT_FLAGS=... override SDK flags
+- Resolves: rhbz#907933 crash on removing second last para
+
+* Tue Feb 19 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.0.0.3-7
+- Resolves: rhbz#895196 sc filter float a11y parent of itself
+
+* Tue Feb 19 2013 David Tardon <dtardon(a)redhat.com> - 1:4.0.0.3-6
+- Resolves: rhbz#911896 add Kazakh localization
+
+* Fri Feb 15 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.0.0.3-5
+- make evolution 3.6 work with address book
+- Resolves: rhbz#910176 cannot select directory with gtk folder picker
+- fixes for building against Boost 1.53.0
+
+* Fri Feb 15 2013 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.0.0.3-4
+- Resolves: fdo#60491 missing libemboleobj.so
+- Resolves: rhbz#908674 crash on start
+
+* Sat Feb 09 2013 Denis Arnaud <denis.arnaud_fedora(a)m4x.org> - 1:4.0.0.3-3
+- Rebuild for Boost-1.53.0
+
+* Wed Feb 06 2013 David Tardon <dtardon(a)redhat.com> - 1:4.0.0.3-2
+- fix parsing errors in translated help
+
+* Fri Feb 01 2013 David Tardon <dtardon(a)redhat.com> - 1:4.0.0.3-1
+- 4.0.0 rc3
+
+* Wed Jan 23 2013 David Tardon <dtardon(a)redhat.com> - 1:4.0.0.2-1
+- 4.0.0 rc2
+- use ucpp again
+
+* Tue Jan 22 2013 David Tardon <dtardon(a)redhat.com> - 1:4.0.0.1-3
+- Resolves: rhbz#760765 Impress doesn't copy custom styles from one file
+ to another
+
+* Mon Jan 21 2013 David Tardon <dtardon(a)redhat.com> - 1:4.0.0.1-2
+- Resolves: rhbz#901346 do not install 512x512 icons
+
+* Tue Jan 15 2013 David Tardon <dtardon(a)redhat.com> - 1:4.0.0.1-1
+- 4.0.0 rc1
+
+* Sat Dec 22 2012 David Tardon <dtardon(a)redhat.com> - 1:4.0.0.0-4.beta2
+- use system cpp instead of ucpp
+
+* Wed Dec 19 2012 David Tardon <dtardon(a)redhat.com> - 1:4.0.0.0-3.beta2
+- 4.0.0 beta2
+
+* Thu Dec 06 2012 David Tardon <dtardon(a)redhat.com> - 1:4.0.0.0-2.beta1
+- 4.0.0 beta1
+
+* Thu Nov 29 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.4.3-1
+- 3.6.4 rc3
+
+* Wed Nov 28 2012 Caolán McNamara <caolanm(a)redhat.com> - 1:3.6.4.1-2
+- fix docx import on big endian
+
+* Sun Nov 18 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.4.1-1
+- 3.6.4 rc1
+
+* Wed Nov 14 2012 Caolán McNamara <caolanm(a)redhat.com> - 1:3.6.3.2-8
+- Resolves: rhbz#872815 ogltrans effects still suboptimal
+
+* Tue Nov 13 2012 Caolán McNamara <caolanm(a)redhat.com> - 1:3.6.3.2-7
+- big endian test failure
+
+* Thu Nov 08 2012 Caolán McNamara <caolanm(a)redhat.com> - 1:3.6.3.2-6
+- Resolves: fdo#56198/rhbz#868002 honour gtk-scrollbar-warp-preference
+
+* Tue Nov 06 2012 Caolán McNamara <caolanm(a)redhat.com> - 1:3.6.3.2-5
+- bump for libexttextcat
+
+* Fri Nov 02 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.3.2-4
+- Resolves: rhbz#871929 add keywords to desktop files
+- fix debuginfo
+
+* Wed Oct 31 2012 Eike Rathke <erack(a)redhat.com> - 1:3.6.3.2-3
+- Resolves: rhbz#865058 increase number of user-defined format codes
+
+* Fri Oct 26 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.3.2-2
+- Resolves: rhbz#824035 do not bundle saxon
+
+* Wed Oct 24 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.3.2-1
+- 3.6.3 rc2
+- drop integrated 0001-Resolves-rhbz-868479-fdo-56281-doubled-in-German-ok-.patch
+
+* Mon Oct 22 2012 Caolán McNamara <caolanm(a)redhat.com> - 1:3.6.3.1-3
+- Resolves: rhbz#868479 guard against duplicated ~ in OK/Cancel
+
+* Thu Oct 11 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.3.1-2
+- Resolves: rhbz#858641 backport gstreamer 1.0 support to F-18
+
+* Thu Oct 11 2012 Caolán McNamara <caolanm(a)redhat.com> - 1:3.6.3.1-1
+- 3.6.3 rc1
+- drop integrated 0001-Resolves-rhbz-855972-crash-on-switching-to-outline-v.patch
+- drop integrated 0001-fdo-52022-Simple-LargeControlPoints-actually-can-hav.patch
+- drop integrated 0001-fdo-46071-Do-not-hide-windows-based-on-nil-Visible-p.patch
+
+* Fri Oct 05 2012 Stephan Bergmann <sbergman(a)redhat.com> - 1:3.6.2.2-3
+- Resolves: fdo#46071 Do not hide windows based on nil Visible property
+
+* Fri Oct 05 2012 Stephan Bergmann <sbergman(a)redhat.com> - 1:3.6.2.2-2
+- Resolves: fdo#52022 Part of data in userdir is lost on upgrade
+
+* Wed Sep 26 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.2.2-1
+- 3.6.2 rc2
+
+* Wed Sep 12 2012 Caolán McNamara <caolanm(a)redhat.com> - 1:3.6.2.1-2
+- Resolves: rhbz#855541 XIOError handler multithread woes
+
+* Wed Sep 12 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.2.1-1
+- 3.6.2 rc1
+
+* Tue Sep 11 2012 Caolán McNamara <caolanm(a)redhat.com> - 1:3.6.1.2-4
+- Resolves: rhbz#855507 large ole2 compound files fail to load
+
+* Mon Sep 10 2012 Caolán McNamara <caolanm(a)redhat.com> - 1:3.6.1.2-3
+- Resolves: rhbz#855972 crash on switching to outline view
+
+* Wed Aug 29 2012 Caolán McNamara <caolanm(a)redhat.com> - 1:3.6.1.2-2
+- Related: rhbz#850709 hunspell en-US available standalone so
+ make English langpack require hunspell-en and core just
+ bare bones hunspell-en-US
+
+* Sun Aug 26 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.1.2-1
+- 3.6.1 rc2
+
+* Wed Aug 22 2012 Caolán McNamara <caolanm(a)redhat.com> - 1:3.6.1.1-2
+- Resolves: rhbz#846775 Clipboard must be disposed before selection
+- Resolves: rhbz#842292 crash in scrolling multiselection in draw
+
+* Wed Aug 15 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.1.1-1
+- 3.6.1 rc1
+
+* Sun Aug 12 2012 Kevin Fenzi <kevin(a)scrye.com> - 1:3.6.0.4-3
+- Rebuild for new boost
+
+* Sat Jul 28 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.0.4-2
+- rebuilt for boost 1.50
+
+* Fri Jul 27 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.0.4-1
+- 3.6.0 rc4
+
+* Thu Jul 26 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.0.3-2
+- Resolves: rhbz#842552 crash in pptx import
+
+* Wed Jul 25 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.0.3-1
+- 3.6.0 rc3
+
+* Tue Jul 17 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.0.2-1
+- 3.6.0 rc2
+
+* Mon Jul 16 2012 Caolán McNamara <caolanm(a)redhat.com> - 1:3.6.0.1-3
+- Resolves: rhbz#836937 insanely slow with Zemberek
+
+* Mon Jul 16 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.0.1-2
+- rebuild for new libexttextcat
+
+* Thu Jul 12 2012 David Tardon <dtardon(a)redhat.com> - 3.6.0.1-1
+- 3.6.0 rc1
+
+* Mon Jul 09 2012 Caolán McNamara <caolanm(a)redhat.com> - 3.6.0.0-4
+- Resolves: rhbz#838368 --view ignored while -view accepted
+
+* Thu Jul 05 2012 David Tardon <dtardon(a)redhat.com> - 3.6.0.0-3
+- 3.6.0 beta3
+
+* Mon Jul 2 2012 Marek Kasik <mkasik(a)redhat.com> - 3.6.0.0-2
+- Rebuild (poppler-0.20.1)
+
+* Wed Jun 27 2012 David Tardon <dtardon(a)redhat.com> - 3.6.0.0-1
+- 3.6.0 beta2
+- drop integrated 0001-move-binfilter-mime-types-into-extra-.desktop-file.patch
+- drop integrated 0001-Resolves-rhbz-788042-skip-splashscreen-with-quicksta.patch
+- drop integrated libreoffice-ensure-non-broken-xml-tree.patch
+- drop integrated 0001-preserve-timestamps-for-.py-files.patch
+- drop integrated 0001-Resolves-rhbz-788045-swriter-help-etc-doesn-t-show-h.patch
+- drop integrated 0001-Resolves-rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch
+- drop integrated 0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch
+- drop integrated 0001-Resolves-rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch
+- drop integrated 0001-desktop-do-not-complain-about-soffice-command-line-o.patch
+- drop integrated 0001-Resolves-fdo-48096-torn-off-popups-trigger-keyboard-.patch
+- drop integrated 0001-fdo-38088-better-CSV-import-default-separators.patch
+- drop integrated 0001-save-register-arguments-first.patch
+- drop integrated 0001-do-not-let-gcc-use-registers-we-are-setting-ourselve.patch
+- drop integrated 0001-wrong-types-used-here-breaks-64bit-bigendian.patch
+- drop integrated 0001-Resolves-rhbz-805743-a11y-call-doShow-after-we-have-.patch
+- drop integrated 0001-Resolves-fdo-49849-implement-Unicode-6.1-hebrew-line.patch
+- drop integrated 0001-use-ure-instead-of-ure-link.patch
+- drop broken 0001-fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch
+
+* Mon Jun 18 2012 Caolán McNamara <caolanm(a)redhat.com> - 3.5.5.1-2
+- Resolves: rhbz#830810 missing dependency on lucene-contrib
+
+* Thu Jun 14 2012 David Tardon <dtardon(a)redhat.com> - 3.5.5.1-1
+- 3.5.5 rc1
+- drop integrated 0001-make-hsqldb-build-with-java-1.7.patch
+- drop integrated 0001-Related-rhbz-799628-crash-with-chewing-IM-with-g3g.patch
+- drop integrated 0001-silence-SolarMutex-not-locked-spew.patch
+- drop integrated 0001-gcc-trunk-fix-unable-to-find-string-literal-operator.patch
+- drop integrated 0001-ppc-yyinput-returns-a-int-truncating-to-unsigned-cha.patch
+- drop integrated 0001-Resolves-rhbz-826609-rhbz-820554-fix-smoketest-on-pp.patch
+
+* Mon Jun 11 2012 David Tardon <dtardon(a)redhat.com> - 3.5.4.2-3
+- make gdb pretty printers for URE libs usable again
+
+* Fri Jun 08 2012 Caolán McNamara <caolanm(a)redhat.com> - 3.5.4.2-2
+- Resolves: rhbz#826609, rhbz#820554 fix smoketest on ppc[64] and s390[x]
+
+* Wed May 23 2012 David Tardon <dtardon(a)redhat.com> - 3.5.4.2-1
+- 3.5.4 rc2
+
+* Thu May 17 2012 Caolán McNamara <caolanm(a)redhat.com> - 3.5.4.1-2
+- Resolves: rhbz#811226 ARM FTBFS
+
+* Wed May 16 2012 David Tardon <dtardon(a)redhat.com> - 3.5.4.1-1
+- 3.5.4 rc1
+- drop integrated 0001-do-not-prepend-n-twice-it-confuses-KFileDialog-rhbz-.patch
+- drop integrated 0001-incrementing-index-twice-in-one-run-seems-wrong.patch
+- drop integrated 0001-fdo-49365-correctly-map-monitor-index-back-to-screen.patch
+- drop integrated 0001-rhbz-809019-count-mirrored-monitors-as-one.patch
+
+* Sun May 13 2012 Caolán McNamara <caolanm(a)redhat.com> - 3.5.3.2-5
+- Resolves: fdo#49849 line breaking fixes for Hebrew
+
+* Fri May 11 2012 David Tardon <dtardon(a)redhat.com> - 3.5.3.2-4
+- Resolves: rhbz#820439 KDE export dialog broken for most formats
+- Resolves: fdo#49365 Libreoffice fails to start on second screen with
+ gtk vcl plugin
+- Resolves: rhbz#809019 Impress thinks a machine with 2 monitors in
+ clone mode is multihead
+
+* Wed May 09 2012 Caolán McNamara <caolanm(a)redhat.com> - 3.5.3.2-3
+- Resolves: rhbz#805743 a11y crash in impress/draw
+- Resolves: rhbz#813202 opengl slide transitions still a bit
+ problematic in Fedora 17
+
+* Thu May 03 2012 David Tardon <dtardon(a)redhat.com> - 3.5.3.2-2
+- rebuild for changed dependencies
+
+* Wed Apr 25 2012 David Tardon <dtardon(a)redhat.com> - 3.5.3.2-1
+- 3.5.3 rc2
+- fix broken test on 64bit big endian
+
+* Mon Apr 23 2012 David Tardon <dtardon(a)redhat.com> - 3.5.3.1-2
+- rebuild for icu
+- fix UNO bridges for ppc and ppc64
+
+* Thu Apr 19 2012 David Tardon <dtardon(a)redhat.com> - 3.5.3.1-1
+- 3.5.3 rc1
+- drop integrated 0001-Introduced-SystemShellExecuteFlags-URIS_ONLY.patch
+- drop integrated 0001-Simplify-code-and-use-proper-register-names-for-linu.patch
+- drop integrated 0001-resolved-rhbz-813280-the-current-document-is-not-alw.patch
+
+* Wed Apr 18 2012 Eike Rathke <erack(a)redhat.com> - 3.5.2.1-7
+- Resolves: rhbz#813280 sheets cannot be moved in Calc
+
+* Wed Apr 11 2012 Eike Rathke <erack(a)redhat.com> - 3.5.2.1-6
+- Resolves: fdo#38088 rhbz#810267 better CSV import default separators
+
+* Tue Apr 10 2012 Caolán McNamara <caolanm(a)redhat.com> - 3.5.2.1-5
+- Resolves: rhbz#811226 FTBFS ARM
+
+* Thu Apr 05 2012 Stephan Bergmann <sbergman(a)redhat.com> - 3.5.2.1-4
+- Fix URIS_ONLY flag issue
+- rebuild for db4
+
+* Mon Apr 02 2012 Caolán McNamara <caolanm(a)redhat.com> - 3.5.2.1-3
+- Resolves: rhbz#708041 focus problems with tearable menus
+
+* Mon Mar 26 2012 Caolán McNamara <caolanm(a)redhat.com> - 3.5.2.1-2
+- Resolves: rhbz#806663 SlideshowImpl can outlive SdModule
+
+* Sun Mar 25 2012 David Tardon <dtardon(a)redhat.com> - 3.5.2.1-1
+- 3.5.2 rc1
+-drop integrated 0001-yet-another-clash-with-macro-name.patch
+
+* Wed Mar 14 2012 David Tardon <dtardon(a)redhat.com> - 3.5.1.2-2
+- Resolves: rhbz#770209 can't change paper tray setting while printing
+
+* Thu Mar 08 2012 David Tardon <dtardon(a)redhat.com> - 3.5.1.2-1
+- 3.5.1 rc2
+
+* Tue Mar 06 2012 Caolán McNamara <caolanm(a)redhat.com> - 3.5.1.1-3
+- Resolves: rhbz#799628 crash with chewing IM with g3g
+- Resolves: rhbz#799525 put flat odf mimetypes into xsltfilter.desktop
+- Resolves: rhbz#800272 complain about unknown commandline options
+
+* Wed Feb 29 2012 Caolán McNamara <caolanm(a)redhat.com> - 3.5.1.1-2
+- Resolves: rhbz#788045 swriter --help doesn't show help
+- Resolves: rhbz#798667 missing .desktop icons
+
+* Sun Feb 26 2012 David Tardon <dtardon(a)redhat.com> - 3.5.1.1-1
+- 3.5.1 rc1
+- drop 0001-Resolves-fdo-43644-survive-registered-but-unavailabl.patch
+- drop 0001-Resolves-rhbz-789622-Adapt-SDK-to-changed-paths-in-L.patch
+- drop 0001-Fix-fdo-45177-avoid-linked-undo-for-the-while.patch
+- drop 0001-Fix-some-apparent-misuses-of-RTL_CONSTASCII_USTRINGP.patch
+- drop binfilter-Fix-some-apparent-misuses-of-RTL_CONSTASCII_USTRINGP.patch
+- Resolves: fdo#45177 avoid linked undo crash
+- Fix some apparent misuses of RTL_CONSTASCII_USTRINGPARAM (cherry-picked from
+ upstream libreoffice-3-5 branch)
+
+* Tue Feb 14 2012 Stephan Bergmann <sbergman(a)redhat.com> - 3.5.0.3-5
+- Resolves rhbz#789622: Adapt SDK to changed paths in LO installation
+
+* Mon Feb 13 2012 Caolán McNamara <caolanm(a)redhat.com> - 3.5.0.3-4
+- ensure gdb .py files have the same timstamps so that multilib
+ .pyc's and .pyo's have the same content (timestamp in binary cache)
+
+* Sat Feb 11 2012 Caolán McNamara <caolanm(a)redhat.com> - 3.5.0.3-3
+- make sure .tree files don't get busted again
+
+* Tue Feb 07 2012 Stephan Bergmann <sbergman(a)redhat.com> - 3.5.0.3-2
+- junit4 -> junit
+- Resolves: rhbz#788042 skip splashscreen with quickstarter
+- with split binfilter we need fix for fdo#43644
+
+* Thu Feb 02 2012 David Tardon <dtardon(a)redhat.com> - 3.5.0.3-1
+- 3.5.0 rc3
+- Resolves: rhbz#786328 add nlpsolver subpackage
+- split legacy binary filters into subpackage
+
+* Thu Jan 26 2012 Stephan Bergmann <sbergman(a)redhat.com> - 3.5.0.2-2
+- add libreoffice-postgresql subpackage
+
+* Wed Jan 25 2012 David Tardon <dtardon(a)redhat.com> - 3.5.0.2-1
+- 3.5.0 rc2
+
+* Thu Jan 19 2012 David Tardon <dtardon(a)redhat.com> - 3.5.0.1-1
+- 3.5.0 rc1
+- drop integrated 0001-workaround-internal-compiler-error-with-gcc-4.7.patch
+- drop integrated 0001-fix-for-gcc-4.7-C-11-these-are-not-string-literal-op.patch
+- drop integrated 0001-fix-for-gcc-4.7-C-11-this-is-not-string-literal-oper.patch
+- drop integrated 0001-Revert-fast_merge-fix-mis-merge-of-first-module-s-st.patch
+- drop integrated 0001-fix-writing-of-strings-from-the-first-module.patch
+- drop integrated 0001-refactor-slightly-to-avoid-link-problems-with-gcc-4..patch
+
+* Fri Jan 13 2012 David Tardon <dtardon(a)redhat.com> - 3.4.99.3-1
+- 3.5.0 beta3
+- drop integrated 0001-fix-syntactic-error.patch
+- drop integrated 0001-gcc-trunk-fix-error-unable-to-find-string-literal-op.patch
+- drop integrated 0001-gcc-trunk-avoid-confusion.patch
+- drop integrated 0001-workaround-for-LO-namespace-pollution-breaking-KDE4-.patch
+- drop integrated 0001-smath-does-not-handle-accents-in-MathML.patch
+- Resolves: rhbz#533318 smath does not handle accents in MathML
+- Resolves: rhbz#771108 English menu in writer despite installation of
+ libreoffice-langpack-de
+
+* Fri Jan 06 2012 David Tardon <dtardon(a)redhat.com> - 3.4.99.2-2
+- rebuild with gcc 4.7
+
+* Wed Dec 21 2011 David Tardon <dtardon(a)redhat.com> - 3.4.99.2-1
+- 3.5.0 beta2
+- drop integrated 0001-Resolves-rhbz-761009-IFSD_Equal-is-asymmetrical.patch
+- drop integrated 0001-Resolves-rhbz-767708-avoid-SIGBUS-writing-to-overcom.patch
+- drop integrated 0001-force-gbuild-stage-for-CustomTargets.patch
+- drop integrated 0001-these-translations-do-already-exist-in-translations-.patch
+- drop integrated 0001-Fix-typo-and-clean-up.patch
+- use system mysql-connector-c++
+
+* Sun Dec 18 2011 David Tardon <dtardon(a)redhat.com> - 3.4.99.1-1
+- 3.5.0 beta1
+- drop integrated 0001-Related-fdo-37195-migrationoo3-not-registered.patch
+- drop integrated 0001-Related-i58612-don-t-crash-anyway.patch
+- drop integrated 0001-Related-rhbz-652604-better-survive-exceptions-thrown.patch
+- drop integrated 0001-Related-rhbz-702833-addEventListener-without-removeE.patch
+- drop integrated 0001-Related-rhbz-711087-band-aid.patch
+- drop integrated 0001-Related-rhbz-718976-crash-in-SwTxtSizeInfo-GetMultiC.patch
+- drop integrated 0001-Related-rhbz-730225-avoid-segv-in-ld-this-was-set-to.patch
+- drop integrated 0001-Related-rhbz-753201-fedora-ant-java-1.5.0-gcj-won-t-.patch
+- drop integrated 0001-Resolves-fdo-32665-handle-that-FreeSerif-lacks-some-.patch
+- drop integrated 0001-Resolves-rhbz-693265-fix-crash-from-unhandled-except.patch
+- drop integrated 0001-Resolves-rhbz-695509-crash-in-RefreshDocumentLB.patch
+- drop integrated 0001-Resolves-rhbz-713154-pdf-export-dialog-too-tall-to-f.patch
+- drop integrated 0001-Resolves-rhbz-715549-use-fontconfig-s-detected-forma.patch
+- drop integrated 0001-Resolves-rhbz-738255-avoid-crash-on-NULL-pointer.patch
+- drop integrated 0001-Resolves-rhbz-751290-KDE-black-on-dark-tooltips.patch
+- drop integrated 0001-add-Oracle-Java-1.7.0-recognition.patch
+- drop integrated 0001-avoid-using-com.sun.org-apis.patch
+- drop integrated 0001-bubble-down-configure-test-findings-on-visibility.patch
+- drop integrated 0001-fix-horizontal-scrollbars-with-KDE-oxygen-style-bnc-.patch
+- drop integrated 0001-gtk3-fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch
+- drop integrated 0001-helgrind-Related-rhbz-655686-get-order-of-shutdown-c.patch
+- drop integrated 0001-rhbz-667082-do-not-crash-importing-section-containin.patch
+- drop integrated 0001-rhbz-702635-set-correct-page-number-when-exporting-s.patch
+- drop integrated Backport-reading-AES-encrypted-ODF-1.2-documents.patch
+- drop integrated gdb-pretty-printers.patch
+- drop integrated kde4configure.patch
+- drop integrated libreoffice-ppc64.patch
+- drop integrated openoffice.org-3.3.0.ooo108637.sfx2.uisavedir.patch
+- drop integrated openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
+- drop integrated vbahelper.visibility.patch
+- drop libreoffice-testtools subpackage, because testtool has been
+ removed by upstream
+
+* Thu Dec 15 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.4.2-6
+- Resolves: rhbz#761009 IFSD_Equal is asymmetrical
+- Resolves: rhbz#767708 write to mmap'ed file w/o disk space: SIGBUS
+
+* Tue Nov 29 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.4.2-5
+- Resolves: rhbz#757653 fix headless crash with cairo canvas
+
+* Tue Nov 22 2011 Lukas Tinkl <ltinkl(a)redhat.com> - 3.4.4.2-4
+- Resolves: rhbz#751290 - [kde] LibreOffice has black on dark-grey tooltip-texts
+
+* Fri Nov 11 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.4.2-3
+- Related: fdo#42534 0001-Related-i58612-don-t-crash-anyway.patch
+- Resolves: fdo#42749 KDE oxygen theme and scrollbars
+
+* Thu Nov 10 2011 Stephan Bergmann <sbergman(a)redhat.com> - 3.4.4.2-2
+- Patch to backport reading AES-encrypted ODF 1.2 documents
+
+* Thu Nov 03 2011 David Tardon <dtardon(a)redhat.com> - 3.4.4.2-1
+- 3.4.4 rc2
+
+* Fri Oct 28 2011 Rex Dieter <rdieter(a)fedoraproject.org> - 1:3.4.4.1-4
+- rebuild(poppler)
+
+* Thu Oct 27 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.4.1-3
+- Resolves: rhbz#665800 missing glyph symbol shown when toggling bold/italic
+ for Sinhala text
+
+* Thu Oct 27 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.4.1-2
+- possible fix for java 1.7.0 detection
+
+
+* Wed Oct 26 2011 David Tardon <dtardon(a)redhat.com> - 3.4.4.1-1
+- 3.4.4 rc1
+
+* Tue Oct 25 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.3.2-16
+- allow building with gcj
+
+* Fri Oct 21 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.3.2-15
+- Resolves: rhbz#747356 let Qt call XInitThreads
+- fix .sdw import
+
+* Wed Oct 19 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.3.2-14
+- Related: rhbz#743750 addXineramaScreenUnique issue
+
+* Fri Oct 07 2011 Stephan Bergmann <sbergman(a)redhat.com> - 3.4.3.2-13
+- Patches to build with GCC 6.4.1
+
+* Fri Sep 30 2011 Marek Kasik <mkasik(a)redhat.com> - 3.4.3.2-12
+- Rebuild (poppler-0.18.0)
+
+* Tue Sep 20 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.3.2-11
+- Resolves: rhbz#738133 fix bn discard string
+- Resolves: fdo#35513 avoid crash while processing incorrect print range
+
+* Mon Sep 19 2011 Marek Kasik <mkasik(a)redhat.com> - 3.4.3.2-10
+- Rebuild (poppler-0.17.3)
+
+* Thu Sep 15 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.3.2-9
+- Resolves: rhbz#738255 avoid crash on sc inputhdl
+
+* Tue Sep 13 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.3.2-8
+- Resolves: rhbz#274631 remove NoDisplay from -math.desktop
+
+* Thu Sep 08 2011 David Tardon <dtardon(a)redhat.com> - 3.4.3.2-7
+- rebuild for new icu
+
+* Tue Sep 06 2011 David Tardon <dtardon(a)redhat.com> - 3.4.3.2-6
+- Resolves: rhbz#734976 libreoffice-langpack-*-* not pulled in by
+ yum install libreoffice
+
+* Fri Sep 02 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.3.2-5
+- Resolves: rhbz#735182 be able to rebuild against poppler 0.17.3
+
+* Tue Aug 30 2011 David Tardon <dtardon(a)redhat.com> - 3.4.3.2-4
+- Resolves: rhbz#734432 openoffice.org symlink broken
+
+* Mon Aug 29 2011 David Tardon <dtardon(a)redhat.com> - 3.4.3.2-3
+- add Latvian langpack
+
+* Fri Aug 26 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.3.2-2
+- Resolves: rhbz#733564 graphite2 now packaged into fedora
+- Related: fdo#37195 migrationoo3 not registered
+
+* Thu Aug 25 2011 David Tardon <dtardon(a)redhat.com> - 3.4.3.2-1
+- 3.4.3 rc2
+
+* Mon Aug 22 2011 David Tardon <dtardon(a)redhat.com> - 3.4.3.1-2
+- add gdb pretty printers
+
+* Tue Aug 16 2011 David Tardon <dtardon(a)redhat.com> - 3.4.3.1-1
+- 3.4.3 rc1
+- drop integrated 0001-Resolves-rhbz-725144-wrong-csh-syntax.patch
+
+* Fri Aug 12 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.2.3-3
+- Related: rhbz#730225 avoid segv in ld
+
+* Tue Aug 02 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.2.3-2
+- Resolves: rhbz#693265 fix crash from unhandled exception
+
+* Fri Jul 29 2011 David Tardon <dtardon(a)redhat.com> - 3.4.2.3-1
+- 3.4.2 rc3
+
+* Mon Jul 25 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.2.2-2
+- Resolves: rhbz#725144 wrong csh syntax
+
+* Wed Jul 20 2011 David Tardon <dtardon(a)redhat.com> - 3.4.2.2-1
+- 3.4.2 rc2
+- fix breakage in KDE4 plugin
+
+* Tue Jul 19 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.2.1-3
+- Resolves: rhbz#715549 use fontconfig's detected format
+
+* Mon Jul 18 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.2.1-2
+- Rebuild (poppler-0.17.0), add libreoffice-poppler-0.17.0.patch
+ seeing as the API changed for some reason or other
+
+* Wed Jul 13 2011 David Tardon <dtardon(a)redhat.com> - 3.4.2.1-1
+- 3.4.2 rc1
+- drop 0001-bad-merge-fix-to-enable-extensions-to-build-again.patch
+- drop 0001-fix-regression-in-SvGlobalName-operator.patch
+
+* Tue Jul 12 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.1.3-3
+- fix regression in SvGlobalName operator
+
+* Tue Jul 05 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.1.3-2
+- Related: rhbz#718976 crash in SwTxtSizeInfo::GetMultiCreator
+
+* Fri Jul 01 2011 David Tardon <dtardon(a)redhat.com> - 3.4.1.3-1
+- 3.4.1 rc3
+
+* Thu Jun 23 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.1.2-1
+- 3.4.1 rc2
+- drop integrated 0001-correctly-build-GTK-systray-icon.patch
+
+* Tue Jun 21 2011 David Tardon <dtardon(a)redhat.com> - 3.4.1.1-5
+- Resolves: rhbz#714781 add Persian langpack
+- Resolves: rhbz#667082 do not crash importing section containing just
+ an empty paragraph
+
+* Mon Jun 20 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.1.1-4
+- Related: rhbz#711087 band aid for crash in sc undo
+- Resolves: rhbz#714338 add a metapackage to install standard bits
+
+* Fri Jun 17 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.1.1-3
+- Related: rhbz#702833 addEventListener without removeEventListener
+
+* Thu Jun 16 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.1.1-2
+- Resolves: rhbz#713154 pdf export dialog too tall to fit
+
+* Wed Jun 15 2011 David Tardon <dtardon(a)redhat.com> - 3.4.1.1-1
+- 3.4.1 RC1
+- drop integrated 0001-Resolves-rhbz-707317-avoid-crash-in-getRowSpan.patch
+- drop integrated 0001-Resolves-rhbz-710004-band-aid-for-immediate-crash-in.patch
+- drop integrated 0001-Resolves-rhbz-710556-don-t-crash-on-missing-graphics.patch
+- drop integrated 0001-Resolves-rhbz-699909-crash-in-export-of-.doc-in-lcl_.patch
+- drop integrated 0001-fdo-37584-Make-a-real-copy-of-the-text-where-to-coun.patch
+- drop integrated 0001-Resolves-fdo-37668-bitwise-operations-on-signed-numb.patch
+
+* Thu Jun 09 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.0.2-5
+- Resolves: rhbz#699909 crash in export of .doc in lcl_getField
+- Resolves: fdo#37584 Make a real copy of the text
+- Resolves: rhbz#709503/fdo#37668 bitwise operations on signed values
+
+* Tue Jun 07 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.0.2-4
+- Resolves: rhbz#710556 't crash on missing graphics .pptx export
+- Resolves: rhbz#652604 better survive exceptions in autorecovery
+
+* Thu Jun 02 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.0.2-3
+- Resolves: rhbz#710004 band aid for crash
+
+* Mon May 30 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.0.2-2
+- Resolves: rhbz#707317 avoid crash in getRowSpan
+
+* Fri May 27 2011 David Tardon <dtardon(a)redhat.com> - 3.4.0.2-1
+- 3.4.0 RC2
+- drop integrated 0001-fix-build-with-system-bsh.patch
+
+* Wed May 25 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.0.1-3
+- rebuild for new hunspell
+
+* Tue May 24 2011 David Tardon <dtardon(a)redhat.com> - 3.4.0.1-2
+- Resolves: rhbz#706110 oosplash.bin segfault on every login
+
+* Fri May 20 2011 David Tardon <dtardon(a)redhat.com> - 3.4.0.1-1
+- 3.4 RC1
+- Resolves: rhbz#702635 set correct page number when exporting selected
+ pages
+
+* Sat May 07 2011 Christopher Aillon <caillon(a)redhat.com> - 3.3.99.4-2
+- Update icon cache scriptlet
+
+* Sat May 07 2011 David Tardon <dtardon(a)redhat.com> 3.3.99.4-1
+- 3.4 beta4
+- drop integrated 0001-Removed-duplicate-code-block-mis-merge-prolly.patch
+- drop integrated 7de0b88ce2dd932915894385b54be1897d5ee053.zip
+
+* Mon Apr 18 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.99.1-2
+- Resolves: rhbz#695509 crash in RefreshDocumentLB
+- bubble down configure test findings on visibility
+
+* Mon Apr 11 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.99.1-1
+- 3.4 beta1
+- drop openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+ in favour of ooosplash
+- drop openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+ because components are passively registered now
+- drop integrated openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
+- drop integrated turn-script-providers-into-extensions.patch
+- drop integrated 0001-tidy-this-up-and-don-t-bail-out-on-mislength-records.patch
+- drop integrated 0001-free-ctxt-after-taking-lastError-details.patch
+- drop integrated 0001-Removed-suspect-hack.-Cursor-on-post-it-now-scrolls-.patch
+- drop integrated libreoffice-gcc4.6.0.patch
+- drop integrated 0001-fexceptions-fexceptions.patch
+- drop integrated 0001-Related-rhbz-672872-cancel-gtk-file-dialog-on-deskto.patch
+- drop vbahelper.visibility.patch
+- drop integrated 0001-Resolves-fdo-33509-i62414-out-by-one-breaks-CTL-spel.patch
+- drop integrated 0001-Resolves-rhbz-670020-crash-in-slidesorting.patch
+- drop integrated 0001-Resolves-rhbz-676539-handle-missing-pWindows-from-xW.patch
+- drop integrated 0001-Resolves-fdo-33750-i94623-use-optimal-border-width-w.patch
+- drop integrated 0001-rhbz-649310-don-t-crash-deregistering-diff.-platform.patch
+- drop integrated 0001-Resolves-rhbz-674330-dereference-of-NULL-mpBase.patch
+- drop integrated 0001-rhbz-678284-Get-correct-current-position-when-shift-page-up-and-.patch
+- drop integrated 0001-Resolves-rhbz-681159-bandaid-for-crash.patch
+- drop integrated 0001-Resolves-rhbz-672818-bandaid-for-crash-in-SwTxtNode-.patch
+- drop integrated 0001-install-high-resolution-icons.patch
+- drop integrated 0001-Resolves-rhbz-682716-pa-IN-isn-t-handled-by-fontconf.patch
+- drop integrated 0001-Related-rhbz-684477-make-sure-this-is-thread-safe.patch
+- drop integrated 0001-Resolves-rhbz-682621-better-resizing-of-overtall-gly.patch
+- drop integrated 0001-Resolves-rhbz-684620-crash-with-NULL-pTableBox.patch
+- drop integrated libreoffice-fdo33947.sd.print.crash.patch
+- drop integrated 0001-add-cairo_ft_font_face_create_for_pattern-wrapper.patch
+- drop integrated 0001-Related-rhbz-680460-reorganize-this-to-make-it-inher.patch
+- drop integrated 0001-Related-rhbz-680460-don-t-bother-with-an-interim-Fon.patch
+- drop integrated 0001-Resolves-rhbz-680460-honour-lcdfilter-subpixeling-et.patch
+- drop integrated 0001-Cut-Gordian-Knot-of-who-owns-the-font-options.patch
+- drop integrated 0001-beware-of-invalidated-iterator.patch
+- drop integrated rhbz680766.fix-mdds-crash.patch
+- drop integrated 0001-Resolves-rhbz-684580-X-and-strike-through-escapes-ra.patch
+- drop integrated 0001-set-mime-types-on-flat-xml-filters.patch
+- drop integrated 0001-add-flat-xml-types-to-.desktop-files-etc.patch
+- drop integrated libreoffice-fdo31271.icu.patch
+
+* Tue Apr 05 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.2.2-6
+- Resolves: rhbz#655686 get order of shutdown correct
+
+* Wed Mar 30 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.2.2-5
+- Add application/vnd.oasis.opendocument.text-flat-xml, etc. to
+ .desktop files for mcepl
+
+* Tue Mar 29 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.2.2-4
+- Resolves: rhbz#684580 improve X and / strike-through
+
+* Thu Mar 24 2011 David Tardon <dtardon(a)redhat.com> 3.3.2.2-3
+- Resolves: rhbz#680766 crash in mdds
+
+* Wed Mar 23 2011 David Tardon <dtardon(a)redhat.com> 3.3.2.2-2
+- Related: rhbz#689268 versioned deps need to contain epoch
+
+* Tue Mar 22 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.2.2-1
+- latest version
+- drop integrated 0001-Resolves-fdo-33701-ensure-node-outlives-path.patch
+- drop integrated 0001-valgrind-don-t-leave-an-evil-thread-running-after-ma.patch
+
+* Tue Mar 22 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.1.2-12
+- Fix fontoptions cache
+- avoid crash in calc on changing size of rows (dtardon)
+
+* Mon Mar 21 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.1.2-11
+- Resolves: rhbz#689268 autocorrs from OOo F14 not upgraded
+
+* Wed Mar 16 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.1.2-10
+- Resolves: rhbz#680460 honour lcdfilter and subpixeling
+
+* Tue Mar 15 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.1.2-9
+- Resolves: fdo#33947 sd print crash
+
+* Mon Mar 14 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.1.2-8
+- Related: rhbz#684477 make sure this is thread safe
+- Resolves: rhbz#684620 crash with NULL pTableBox
+
+* Sun Mar 13 2011 Marek Kasik <mkasik(a)redhat.com> 3.3.1.2-7
+- Rebuild (poppler-0.16.3)
+
+* Wed Mar 09 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.1.2-6
+- Resolves: rhbz#682621 better resizing of overtall glyphsubs
+
+* Tue Mar 08 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.1.2-5
+- Resolves: rhbz#682716 pa-IN isn't handled well by fontconfig
+
+* Tue Mar 08 2011 David Tardon <dtardon(a)redhat.com> 3.3.1.2-4
+- install 128x128 px icons
+
+* Wed Mar 02 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.1.2-3
+- Resolves: rhbz#681159 crash in writer
+- Resolves: rhbz#672818 crash in writer
+- Resolves: fdo#33701 ensure node outlives path
+- Resolves: rhbz#681738 crash on writing config post-main
+
+* Thu Feb 17 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.1.2-2
+- Resolves: rhbz#678284 Calc crashes during cell select with keys
+ (dtardon)
+
+* Thu Feb 17 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.1.2-1
+- RC2
+
+* Wed Feb 16 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.1.1-2
+- Resolves: rhbz#674330 dereference of NULL mpBase
+
+* Fri Feb 11 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.1.1-1
+- 3.3.1 rc1
+- drop integrated 0001-don-t-pushback-and-process-a-corrupt-extension.patch
+- drop integrated libreoffice-fdo32561.comphelper.patch
+- drop integrated 0001-Related-rhbz-610103-more-woes-on-rpm-upgrade-vs-rpm-.patch
+- drop integrated 0001-Resolves-rhbz-673819-crash-on-changing-position-of-d.patch
+- drop integrated 0001-rhbz-666440-don-t-pushback-and-process-a-corrupt-extension.patch
+
+* Thu Feb 10 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.0.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+- Related: rhbz#610103 make this even more robust
+- Related: rhbz#672872 cancel gtk file dialog on terminate
+- Resolves: fdo#33509/ooo#62414 fix CTL spelling popup
+- Resolves: rhbz#673819 crash on changing position of header/footer object
+- Resolves: rhbz#670020 crash in slidesorting
+- Resolves: rhbz#676539 handle missing pWindows from xWindows
+- Resolves: rhbz#649310 don't crash deregistering diff. platform ext.
+ (dtardon)
+- Resolves: rhbz#666440 don't pushback and process a corrupt extension
+
+* Mon Jan 24 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.0.4-2
+- Resolves: rhbz#671540 fix lonely )
+
+* Thu Jan 20 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.0.4-1
+- next release candidate
+- drop integrated 0001-fix-presenter-screens-description.xml-build.patch
+
+* Tue Jan 18 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.0.3-2
+- backport fix to get presenter screen working
+- make handling busted extensions more robust
+
+* Wed Jan 12 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.0.3-1
+- latest version
+- drop integrated 0001-Resoves-rhbz-663857-font-color-missing-C-FAQ-10.3-do.patch
+- drop integrated 0001-Avoid-double-paste-when-pasting-text-into-cell-comme.patch
+- drop integrated 0001-Resolves-rhbz-660342-Undo-Redo-crash-with-postits.patch
+- drop integrated 0001-Resolves-rhbz-666088-clean-up-search-cache-singleton.patch
+
+* Thu Jan 06 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.0.2-5
+- Resolves: rhbz#666088 don't crash on clean up of search cache
+
+* Wed Jan 05 2011 Lukas Tinkl <ltinkl(a)redhat.com> 3.3.0.2-4
+- create a KDE integration subpackage
+
+* Mon Jan 03 2011 David Tardon <dtardon(a)redhat.com> 3.3.0.2-3
+- rebuild with new poppler
+
+* Wed Dec 22 2010 Caolán McNamara <caolanm(a)redhat.com> 3.3.0.2-2
+- Resolves: rhbz#663724 fdo32572-sc-dont-double-paste.patch
+- Resolves: rhbz#660342 Undo/Redo crash with postits
+
+* Tue Dec 21 2010 Caolán McNamara <caolanm(a)redhat.com> 3.3.0.2-1
+- latest version
+
+* Sat Dec 18 2010 Caolán McNamara <caolanm(a)redhat.com> 3.3.0.1-4
+- Resolves: rhbz#663857 font color missing in transitions
+
+* Wed Dec 15 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 3.3.0.1-3
+- rebuild (poppler)
+
+* Wed Dec 15 2010 Caolán McNamara <caolanm(a)redhat.com> 3.3.0.1-2
+- Fix up some doc imports
+
+* Sun Dec 05 2010 Caolán McNamara <caolanm(a)redhat.com> 3.3.0.1-1
+- release candidate 1
+- drop integrated qstart.dont-forceenabled-on-post-reg-restart.patch
+- drop integrated exit.quickstarter.when.deleted.patch
+- drop integrated 0001-destroydesktop.in.timeout.patch
+- drop integrated openoffice.org-3.3.0.rhbz657541.join-paragraphs.patch
+
+* Sat Nov 27 2010 Caolán McNamara <caolanm(a)redhat.com> 3.2.99.3-2
+- Resolves: rhbz#610103 exit quickstarter when libs deleted
+- Resolves: rhbz#652695 release desktop in timeout
+- Resolves: rhbz#657541 don't crash during processing of auto. styles
+ when joining paragraphs (dtardon)
+
+* Thu Nov 18 2010 Caolán McNamara <caolanm(a)redhat.com 3.2.99.3-1
+- next Libreoffice milestone
+- drop integrated openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
+- drop integrated openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
+- drop integrated openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch
+- drop integrated openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
+- drop integrated libreoffice-buildfix.patch
+- drop integrated libreoffice-xdg632229.gnomeshell.patch
+- drop integrated 0001-strcpy-cannot-be-used-with-overlapping-src-and-dest.patch
+- drop integrated 0001-abort-doesn-t-gain-us-anything-here.patch
+- drop integrated 0001-latest-libX11-changed-header-guards.patch
+
+* Sat Nov 06 2010 David Tardon <dtardon(a)redhat.com 3.2.99.2-6
+- turn script providers into extensions
+
+* Wed Nov 03 2010 Caolán McNamara <caolanm(a)redhat.com> 3.2.99.2-5
+- Resolves: rhbz#649210 add Sinhalese langpack
+
+* Sat Oct 30 2010 Caolán McNamara <caolanm(a)redhat.com> 3.2.99.2-4
+- langpack macro hard-coded version number
+
+* Fri Oct 22 2010 Caolán McNamara <caolanm(a)redhat.com> 3.2.99.2-3
+- Resolves: xdg632229 gnomeshell app tracking
+
+* Tue Oct 12 2010 David Tardon <dtardon(a)redhat.com> 3.2.99.2-2
+- use macros to define auto-correction and language pack subpackages
+
+* Mon Oct 11 2010 Caolán McNamara <caolanm(a)redhat.com> 3.2.99.2-1
+- next LibreOffice milestone
+- drop integrated openoffice.org-2.3.0.ooo76649.httpencoding.patch
+- drop integrated workspace.dtardon03.patch
+- drop integrated openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
+- drop integrated workspace.impress195.patch
+- drop integrated workspace.srb1.patch
+- drop integrated openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+- drop integrated openoffice.org-3.3.0.ooo108246.svx.hide-sql-group-when-inactive.patch
+- drop integrated openoffice.org-3.2.0.ooo95369.sw.sortedobjs.patch
+- drop integrated openoffice.org-3.2.0.ooo110142.svx.safercolornames.patch
+- drop integrated openoffice.org-3.3.0.ooo111758.sd.xerror.patch
+- drop integrated openoffice.org-3.2.0.ooo111741.extras.malformed-xml-file.patch
+- drop integrated openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch
+- drop integrated openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
+- drop integrated workspace.vcl113.patch
+- drop integrated openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch
+- drop integrated workspace.cmcfixes77.patch
+- drop integrated workspace.vcl114.patch
+- drop integrated openoffice.org-3.3.0.ooo106591.sal.tradcopy.patch
+- drop integrated workspace.vcl115.patch
+- drop integrated workspace.cmcfixes78.patch
+- drop integrated openoffice.org-3.3.0.ooo114012.sd.bada11ychain.patch
+- drop integrated workspace.cmcfixes79.patch
+- drop integrated openoffice.org-3.3.0.ooo114703.vcl.betterlocalize.font.patch
+- drop integrated openoffice.org-3.3.0.rh638185.editeng.cjkctlhtmlsizes.patch
+- drop integrated openoffice.org-3.3.0.rh637738.libgcrypt.addmutex.patch
+- drop integrated openoffice.org-3.2.0.rh632236.writerfilter.cleanup-cell-props.patch
+- drop workspace.gtk3.patch
+
+* Wed Oct 06 2010 Caolán McNamara <caolanm(a)redhat.com> 3.2.99.1-2
+- Related: rhbz#639945 pull in review changes
+ + redland build-fix
+ + replace awk script
+ + validate .destop files
+
+* Wed Sep 29 2010 Caolán McNamara <caolanm(a)redhat.com> 3.2.99.1-1
+- initial import of the leviathan
diff --git a/libreoffice.spec b/libreoffice.spec
index 3c365ba..3e0e796 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -58,7 +58,11 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.1
-Release: 2%{?libo_prerelease}%{?dist}
+%if 0%{?libo_prerelease}
+Release: %autorelease -e %{?libo_prerelease}
+%else
+Release: %autorelease
+%endif
# default new files are: MPLv2
# older files are typically: MPLv2 incorporating work under ASLv2
# nlpsolver is: LGPLv3
@@ -2267,2760 +2271,4 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
-* Sun Oct 01 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.2.1-2
-- Add patch 501 for failing tests on aarc64 and s390x
-
-* Sat Sep 30 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.2.1-1
-- 7.6.2.1
-
-* Fri Sep 08 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1:7.6.1.2-1
-- 7.6.1.2
-
-* Mon Sep 04 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.1.1-2
-- Unbundle dragonbox
-
-* Mon Aug 28 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1:7.6.1.1-1
-- 7.6.1.1
-
-* Sun Aug 27 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.0.3-4
-- Remove test exclusions from aarch64
-- Link aarch64 executable with standard -g level
-
-* Wed Aug 23 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.0.3-3
-- Disable other failing tests under s390x
-- Add patch to fix FTB under ppc64le
-
-* Tue Aug 15 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.0.3-2
-- Disable unreliable test under s390x
-- Try verbose make if first build attempt fails
-
-* Sun Aug 13 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.0.3-1
-- 7.6.0.3
-
-* Wed Aug 02 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1:7.5.5.2-2
-- Poppler rebuild.
-
-* Mon Jul 31 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1:7.5.5.2-1
-- 7.5.5.2
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:7.5.4.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jul 11 2023 František Zatloukal <fzatlouk(a)redhat.com> - 1:7.5.4.2-4
-- Rebuilt for ICU 73.2
-
-* Fri Jun 30 2023 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1:7.5.4.2-3
-- Make Java optional. Fixes rhbz#2084071.
-
-* Mon Jun 19 2023 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 1:7.5.4.2-2
-- Backport upstream fix for testSignDocument_PEM_PDF test failure
-- Enable test again
-
-* Fri Jun 16 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1:7.5.4.2-1
-- 7.5.4.2
-- Drop 0001-tdf-155161-Always-embed-fonts-with-CFF2-table-as-PDF.patch, upstreamed.
-
-* Thu Jun 15 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1:7.5.3.2-4
-- Disable tests temporarily to resolve FTBFS.
-
-* Thu Jun 15 2023 Python Maint <python-maint(a)redhat.com> - 1:7.5.3.2-3
-- Rebuilt for Python 3.12
-
-* Tue May 09 2023 Caolán McNamara <caolanm(a)redhat.com> - 1:7.5.3.2-2
-- rhbz#2192915 Japanese font not printed
-
-* Thu May 04 2023 Caolán McNamara <caolanm(a)redhat.com> - 1:7.5.3.2-1
-- latest version
-
-* Fri Mar 31 2023 Caolán McNamara <caolanm(a)redhat.com> - 1:7.5.2.2-1
-- latest version
-
-* Wed Mar 22 2023 Stephan Bergmann <sbergman(a)redhat.com> - 1:7.5.1.2-4
-- Resolves: rhbz#2171265 Failure to start with junk in program/services/
-
-* Fri Mar 10 2023 Caolán McNamara <caolanm(a)redhat.com> - 1:7.5.1.2-3
-- Use sifr/sifr_dark for gnome,
- https://pagure.io/fedora-workstation/issue/361
-
-* Thu Mar 09 2023 Caolán McNamara <caolanm(a)redhat.com> - 1:7.5.1.2-2
-- fix gray background in kf5 print preview
-
-* Thu Mar 02 2023 Caolán McNamara <caolanm(a)redhat.com> - 1:7.5.1.2-1
-- latest version
-
-* Fri Feb 24 2023 Caolán McNamara <caolanm(a)redhat.com> - 1:7.5.0.3-4
-- Rebuild for zxing-cpp 2.0.0
-
-* Mon Feb 20 2023 Jonathan Wakely <jwakely(a)redhat.com> - 1:7.5.0.3-3
-- Rebuilt for Boost 1.81
-
-* Mon Feb 06 2023 Marek Kasik <mkasik(a)redhat.com> - 1:7.5.0.3-2
-- Rebuild for poppler-23.02.0
-
-* Thu Feb 02 2023 Caolán McNamara <caolanm(a)redhat.com> - 1:7.5.0.3-1
-- 7.5.0 release
-
-* Fri Jan 20 2023 Caolán McNamara <caolanm(a)redhat.com> - 1:7.5.0.2-1
-- 7.5.0 beta
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:7.4.4.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jan 12 2023 Caolán McNamara <caolanm(a)redhat.com> - 1:7.4.4.2-1
-- 7.4.4 release
-
-* Sat Dec 31 2022 Pete Walter <pwalter(a)fedoraproject.org> - 1:7.4.3.2-4
-- Rebuild for ICU 72
-
-* Fri Dec 16 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.4.3.2-3
-- fix License syntax "and/or" -> "AND/OR"
-
-* Tue Dec 06 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.4.3.2-2
-- add BuildRequires on hunspell-en-US for testTdf124603
-
-* Thu Nov 17 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.4.3.2-1
-- 7.4.3 release
-
-* Thu Nov 17 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.4.2.3-2
-- Resolves: rhbz#2143431 fix autofilter missing search entry
-
-* Thu Oct 13 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.4.2.3-1
-- 7.4.2 release
-
-* Fri Sep 16 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.4.1.2-1
-- 7.4.1 release
-
-* Thu Aug 18 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.4.0.3-1
-- 7.4.0 release
-
-* Tue Aug 09 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.4.0.2-1
-- 7.4rc2
-
-* Wed Aug 03 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.3.5.2-3
-- Rebuilt for poppler 22.08.0
-
-* Tue Aug 02 2022 Frantisek Zatloukal <fzatlouk(a)redhat.com> - 1:7.3.5.2-2
-- Rebuilt for ICU 71.1
-
-* Thu Jul 21 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.3.5.2-1
-- latest version
-
-* Tue Jul 19 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.3.4.2-5
-- rhbz#2104072 build on i686 without java support
-
-* Mon Jul 11 2022 Stephan Bergmann <sbergman(a)redhat.com> - 1:7.3.4.2-4
-- Resolves: rhbz#2104545 Avoid call to utl::IsYounger if possible
-
-* Thu Jun 23 2022 Parag Nemade <pnemade AT redhat DOT com> - 1:7.3.4.2-3
-- Fix Requires: hunspell-pt-BR and hyphen-pt-BR for libreoffice-langpack-pt-BR
-
-* Mon Jun 13 2022 Python Maint <python-maint(a)redhat.com> - 1:7.3.4.2-2
-- Rebuilt for Python 3.11
-
-* Thu Jun 09 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.3.4.2-1
-- 7.3.4 release
-
-* Wed May 04 2022 Thomas Rodgers <trodgers(a)redhat.com> - 1:7.3.3.2-2
-- Rebuilt for Boost 1.78
-
-* Mon May 02 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.3.3.2-1
-- 7.3.3 release
-
-* Tue Apr 05 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.3.2.2-1
-- 7.3.2 release
-
-* Mon Mar 14 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.3.1.3-4
-- tdf#144862 use resolution independent text rendering
-
-* Tue Mar 08 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.3.1.3-3
-- rhbz#2061598 No Icons Launcher of LibreOffice Apps in Raspberry Pi
-
-* Mon Mar 07 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.3.1.3-2
-- rhbz#2061268 finally drop the dependency on the dejavu fonts
-
-* Sat Mar 05 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.3.1.3-1
-- 7.3.1 release
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek(a)redhat.com> - 1:7.3.0.3-3
-- Rebuilt for java-17-openjdk as system jdk
-
-* Sat Feb 05 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.3.0.3-2
-- reenable tests
-
-* Wed Feb 02 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.3.0.3-1
-- 7.3.0 release
-- drop conditionals for rhel < 9
-- drop conditionals for fedora < 36
-
-* Tue Feb 01 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.5.2-5
-- Related: rhbz#2029810 set NoDisplay=true for .desktop on s390x/aarch64
-- Related: rhbz#2029810 don't Require any vclplug for s390x/aarch64
-
-* Mon Jan 24 2022 Parag Nemade <pnemade AT redhat DOT com> - 1:7.2.5.2-4
-- Update hunspell dictionary directory path
- https://fedoraproject.org/wiki/Changes/Hunspell_dictionary_dir_change
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:7.2.5.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jan 13 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.5.2-2
-- rebuild for rebase of poppler to 22.01.0
-
-* Thu Jan 06 2022 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.5.2-1
-- upgrade to 7.2.5
-
-* Mon Dec 13 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.4.1-2
-- Resolves: rhbz#2028991 fix insert, object, QR code
-
-* Mon Dec 06 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.4.1-1
-- upgrade to 7.2.4
-
-* Fri Nov 19 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.3.2-1
-- upgrade to 7.2.3 (likely will fix rhbz#2022410)
-
-* Tue Oct 12 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.2.2-3
-- Icon=document-new shouldn't get prefixed to become
- Icon=libreoffice-document-new
-
-* Fri Oct 08 2021 Kalev Lember <klember(a)redhat.com> - 1:7.2.2.2-2
-- Use -g1 on arm builders as well
-
-* Thu Oct 07 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.2.2-1
-- upgrade to 7.2.2 (likely will fix rhbz#2011384)
-
-* Tue Oct 05 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.1.2-4
-- rhbz#2010520 move libroffice.jar to noarch java location
-
-* Wed Sep 22 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.1.2-3
-- reenable make check for s390x
-
-* Fri Sep 10 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.1.2-2
-- remove obscure rhino and bsh scripting for fedora >= 36 like in rhel
-
-* Thu Sep 09 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.1.2-1
-- upgrade to 7.2.1
-
-* Sat Aug 21 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.0.4-3
-- fix arm32 uno bridge
-
-* Fri Aug 20 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.0.4-2
-- s390x firebird is available again
-
-* Mon Aug 16 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.0.4-1
-- upgrade to 7.2.0
-
-* Sat Aug 14 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.0.3-1
-- prep upgrade to 7.2.0
-
-* Thu Aug 12 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.5.2-5
-- replace use of ucpp with gcc cpp
-- Resolves: tdf#132739 two html style tags where there should be just one
-
-* Sat Aug 07 2021 Jonathan Wakely <jwakely(a)redhat.com> - 1:7.1.5.2-4
-- Rebuilt for Boost 1.76
-
-* Wed Aug 04 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.5.2-3
-- rebuild for poppler rebase to 21.07.0
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:7.1.5.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Sun Jul 18 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.5.2-1
-- latest version
-- drop merged patches
-
-* Wed Jul 14 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.4.2-3
-- Related: rhbz#1980800 allow convert to csv to write each sheet to
- a separate file
-
-* Wed Jun 30 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.4.2-2
-- Remove unused DOCTYPE from odk/examples xcu file
-- drop bsh buildrequires in rhel
-
-* Wed Jun 09 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.4.2-1
-- latest version
-- replace 'badfuncs' of inet_addr and inet_ntoa
-- allow system firebird-4
-
-* Fri Jun 04 2021 Python Maint <python-maint(a)redhat.com> - 1:7.1.3.2-5
-- Rebuilt for Python 3.10
-
-* Wed Jun 02 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.3.2-4
-- gtk3: workaround missing gdk_threads_enter calls in gio errordialog callback
-
-* Mon May 31 2021 Stephan Bergmann <sbergman(a)redhat.com> - 1:7.1.3.2-3
-- Resolves: rhbz#1965975 Adapt to "libstdc++: Implement LWG 1203 for rvalue iostreams"
-- Resolves: rhbz#1965975 Adapt to hamcrest-2.2-3.fc35.noarch.rpm
-
-* Thu May 20 2021 Pete Walter <pwalter(a)fedoraproject.org> - 1:7.1.3.2-2
-- Rebuild for ICU 69
-
-* Thu May 06 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.3.2-1
-- latest version
-
-* Wed May 05 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.2.2-4
-- Resolves: rhbz#1956977 Impress crashes on switch from commenting to slide sorter
-- Resolves: rhbz#1957034 fix assertion on avmedia volumne control
-
-* Thu Apr 29 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.2.2-3
-- Resolves: rhbz#1955013 build libreoffice-langpack-fy for libreoffice
-
-* Mon Apr 12 2021 Stephan Bergmann <sbergman(a)redhat.com> - 1:7.1.2.2-2
-- Related: rhbz#1895921 Get rid of apache-commons-logging
-
-* Thu Apr 01 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.2.2-1
-- latest version
-
-* Wed Mar 24 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.1.2-2
-- tdf#141197 expose gtk-widgets inside vcl-containers to atk hierarchy
-
-* Thu Mar 04 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.1.2-1
-- latest version
-
-* Mon Feb 08 2021 Pavel Raiskup <praiskup(a)redhat.com> - 1:7.1.0.3-3
-- rebuild for libpq ABI fix rhbz#1908268
-
-* Fri Feb 05 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.0.3-2
-- use classic brand
-
-* Wed Feb 03 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.0.3-1
-- bump to 7.1.0 series
-- drop integrated 0001-rhbz-1870501-crash-on-reexport-of-odg.patch
-- drop integrated 0001-rhbz-1882616-move-cursor-one-step-at-a-time-in-the-d.patch
-- drop integrated 0001-export-HYPERLINK-target-in-html-clipboard-export.patch
-- drop integrated 0001-gcc11.patch
-- drop integrated 0001-disable-tests-that-don-t-work-without-pdfium.patch
-- drop integrated 0001-rhbz-1913828-SfxViewFrame-Current-can-return-null.patch
-- drop integrated 0001-Upgrade-liborcus-to-0.16.0.patch
-
-* Thu Jan 28 2021 Stephan Bergmann <sbergman(a)redhat.com> - 1:7.0.4.2-9
-- Make libreoffice-bsh, libreoffice-rhino depend on full java
-
-* Wed Jan 27 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.4.2-8
-- drop unneeded BuildRequires: gdb
-
-* Wed Jan 27 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.4.2-7
-- Resolves: rhbz#1916539 text not wrapping in right hand help brower pane
-
-* Mon Jan 25 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.4.2-6
-- really rebuild for Boost 1.75
-
-* Fri Jan 22 2021 Jonathan Wakely <jwakely(a)redhat.com> - 1:7.0.4.2-5
-- Rebuilt for Boost 1.75
-
-* Fri Jan 15 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.4.2-4
-- rebuild for poppler
-
-* Mon Jan 11 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.4.2-3
-- Resolves: rhbz#1913828 SfxViewFrame::Current() can return null
-
-* Sun Dec 20 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.4.2-2
-- workaround for make check failure
-
-* Wed Dec 09 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.4.2-1
-- latest version
-
-* Wed Dec 02 2020 Thierry Vignaud <tv(a)mageia.org> 1:7.0.4.1-1
-- Update to 7.0.4 RC1
-
-* Tue Nov 24 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.3.1-4
-- Resolves: rhbz#1900937 fix null deref in non-pdfium build
-
-* Mon Nov 23 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.3.1-3
-- Resolves: rhbz#1900428 don't crash on invalid index used in StarBasic macro
-
-* Tue Nov 03 2020 Jeff Law <law(a)redhat.com> - 1:7.0.3.1-2
-- Fix missing #include for gcc-11
-
-* Thu Oct 29 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.3.1-1
-- latest version
-
-* Sun Oct 25 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.2.2-3
-- Resolves: rhbz#1891326 suggest package install of the best pt-* langpack
-
-* Sat Oct 24 18:45:56 CEST 2020 David Tardon <dtardon(a)redhat.com> - 1:7.0.2.2-2
-- fix upgrade from Fedora 32
-
-* Sat Oct 10 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.2.2-1
-- latest version
-
-* Tue Oct 06 2020 Rex Dieter <rdieter(a)fedoraproject.org> - 1:7.0.1.2-7
-- -kf5: enable Supplements: (%%name-core and plasma-workspace)
-
-* Tue Sep 29 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.1.2-6
-- export HYPERLINK target in html clipboard export
-
-* Fri Sep 25 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.1.2-5
-- Resolves: rhbz#1882616 IM cursor pos problem with emojis in writer
-
-* Thu Sep 24 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.1.2-4
-- upgrade liborcus
-
-* Fri Sep 04 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.1.2-3
-- rhbz#1875377 prefer Cantarell-Regular to Cantarell-VF
-
-* Thu Sep 03 2020 Merlin Mathesius <mmathesi(a)redhat.com> - 1:7.0.1.2-2
-- Rebase RHEL patch to disable libe-book support to libreoffice-7.0
-- Add BR perl(base)
-
-* Tue Sep 01 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.1.2-1
-- 7.0.1 RC2
-
-* Fri Aug 21 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.1.1-3
-- rhbz#1870501 crash on reexport of odg
-
-* Fri Aug 21 2020 Stephan Bergmann <sbergman(a)redhat.com> 1:7.0.1.1-2
-- Build the binary UNO bridge with -fno-lto
-
-* Thu Aug 20 2020 Thierry Vignaud <tvignaud(a)redhat.com> 1:7.0.1.1-1
-- 7.0.1 RC1
-
-* Thu Aug 06 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:7.0.0.3-1
-- 7.0.0
-
-* Wed Aug 05 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:6.4.5.2-6
-- Resolves: rhbz#1745771
- + drop the GTK3-KF5 VCL plugin (formerly subpackage kf5)
- + rename the current -kde5 subpackage (the Qt5/KF5 VCL plugin) to -kf5
-
-* Wed Jul 29 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:6.4.5.2-5
-- Resolves: rhbz#1861794 missing csv fixed width handles
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:6.4.5.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Jul 25 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:6.4.5.2-3
-- Related: rhbz#1859588 workaround vcldemo ICE
-- add py_byte_compile call for
- https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompila…
-
-* Tue Jul 14 2020 Jiri Vanek <jvanek(a)redhat.com> - 1:6.4.5.2-2
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Sat Jul 11 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:6.4.5.2-1
-- latest stable
-
-* Sat Jul 11 2020 Jiri Vanek <jvanek(a)redhat.com> - 1:6.4.4.2-4
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Sat May 30 2020 Jonathan Wakely <jwakely(a)redhat.com> - 1:6.4.4.2-3
-- Rebuilt for Boost 1.73
-
-* Tue May 26 2020 Miro Hrončok <mhroncok(a)redhat.com> - 1:6.4.4.2-2
-- Rebuilt for Python 3.9
-
-* Thu May 21 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:6.4.4.2-1
-- latest stable
-
-* Sun May 17 2020 Pete Walter <pwalter(a)fedoraproject.org> - 1:6.4.3.2-2
-- Rebuild for ICU 67
-
-* Thu Apr 16 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:6.4.3.2-1
-- latest stable
-
-* Mon Mar 30 2020 Thierry Vignaud <tvgnaud(a)mredhat.com> 1:6.4.2.2-1
-- 6.4.2.2
-
-* Mon Mar 23 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:6.4.1.2-4
-- help->license->license doesn't do anything
-
-* Fri Mar 20 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:6.4.1.2-3
-- disable tip-of-the-day dialog by default
-
-* Wed Mar 18 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:6.4.1.2-2
-- rhbz#1776774 make math subpackage just a superficial package for
- math launcher
-
-* Tue Feb 25 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:6.4.1.2-1
-- 6.4.1 beta 2
-
-* Mon Feb 10 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:6.4.0.3-2
-- rhbz#1793632 make draw subpackage just a superficial package for
- draw launcher
-
-* Wed Jan 29 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:6.4.0.3-1
-- latest release
-
-* Wed Jan 22 2020 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.4.2-1
-- latest stable release
-
-* Fri Jan 17 2020 Marek Kasik <mkasik(a)redhat.com> - 1:6.3.3.2-6
-- Rebuild for poppler-0.84.0
-
-* Fri Jan 17 2020 Marek Kasik <mkasik(a)redhat.com> - 1:6.3.3.2-5
-- Rebuild for poppler-0.84.0
-
-* Wed Nov 27 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.3.2-4
-- rhbz#1776774 undo rhbz#156677 and stop customizing math.desktop
-
-* Mon Nov 18 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.3.2-3
-- rhbz#1773525 fix find&replace search save limit
-
-* Sat Nov 02 2019 Pete Walter <pwalter(a)fedoraproject.org> - 1:6.3.3.2-2
-- Rebuild for ICU 65
-
-* Thu Oct 24 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.3.2-1
-- latest stable release
-
-* Thu Sep 26 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.2.2-1
-- latest stable release
-
-* Thu Sep 05 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.1.2-1
-- latest stable release
-
-* Sat Aug 31 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.0.4-6
-- Related: rhbz#1747596 see if a depend on firebird from just base is
- sufficient
-
-* Thu Aug 29 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.0.4-5
-- Resolves: rhbz#1736810 disable opencl by default again
-
-* Sun Aug 25 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.0.4-4
-- Resolves: rhbz#1744876 firebird not an automatically dependency
-
-* Wed Aug 21 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.0.4-3
-- Resolves: rhbz#1743894 make build with mdds-1.5
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok(a)redhat.com> - 1:6.3.0.4-2
-- Rebuilt for Python 3.8
-
-* Thu Aug 08 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.0.4-1
-- upgrade to RC4
-
-* Tue Aug 06 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.0.3-1
-- upgrade to RC3
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:6.3.0.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Jul 19 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.0.1-2
-- missing ldap support
-- kde4 support is gone, replace with kde5
-
-* Tue Jul 16 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.3.0.1-1
-- move rawhide to 6.3.0
-
-* Tue Jul 16 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.5.2-1
-- latest stable
-
-* Fri Jun 14 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.4.2-5
-- Resolves: rhbz#1720483 make all app rpms depend on pdfimport
-
-* Tue Jun 11 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.4.2-4
-- Resolves: rhbz#1667039 drop Requires: font(:lang=XX) requires in
- favor of langpacks
-
-* Mon Jun 10 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.4.2-3
-- Related: rhbz#1718063 look for pkg-config python-version-embed
-
-* Fri Jun 07 2019 Stephan Bergmann <sbergman(a)redhat.com> - 1:6.2.4.2-2
-- Resolves: rhbz#1718063 adapt to upcoming Python 3.8
-
-* Thu May 30 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.4.2-1
-- latest stable version
-
-* Sun May 26 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.3.2-5
-- Resolves: rhbz#1713827 protect against null ViewShell
-- Resolves: rhbz#1713908 stop disabling firebird-sdbc
-
-* Thu May 23 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.3.2-4
-- Resolves: rhbz#1712823 crash in extended tooltips over pattern editor
-- Resolves: rhbz#1711143 calc not rounding time calculation correctly
-
-* Tue May 21 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.3.2-3
-- rebuild for e-d-s
-
-* Thu May 02 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.3.2-2
-- add Esperanto
-
-* Tue Apr 30 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.3.2-1
-- latest stable release
-
-* Fri Apr 26 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.2.2-6
-- Related: rhbz#1703375 disable bsh and rhino for rhel
-
-* Thu Apr 25 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.2.2-5
-- Resolves: rhbz#1702810 Prepare for upcoming libebook
-
-* Sat Apr 13 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.2.2-4
-- tdf#119890 followup Forbid HOME to be the default dir for templates
-
-* Fri Apr 12 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.2.2-3
-- Resolves: rhbz#1699347 __glibcxx_requires_subscript-enabled enabled
-
-* Thu Apr 04 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.2.2-2
-- Related: rhbz#1692584 mythes-de is available again
-
-* Tue Apr 02 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.2.2-1
-- latest stable release
-
-* Wed Mar 27 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.1.2-6
-- Resolves: rhbz#1693388 mythes-de got retired so is unavailable
-
-* Thu Mar 21 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.1.2-5
-- Resolves: rhbz#1690732 basic font variation support
-
-* Wed Mar 20 2019 Stephan Bergmann <sbergman(a)redhat.com> - 1:6.2.1.2-4
-- Resolves: rhbz#1687589 KDE4 gpoll_wrapper can be called with SolarMutex locked
-
-* Tue Mar 12 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.1.2-3
-- currency menu too narrow
-
-* Thu Mar 07 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.1.2-2
-- bump n-v-r
-
-* Sat Mar 02 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.1.2-1
-- latest stable
-
-* Mon Feb 25 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.0.3-4
-- Related: rhbz#1678319 workaround weird compilation result
-
-* Thu Feb 21 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.0.3-3
-- menu of currency combobox is too wide
-
-* Thu Feb 21 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.0.3-2
-- Resolves: tdf#122623 theme unwanted tab into invisibilty
-
-* Thu Feb 07 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.2.0.3-1
-- latest version
-
-* Fri Feb 01 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.1.4.2-5
-- Resolves: rhbz#1671340 extended tooltips not working in impress navigator
-
-* Thu Jan 31 2019 Kalev Lember <klember(a)redhat.com> - 1:6.1.4.2-4
-- Rebuilt for Boost 1.69
-
-* Sat Jan 26 2019 Marek Kasik <mkasik(a)redhat.com> - 1:6.1.4.2-3
-- Additional fixes needed for rebuild
-
-* Fri Jan 25 2019 Marek Kasik <mkasik(a)redhat.com> - 1:6.1.4.2-2
-- Rebuild for poppler-0.73.0
-
-* Mon Jan 07 2019 Caolán McNamara <caolanm(a)redhat.com> - 1:6.1.4.2-1
-- latest version
-- Resolves: rhbz#1662616 crash in macro dialog editor
-- Resolves: rhbz#1662512 a11y freeze in calc
-
-* Tue Dec 04 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.1.2.1-8
-- Resolves: rhbz#1639174 desire to block en-help install
-
-* Tue Nov 20 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.1.2.1-7
-- Resolves: rhbz#1651469 improve obsoletes
-
-* Wed Nov 14 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 1:6.1.2-6
-- -kf5 subpackage: include support for --enable-gtk3-kde5 (#1647233)
-- -kde4: adjust summary/description s/KDE/KDE4/
-
-* Tue Nov 13 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.1.2.1-5
-- Rebuild for hunspell 1.7.0
-
-* Thu Nov 08 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.1.2.1-4
-- drop gtk2 support and obsolete it
-
-* Wed Nov 07 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.1.2.1-3
-- drop rhel 7 conditionals
-
-* Tue Oct 30 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.1.2.1-2
-- Related: rhbz#1644128 gtk tooltip problems
-
-* Wed Oct 10 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.1.2.1-1
-- latest version
-- rhbz#1637848 keep Supplements but not Recommends
-
-* Fri Sep 14 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.1.1.2-1
-- latest version
-
-* Sun Sep 02 2018 David Tardon <dtardon(a)redhat.com> - 1:6.1.0.3-2
-- rebuild for liborcus 0.14.0
-
-* Thu Aug 16 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.1.0.3-1
-- 6.1.X series
-
-* Tue Aug 14 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.6.2-1
-- latest version
-
-* Tue Jul 31 2018 Florian Weimer <fweimer(a)redhat.com> - 1:6.0.6.1-7
-- Rebuild with fixed binutils
-
-* Thu Jul 26 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.6.1-6
-- Related: rhbz#1602589 fix/silence more covscan warnings
-
-* Fri Jul 20 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.6.1-5
-- implement export of underline in outlined font for simple case
-
-* Wed Jul 18 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.6.1-4
-- Resolves: rhbz#1602589 fix covscan issues
-
-* Tue Jul 17 2018 Eike Rathke <erack(a)redhat.com> - 1:6.0.6.1-3
-- Upgrade to ICU 61.1
-- Upgrade to ICU 62.1
-
-* Tue Jul 17 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.6.1-2
-- Resolves: rhbz#1601882 fails to build with --nocheck
-
-* Tue Jul 17 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.6.1-1
-- latest 6.0 release
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:6.0.5.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jul 10 2018 Pete Walter <pwalter(a)fedoraproject.org> - 1:6.0.5.2-2
-- Rebuild for ICU 62
-
-* Fri Jun 22 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.5.2-1
-- latest 6.0 release
-- fix for ICU 61
-- fix for Python 3.7
-
-* Tue Jun 19 2018 Miro Hrončok <mhroncok(a)redhat.com> - 1:6.0.4.2-5
-- Rebuilt for Python 3.7
-
-* Tue Jun 05 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.4.2-4
-- Resolves: rhbz#1581028 endless font widget update
-
-* Tue Jun 05 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.4.2-3
-- use weak deps for fedora only
-
-* Mon May 28 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.4.2-2
-- Resolves: rhbz#1582324 crash after merging writer table cells
-
-* Fri May 25 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.4.2-1
-- latest 6.0 release
-
-* Wed May 9 2018 Stephan Bergmann <sbergman(a)redhat.com> - 1:6.0.3.2-10
-- Fix a potential crash when using the dconf configuration backend
-
-* Sat May 5 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.3.2-9
-- tdf#117413 char doubling in calc under X
-
-* Fri May 4 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.3.2-8
-- rhbz#1575000 CVE-2018-10583 allow embedded links to smb resources
- to be blocked
-
-* Thu May 3 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.3.2-7
-- rhbz#1573845 won't start without at least Langpack-en-US.xcd
-
-* Mon Apr 30 2018 Pete Walter <pwalter(a)fedoraproject.org> - 1:6.0.3.2-6
-- Rebuild for ICU 61.1
-
-* Tue Apr 24 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.3.2-5
-- Resolves: tdf#116951 rhbz#1569331 start is G_MAXINT
-
-* Thu Apr 19 2018 Stephan Bergmann <sbergman(a)redhat.com> - 1:6.0.3.2-4
-- Resolves: rhbz#1568579 LibreOffice --headless zombie process
-- Related: rhbz#1569331 end should be in terms of unicode chars, not bytes
-
-* Tue Apr 17 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.3.2-3
-- Related: rhbz#1396729 use cairo_surface_create_similar
-
-* Tue Apr 10 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.3.2-2
-- finally drop bundled xmlsec1
-
-* Thu Mar 29 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.3.2-1
-- latest version
-
-* Thu Mar 29 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.3.1-3
-- Related: rhbz#1066844 drop libreofficekit requires
-
-* Fri Mar 23 2018 Marek Kasik <mkasik(a)redhat.com> - 1:6.0.3.1-2
-- Rebuild for poppler-0.63.0
-
-* Thu Mar 22 2018 David Tardon <dtardon(a)redhat.com> - 1:6.0.3.1-1
-- update to 6.0.3 rc1
-
-* Fri Mar 16 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.2.1-3
-- Resolves: rhbz#1392145 ensure titlebar close button matches 'outside' direction
-
-* Fri Mar 16 2018 Stephan Bergmann <sbergman(a)redhat.com> - 1:6.0.2.1-2
-- lib dir missing from libreoffice-sdk
-
-* Fri Feb 23 2018 David Tardon <dtardon(a)redhat.com> - 1:6.0.2.1-1
-- update to 6.0.2 rc1
-
-* Wed Feb 14 2018 David Tardon <dtardon(a)redhat.com> - 1:6.0.1.1-2
-- rebuild for poppler 0.62.0
-
-* Fri Feb 09 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.1.1-1
-- latest stable
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:6.0.0.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Tue Feb 06 2018 Stephan Bergmann <sbergman(a)redhat.com> - 1:6.0.0.3-2-UNBUILT
-- Resolves: rhbz#1541486 Base table dialog title shown in wrong language
-
-* Sun Feb 04 2018 David Tardon <dtardon(a)redhat.com> - 1:6.0.0.3-1
-- update to 6.0.0 rc3
-
-* Wed Jan 31 2018 Michael Stahl <mstahl(a)fedoraproject.org> - 1:6.0.0.2-3
-- add lots of .abignore files to restrict abipkgdiff to shared objects
- that actually have a stable ABI
-
-* Tue Jan 30 2018 Björn Esser <besser82(a)fedoraproject.org> - 1:6.0.0.2-2
-- Rebuilt for Boost 1.66.0
-
-* Fri Jan 12 2018 David Tardon <dtardon(a)redhat.com> - 1:6.0.0.2-1
-- update to 6.0.0 rc2
-
-* Tue Jan 09 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.0.1-3
-- bump to Modify2 for app_id so install hint says 'LibreOffice wants to install'
-
-* Thu Dec 21 2017 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.0.1-2
-- request langpack for autodetected desired ui locale via packagekit
-
-* Wed Dec 20 2017 David Tardon <dtardon(a)redhat.com> - 1:6.0.0.1-1
-- update to 6.0.0 rc1
-
-* Thu Dec 14 2017 David Tardon <dtardon(a)redhat.com> - 1:6.0.0.0-8.beta2
-- update to 6.0.0 beta2
-
-* Mon Dec 04 2017 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.0.0-7.beta1
-- Rebuild for hunspell 1.6.2
-
-* Thu Nov 30 2017 Pete Walter <pwalter(a)fedoraproject.org> - 1:6.0.0.0-6.beta1
-- Rebuild for ICU 60.1
-
-* Sat Nov 25 2017 David Tardon <dtardon(a)redhat.com> - 1:6.0.0.0-5.beta1
-- update to 6.0.0 beta1
-
-* Wed Nov 22 2017 Eike Rathke <erack(a)redhat.com> - 1:6.0.0.0-4.alpha1
-- prepare for build with ICU 60.1
-
-* Mon Nov 20 2017 David Tardon <dtardon(a)redhat.com> - 1:6.0.0.0-3.alpha1
-- rebuild for liborcus 0.13.1
-
-* Wed Nov 08 2017 David Tardon <dtardon(a)redhat.com> - 1:6.0.0.0-2.alpha1
-- rebuild for poppler 0.61.0
-
-* Thu Nov 02 2017 David Tardon <dtardon(a)redhat.com> - 1:6.0.0.0-1.alpha1
-- update to 6.0.0 alpha1
-- update location of appdata files
-- use weak dependencies
-- mark bundled packages
-
-* Tue Oct 17 2017 David Tardon <dtardon(a)redhat.com> - 1:5.4.3.1-1
-- update to 5.4.3 rc1
-
-* Fri Oct 06 2017 David Tardon <dtardon(a)redhat.com> - 1:5.4.2.2-3
-- rebuild for poppler 0.60.1
-
-* Sun Oct 01 2017 Thierry Vignaud <tvignaud(a)redhat.com> - 1:5.4.2.2-2
-- fix libreoffice wrapper
-
-* Wed Sep 27 2017 David Tardon <dtardon(a)redhat.com> - 1:5.4.2.2-1
-- update to 5.4.2 rc2
-
-* Mon Sep 18 2017 David Tardon <dtardon(a)redhat.com> - 1:5.4.2.1-1
-- update to 5.4.2 rc1
-
-* Tue Sep 12 2017 David Tardon <dtardon(a)redhat.com> - 1:5.4.1.2-3
-- Resolves: rhbz#1490318 do not use versioned Supplements
-
-* Fri Sep 08 2017 David Tardon <dtardon(a)redhat.com> - 1:5.4.1.2-2
-- rebuild for poppler 0.59.0
-
-* Sun Aug 27 2017 David Tardon <dtardon(a)redhat.com> - 1:5.4.1.2-1
-- update to 5.4.1 rc2
-
-* Fri Aug 11 2017 Caolán McNamara <caolanm(a)redhat.com> - 1:5.4.0.3-5
-- implement char highlighting ui for graphics styles
-
-* Thu Aug 03 2017 David Tardon <dtardon(a)redhat.com> - 1:5.4.0.3-4
-- rebuild for poppler 0.57.0
-
-* Mon Jul 31 2017 Kalev Lember <klember(a)redhat.com> - 1:5.4.0.3-3
-- Enable the s390x build again
-
-* Mon Jul 31 2017 Kalev Lember <klember(a)redhat.com> - 1:5.4.0.3-2
-- Temporarily disable the build on s390x
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:5.4.0.3-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Jul 21 2017 Kalev Lember <klember(a)redhat.com> - 1:5.4.0.2-2
-- Rebuilt for Boost 1.64
-
-* Fri Jul 07 2017 David Tardon <dtardon(a)redhat.com> - 1:5.4.0.2-1
-- update to 5.4.0 rc2
-
-* Fri Jun 23 2017 David Tardon <dtardon(a)redhat.com> - 1:5.4.0.1-1
-- update to 5.4.0 rc1
-
-* Wed Jun 07 2017 David Tardon <dtardon(a)redhat.com> - 1:5.4.0.0-3.beta2
-- update to 5.4.0 beta2
-
-* Sun May 21 2017 David Tardon <dtardon(a)redhat.com> - 1:5.4.0.0-2.beta1
-- update to 5.4.0 beta1
-
-* Tue May 02 2017 David Tardon <dtardon(a)redhat.com> - 1:5.4.0.0-1.alpha1
-- update to 5.4.0 alpha1
-
-* Wed Apr 19 2017 David Tardon <dtardon(a)redhat.com> - 1:5.3.3.1-1
-- update to 5.3.3 rc1
-
-* Wed Mar 29 2017 David Tardon <dtardon(a)redhat.com> - 1:5.3.2.2-1
-- update to 5.3.2 rc2
-
-* Tue Mar 28 2017 David Tardon <dtardon(a)redhat.com> - 1:5.3.2.1-3
-- rebuild for poppler 0.53.0
-
-* Mon Mar 27 2017 Caolán McNamara <caolanm(a)redhat.com> - 1:5.3.2.1-2
-- Resolves: rhbz#1432468 disable opencl by default
-
-* Sun Mar 19 2017 David Tardon <dtardon(a)redhat.com> - 1:5.3.2.1-1
-- update to 5.3.2 rc1
-
-* Mon Mar 13 2017 Caolán McNamara <caolanm(a)redhat.com> - 1:5.3.1.2-2
-- Resolves: rhbz#1431189 add Indonesian langpack
-
-* Thu Mar 09 2017 David Tardon <dtardon(a)redhat.com> - 1:5.3.1.2-1
-- update to 5.3.1 rc2
-
-* Thu Feb 23 2017 David Tardon <dtardon(a)redhat.com> - 1:5.3.1.1-1
-- update to 5.3.1 rc1
-
-* Tue Feb 07 2017 Björn Esser <besser82(a)fedoraproject.org> - 1:5.3.0.3-3
-- Rebuilt for Boost 1.63
-
-* Thu Feb 02 2017 Caolán McNamara <caolanm(a)redhat.com> - 1:5.3.0.3-2
-- Resolves: rhbz#1409401 add depend on gtksink gstreamer1 element
-
-* Fri Jan 27 2017 David Tardon <dtardon(a)redhat.com> - 1:5.3.0.3-1
-- update to 5.3.0 rc3
-
-* Wed Jan 18 2017 David Tardon <dtardon(a)redhat.com> - 1:5.3.0.2-1
-- update to 5.3.0 rc2
-- temp. disable building of help on ARM to fix build
-
-* Tue Jan 10 2017 David Tardon <dtardon(a)redhat.com> - 1:5.3.0.1-1
-- update to 5.3.0 rc1
-
-* Tue Dec 27 2016 Caolán McNamara <caolanm(a)redhat.com> - 1:5.3.0.0-8.beta1
-- try arm build
-
-* Thu Dec 22 2016 Miro Hrončok <mhroncok(a)redhat.com> - 1:5.3.0.0-7.beta2
-- Rebuild for Python 3.6
-
-* Mon Dec 19 2016 Miro Hrončok <mhroncok(a)redhat.com> - 1:5.3.0.0-6.beta2
-- Rebuild for Python 3.6
-
-* Thu Dec 15 2016 David Tardon <dtardon(a)redhat.com> - 1:5.3.0.0-5.beta2
-- update to 5.3.0 beta2
-
-* Tue Dec 13 2016 Caolán McNamara <caolanm(a)redhat.com> - 1:5.3.0.0-4.beta1
-- rebuild for hunspell-1.5.4
-
-* Wed Nov 23 2016 David Tardon <dtardon(a)redhat.com> - 1:5.3.0.0-3.beta1
-- update to 5.3.0 beta1
-
-* Tue Nov 08 2016 David Tardon <dtardon(a)redhat.com> - 1:5.3.0.0-2.alpha1
-- allow abrt to work again
-
-* Sat Oct 22 2016 David Tardon <dtardon(a)redhat.com> - 1:5.3.0.0-1.alpha1
-- update to 5.3.0 alpha1
-
-* Fri Oct 21 2016 Marek Kasik <mkasik(a)redhat.com> - 1:5.2.3.1-2
-- Rebuild for poppler-0.48.0
-
-* Sat Oct 15 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.3.1-1
-- update to 5.2.3 rc1
-
-* Fri Oct 07 2016 Stephan Bergmann <sbergman(a)redhat.com> - 1:5.2.2.2-3
-- Resolves: rhbz#1382401 broken export of emojis to HTML
-
-* Thu Sep 29 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.2.2-2
-- rebuild for liborcus 0.12
-
-* Wed Sep 21 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.2.2-1
-- update to 5.2.2 rc2
-
-* Wed Sep 21 2016 Caolán McNamara <caolanm(a)redhat.com> - 1:5.2.2.1-5
-- Related: rhbz#1362451 apply patch
-
-* Tue Sep 20 2016 Caolán McNamara <caolanm(a)redhat.com> - 1:5.2.2.1-4
-- Related: rhbz#1362451 avoid recursive ownerchanged signal during ownerchange
-
-* Mon Sep 19 2016 Caolán McNamara <caolanm(a)redhat.com> - 1:5.2.2.1-3
-- Related: rhbz#1373933 do less on style-updated
-- Related: rhbz#1353069 don't clear XATTR_FILL from in use styles
-
-* Fri Sep 16 2016 Caolán McNamara <caolanm(a)redhat.com> - 1:5.2.2.1-2
-- Resolves: rhbz#1373933 gtk 3.21 emits way too many "style-set" signals
-
-* Wed Sep 14 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.2.1-1
-- update to 5.2.2 rc1
-
-* Tue Sep 13 2016 Stephan Bergmann <sbergman(a)redhat.com> - 1:5.2.1.2-3
-- enable dconf support for Fleet Commander
-
-* Mon Sep 05 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.1.2-2
-- Resolves: rhbz#1247399 install public jars according to packaging guidelines
-- Resolves: rhbz#1363874 install LibreOfficeKit headers
-
-* Fri Aug 26 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.1.2-1
-- update to 5.2.1 rc2
-
-* Thu Aug 11 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.1.1-1
-- update to 5.2.1 rc1
-
-* Fri Jul 29 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.0.4-1
-- update to 5.2.0 rc4
-
-* Thu Jul 21 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.0.3-1
-- update to 5.2.0 rc3
-
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:5.2.0.2-4
-- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Pa…
-
-* Mon Jul 18 2016 Marek Kasik <mkasik(a)redhat.com> - 1:5.2.0.2-3
-- Rebuild for poppler-0.45.0
-
-* Thu Jul 07 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.0.2-2
-- remove obsolete wiki-publisher requires apache-commons-*
-
-* Thu Jul 07 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.0.2-1
-- update to 5.2.0 rc2
-- Resolves: rhbz#1351292 fix switching of modes in Impress
-
-* Tue Jun 28 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.0.1-2
-- Resolves: rhbz#1341064 fix test on big endian systems
-
-* Wed Jun 22 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.0.1-1
-- update to 5.1.0 rc1
-- Resolves: rhbz#1343752 wrong radiobutton and checkbutton behavior in
- "view" menu
-- Resolves: rhbz#1349261 do not pull in all variants of english dicts
-
-* Thu Jun 09 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.0.0-8.beta2
-- update to 5.2.0 beta2
-
-* Thu May 26 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.0.0-7.beta1
-- update to 5.2.0 beta1
-
-* Mon May 16 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.0.0-6.alpha1
-- Resolves: rhbz#1327847 remove multilib conflicts in .desktop files
-
-* Fri May 13 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.0.0-5.alpha1
-- rebuild for mdds 1.2.0
-- Resolves: rhbz#1325858 fix build on 64-bit secondary arches
-
-* Tue May 10 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.0.0-4.alpha1
-- Resolves: rhbz#1333899 recommended pkgs are omitted from default
- installation
-
-* Tue May 3 2016 Marek Kasik <mkasik(a)redhat.com> - 1:5.2.0.0-3.alpha1
-- Rebuild for poppler-0.43.0
-
-* Mon May 02 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.0.0-2.alpha1
-- Resolves: rhbz#1326602 leakage of removed background image set in master slide
-
-* Fri Apr 22 2016 David Tardon <dtardon(a)redhat.com> - 1:5.2.0.0-1.alpha1
-- update to 5.2.0 alpha1
-
-* Thu Apr 21 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.3.1-1
-- update to 5.1.3 rc1
-- Resolves: tdf#91778 drawing the background over an active cursor
-
-* Mon Apr 18 2016 Caolán McNamara <caolanm(a)redhat.com> - 1:5.1.2.1-6
-- rebuild for hunspell 1.4.0
-
-* Fri Apr 15 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.2.1-5
-- rebuild for ICU 57.1
-
-* Thu Apr 07 2016 Caolán McNamara <caolanm(a)redhat.com> - 1:5.1.2.1-4
-- gtk3: fix combobox and listbox
-
-* Wed Mar 30 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.2.1-3
-- support both glade and glade3
-
-* Mon Mar 21 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.2.1-2
-- Resolves: rhbz#1319458 avoid rich deps in Requires
-
-* Wed Mar 16 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.2.1-1
-- update to 5.1.2 rc1
-- split VCL plugins into subpackages
-- rename libreoffice-kde to libreoffice-kde4
-- only recommend fonts
-- remove hard dependency on English spell checker and auto-correction
- rules
-- disable quickstarter
-- move icons and other system-integration stuff to a noarch subpackage
-- disable browser plugin in preparation for its removal in 5.2
-
-* Wed Mar 09 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.1.3-2
-- update for liborcus 0.11.0
-
-* Thu Mar 03 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.1.3-1
-- update to 5.1.1 rc3
-
-* Fri Feb 26 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.1.2-1
-- update to 5.1.1 rc2
-
-* Mon Feb 22 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.1.1-5
-- Resolves: rhbz#1310527 add langpack deps
-
-* Tue Feb 16 2016 Caolán McNamara <caolanm(a)redhat.com> - 1:5.1.1.1-4
-- video playback under wayland with gstreamer gtksink
-
-* Mon Feb 15 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.1.1-3
-- rebuild for openCOLLADA soname change
-
-* Sun Feb 14 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.1.1-2
-- switch to mdds 1.x
-
-* Thu Feb 11 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.1.1-1
-- update to 5.1.1 rc1
-- Resolves: rhbz#1303007 add noarch Provides too
-
-* Thu Feb 11 2016 Caolán McNamara <caolanm(a)redhat.com> - 1:5.1.0.3-3
-- rework gtk3 themeing to work with latest gtk
-
-* Tue Feb 02 2016 Caolán McNamara <caolanm(a)redhat.com> - 1:5.1.0.3-2
-- Resolves: rhbz#1303619 nothing provides java-devel(x86_64)
-
-* Wed Jan 27 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.0.3-1
-- update to 5.1.0 rc3
-- Resolves: rhbz#1168757 Selecting multiple slides is not reflected in Print
- dialog
-
-* Fri Jan 22 2016 Marek Kasik <mkasik(a)redhat.com> - 1:5.1.0.2-5
-- Rebuild for poppler-0.40.0
-
-* Mon Jan 18 2016 Jonathan Wakely <jwakely(a)redhat.com> - 1:5.1.0.2-4
-- Rebuilt for Boost 1.60
-
-* Sat Jan 16 2016 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 1:5.1.0.2-3
-- Remove arch-specific dependency for font subpackage as it is noarch
-
-* Thu Jan 14 2016 Adam Jackson <ajax(a)redhat.com> - 1:5.1.0.2-2
-- Rebuild for glew 1.13
-
-* Thu Jan 14 2016 David Tardon <dtardon(a)redhat.com> - 1:5.1.0.2-1
-- update to 5.1.0 rc2
-
-* Thu Dec 17 2015 Bastien Nocera <bnocera(a)redhat.com> 1:5.1.0.1-2
-- Add GLSL files missing from the package
-- Split up inclusion of latin Serbian files to avoid duplicate listing
-
-* Wed Dec 16 2015 David Tardon <dtardon(a)redhat.com> - 1:5.1.0.1-1
-- update to 5.1.0 rc1
-
-* Mon Dec 14 2015 David Tardon <dtardon(a)redhat.com> - 1:5.1.0.0-11.beta2
-- backport more upstream fixes for libreofficekit
-- fix unit test on i686
-
-* Wed Dec 09 2015 David Tardon <dtardon(a)redhat.com> - 1:5.1.0.0-10.beta2
-- backport upstream fixes for libreofficekit
-
-* Fri Dec 04 2015 David Tardon <dtardon(a)redhat.com> - 1:5.1.0.0-9.beta2
-- update to 5.1.0 beta2
-
-* Thu Dec 03 2015 Caolán McNamara <caolanm(a)redhat.com> - 1:5.1.0.0-8.beta1
-- enable and bundle libreofficekit introspection
-
-* Thu Nov 26 2015 David Tardon <dtardon(a)redhat.com> - 1:5.1.0.0-7.beta1
-- update to 5.1.0 beta1
-
-* Tue Nov 10 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:5.1.0.0-6.alpha1
-- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
-
-* Thu Nov 05 2015 David Tardon <dtardon(a)redhat.com> - 1:5.1.0.0-5.alpha1
-- Related: rhbz#1276061 build failure on ppc64
-
-* Tue Nov 03 2015 David Tardon <dtardon(a)redhat.com> - 1:5.1.0.0-4.alpha1
-- Resolves: rhbz#1276061 build failure on ppc64
-
-* Wed Oct 28 2015 David Tardon <dtardon(a)redhat.com> - 1:5.1.0.0-3.alpha1
-- rebuild for ICU 56.1
-
-* Tue Oct 27 2015 Eike Rathke <erack(a)redhat.com> - 1:5.1.0.0-2.alpha1
-- prepare to enable build with ICU 56
-
-* Mon Oct 19 2015 David Tardon <dtardon(a)redhat.com> - 1:5.1.0.0-1.alpha1
-- update to 5.1.0 alpha1
-
-* Mon Oct 12 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.3.1-1
-- update to 5.0.3 rc1
-
-* Thu Oct 08 2015 Caolán McNamara <caolanm(a)redhat.com> - 1:5.0.2.2-4
-- Resolves: rhbz#1269593 declare support for vnd.libreoffice.cmis:// URLs
-
-* Wed Sep 30 2015 Caolán McNamara <caolanm(a)redhat.com> - 1:5.0.2.2-3
-- implement save slide background for impress
-
-* Mon Sep 28 2015 Caolán McNamara <caolanm(a)redhat.com> - 1:5.0.2.2-2
-- Resolves: tdf#93461 captions laid out behind images
-
-* Thu Sep 17 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.2.2-1
-- update to 5.0.2 rc2
-
-* Sat Sep 05 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.2.1-1
-- update to 5.0.2 rc1
-
-* Sat Aug 22 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.1.2-1
-- update to 5.0.1 rc2
-
-* Tue Aug 11 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.1.1-1
-- update to 5.0.1 rc1
-
-* Wed Aug 05 2015 Jonathan Wakely <jwakely(a)redhat.com> 5.0.0.5-2
-- Rebuilt for Boost 1.58
-
-* Mon Aug 03 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.0.5-1
-- update to 5.0.0 rc5
-
-* Wed Jul 29 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:5.0.0.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
-
-* Sat Jul 25 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.0.4-1
-- update to 5.0.0 rc4
-
-* Fri Jul 24 2015 Adam Williamson <awilliam(a)redhat.com> - 1:5.0.0.3-3
-- rebuild for Boost 1.58 (for real this time)
-
-* Wed Jul 22 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.0.3-2
-- rebuild for Boost 1.58
-
-* Fri Jul 10 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.0.3-1
-- update to 5.0.0 rc3
-
-* Sun Jun 28 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.0.2-1
-- update to 5.0.0 rc2
-
-* Sun Jun 21 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.0.1-1
-- update to 5.0.0 rc1
-
-* Fri Jun 19 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.0.0-8.beta3
-- Resolves: rhbz#1233420 crash on auto-fill
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:5.0.0.0-7.beta3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Wed Jun 10 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.0.0-6.beta3
-- update to 5.0.0 beta3
-
-* Tue Jun 09 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.0.0-5.beta2
-- update to 5.0.0 beta2
-
-* Mon Jun 08 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.0.0-4.beta1
-- rebuild for poppler 0.33
-
-* Wed May 20 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.0.0-3.beta1
-- update to 5.0.0 beta1
-
-* Sat May 16 2015 Kalev Lember <kalevlember(a)gmail.com> - 1:5.0.0.0-2.alpha1
-- Resolves: rhbz#1215800 install symbolic icons
-
-* Sun Apr 19 2015 David Tardon <dtardon(a)redhat.com> - 1:5.0.0.0-1.alpha1
-- update to 5.0.0 alpha1
-
-* Tue Apr 14 2015 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.4.2.2-3
-- Resolves: rhbz#1197614 crash when updating extension
-- Resolves: rhbz#1134285 redundant user/password request for WebDAV access
-
-* Mon Mar 30 2015 Richard Hughes <rhughes(a)redhat.com> - 1:4.4.2.2-2
-- Use better AppData screenshots
-
-* Thu Mar 26 2015 David Tardon <dtardon(a)redhat.com> - 1:4.4.2.2-1
-- update to 4.4.2 rc2
-
-* Thu Mar 12 2015 David Tardon <dtardon(a)redhat.com> - 1:4.4.2.1-1
-- update to 4.2.2 rc1
-
-* Mon Feb 23 2015 David Tardon <dtardon(a)redhat.com> - 1:4.4.1.2-1
-- update to 4.4.1 rc2
-
-* Tue Feb 10 2015 David Tardon <dtardon(a)redhat.com> - 1:4.4.1.1-1
-- update to 4.4.1 rc1
-
-* Thu Jan 29 2015 David Tardon <dtardon(a)redhat.com> - 1:4.4.0.3-5
-- fix build on s390
-
-* Wed Jan 28 2015 Petr Machata <pmachata(a)redhat.com> - 1:4.4.0.3-4
-- Rebuild for boost 1.57.0
-
-* Wed Jan 28 2015 Petr Machata <pmachata(a)redhat.com> - 1:4.4.0.3-3
-- Rebuild for boost 1.57.0
-
-* Fri Jan 23 2015 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.4.0.3-2
-- Related: rhbz#1185307 get search for Hamcrest unstuck
-
-* Fri Jan 23 2015 David Tardon <dtardon(a)redhat.com> - 1:4.4.0.3-1
-- update to 4.4.0 rc3
-
-* Fri Jan 23 2015 Marek Kasik <mkasik(a)redhat.com> - 1:4.4.0.2-4
-- Rebuild (poppler-0.30.0)
-
-* Thu Jan 22 2015 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.4.0.2-3
-- Resolves: rhbz#1184582 crash in grammar checking thread
-
-* Mon Jan 19 2015 David Tardon <dtardon(a)redhat.com> - 1:4.4.0.2-2
-- Resolves: rhbz#1180114 writerfilter: don't crash on w:customXmlDelRangeStart
- etc.
-- Resolves: rhbz#1175027 fix life cycle of SwConnectionDisposedListener_Impl
-
-* Fri Jan 09 2015 David Tardon <dtardon(a)redhat.com> - 1:4.4.0.2-1
-- update to 4.4.0 rc2
-
-* Wed Jan 07 2015 Caolán McNamara <caolanm(a)redhat.com> - 1:4.4.0.1-2
-- Resolves: rhbz#1177547 system autocorr files not detected
-
-* Sun Dec 21 2014 David Tardon <dtardon(a)redhat.com> - 1:4.4.0.1-1
-- update to 4.4.0 rc1
-
-* Fri Dec 12 2014 David Tardon <dtardon(a)redhat.com> - 1:4.4.0.0-6.beta2
-- Resolves: rhbz#1116534 crash when pasting over a formula
-
-* Sat Dec 06 2014 David Tardon <dtardon(a)redhat.com> - 1:4.4.0.0-5.beta2
-- update to 4.4.0 beta2
-- move officehelper.py to pyuno package so it can be imported from python
-
-* Tue Dec 02 2014 David Tardon <dtardon(a)redhat.com> - 1:4.4.0.0-4.beta1
-- add Provides: libreoffice-headless; packages are depending on it
-
-* Thu Nov 27 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.4.0.0-3.beta1
-- Resolves: rhbz#1165444 abrt crash with NULL pView
-
-* Thu Nov 27 2014 Marek Kasik <mkasik(a)redhat.com> - 1:4.4.0.0-2.beta1
-- Rebuild (poppler-0.28.1)
-
-* Sat Nov 22 2014 David Tardon <dtardon(a)redhat.com> - 1:4.4.0.0-1.beta1
-- update to 4.4.0 beta1
-
-* Fri Nov 21 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.4.1-6
-- Resolves: fdo#86466 Wrong background color shown in impress table
-
-* Thu Nov 20 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.4.1-5
-- Resolves: rhbz#1164551 we want to ensure that a libjvm.so is available
- but we have no firm interest in which one that is
-
-* Wed Nov 19 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.4.1-4
-- Resolves: rhbz#1165740 arbitrarily backport some rtf crash fixes
-
-* Mon Nov 17 2014 Michael Stahl <mstahl(a)redhat.com>- 1:4.3.4.1-3
-- set VCL.WM.ShouldSwitchWorkspace to false to avoid virtual desktop switching
-
-* Thu Nov 13 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.4.1-2
-- fix impress table layout cache wrt wrong table selection border
-
-* Tue Nov 11 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.4.1-1
-- update to 4.3.4 rc1
-
-* Tue Nov 11 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.3.2-6
-- strip hard coded numbering off outline master previews
-
-* Mon Nov 10 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.3.2-5
-- Resolves: rhbz#1161238 sync PRESOBJ_OUTLINE para depth on load
-
-* Thu Nov 06 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.3.2-4
-- Resolves: fdo#60712 Inherits cell styles in inserting rows/columns
-- implement toggling off removeable master elements with delete
-- Resolves: fdo#78151 change underlying style on toggling bullets on/off in master view
-
-* Thu Nov 06 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.3.2-3
-- Resolves: fdo#76581 copy-and-paste -> slideshow crash in presenter console
-
-* Wed Nov 05 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.3.2-2
-- Resolves: fdo#37559 revert adding extra dummy polygons
-
-* Tue Oct 28 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.3.2-1
-- update to 4.3.3 rc2
-
-* Sun Oct 19 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.3.1-2
-- enable support for 3-D models
-
-* Thu Oct 09 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.3.1-1
-- update to 4.3.3 rc1
-
-* Wed Oct 08 2014 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.3.2.2-5
-- Resolves: rhbz#1054952 bad access of smb URLs on KDE
-
-* Tue Sep 23 2014 Richard Hughes <richard(a)hughsie.com> - 1:4.3.2.2-4
-- move appdata files to desktop files, where the belong
-
-* Tue Sep 23 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.2.2-3
-- Resolves: rhbz#1054952 cannot access smb URLs on KDE
-
-* Tue Sep 23 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.2.2-2
-- make brochure printing of impress/draw work out of the box
-- Resolves: rhbz#1133863 fix looping layout
-
-* Mon Sep 22 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.2.2-1
-- update to 4.3.2 rc2
-
-* Wed Sep 17 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.2.1-3
-- make n-up printing of impress notes work out of the box
-
-* Wed Sep 17 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.2.1-2
-- Resolves: fdo#80911 don't swap notes page width height
-
-* Fri Sep 12 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.2.1-1
-- update to 4.3.2 rc1
-
-* Wed Sep 10 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.1.2-5
-- create a master document template type
-
-* Tue Sep 09 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.1.2-4
-- Resolves: fdo#82496 Change picture option with right click in writer
-
-* Fri Sep 05 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.1.2-3
-- build for aarch64
-
-* Fri Aug 29 2014 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.3.1.2-2
-- Resolves: rhbz#1098693 AArch64 port
-
-* Wed Aug 27 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.1.2-1
-- update to 4.3.1 rc2
-
-* Tue Aug 26 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.1.1-8
-- Related: rhbz#1131425 ure only needs jre-headless
-
-* Tue Aug 26 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.1.1-7
-- rebuild for ICU 53.1
-
-* Fri Aug 22 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.1.1-6
-- Resolves: rhbz#1131425 move libjawt-using office bean into a subpackage
-- Resolves: rhbz#1125588 port LibreOffice to ppc64le
-
-* Tue Aug 19 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.1.1-5
-- Resolves: rhbz#1131425 try java-headless instead of java
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:4.3.1.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Aug 16 2014 Rex Dieter <rdieter(a)fedoraproject.org> 1:4.3.1.1-3
-- update mime scriptlets
-
-* Fri Aug 15 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.1.1-2
-- Related: rhbz#1130264 crash in media playback on s390x
-
-* Sun Aug 10 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.1.1-1
-- update to 4.3.1 rc1
-
-* Mon Jul 28 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.4-1
-- update to 4.3.0 rc4
-
-* Fri Jul 25 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.3-4
-- Resolves: rhbz#1121254 crash when using font selector after adding new font
-
-* Fri Jul 25 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.3.0.3-3
-- Resolves: rhbz#1122868 landscape printing is broken
-
-* Thu Jul 24 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.3-2
-- avoid image loss in Impress after auto-save
-
-* Wed Jul 16 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.1-1
-- update to 4.3.0 rc3
-
-* Tue Jul 08 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.2-2
-- avoid problems detecting HTML files with xls extension
-
-* Wed Jul 02 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.2-1
-- update to 4.3.0 rc2
-
-* Tue Jun 17 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.1-1
-- update to 4.3.0 rc1
-
-* Mon Jun 09 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.0-9.beta2
-- Resolves: rhbz#1105376 FlatODF import/export does not work unless
- libreoffice-xsltfilter is installed
-
-* Wed Jun 04 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.0-8.beta2
-- update to 4.3.0 beta2
-
-* Thu May 29 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.0-7.beta1
-- fix some fallout from the import libs rebase
-
-* Wed May 28 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.0-6.beta1
-- switch to librevenge-based import libs
-
-* Tue May 27 2014 Kalev Lember <kalevlember(a)gmail.com> - 1:4.3.0.0-5.beta1
-- Rebuild for boost 1.55.0
-
-* Mon May 26 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.0-4.beta1
-- unblock build on ARM
-
-* Fri May 23 2014 Petr Machata <pmachata(a)redhat.com> - 1:4.3.0.0-3.beta1
-- Rebuild for boost 1.55.0
-
-* Fri May 23 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.0-2.beta1
-- rebuild for boost 1.55.0
-
-* Wed May 21 2014 David Tardon <dtardon(a)redhat.com> - 1:4.3.0.0-1.beta1
-- update to 4.3.0 beta1
-
-* Fri May 16 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.4.2-14
-- render smart-art with a vector format so it can be scaled nicely
-- fix leak on pasting metafiles into office
-- fix leak on pasting draw items into office
-- fix another leak on scaling metric items
-
-* Thu May 15 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.4.2-13
-- fix SDK doc generation with doxygen 1.8.7
-
-* Wed May 14 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.4.2-12
-- rebuild for new poppler
-
-* Mon May 12 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.4.2-11
-- Resolves: rhbz#1096747 format->page crash on html doc
-
-* Mon May 12 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.4.2-10
-- Resolves: fdo#78119 bad july (červenec) month name support in czech
- localization
-
-* Mon May 12 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.4.2-9
-- Resolves: rhbz#1096486 avoid access to nonexisting parent
-- Resolves: rhbz#1096295 hard to distinguish slides in slide pane
-
-* Fri May 09 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.4.2-8
-- Resolves: rhbz#1071604 Draw depends on files from libreoffice-impress, crashes
- without them
-
-* Fri May 09 2014 Eike Rathke <erack(a)redhat.com> - 1:4.2.4.2-7
-- Resolves: fdo#77509 memory corruption / crash in Consolidate
-
-* Thu May 08 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.4.2-6
-- center current slide after changing zoom
-- add a status bar icon to fit slide to window
-- Related: fdo#50697 reset the cache timeout on GetGraphic
-
-* Thu May 08 2014 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.2.4.2-5
-- Resolves: rhbz#1092589 Thoroughly check whether JRE is still present
-
-* Tue May 06 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.4.2-4
-- clip over-long comments
-
-* Thu May 01 2014 Eike Rathke <erack(a)redhat.com> - 1:4.2.4.2-3
-- Resolves: fdo#78294 default null-date for document import is 1899-12-30
-
-* Thu May 01 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.4.2-2
-- better scaling of notes-using pages
-
-* Wed Apr 30 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.4.2-1
-- update to 4.2.4 rc2
-
-* Fri Apr 25 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.4.1-7
-- Related: rhbz#1032774 disable autoexit when switching monitors
-
-* Thu Apr 24 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.4.1-6
-- Resolves: fdo#37130 use 10pt Default style font for comments
-- Resolves: fdo#60040 crash after undoing master page
-- vertically center printout when including comments
-
-* Wed Apr 23 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.4.1-5
-- add a 'format all comments' feature
-
-* Tue Apr 22 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.4.1-4
-- Resolves: rhbz#1089377 crash on loading a specific rtf
-
-* Tue Apr 22 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.4.1-3
-- sometimes tables in impress don't resize when adding rows
-- Resolves: fdo#71423 crash while editing Impress tables
-
-* Fri Apr 18 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.4.1-2
-- every 2nd print job is incorrectly flagged as failed
-- Related: rhbz#1088625 PresenterPaintManager seen as NULL
-
-* Thu Apr 17 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.4.1-1
-- update to 4.2.4 rc1
-
-* Wed Apr 16 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.3.3-6
-- install man pages
-- Resolves: rhbz#1086714 overlarge pixmap
-
-* Wed Apr 16 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.3.3-5
-- Resolves: fdo#36815 enable printing WYSIWYG sidewindow comments
-
-* Sat Apr 12 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.3.3-4
-- drop filtering of provides again
-
-* Sat Apr 12 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.3.3-3
-- Related: rhbz#1081176 don't jump to cursor pos when we don't want to
-
-* Fri Apr 11 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.3.3-2
-- Resolves: rhbz#1081176 don't jump to cursor pos when we don't want to
-- Related: rhbz#1085916 kde startup woes
-
-* Sat Apr 05 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.3.3-1
-- update to 4.2.3 rc3
-
-* Tue Apr 01 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.3.2-3
-- Related: rhbz#1075951 abrt crash in MSWordExportBase
-
-* Mon Mar 31 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.3.2-2
-- Resolves: rhbz#1080196 mdds/multi_type_vector_itr.hpp update_node():
- soffice.bin killed by SIGSEGV
-
-* Wed Mar 26 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.3.2-1
-- update to 4.2.3 rc2
-
-* Tue Mar 25 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.3.1-2
-- Resolves: rhbz#1077780 crash on loading a specific docx
-
-* Mon Mar 17 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.3.1-1
-- update to 4.2.3 rc1
-
-* Fri Mar 14 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.2.1-7
-- Related: rhbz#1076264 intermittent a11y crash in calc
-
-* Mon Mar 10 2014 Michael Stahl <mstahl(a)redhat.com> - 1:4.2.2.1-6
-- Resolves: rhbz#988516: DOCX import: fix context stack when importing header
-- Resolves: rhbz#1072553: Fix deselection problems of template view
-- Resolves: rhbz#1072607: fix crash in SvxRuler::MouseMove()
-- Resolves: rhbz#1043551: sw: avoid division-by-0 in Text Grid painting code
-- RTF import: import field parameters
-- RTF import: fix spurious page breaks at doc end
-
-* Tue Mar 04 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.2.1-5
-- Related: rhbz#1065807 wizards should find the right wizards subdir
- of Template_internal, who knew this stuff was so fragile
-
-* Mon Mar 03 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.2.1-4
-- Related: rhbz#1065807 wizards should look in Template_internal
-
-* Fri Feb 28 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.2.1-3
-- Resolves: rhbz#1007697 Update on a Window deletes itself
-
-* Fri Feb 28 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.2.1-2
-- Related: rhbz#1065807 don't throw with no "Templates" dir under KDE
-
-* Thu Feb 27 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.2.1-1
-- update to 4.2.2 rc1
-
-* Thu Feb 27 2014 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.2.1.1-4
-- Resolves: fdo#75540 spadmin does not start
-
-* Thu Feb 27 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.1.1-3
-- Resolves: rhbz#1057977 do not crash when fonts are updated
-
-* Tue Feb 25 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.1.1-2
-- Resolves: rhbz#1065807 search XDG defined "Templates" dir
-
-* Thu Feb 13 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.1.1-1
-- update to 4.2.1 rc1
-
-* Thu Feb 13 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.0.4-4
-- rebuild for new ICU
-
-* Thu Feb 06 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.0.4-3
-- Resolves: rhbz#1017379 libreoffice impress imports animated motion paths
- incorrectly from powerpoint
-- Resolves: fdo#33852 Custom animation (Motionpath Left) isn't being
- imported correctly from .ppt
-
-* Thu Jan 30 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.0.4-2
-- split LibreLogo into a separate subpackage
-- create a metapackage depending on all subpackages containing filters,
- for use of packages like unoconv
-
-* Tue Jan 28 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.0.4-1
-- update to 4.2.0 rc4
-
-* Fri Jan 24 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.0.3-3
-- enable EOT support
-- fix PPC build
-
-* Thu Jan 23 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.0.3-2
-- stop showing math and startcenter in menu (again)
-
-* Wed Jan 22 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.0.3-1
-- update to 4.2.0 rc3
-
-* Mon Jan 13 2014 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.0.2-2
-- Related: rhbz#1047871 conditional formatting doesn't fit on screen
-
-* Thu Jan 09 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.0.2-1
-- update to 4.2.0 rc2
-- Resolves: rhbz#1049543 Include AppData files in packages
-
-* Tue Jan 07 2014 David Tardon <dtardon(a)redhat.com> - 1:4.2.0.1-1
-- 4.2.0 rc1
-
-* Wed Dec 11 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.0.0-3.beta2
-- Resolves: rhbz#1040291 Change language name from "Oriya" to "Odia"
-
-* Wed Dec 04 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.2.0.0-2.beta2
-- update to 4.2.0 beta2
-- Related: rhbz#1032774 bodge around reported NULL
-- Resolves: rhbz#1035092 no shortcut key for Italian 'Tools' menu
-- Resolves: rhbz#912529 Kerkis SmallCaps shown instead of Kerkis Regular
-- Resolves: rhbz#1038189 refresh printer list when print dialog launched
-- openssl no longer required to build
-
-* Thu Nov 21 2013 David Tardon <dtardon(a)redhat.com> - 1:4.2.0.0-1.beta1
-- switch to 4.2.0
-
-* Wed Nov 20 2013 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.1.3.2-5
-- Resolves: rhbz#1031989 Accept --pt in addition to deprecated -pt
-- Related: rhbz#1014990 valgrind reports uninitialized variables
-
-* Sun Nov 03 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.3.2-4
-- adapt for libmwaw 0.2
-
-* Thu Oct 31 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.3.2-3
-- Resolves: fdo#56209 reviving FilterFormulaParser
-
-* Thu Oct 31 2013 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.1.3.2-2
-- Resolves: fdo#67725 unoidl::AggregatingCursor must wrap modules for aggregation
-- Resolves: rhbz#1021915 force menubar menus to be up/down only
-- Resolves: rhbz#1025201 Incorrect rendering of Devanagari short i
-
-* Wed Oct 23 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.3.2-1
-- 4.1.3 rc2
-- Resolves: rhbz#1022094 libreoffice-4.1.3.1-1 was built without
- langpacks
-
-* Mon Oct 21 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.3.1-2
-- Resolves: rhbz#1020712 wrong default CTL font shown in editengine
-- Resolves: rhbz#919070 display -1 means span all screens
-
-
-* Wed Oct 16 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.3.1-1
-- 4.1.3 rc1
-
-* Mon Oct 07 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.2.3-4
-- Resolves: rhbz#1001768: fix various a11y deadlocks and crashes
-- Resolves: rhbz#1016022 fix cut from impress and paste to writer
-- Resolves: rhbz#1003179 fix AUTOFMT related crashes in Writer Undo
-
-* Mon Oct 07 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.2.3-3
-- Resolves: rhbz#1015281 crash on clicking custom animation
-- Resolves: rhbz#996162 crash with no bullet font
-
-* Wed Oct 02 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.2.3-2
-- Resolves: rhbz#1013480 crash in EditLineList::operator[]
-- Resolves: rhbz#1014010 crash on start up
-- Resolves: rhbz#1013844 encrypted OOo 1.0 files don't reopen
-
-* Mon Sep 30 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.2.3-1
-- 4.1.2 rc3
-
-* Fri Sep 20 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.2.2-1
-- 4.1.2 rc2
-
-* Tue Sep 17 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.2.1-3
-- add select sheet menu to calc prev/next area
-- Resolves: rhbz#988104 crash on certain pptx
-
-* Thu Sep 12 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.2.1-2
-- Resolves: rhbz#1006850 crash in SwCommentRuler
-
-* Thu Sep 05 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.2.1-1
-- 4.1.2 rc1
-
-* Tue Sep 03 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.1.2-3
-- Resolves: rhbz#993963 NULL m_pWindow on firefox close plugin window
-
-* Fri Aug 23 2013 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.1.1.2-2
-- Resolves: rhbz#1000150, Do not call exit upon XIOError
-
-* Thu Aug 22 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.1.2-1
-- 4.1.1 rc2
-- Related: rhbz#895690 Always try to do a mount when opening a file via GIO
-- Resolves: rhbz#998136 wrong index to gWidgetData
-- Resolves: rhbz#998046 store last size/position of the base windows
-
-* Mon Aug 19 2013 Marek Kasik <mkasik(a)redhat.com> - 1:4.1.1.1-2
-- Rebuild (poppler-0.24.0)
-
-* Fri Aug 09 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.1.1-1
-- 4.1.1 rc1
-
-* Fri Aug 09 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.0.4-6
-- Resolves: fdo#67743 user autocorr file not written
-
-* Tue Jul 30 2013 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.1.0.4-5
-- Resolves: rhbz#989246 Honor user's JavaDriverClass override in mysql driver
-- Resolves: fdo#67045 fix several nasty screen selection issues
-
-* Tue Jul 30 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.0.4-4
-- Resolves: rhbz#989686 Fix crash with stripping whitespace from toc entries
-
-* Mon Jul 29 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.4-3
-- make libwpd-based filters work correctly with newest libwpd
-
-* Sun Jul 28 2013 Petr Machata <pmachata(a)redhat.com> - 1:4.1.0.4-2
-- Rebuild for boost 1.54.0
-
-* Wed Jul 24 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.4-1
-- 4.1.0 rc4
-
-* Mon Jul 22 2013 Eike Rathke <erack(a)redhat.com> - 1:4.1.0.3-2
-- force rebuild with icu-50.1.2-7
-
-* Thu Jul 18 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.3-1
-- 4.1.0 rc3
-- Resolves: fdo#48835 GNOME3 app menu
-
-* Thu Jul 18 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.0.2-5
-- silence scary gcc warning
-- fdo#66924 switching to master view is broken
-
-* Tue Jul 16 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.2-4
-- bump release
-
-* Fri Jul 12 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.2-3
-- Resolves: rhbz#983809 libreoffice-base misses deps on needed java packages
-
-* Thu Jul 11 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.2-2
-- Resolves: rhbz#980387 Exporting a odg to jpg or tiff generates error
-
-* Thu Jul 04 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.2-1
-- 4.1.0 rc2
-
-* Mon Jul 01 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.0.1-8
-- Resolves: rhbz#979758 crash on Diagrammen in LibreOffice help page
-
-* Thu Jun 27 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.1-7
-- bump revision
-
-* Mon Jun 24 2013 Marek Kasik <mkasik(a)redhat.com> - 1:4.1.0.1-6
-- Rebuild (poppler-0.22.5)
-
-* Mon Jun 24 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.1-5
-- fix build on big endian archs
-
-* Mon Jun 24 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.1-4
-- put glade catalog into an extra packgae
-
-* Sun Jun 23 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.0.1-3
-- Resolves: rhbz#976304 gallery elements may not insert
-
-* Wed Jun 19 2013 Dennis Gilmore <dennis(a)ausil.us> - 1:4.1.0.1-2
-- fix _smp_mflags macro useage
-
-* Wed Jun 19 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.1-1
-- 4.1.0 rc1
-- Related: rhbz#971321 failing tests on ppc and s390
-
-* Sun Jun 16 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.0-9.beta2
-- Resolves: rhbz#971321 failing tests on ppc and s390
-- Resolves: rhbz#974062 incorrect rendering of text in outline blocks in
- Impress
-
-* Fri Jun 07 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.0-8.beta2
-- Related: rhbz#971795 go back to BR: harfbuzz-devel
-
-* Fri Jun 07 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.0-7.beta2
-- Resolves: rhbz#971230 Use BR: harfbuzz-icu-devel
-
-* Wed Jun 05 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.0-7.beta1
-- 4.1.0 beta2
-
-* Wed Jun 05 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.0.0-6.beta1
-- Related: rhbz#968892 discard impossible languages for Oriya script
-
-* Tue Jun 04 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.0.0-5.beta1
-- Resolves: rhbz#968892 block entire grapheme together for glyph fallback
-- Related: rhbz#968892 discard impossible languages for glyph fallback
-
-* Fri May 31 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.1.0.0-4.beta1
-- Resolves: rhbz#968976 fix dropdown list autosizing
-
-* Thu May 30 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.0-3.beta1
-- build fix for s390
-
-* Fri May 24 2013 David Tardon <dtardon(a)redhat.com> - 1:4.1.0.0-2.beta1
-- 4.1.0 beta1
-
-* Fri May 24 2013 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.0.3.3-3
-- Resolves: rhbz#961460 can't save WebDAV (davs) files
-
-* Thu May 16 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.0.3.3-2
-- Resolves: rhbz#963276 font options cache crash
-
-* Fri May 03 2013 David Tardon <dtardon(a)redhat.com> - 1:4.0.3.3-1
-- 4.0.3 rc3
-
-* Tue Apr 30 2013 David Tardon <dtardon(a)redhat.com> - 1:4.0.3.2-1
-- 4.0.3 rc2
-
-* Mon Apr 22 2013 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.0.3.1-2
-- Resolves: rhbz#954991 Avoid static data (causing trouble at exit)
-
-* Thu Apr 18 2013 David Tardon <dtardon(a)redhat.com> - 1:4.0.3.1-1
-- 4.0.3 rc1
-- Resolves: rhbz#867808 do not throw UNO exceptions by pointer in C++
-
-* Tue Apr 16 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.0.2.2-4
-- Resolves: rhbz#927223 syntax highlighting crash
-
-* Mon Apr 08 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.0.2.2-3
-- Resolves: rhbz#949238 div by zero on pagedown in 0 width panel
-
-* Fri Apr 05 2013 Kalev Lember <kalevlember(a)gmail.com> - 1:4.0.2.2-2
-- Resolves: rhbz#949106 libreoffice drags in both openjdk 1.7.0 and 1.8.0
-
-* Thu Mar 28 2013 David Tardon <dtardon(a)redhat.com> - 1:4.0.2.2-1
-- 4.0.2 rc2
-- Resolves: rhbz#876742 manipulation with larger tables in impress is
- very slow
-
-* Fri Mar 15 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.0.2.1-2
-- Resolves: rhbz#906137 slide show inverts outputs
-
-* Fri Mar 15 2013 David Tardon <dtardon(a)redhat.com> - 1:4.0.2.1-1
-- 4.0.2 rc1
-- Resolves: rhbz#921716 Build Breton language pack
-
-* Wed Mar 13 2013 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.0.1.2-4
-- Resolves: rhbz#895690 failure saving to gvfs mounts
-
-* Tue Mar 12 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.0.1.2-3
-- Resolves: rhbz#920697 presentation not always full-screen
-
-* Thu Mar 07 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.0.1.2-2
-- Related: rhbz#902884 check for NULL GetSelectedMasterPage
-- Resolves: fdo#61241 force area page to size itself
-- Resolves: fdo#61656 use order and orientation combobox
-- Resolves: fdo#56031 RSID attr changes drop content changes
-
-* Thu Feb 28 2013 David Tardon <dtardon(a)redhat.com> - 1:4.0.1.2-1
-- 4.0.1 rc2
-
-* Tue Feb 26 2013 Eike Rathke <erack(a)redhat.com> - 1:4.0.0.3-8
-- do not access vector elements beyond size, rhbz#847519 related
-- Resolves: rhbz#742780 let make OPT_FLAGS=... override SDK flags
-- Resolves: rhbz#907933 crash on removing second last para
-
-* Tue Feb 19 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.0.0.3-7
-- Resolves: rhbz#895196 sc filter float a11y parent of itself
-
-* Tue Feb 19 2013 David Tardon <dtardon(a)redhat.com> - 1:4.0.0.3-6
-- Resolves: rhbz#911896 add Kazakh localization
-
-* Fri Feb 15 2013 Caolán McNamara <caolanm(a)redhat.com> - 1:4.0.0.3-5
-- make evolution 3.6 work with address book
-- Resolves: rhbz#910176 cannot select directory with gtk folder picker
-- fixes for building against Boost 1.53.0
-
-* Fri Feb 15 2013 Stephan Bergmann <sbergman(a)redhat.com> - 1:4.0.0.3-4
-- Resolves: fdo#60491 missing libemboleobj.so
-- Resolves: rhbz#908674 crash on start
-
-* Sat Feb 09 2013 Denis Arnaud <denis.arnaud_fedora(a)m4x.org> - 1:4.0.0.3-3
-- Rebuild for Boost-1.53.0
-
-* Wed Feb 06 2013 David Tardon <dtardon(a)redhat.com> - 1:4.0.0.3-2
-- fix parsing errors in translated help
-
-* Fri Feb 01 2013 David Tardon <dtardon(a)redhat.com> - 1:4.0.0.3-1
-- 4.0.0 rc3
-
-* Wed Jan 23 2013 David Tardon <dtardon(a)redhat.com> - 1:4.0.0.2-1
-- 4.0.0 rc2
-- use ucpp again
-
-* Tue Jan 22 2013 David Tardon <dtardon(a)redhat.com> - 1:4.0.0.1-3
-- Resolves: rhbz#760765 Impress doesn't copy custom styles from one file
- to another
-
-* Mon Jan 21 2013 David Tardon <dtardon(a)redhat.com> - 1:4.0.0.1-2
-- Resolves: rhbz#901346 do not install 512x512 icons
-
-* Tue Jan 15 2013 David Tardon <dtardon(a)redhat.com> - 1:4.0.0.1-1
-- 4.0.0 rc1
-
-* Sat Dec 22 2012 David Tardon <dtardon(a)redhat.com> - 1:4.0.0.0-4.beta2
-- use system cpp instead of ucpp
-
-* Wed Dec 19 2012 David Tardon <dtardon(a)redhat.com> - 1:4.0.0.0-3.beta2
-- 4.0.0 beta2
-
-* Thu Dec 06 2012 David Tardon <dtardon(a)redhat.com> - 1:4.0.0.0-2.beta1
-- 4.0.0 beta1
-
-* Thu Nov 29 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.4.3-1
-- 3.6.4 rc3
-
-* Wed Nov 28 2012 Caolán McNamara <caolanm(a)redhat.com> - 1:3.6.4.1-2
-- fix docx import on big endian
-
-* Sun Nov 18 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.4.1-1
-- 3.6.4 rc1
-
-* Wed Nov 14 2012 Caolán McNamara <caolanm(a)redhat.com> - 1:3.6.3.2-8
-- Resolves: rhbz#872815 ogltrans effects still suboptimal
-
-* Tue Nov 13 2012 Caolán McNamara <caolanm(a)redhat.com> - 1:3.6.3.2-7
-- big endian test failure
-
-* Thu Nov 08 2012 Caolán McNamara <caolanm(a)redhat.com> - 1:3.6.3.2-6
-- Resolves: fdo#56198/rhbz#868002 honour gtk-scrollbar-warp-preference
-
-* Tue Nov 06 2012 Caolán McNamara <caolanm(a)redhat.com> - 1:3.6.3.2-5
-- bump for libexttextcat
-
-* Fri Nov 02 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.3.2-4
-- Resolves: rhbz#871929 add keywords to desktop files
-- fix debuginfo
-
-* Wed Oct 31 2012 Eike Rathke <erack(a)redhat.com> - 1:3.6.3.2-3
-- Resolves: rhbz#865058 increase number of user-defined format codes
-
-* Fri Oct 26 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.3.2-2
-- Resolves: rhbz#824035 do not bundle saxon
-
-* Wed Oct 24 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.3.2-1
-- 3.6.3 rc2
-- drop integrated 0001-Resolves-rhbz-868479-fdo-56281-doubled-in-German-ok-.patch
-
-* Mon Oct 22 2012 Caolán McNamara <caolanm(a)redhat.com> - 1:3.6.3.1-3
-- Resolves: rhbz#868479 guard against duplicated ~ in OK/Cancel
-
-* Thu Oct 11 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.3.1-2
-- Resolves: rhbz#858641 backport gstreamer 1.0 support to F-18
-
-* Thu Oct 11 2012 Caolán McNamara <caolanm(a)redhat.com> - 1:3.6.3.1-1
-- 3.6.3 rc1
-- drop integrated 0001-Resolves-rhbz-855972-crash-on-switching-to-outline-v.patch
-- drop integrated 0001-fdo-52022-Simple-LargeControlPoints-actually-can-hav.patch
-- drop integrated 0001-fdo-46071-Do-not-hide-windows-based-on-nil-Visible-p.patch
-
-* Fri Oct 05 2012 Stephan Bergmann <sbergman(a)redhat.com> - 1:3.6.2.2-3
-- Resolves: fdo#46071 Do not hide windows based on nil Visible property
-
-* Fri Oct 05 2012 Stephan Bergmann <sbergman(a)redhat.com> - 1:3.6.2.2-2
-- Resolves: fdo#52022 Part of data in userdir is lost on upgrade
-
-* Wed Sep 26 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.2.2-1
-- 3.6.2 rc2
-
-* Wed Sep 12 2012 Caolán McNamara <caolanm(a)redhat.com> - 1:3.6.2.1-2
-- Resolves: rhbz#855541 XIOError handler multithread woes
-
-* Wed Sep 12 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.2.1-1
-- 3.6.2 rc1
-
-* Tue Sep 11 2012 Caolán McNamara <caolanm(a)redhat.com> - 1:3.6.1.2-4
-- Resolves: rhbz#855507 large ole2 compound files fail to load
-
-* Mon Sep 10 2012 Caolán McNamara <caolanm(a)redhat.com> - 1:3.6.1.2-3
-- Resolves: rhbz#855972 crash on switching to outline view
-
-* Wed Aug 29 2012 Caolán McNamara <caolanm(a)redhat.com> - 1:3.6.1.2-2
-- Related: rhbz#850709 hunspell en-US available standalone so
- make English langpack require hunspell-en and core just
- bare bones hunspell-en-US
-
-* Sun Aug 26 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.1.2-1
-- 3.6.1 rc2
-
-* Wed Aug 22 2012 Caolán McNamara <caolanm(a)redhat.com> - 1:3.6.1.1-2
-- Resolves: rhbz#846775 Clipboard must be disposed before selection
-- Resolves: rhbz#842292 crash in scrolling multiselection in draw
-
-* Wed Aug 15 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.1.1-1
-- 3.6.1 rc1
-
-* Sun Aug 12 2012 Kevin Fenzi <kevin(a)scrye.com> - 1:3.6.0.4-3
-- Rebuild for new boost
-
-* Sat Jul 28 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.0.4-2
-- rebuilt for boost 1.50
-
-* Fri Jul 27 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.0.4-1
-- 3.6.0 rc4
-
-* Thu Jul 26 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.0.3-2
-- Resolves: rhbz#842552 crash in pptx import
-
-* Wed Jul 25 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.0.3-1
-- 3.6.0 rc3
-
-* Tue Jul 17 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.0.2-1
-- 3.6.0 rc2
-
-* Mon Jul 16 2012 Caolán McNamara <caolanm(a)redhat.com> - 1:3.6.0.1-3
-- Resolves: rhbz#836937 insanely slow with Zemberek
-
-* Mon Jul 16 2012 David Tardon <dtardon(a)redhat.com> - 1:3.6.0.1-2
-- rebuild for new libexttextcat
-
-* Thu Jul 12 2012 David Tardon <dtardon(a)redhat.com> - 3.6.0.1-1
-- 3.6.0 rc1
-
-* Mon Jul 09 2012 Caolán McNamara <caolanm(a)redhat.com> - 3.6.0.0-4
-- Resolves: rhbz#838368 --view ignored while -view accepted
-
-* Thu Jul 05 2012 David Tardon <dtardon(a)redhat.com> - 3.6.0.0-3
-- 3.6.0 beta3
-
-* Mon Jul 2 2012 Marek Kasik <mkasik(a)redhat.com> - 3.6.0.0-2
-- Rebuild (poppler-0.20.1)
-
-* Wed Jun 27 2012 David Tardon <dtardon(a)redhat.com> - 3.6.0.0-1
-- 3.6.0 beta2
-- drop integrated 0001-move-binfilter-mime-types-into-extra-.desktop-file.patch
-- drop integrated 0001-Resolves-rhbz-788042-skip-splashscreen-with-quicksta.patch
-- drop integrated libreoffice-ensure-non-broken-xml-tree.patch
-- drop integrated 0001-preserve-timestamps-for-.py-files.patch
-- drop integrated 0001-Resolves-rhbz-788045-swriter-help-etc-doesn-t-show-h.patch
-- drop integrated 0001-Resolves-rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch
-- drop integrated 0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch
-- drop integrated 0001-Resolves-rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch
-- drop integrated 0001-desktop-do-not-complain-about-soffice-command-line-o.patch
-- drop integrated 0001-Resolves-fdo-48096-torn-off-popups-trigger-keyboard-.patch
-- drop integrated 0001-fdo-38088-better-CSV-import-default-separators.patch
-- drop integrated 0001-save-register-arguments-first.patch
-- drop integrated 0001-do-not-let-gcc-use-registers-we-are-setting-ourselve.patch
-- drop integrated 0001-wrong-types-used-here-breaks-64bit-bigendian.patch
-- drop integrated 0001-Resolves-rhbz-805743-a11y-call-doShow-after-we-have-.patch
-- drop integrated 0001-Resolves-fdo-49849-implement-Unicode-6.1-hebrew-line.patch
-- drop integrated 0001-use-ure-instead-of-ure-link.patch
-- drop broken 0001-fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch
-
-* Mon Jun 18 2012 Caolán McNamara <caolanm(a)redhat.com> - 3.5.5.1-2
-- Resolves: rhbz#830810 missing dependency on lucene-contrib
-
-* Thu Jun 14 2012 David Tardon <dtardon(a)redhat.com> - 3.5.5.1-1
-- 3.5.5 rc1
-- drop integrated 0001-make-hsqldb-build-with-java-1.7.patch
-- drop integrated 0001-Related-rhbz-799628-crash-with-chewing-IM-with-g3g.patch
-- drop integrated 0001-silence-SolarMutex-not-locked-spew.patch
-- drop integrated 0001-gcc-trunk-fix-unable-to-find-string-literal-operator.patch
-- drop integrated 0001-ppc-yyinput-returns-a-int-truncating-to-unsigned-cha.patch
-- drop integrated 0001-Resolves-rhbz-826609-rhbz-820554-fix-smoketest-on-pp.patch
-
-* Mon Jun 11 2012 David Tardon <dtardon(a)redhat.com> - 3.5.4.2-3
-- make gdb pretty printers for URE libs usable again
-
-* Fri Jun 08 2012 Caolán McNamara <caolanm(a)redhat.com> - 3.5.4.2-2
-- Resolves: rhbz#826609, rhbz#820554 fix smoketest on ppc[64] and s390[x]
-
-* Wed May 23 2012 David Tardon <dtardon(a)redhat.com> - 3.5.4.2-1
-- 3.5.4 rc2
-
-* Thu May 17 2012 Caolán McNamara <caolanm(a)redhat.com> - 3.5.4.1-2
-- Resolves: rhbz#811226 ARM FTBFS
-
-* Wed May 16 2012 David Tardon <dtardon(a)redhat.com> - 3.5.4.1-1
-- 3.5.4 rc1
-- drop integrated 0001-do-not-prepend-n-twice-it-confuses-KFileDialog-rhbz-.patch
-- drop integrated 0001-incrementing-index-twice-in-one-run-seems-wrong.patch
-- drop integrated 0001-fdo-49365-correctly-map-monitor-index-back-to-screen.patch
-- drop integrated 0001-rhbz-809019-count-mirrored-monitors-as-one.patch
-
-* Sun May 13 2012 Caolán McNamara <caolanm(a)redhat.com> - 3.5.3.2-5
-- Resolves: fdo#49849 line breaking fixes for Hebrew
-
-* Fri May 11 2012 David Tardon <dtardon(a)redhat.com> - 3.5.3.2-4
-- Resolves: rhbz#820439 KDE export dialog broken for most formats
-- Resolves: fdo#49365 Libreoffice fails to start on second screen with
- gtk vcl plugin
-- Resolves: rhbz#809019 Impress thinks a machine with 2 monitors in
- clone mode is multihead
-
-* Wed May 09 2012 Caolán McNamara <caolanm(a)redhat.com> - 3.5.3.2-3
-- Resolves: rhbz#805743 a11y crash in impress/draw
-- Resolves: rhbz#813202 opengl slide transitions still a bit
- problematic in Fedora 17
-
-* Thu May 03 2012 David Tardon <dtardon(a)redhat.com> - 3.5.3.2-2
-- rebuild for changed dependencies
-
-* Wed Apr 25 2012 David Tardon <dtardon(a)redhat.com> - 3.5.3.2-1
-- 3.5.3 rc2
-- fix broken test on 64bit big endian
-
-* Mon Apr 23 2012 David Tardon <dtardon(a)redhat.com> - 3.5.3.1-2
-- rebuild for icu
-- fix UNO bridges for ppc and ppc64
-
-* Thu Apr 19 2012 David Tardon <dtardon(a)redhat.com> - 3.5.3.1-1
-- 3.5.3 rc1
-- drop integrated 0001-Introduced-SystemShellExecuteFlags-URIS_ONLY.patch
-- drop integrated 0001-Simplify-code-and-use-proper-register-names-for-linu.patch
-- drop integrated 0001-resolved-rhbz-813280-the-current-document-is-not-alw.patch
-
-* Wed Apr 18 2012 Eike Rathke <erack(a)redhat.com> - 3.5.2.1-7
-- Resolves: rhbz#813280 sheets cannot be moved in Calc
-
-* Wed Apr 11 2012 Eike Rathke <erack(a)redhat.com> - 3.5.2.1-6
-- Resolves: fdo#38088 rhbz#810267 better CSV import default separators
-
-* Tue Apr 10 2012 Caolán McNamara <caolanm(a)redhat.com> - 3.5.2.1-5
-- Resolves: rhbz#811226 FTBFS ARM
-
-* Thu Apr 05 2012 Stephan Bergmann <sbergman(a)redhat.com> - 3.5.2.1-4
-- Fix URIS_ONLY flag issue
-- rebuild for db4
-
-* Mon Apr 02 2012 Caolán McNamara <caolanm(a)redhat.com> - 3.5.2.1-3
-- Resolves: rhbz#708041 focus problems with tearable menus
-
-* Mon Mar 26 2012 Caolán McNamara <caolanm(a)redhat.com> - 3.5.2.1-2
-- Resolves: rhbz#806663 SlideshowImpl can outlive SdModule
-
-* Sun Mar 25 2012 David Tardon <dtardon(a)redhat.com> - 3.5.2.1-1
-- 3.5.2 rc1
--drop integrated 0001-yet-another-clash-with-macro-name.patch
-
-* Wed Mar 14 2012 David Tardon <dtardon(a)redhat.com> - 3.5.1.2-2
-- Resolves: rhbz#770209 can't change paper tray setting while printing
-
-* Thu Mar 08 2012 David Tardon <dtardon(a)redhat.com> - 3.5.1.2-1
-- 3.5.1 rc2
-
-* Tue Mar 06 2012 Caolán McNamara <caolanm(a)redhat.com> - 3.5.1.1-3
-- Resolves: rhbz#799628 crash with chewing IM with g3g
-- Resolves: rhbz#799525 put flat odf mimetypes into xsltfilter.desktop
-- Resolves: rhbz#800272 complain about unknown commandline options
-
-* Wed Feb 29 2012 Caolán McNamara <caolanm(a)redhat.com> - 3.5.1.1-2
-- Resolves: rhbz#788045 swriter --help doesn't show help
-- Resolves: rhbz#798667 missing .desktop icons
-
-* Sun Feb 26 2012 David Tardon <dtardon(a)redhat.com> - 3.5.1.1-1
-- 3.5.1 rc1
-- drop 0001-Resolves-fdo-43644-survive-registered-but-unavailabl.patch
-- drop 0001-Resolves-rhbz-789622-Adapt-SDK-to-changed-paths-in-L.patch
-- drop 0001-Fix-fdo-45177-avoid-linked-undo-for-the-while.patch
-- drop 0001-Fix-some-apparent-misuses-of-RTL_CONSTASCII_USTRINGP.patch
-- drop binfilter-Fix-some-apparent-misuses-of-RTL_CONSTASCII_USTRINGP.patch
-- Resolves: fdo#45177 avoid linked undo crash
-- Fix some apparent misuses of RTL_CONSTASCII_USTRINGPARAM (cherry-picked from
- upstream libreoffice-3-5 branch)
-
-* Tue Feb 14 2012 Stephan Bergmann <sbergman(a)redhat.com> - 3.5.0.3-5
-- Resolves rhbz#789622: Adapt SDK to changed paths in LO installation
-
-* Mon Feb 13 2012 Caolán McNamara <caolanm(a)redhat.com> - 3.5.0.3-4
-- ensure gdb .py files have the same timstamps so that multilib
- .pyc's and .pyo's have the same content (timestamp in binary cache)
-
-* Sat Feb 11 2012 Caolán McNamara <caolanm(a)redhat.com> - 3.5.0.3-3
-- make sure .tree files don't get busted again
-
-* Tue Feb 07 2012 Stephan Bergmann <sbergman(a)redhat.com> - 3.5.0.3-2
-- junit4 -> junit
-- Resolves: rhbz#788042 skip splashscreen with quickstarter
-- with split binfilter we need fix for fdo#43644
-
-* Thu Feb 02 2012 David Tardon <dtardon(a)redhat.com> - 3.5.0.3-1
-- 3.5.0 rc3
-- Resolves: rhbz#786328 add nlpsolver subpackage
-- split legacy binary filters into subpackage
-
-* Thu Jan 26 2012 Stephan Bergmann <sbergman(a)redhat.com> - 3.5.0.2-2
-- add libreoffice-postgresql subpackage
-
-* Wed Jan 25 2012 David Tardon <dtardon(a)redhat.com> - 3.5.0.2-1
-- 3.5.0 rc2
-
-* Thu Jan 19 2012 David Tardon <dtardon(a)redhat.com> - 3.5.0.1-1
-- 3.5.0 rc1
-- drop integrated 0001-workaround-internal-compiler-error-with-gcc-4.7.patch
-- drop integrated 0001-fix-for-gcc-4.7-C-11-these-are-not-string-literal-op.patch
-- drop integrated 0001-fix-for-gcc-4.7-C-11-this-is-not-string-literal-oper.patch
-- drop integrated 0001-Revert-fast_merge-fix-mis-merge-of-first-module-s-st.patch
-- drop integrated 0001-fix-writing-of-strings-from-the-first-module.patch
-- drop integrated 0001-refactor-slightly-to-avoid-link-problems-with-gcc-4..patch
-
-* Fri Jan 13 2012 David Tardon <dtardon(a)redhat.com> - 3.4.99.3-1
-- 3.5.0 beta3
-- drop integrated 0001-fix-syntactic-error.patch
-- drop integrated 0001-gcc-trunk-fix-error-unable-to-find-string-literal-op.patch
-- drop integrated 0001-gcc-trunk-avoid-confusion.patch
-- drop integrated 0001-workaround-for-LO-namespace-pollution-breaking-KDE4-.patch
-- drop integrated 0001-smath-does-not-handle-accents-in-MathML.patch
-- Resolves: rhbz#533318 smath does not handle accents in MathML
-- Resolves: rhbz#771108 English menu in writer despite installation of
- libreoffice-langpack-de
-
-* Fri Jan 06 2012 David Tardon <dtardon(a)redhat.com> - 3.4.99.2-2
-- rebuild with gcc 4.7
-
-* Wed Dec 21 2011 David Tardon <dtardon(a)redhat.com> - 3.4.99.2-1
-- 3.5.0 beta2
-- drop integrated 0001-Resolves-rhbz-761009-IFSD_Equal-is-asymmetrical.patch
-- drop integrated 0001-Resolves-rhbz-767708-avoid-SIGBUS-writing-to-overcom.patch
-- drop integrated 0001-force-gbuild-stage-for-CustomTargets.patch
-- drop integrated 0001-these-translations-do-already-exist-in-translations-.patch
-- drop integrated 0001-Fix-typo-and-clean-up.patch
-- use system mysql-connector-c++
-
-* Sun Dec 18 2011 David Tardon <dtardon(a)redhat.com> - 3.4.99.1-1
-- 3.5.0 beta1
-- drop integrated 0001-Related-fdo-37195-migrationoo3-not-registered.patch
-- drop integrated 0001-Related-i58612-don-t-crash-anyway.patch
-- drop integrated 0001-Related-rhbz-652604-better-survive-exceptions-thrown.patch
-- drop integrated 0001-Related-rhbz-702833-addEventListener-without-removeE.patch
-- drop integrated 0001-Related-rhbz-711087-band-aid.patch
-- drop integrated 0001-Related-rhbz-718976-crash-in-SwTxtSizeInfo-GetMultiC.patch
-- drop integrated 0001-Related-rhbz-730225-avoid-segv-in-ld-this-was-set-to.patch
-- drop integrated 0001-Related-rhbz-753201-fedora-ant-java-1.5.0-gcj-won-t-.patch
-- drop integrated 0001-Resolves-fdo-32665-handle-that-FreeSerif-lacks-some-.patch
-- drop integrated 0001-Resolves-rhbz-693265-fix-crash-from-unhandled-except.patch
-- drop integrated 0001-Resolves-rhbz-695509-crash-in-RefreshDocumentLB.patch
-- drop integrated 0001-Resolves-rhbz-713154-pdf-export-dialog-too-tall-to-f.patch
-- drop integrated 0001-Resolves-rhbz-715549-use-fontconfig-s-detected-forma.patch
-- drop integrated 0001-Resolves-rhbz-738255-avoid-crash-on-NULL-pointer.patch
-- drop integrated 0001-Resolves-rhbz-751290-KDE-black-on-dark-tooltips.patch
-- drop integrated 0001-add-Oracle-Java-1.7.0-recognition.patch
-- drop integrated 0001-avoid-using-com.sun.org-apis.patch
-- drop integrated 0001-bubble-down-configure-test-findings-on-visibility.patch
-- drop integrated 0001-fix-horizontal-scrollbars-with-KDE-oxygen-style-bnc-.patch
-- drop integrated 0001-gtk3-fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch
-- drop integrated 0001-helgrind-Related-rhbz-655686-get-order-of-shutdown-c.patch
-- drop integrated 0001-rhbz-667082-do-not-crash-importing-section-containin.patch
-- drop integrated 0001-rhbz-702635-set-correct-page-number-when-exporting-s.patch
-- drop integrated Backport-reading-AES-encrypted-ODF-1.2-documents.patch
-- drop integrated gdb-pretty-printers.patch
-- drop integrated kde4configure.patch
-- drop integrated libreoffice-ppc64.patch
-- drop integrated openoffice.org-3.3.0.ooo108637.sfx2.uisavedir.patch
-- drop integrated openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
-- drop integrated vbahelper.visibility.patch
-- drop libreoffice-testtools subpackage, because testtool has been
- removed by upstream
-
-* Thu Dec 15 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.4.2-6
-- Resolves: rhbz#761009 IFSD_Equal is asymmetrical
-- Resolves: rhbz#767708 write to mmap'ed file w/o disk space: SIGBUS
-
-* Tue Nov 29 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.4.2-5
-- Resolves: rhbz#757653 fix headless crash with cairo canvas
-
-* Tue Nov 22 2011 Lukas Tinkl <ltinkl(a)redhat.com> - 3.4.4.2-4
-- Resolves: rhbz#751290 - [kde] LibreOffice has black on dark-grey tooltip-texts
-
-* Fri Nov 11 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.4.2-3
-- Related: fdo#42534 0001-Related-i58612-don-t-crash-anyway.patch
-- Resolves: fdo#42749 KDE oxygen theme and scrollbars
-
-* Thu Nov 10 2011 Stephan Bergmann <sbergman(a)redhat.com> - 3.4.4.2-2
-- Patch to backport reading AES-encrypted ODF 1.2 documents
-
-* Thu Nov 03 2011 David Tardon <dtardon(a)redhat.com> - 3.4.4.2-1
-- 3.4.4 rc2
-
-* Fri Oct 28 2011 Rex Dieter <rdieter(a)fedoraproject.org> - 1:3.4.4.1-4
-- rebuild(poppler)
-
-* Thu Oct 27 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.4.1-3
-- Resolves: rhbz#665800 missing glyph symbol shown when toggling bold/italic
- for Sinhala text
-
-* Thu Oct 27 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.4.1-2
-- possible fix for java 1.7.0 detection
-
-
-* Wed Oct 26 2011 David Tardon <dtardon(a)redhat.com> - 3.4.4.1-1
-- 3.4.4 rc1
-
-* Tue Oct 25 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.3.2-16
-- allow building with gcj
-
-* Fri Oct 21 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.3.2-15
-- Resolves: rhbz#747356 let Qt call XInitThreads
-- fix .sdw import
-
-* Wed Oct 19 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.3.2-14
-- Related: rhbz#743750 addXineramaScreenUnique issue
-
-* Fri Oct 07 2011 Stephan Bergmann <sbergman(a)redhat.com> - 3.4.3.2-13
-- Patches to build with GCC 6.4.1
-
-* Fri Sep 30 2011 Marek Kasik <mkasik(a)redhat.com> - 3.4.3.2-12
-- Rebuild (poppler-0.18.0)
-
-* Tue Sep 20 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.3.2-11
-- Resolves: rhbz#738133 fix bn discard string
-- Resolves: fdo#35513 avoid crash while processing incorrect print range
-
-* Mon Sep 19 2011 Marek Kasik <mkasik(a)redhat.com> - 3.4.3.2-10
-- Rebuild (poppler-0.17.3)
-
-* Thu Sep 15 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.3.2-9
-- Resolves: rhbz#738255 avoid crash on sc inputhdl
-
-* Tue Sep 13 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.3.2-8
-- Resolves: rhbz#274631 remove NoDisplay from -math.desktop
-
-* Thu Sep 08 2011 David Tardon <dtardon(a)redhat.com> - 3.4.3.2-7
-- rebuild for new icu
-
-* Tue Sep 06 2011 David Tardon <dtardon(a)redhat.com> - 3.4.3.2-6
-- Resolves: rhbz#734976 libreoffice-langpack-*-* not pulled in by
- yum install libreoffice
-
-* Fri Sep 02 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.3.2-5
-- Resolves: rhbz#735182 be able to rebuild against poppler 0.17.3
-
-* Tue Aug 30 2011 David Tardon <dtardon(a)redhat.com> - 3.4.3.2-4
-- Resolves: rhbz#734432 openoffice.org symlink broken
-
-* Mon Aug 29 2011 David Tardon <dtardon(a)redhat.com> - 3.4.3.2-3
-- add Latvian langpack
-
-* Fri Aug 26 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.3.2-2
-- Resolves: rhbz#733564 graphite2 now packaged into fedora
-- Related: fdo#37195 migrationoo3 not registered
-
-* Thu Aug 25 2011 David Tardon <dtardon(a)redhat.com> - 3.4.3.2-1
-- 3.4.3 rc2
-
-* Mon Aug 22 2011 David Tardon <dtardon(a)redhat.com> - 3.4.3.1-2
-- add gdb pretty printers
-
-* Tue Aug 16 2011 David Tardon <dtardon(a)redhat.com> - 3.4.3.1-1
-- 3.4.3 rc1
-- drop integrated 0001-Resolves-rhbz-725144-wrong-csh-syntax.patch
-
-* Fri Aug 12 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.2.3-3
-- Related: rhbz#730225 avoid segv in ld
-
-* Tue Aug 02 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.2.3-2
-- Resolves: rhbz#693265 fix crash from unhandled exception
-
-* Fri Jul 29 2011 David Tardon <dtardon(a)redhat.com> - 3.4.2.3-1
-- 3.4.2 rc3
-
-* Mon Jul 25 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.2.2-2
-- Resolves: rhbz#725144 wrong csh syntax
-
-* Wed Jul 20 2011 David Tardon <dtardon(a)redhat.com> - 3.4.2.2-1
-- 3.4.2 rc2
-- fix breakage in KDE4 plugin
-
-* Tue Jul 19 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.2.1-3
-- Resolves: rhbz#715549 use fontconfig's detected format
-
-* Mon Jul 18 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.2.1-2
-- Rebuild (poppler-0.17.0), add libreoffice-poppler-0.17.0.patch
- seeing as the API changed for some reason or other
-
-* Wed Jul 13 2011 David Tardon <dtardon(a)redhat.com> - 3.4.2.1-1
-- 3.4.2 rc1
-- drop 0001-bad-merge-fix-to-enable-extensions-to-build-again.patch
-- drop 0001-fix-regression-in-SvGlobalName-operator.patch
-
-* Tue Jul 12 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.1.3-3
-- fix regression in SvGlobalName operator
-
-* Tue Jul 05 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.1.3-2
-- Related: rhbz#718976 crash in SwTxtSizeInfo::GetMultiCreator
-
-* Fri Jul 01 2011 David Tardon <dtardon(a)redhat.com> - 3.4.1.3-1
-- 3.4.1 rc3
-
-* Thu Jun 23 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.1.2-1
-- 3.4.1 rc2
-- drop integrated 0001-correctly-build-GTK-systray-icon.patch
-
-* Tue Jun 21 2011 David Tardon <dtardon(a)redhat.com> - 3.4.1.1-5
-- Resolves: rhbz#714781 add Persian langpack
-- Resolves: rhbz#667082 do not crash importing section containing just
- an empty paragraph
-
-* Mon Jun 20 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.1.1-4
-- Related: rhbz#711087 band aid for crash in sc undo
-- Resolves: rhbz#714338 add a metapackage to install standard bits
-
-* Fri Jun 17 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.1.1-3
-- Related: rhbz#702833 addEventListener without removeEventListener
-
-* Thu Jun 16 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.1.1-2
-- Resolves: rhbz#713154 pdf export dialog too tall to fit
-
-* Wed Jun 15 2011 David Tardon <dtardon(a)redhat.com> - 3.4.1.1-1
-- 3.4.1 RC1
-- drop integrated 0001-Resolves-rhbz-707317-avoid-crash-in-getRowSpan.patch
-- drop integrated 0001-Resolves-rhbz-710004-band-aid-for-immediate-crash-in.patch
-- drop integrated 0001-Resolves-rhbz-710556-don-t-crash-on-missing-graphics.patch
-- drop integrated 0001-Resolves-rhbz-699909-crash-in-export-of-.doc-in-lcl_.patch
-- drop integrated 0001-fdo-37584-Make-a-real-copy-of-the-text-where-to-coun.patch
-- drop integrated 0001-Resolves-fdo-37668-bitwise-operations-on-signed-numb.patch
-
-* Thu Jun 09 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.0.2-5
-- Resolves: rhbz#699909 crash in export of .doc in lcl_getField
-- Resolves: fdo#37584 Make a real copy of the text
-- Resolves: rhbz#709503/fdo#37668 bitwise operations on signed values
-
-* Tue Jun 07 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.0.2-4
-- Resolves: rhbz#710556 't crash on missing graphics .pptx export
-- Resolves: rhbz#652604 better survive exceptions in autorecovery
-
-* Thu Jun 02 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.0.2-3
-- Resolves: rhbz#710004 band aid for crash
-
-* Mon May 30 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.0.2-2
-- Resolves: rhbz#707317 avoid crash in getRowSpan
-
-* Fri May 27 2011 David Tardon <dtardon(a)redhat.com> - 3.4.0.2-1
-- 3.4.0 RC2
-- drop integrated 0001-fix-build-with-system-bsh.patch
-
-* Wed May 25 2011 Caolán McNamara <caolanm(a)redhat.com> - 3.4.0.1-3
-- rebuild for new hunspell
-
-* Tue May 24 2011 David Tardon <dtardon(a)redhat.com> - 3.4.0.1-2
-- Resolves: rhbz#706110 oosplash.bin segfault on every login
-
-* Fri May 20 2011 David Tardon <dtardon(a)redhat.com> - 3.4.0.1-1
-- 3.4 RC1
-- Resolves: rhbz#702635 set correct page number when exporting selected
- pages
-
-* Sat May 07 2011 Christopher Aillon <caillon(a)redhat.com> - 3.3.99.4-2
-- Update icon cache scriptlet
-
-* Sat May 07 2011 David Tardon <dtardon(a)redhat.com> 3.3.99.4-1
-- 3.4 beta4
-- drop integrated 0001-Removed-duplicate-code-block-mis-merge-prolly.patch
-- drop integrated 7de0b88ce2dd932915894385b54be1897d5ee053.zip
-
-* Mon Apr 18 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.99.1-2
-- Resolves: rhbz#695509 crash in RefreshDocumentLB
-- bubble down configure test findings on visibility
-
-* Mon Apr 11 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.99.1-1
-- 3.4 beta1
-- drop openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
- in favour of ooosplash
-- drop openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
- because components are passively registered now
-- drop integrated openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
-- drop integrated turn-script-providers-into-extensions.patch
-- drop integrated 0001-tidy-this-up-and-don-t-bail-out-on-mislength-records.patch
-- drop integrated 0001-free-ctxt-after-taking-lastError-details.patch
-- drop integrated 0001-Removed-suspect-hack.-Cursor-on-post-it-now-scrolls-.patch
-- drop integrated libreoffice-gcc4.6.0.patch
-- drop integrated 0001-fexceptions-fexceptions.patch
-- drop integrated 0001-Related-rhbz-672872-cancel-gtk-file-dialog-on-deskto.patch
-- drop vbahelper.visibility.patch
-- drop integrated 0001-Resolves-fdo-33509-i62414-out-by-one-breaks-CTL-spel.patch
-- drop integrated 0001-Resolves-rhbz-670020-crash-in-slidesorting.patch
-- drop integrated 0001-Resolves-rhbz-676539-handle-missing-pWindows-from-xW.patch
-- drop integrated 0001-Resolves-fdo-33750-i94623-use-optimal-border-width-w.patch
-- drop integrated 0001-rhbz-649310-don-t-crash-deregistering-diff.-platform.patch
-- drop integrated 0001-Resolves-rhbz-674330-dereference-of-NULL-mpBase.patch
-- drop integrated 0001-rhbz-678284-Get-correct-current-position-when-shift-page-up-and-.patch
-- drop integrated 0001-Resolves-rhbz-681159-bandaid-for-crash.patch
-- drop integrated 0001-Resolves-rhbz-672818-bandaid-for-crash-in-SwTxtNode-.patch
-- drop integrated 0001-install-high-resolution-icons.patch
-- drop integrated 0001-Resolves-rhbz-682716-pa-IN-isn-t-handled-by-fontconf.patch
-- drop integrated 0001-Related-rhbz-684477-make-sure-this-is-thread-safe.patch
-- drop integrated 0001-Resolves-rhbz-682621-better-resizing-of-overtall-gly.patch
-- drop integrated 0001-Resolves-rhbz-684620-crash-with-NULL-pTableBox.patch
-- drop integrated libreoffice-fdo33947.sd.print.crash.patch
-- drop integrated 0001-add-cairo_ft_font_face_create_for_pattern-wrapper.patch
-- drop integrated 0001-Related-rhbz-680460-reorganize-this-to-make-it-inher.patch
-- drop integrated 0001-Related-rhbz-680460-don-t-bother-with-an-interim-Fon.patch
-- drop integrated 0001-Resolves-rhbz-680460-honour-lcdfilter-subpixeling-et.patch
-- drop integrated 0001-Cut-Gordian-Knot-of-who-owns-the-font-options.patch
-- drop integrated 0001-beware-of-invalidated-iterator.patch
-- drop integrated rhbz680766.fix-mdds-crash.patch
-- drop integrated 0001-Resolves-rhbz-684580-X-and-strike-through-escapes-ra.patch
-- drop integrated 0001-set-mime-types-on-flat-xml-filters.patch
-- drop integrated 0001-add-flat-xml-types-to-.desktop-files-etc.patch
-- drop integrated libreoffice-fdo31271.icu.patch
-
-* Tue Apr 05 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.2.2-6
-- Resolves: rhbz#655686 get order of shutdown correct
-
-* Wed Mar 30 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.2.2-5
-- Add application/vnd.oasis.opendocument.text-flat-xml, etc. to
- .desktop files for mcepl
-
-* Tue Mar 29 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.2.2-4
-- Resolves: rhbz#684580 improve X and / strike-through
-
-* Thu Mar 24 2011 David Tardon <dtardon(a)redhat.com> 3.3.2.2-3
-- Resolves: rhbz#680766 crash in mdds
-
-* Wed Mar 23 2011 David Tardon <dtardon(a)redhat.com> 3.3.2.2-2
-- Related: rhbz#689268 versioned deps need to contain epoch
-
-* Tue Mar 22 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.2.2-1
-- latest version
-- drop integrated 0001-Resolves-fdo-33701-ensure-node-outlives-path.patch
-- drop integrated 0001-valgrind-don-t-leave-an-evil-thread-running-after-ma.patch
-
-* Tue Mar 22 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.1.2-12
-- Fix fontoptions cache
-- avoid crash in calc on changing size of rows (dtardon)
-
-* Mon Mar 21 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.1.2-11
-- Resolves: rhbz#689268 autocorrs from OOo F14 not upgraded
-
-* Wed Mar 16 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.1.2-10
-- Resolves: rhbz#680460 honour lcdfilter and subpixeling
-
-* Tue Mar 15 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.1.2-9
-- Resolves: fdo#33947 sd print crash
-
-* Mon Mar 14 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.1.2-8
-- Related: rhbz#684477 make sure this is thread safe
-- Resolves: rhbz#684620 crash with NULL pTableBox
-
-* Sun Mar 13 2011 Marek Kasik <mkasik(a)redhat.com> 3.3.1.2-7
-- Rebuild (poppler-0.16.3)
-
-* Wed Mar 09 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.1.2-6
-- Resolves: rhbz#682621 better resizing of overtall glyphsubs
-
-* Tue Mar 08 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.1.2-5
-- Resolves: rhbz#682716 pa-IN isn't handled well by fontconfig
-
-* Tue Mar 08 2011 David Tardon <dtardon(a)redhat.com> 3.3.1.2-4
-- install 128x128 px icons
-
-* Wed Mar 02 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.1.2-3
-- Resolves: rhbz#681159 crash in writer
-- Resolves: rhbz#672818 crash in writer
-- Resolves: fdo#33701 ensure node outlives path
-- Resolves: rhbz#681738 crash on writing config post-main
-
-* Thu Feb 17 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.1.2-2
-- Resolves: rhbz#678284 Calc crashes during cell select with keys
- (dtardon)
-
-* Thu Feb 17 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.1.2-1
-- RC2
-
-* Wed Feb 16 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.1.1-2
-- Resolves: rhbz#674330 dereference of NULL mpBase
-
-* Fri Feb 11 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.1.1-1
-- 3.3.1 rc1
-- drop integrated 0001-don-t-pushback-and-process-a-corrupt-extension.patch
-- drop integrated libreoffice-fdo32561.comphelper.patch
-- drop integrated 0001-Related-rhbz-610103-more-woes-on-rpm-upgrade-vs-rpm-.patch
-- drop integrated 0001-Resolves-rhbz-673819-crash-on-changing-position-of-d.patch
-- drop integrated 0001-rhbz-666440-don-t-pushback-and-process-a-corrupt-extension.patch
-
-* Thu Feb 10 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.0.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-- Related: rhbz#610103 make this even more robust
-- Related: rhbz#672872 cancel gtk file dialog on terminate
-- Resolves: fdo#33509/ooo#62414 fix CTL spelling popup
-- Resolves: rhbz#673819 crash on changing position of header/footer object
-- Resolves: rhbz#670020 crash in slidesorting
-- Resolves: rhbz#676539 handle missing pWindows from xWindows
-- Resolves: rhbz#649310 don't crash deregistering diff. platform ext.
- (dtardon)
-- Resolves: rhbz#666440 don't pushback and process a corrupt extension
-
-* Mon Jan 24 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.0.4-2
-- Resolves: rhbz#671540 fix lonely )
-
-* Thu Jan 20 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.0.4-1
-- next release candidate
-- drop integrated 0001-fix-presenter-screens-description.xml-build.patch
-
-* Tue Jan 18 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.0.3-2
-- backport fix to get presenter screen working
-- make handling busted extensions more robust
-
-* Wed Jan 12 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.0.3-1
-- latest version
-- drop integrated 0001-Resoves-rhbz-663857-font-color-missing-C-FAQ-10.3-do.patch
-- drop integrated 0001-Avoid-double-paste-when-pasting-text-into-cell-comme.patch
-- drop integrated 0001-Resolves-rhbz-660342-Undo-Redo-crash-with-postits.patch
-- drop integrated 0001-Resolves-rhbz-666088-clean-up-search-cache-singleton.patch
-
-* Thu Jan 06 2011 Caolán McNamara <caolanm(a)redhat.com> 3.3.0.2-5
-- Resolves: rhbz#666088 don't crash on clean up of search cache
-
-* Wed Jan 05 2011 Lukas Tinkl <ltinkl(a)redhat.com> 3.3.0.2-4
-- create a KDE integration subpackage
-
-* Mon Jan 03 2011 David Tardon <dtardon(a)redhat.com> 3.3.0.2-3
-- rebuild with new poppler
-
-* Wed Dec 22 2010 Caolán McNamara <caolanm(a)redhat.com> 3.3.0.2-2
-- Resolves: rhbz#663724 fdo32572-sc-dont-double-paste.patch
-- Resolves: rhbz#660342 Undo/Redo crash with postits
-
-* Tue Dec 21 2010 Caolán McNamara <caolanm(a)redhat.com> 3.3.0.2-1
-- latest version
-
-* Sat Dec 18 2010 Caolán McNamara <caolanm(a)redhat.com> 3.3.0.1-4
-- Resolves: rhbz#663857 font color missing in transitions
-
-* Wed Dec 15 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 3.3.0.1-3
-- rebuild (poppler)
-
-* Wed Dec 15 2010 Caolán McNamara <caolanm(a)redhat.com> 3.3.0.1-2
-- Fix up some doc imports
-
-* Sun Dec 05 2010 Caolán McNamara <caolanm(a)redhat.com> 3.3.0.1-1
-- release candidate 1
-- drop integrated qstart.dont-forceenabled-on-post-reg-restart.patch
-- drop integrated exit.quickstarter.when.deleted.patch
-- drop integrated 0001-destroydesktop.in.timeout.patch
-- drop integrated openoffice.org-3.3.0.rhbz657541.join-paragraphs.patch
-
-* Sat Nov 27 2010 Caolán McNamara <caolanm(a)redhat.com> 3.2.99.3-2
-- Resolves: rhbz#610103 exit quickstarter when libs deleted
-- Resolves: rhbz#652695 release desktop in timeout
-- Resolves: rhbz#657541 don't crash during processing of auto. styles
- when joining paragraphs (dtardon)
-
-* Thu Nov 18 2010 Caolán McNamara <caolanm(a)redhat.com 3.2.99.3-1
-- next Libreoffice milestone
-- drop integrated openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
-- drop integrated openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
-- drop integrated openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch
-- drop integrated openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
-- drop integrated libreoffice-buildfix.patch
-- drop integrated libreoffice-xdg632229.gnomeshell.patch
-- drop integrated 0001-strcpy-cannot-be-used-with-overlapping-src-and-dest.patch
-- drop integrated 0001-abort-doesn-t-gain-us-anything-here.patch
-- drop integrated 0001-latest-libX11-changed-header-guards.patch
-
-* Sat Nov 06 2010 David Tardon <dtardon(a)redhat.com 3.2.99.2-6
-- turn script providers into extensions
-
-* Wed Nov 03 2010 Caolán McNamara <caolanm(a)redhat.com> 3.2.99.2-5
-- Resolves: rhbz#649210 add Sinhalese langpack
-
-* Sat Oct 30 2010 Caolán McNamara <caolanm(a)redhat.com> 3.2.99.2-4
-- langpack macro hard-coded version number
-
-* Fri Oct 22 2010 Caolán McNamara <caolanm(a)redhat.com> 3.2.99.2-3
-- Resolves: xdg632229 gnomeshell app tracking
-
-* Tue Oct 12 2010 David Tardon <dtardon(a)redhat.com> 3.2.99.2-2
-- use macros to define auto-correction and language pack subpackages
-
-* Mon Oct 11 2010 Caolán McNamara <caolanm(a)redhat.com> 3.2.99.2-1
-- next LibreOffice milestone
-- drop integrated openoffice.org-2.3.0.ooo76649.httpencoding.patch
-- drop integrated workspace.dtardon03.patch
-- drop integrated openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
-- drop integrated workspace.impress195.patch
-- drop integrated workspace.srb1.patch
-- drop integrated openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
-- drop integrated openoffice.org-3.3.0.ooo108246.svx.hide-sql-group-when-inactive.patch
-- drop integrated openoffice.org-3.2.0.ooo95369.sw.sortedobjs.patch
-- drop integrated openoffice.org-3.2.0.ooo110142.svx.safercolornames.patch
-- drop integrated openoffice.org-3.3.0.ooo111758.sd.xerror.patch
-- drop integrated openoffice.org-3.2.0.ooo111741.extras.malformed-xml-file.patch
-- drop integrated openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch
-- drop integrated openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
-- drop integrated workspace.vcl113.patch
-- drop integrated openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch
-- drop integrated workspace.cmcfixes77.patch
-- drop integrated workspace.vcl114.patch
-- drop integrated openoffice.org-3.3.0.ooo106591.sal.tradcopy.patch
-- drop integrated workspace.vcl115.patch
-- drop integrated workspace.cmcfixes78.patch
-- drop integrated openoffice.org-3.3.0.ooo114012.sd.bada11ychain.patch
-- drop integrated workspace.cmcfixes79.patch
-- drop integrated openoffice.org-3.3.0.ooo114703.vcl.betterlocalize.font.patch
-- drop integrated openoffice.org-3.3.0.rh638185.editeng.cjkctlhtmlsizes.patch
-- drop integrated openoffice.org-3.3.0.rh637738.libgcrypt.addmutex.patch
-- drop integrated openoffice.org-3.2.0.rh632236.writerfilter.cleanup-cell-props.patch
-- drop workspace.gtk3.patch
-
-* Wed Oct 06 2010 Caolán McNamara <caolanm(a)redhat.com> 3.2.99.1-2
-- Related: rhbz#639945 pull in review changes
- + redland build-fix
- + replace awk script
- + validate .destop files
-
-* Wed Sep 29 2010 Caolán McNamara <caolanm(a)redhat.com> 3.2.99.1-1
-- initial import of the leviathan
+%autochangelog
commit f1a26fe67399e269c0b8a87270995e5c416ec13a
Author: Mattia Verga <mattia.verga(a)proton.me>
Date: Mon Oct 2 10:02:46 2023 +0200
Explain why we cannot unbundle hsqldb
diff --git a/libreoffice.spec b/libreoffice.spec
index 6e040b1..3c365ba 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -84,8 +84,11 @@ Source8: libreoffice-multiliblauncher.sh
Source9: %{external_url}/dtoa-20180411.tgz
Source11: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-#Unfortunately later versions of hsqldb changed the file format, so if we use a later version we lose
-#backwards compatability.
+
+# Unfortunately later versions of hsqldb changed the file format, so if we use a later version we lose
+# backwards compatability.
+# LibreOffice is also pinned to use hsqldb really old version 1.8.0 so there's currently no way building
+# with system provided hsqldb without major hacking.
Source12: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
Source13: %{external_url}/../extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
%global bundling_options %{?bundling_options} --without-system-hsqldb
1
0
Architecture specific change in rpms/java-17-openjdk-portable.git
by githook-noreply＠fedoraproject.org 23 Nov '23
by githook-noreply＠fedoraproject.org 23 Nov '23
23 Nov '23
The package rpms/java-17-openjdk-portable.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-17-openjdk-portable.git/commit….
Change:
+%ifarch %{gdb_arches}
Thanks.
Full change:
============
commit 289d0e958f24fa8759c01d48b05c8a4b71e599e2
Author: Jiri <jvanek(a)redhat.com>
Date: Thu Nov 23 16:12:18 2023 +0100
updated to OpenJDK 17.0.9 (2023-10-17)
- adjsuted generate_source_tarball
- removed icedtea_sync
- dropped standalone licenses
- added usntripped subpkg
- added docs subpkg
- adjsuted versions of bundled libraries
- build refactored to several solid methods following gnu_andrew
- removed no longer needed jdk8305995-footprint_regression_from_jdk_8224957, nss.fips.cfg.in, rh1648644-java_access_bridge_privileged_security.patch
- added jdk8312489-max_sig_default_increase.patch
- aligned fips-17u-51e1d00be4e.patch (gnu_andrew)
- fixed '--without release' build-ability by moving docs and misc to
if-release only
diff --git a/.gitignore b/.gitignore
index 6c2c596..f79d052 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@
/openjdk-jdk17u-jdk-17.0.6+10.tar.xz
/openjdk-jdk17u-jdk-17.0.7+7.tar.xz
/openjdk-jdk17u-jdk-17.0.8+7.tar.xz
+/openjdk-17.0.9+9.tar.xz
diff --git a/NEWS b/NEWS
index a7be73f..4edebb8 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,490 @@ Key:
JDK-X - https://bugs.openjdk.java.net/browse/JDK-X
CVE-XXXX-YYYY: https://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
+New in release OpenJDK 17.0.9 (2023-10-17):
+===========================================
+Live versions of these release notes can be found at:
+ * https://bit.ly/openjdk1709
+
+* CVEs
+ - CVE-2023-22081
+ - CVE-2023-22025
+* Security fixes
+ - JDK-8286503, JDK-8312367: Enhance security classes
+ - JDK-8296581: Better system proxy support
+ - JDK-8297856: Improve handling of Bidi characters
+ - JDK-8305815, JDK-8307278: Update Libpng to 1.6.39
+ - JDK-8306881, JDK-8307286: Update FreeType to 2.13.0
+ - JDK-8309966: Enhanced TLS connections
+ - JDK-8312248: Enhanced archival support redux
+ - JDK-8314649: Enhanced archival support redux
+ - JDK-8317121: vector_masked_load instruction is moved too early after JDK-8286941
+* New features
+ - JDK-8276799: Implementation of JEP 422: Linux/RISC-V Port
+* Other changes
+ - JDK-6176679: Application freezes when copying an animated gif image to the system clipboard
+ - JDK-6381945: (cal) Japanese calendar unit test system should avoid multiple static imports
+ - JDK-8040793: vmTestbase/nsk/monitoring/stress/lowmem fails on calling isCollectionUsageThresholdExceeded()
+ - JDK-8153837: AArch64: Handle special cases for MaxINode & MinINode
+ - JDK-8156889: ListKeychainStore.sh fails in some virtualized environments
+ - JDK-8171221: Remove -XX:+CheckMemoryInitialization
+ - JDK-8180266: Convert sun/security/provider/KeyStore/DKSTest.sh to Java Jtreg Test
+ - JDK-8195589: T6587786.java failed after JDK-8189997
+ - JDK-8209398: sun/security/pkcs11/KeyStore/SecretKeysBasic.sh failed with "PKCS11Exception: CKR_ATTRIBUTE_SENSITIVE"
+ - JDK-8225012: sanity/client/SwingSet/src/ToolTipDemoTest.java fails on Windows
+ - JDK-8229147: Linux os::create_thread() overcounts guardpage size with newer glibc (>=2.27)
+ - JDK-8252713: jtreg time out of CtrlASCII.java seems to hang the Xserver.
+ - JDK-8255548: Missing coverage for javax.xml.crypto.dom.DOMCryptoContext
+ - JDK-8263044: jdk/jfr/jvm/TestDumpOnCrash.java timed out
+ - JDK-8267188: gc/stringdedup/TestStringDeduplicationInterned.java fails with Shenandoah
+ - JDK-8267341: macos attempt_reserve_memory_at(arg1, arg2, true) failure
+ - JDK-8267517: async logging for stdout and stderr
+ - JDK-8267860: Off-by-one bug when searching arrays in AlpnGreaseTest
+ - JDK-8268852: AsyncLogWriter should not overide is_Named_thread()
+ - JDK-8269091: javax/sound/sampled/Clip/SetPositionHang.java failed with ArrayIndexOutOfBoundsException: Array index out of range: -4
+ - JDK-8269466: Factor out the common code for initializing and starting internal VM JavaThreads
+ - JDK-8270331: [TESTBUG] Error: Not a test or directory containing tests: java/awt/print/PrinterJob/InitToBlack.java
+ - JDK-8270794: Avoid loading Klass* twice in TypeArrayKlass::oop_size()
+ - JDK-8270894: Use acquire semantics in ObjectSynchronizer::read_stable_mark()
+ - JDK-8271707: migrate tests to use jdk.test.whitebox.WhiteBox
+ - JDK-8271898: disable os.release_multi_mappings_vm on macOS-X64
+ - JDK-8272586: emit abstract machine code in hs-err logs
+ - JDK-8272654: Mark word accesses should not use Access API
+ - JDK-8273092: Sort classlist in JDK image
+ - JDK-8273803: Zero: Handle "zero" variant in CommandLineOptionTest.java
+ - JDK-8274986: max code printed in hs-err logs should be configurable
+ - JDK-8275031: runtime/ErrorHandling/MachCodeFramesInErrorFile.java fails when hsdis is present
+ - JDK-8275303: sun/java2d/pipe/InterpolationQualityTest.java fails with D3D basic render driver
+ - JDK-8275415: Prepare Leak Profiler for Lilliput
+ - JDK-8275662: remove test/lib/sun/hotspot
+ - JDK-8276333: jdk/jfr/event/oldobject/TestLargeRootSet.java failed "assert(!contains(edge->reference())) failed: invariant"
+ - JDK-8276651: java/lang/ProcessHandle tests fail with "RuntimeException: Input/output error" in java.lang.ProcessHandleImpl$Info.info0
+ - JDK-8276696: ParallelObjectIterator freed at the wrong time in VM_HeapDumper
+ - JDK-8277102: Dubious PrintCompilation output
+ - JDK-8277353: java/security/MessageDigest/ThreadSafetyTest.java test times out
+ - JDK-8277417: C1 LIR instruction for load-klass
+ - JDK-8277427: Update jib-profiles.js to use JMH 1.33 devkit
+ - JDK-8277654: Shenandoah: Don't produce new memory state in C2 LRB runtime call
+ - JDK-8277860: PPC: Remove duplicate info != NULL check
+ - JDK-8278141: LIR_OpLoadKlass::_info shadows the field of the same name from LIR_Op
+ - JDK-8278456: Define jtreg jdk_desktop test group time-based sub-tasks for use by headful testing.
+ - JDK-8279545: Buffer overrun in reverse_words of sharedRuntime_x86_64.cpp:3517
+ - JDK-8280032: Update jib-profiles.js to use JMH 1.34 devkit
+ - JDK-8280396: G1: Full gc mark stack draining should prefer to make work available to other threads
+ - JDK-8280885: Shenandoah: Some tests failed with "EA: missing allocation reference path"
+ - JDK-8281507: Two javac tests have bad jtreg `@clean` tags
+ - JDK-8281717: Cover logout method for several LoginModule
+ - JDK-8282404: DrawStringWithInfiniteXform.java failed with "RuntimeException: drawString with InfiniteXform transform takes long time"
+ - JDK-8282651: ZGC: vmTestbase/gc/ArrayJuggle/ tests fails intermittently with exit code 97
+ - JDK-8282665: [REDO] ByteBufferTest.java: replace endless recursion with RuntimeException in void ck(double x, double y)
+ - JDK-8283056: show abstract machine code in hs-err for all VM crashes
+ - JDK-8283276: java/io/ObjectStreamClass/ObjectStreamClassCaching.java fails with various GCs
+ - JDK-8283326: Implement SafeFetch statically
+ - JDK-8283724: Incorrect description for jtreg-failure-handler option
+ - JDK-8283756: (zipfs) ZipFSOutputStreamTest.testOutputStream should only check inflated bytes
+ - JDK-8283865: riscv: Break down -XX:+UseRVB into seperate options for each bitmanip extension
+ - JDK-8283929: GHA: Add RISC-V build config
+ - JDK-8284068: riscv: should call Atomic::release_store in JavaThread::set_thread_state
+ - JDK-8284090: com/sun/security/auth/module/AllPlatforms.java fails to compile
+ - JDK-8284273: Early crashes in os::print_context on AArch64
+ - JDK-8284760: Correct type/array element offset in LibraryCallKit::get_state_from_digest_object()
+ - JDK-8284772: GHA: Use GCC Major Version Dependencies Only
+ - JDK-8284910: Buffer clean in PasswordCallback
+ - JDK-8284937: riscv: should not allocate special register for temp
+ - JDK-8284997: arm32 build crashes since JDK-8283326
+ - JDK-8285303: riscv: Incorrect register mask in call_native_base
+ - JDK-8285437: riscv: Fix MachNode size mismatch for MacroAssembler::verify_oops*
+ - JDK-8285630: Fix a configure error in RISC-V cross build
+ - JDK-8285675: Temporary fix for arm32 SafeFetch
+ - JDK-8285699: riscv: Provide information when hitting a HaltNode
+ - JDK-8285711: riscv: RVC: Support disassembler show-bytes option
+ - JDK-8285756: clean up use of bad arguments for `@clean` in langtools tests
+ - JDK-8285980: Several tests in compiler/c2/irTests miss @requires vm.compiler2.enabled
+ - JDK-8286481: Exception printed to stdout on Windows when storing transparent image in clipboard
+ - JDK-8286620: Create regression test for verifying setMargin() of JRadioButton
+ - JDK-8286623: Bundle zlib by default with JDK on macos aarch64
+ - JDK-8287227: Shenandoah: A couple of virtual thread tests failed with iu mode even without Loom enabled.
+ - JDK-8287418: riscv: Fix correctness issue of MacroAssembler::movptr
+ - JDK-8287552: riscv: Fix comment typo in li64
+ - JDK-8287970: riscv: jdk/incubator/vector/*VectorTests failing
+ - JDK-8288719: [arm32] SafeFetch32 thumb interleaving causes random crashes
+ - JDK-8289077: Add manual tests to open
+ - JDK-8289238: Refactoring changes to PassFailJFrame Test Framework
+ - JDK-8289510: Improve test coverage for XPath Axes: namespace
+ - JDK-8289512: Fix GCC 12 warnings for adlc output_c.cpp
+ - JDK-8289547: Update javax/swing/Popup/TaskbarPositionTest.java
+ - JDK-8289646: configure script failed on WSL
+ - JDK-8289688: jfr command hangs when it processes invalid file
+ - JDK-8289748: C2 compiled code crashes with SIGFPE with -XX:+StressLCM and -XX:+StressGCM
+ - JDK-8289797: tools/launcher/I18NArgTest.java fails on Japanese Windows environment
+ - JDK-8289917: Metadata for regionsRefilled of G1EvacuationStatistics event is wrong
+ - JDK-8290137: riscv: small refactoring for add_memory_int32/64
+ - JDK-8290164: compiler/runtime/TestConstantsInError.java fails on riscv
+ - JDK-8290464: Optimize ResourceArea zapping on ResourceMark release
+ - JDK-8290469: Add new positioning options to PassFailJFrame test framework
+ - JDK-8290496: riscv: Fix build warnings-as-errors with GCC 11
+ - JDK-8291444: GHA builds/tests won't run manually if disabled from automatic running
+ - JDK-8291830: jvmti/RedefineClasses/StressRedefine failed: assert(!is_null(v)) failed: narrow klass value can never be zero
+ - JDK-8291893: riscv: remove fence.i used in user space
+ - JDK-8291947: riscv: fail to build after JDK-8290840
+ - JDK-8291952: riscv: Remove PRAGMA_NONNULL_IGNORED
+ - JDK-8292182: [TESTLIB] Enhance JAXPPolicyManager to setup required permissions for jtreg version 7 jar
+ - JDK-8292315: Tests should not rely on specific JAR file names (hotspot)
+ - JDK-8292316: Tests should not rely on specific JAR file names (jpackage)
+ - JDK-8292683: Remove BadKeyUsageTest.java from Problem List
+ - JDK-8292698: Improve performance of DataInputStream
+ - JDK-8292716: Configure should check that jtreg is of the required version
+ - JDK-8292763: JDK-8292716 breaks configure without jtreg
+ - JDK-8292867: RISC-V: Simplify weak CAS return value handling
+ - JDK-8293012: ConstantPool::print_on can crash if _cache is NULL
+ - JDK-8293050: RISC-V: Remove redundant non-null assertions about macro-assembler
+ - JDK-8293098: GHA: Harmonize GCC version handling for host and cross builds
+ - JDK-8293100: RISC-V: Need to save and restore callee-saved FloatRegisters in StubGenerator::generate_call_stub
+ - JDK-8293107: GHA: Bump to Ubuntu 22.04
+ - JDK-8293114: JVM should trim the native heap
+ - JDK-8293166: jdk/jfr/jvm/TestDumpOnCrash.java fails on Linux ppc64le and Linux aarch64
+ - JDK-8293177: Verify version numbers in legal files
+ - JDK-8293180: JQuery UI license file not updated
+ - JDK-8293252: Shenandoah: ThreadMXBean synchronizer tests crash with aggressive heuristics
+ - JDK-8293361: GHA: dump config.log in case of configure failure
+ - JDK-8293474: RISC-V: Unify the way of moving function pointer
+ - JDK-8293524: RISC-V: Use macro-assembler functions as appropriate
+ - JDK-8293566: RISC-V: Clean up push and pop registers
+ - JDK-8293811: Provide a reason for PassFailJFrame.forceFail
+ - JDK-8293851: hs_err should print more stack in hex dump
+ - JDK-8294012: RISC-V: get/put_native_u8 missing the case when address&7 is 6
+ - JDK-8294083: RISC-V: Minimal build failed with --disable-precompiled-headers
+ - JDK-8294086: RISC-V: Cleanup InstructionMark usages in the backend
+ - JDK-8294087: RISC-V: RVC: Fix a potential alignment issue and add more alignment assertions for the patchable calls/nops
+ - JDK-8294149: JMH 1.34 and later requires jopt-simple 5.0.4
+ - JDK-8294187: RISC-V: Unify all relocations for the backend into AbstractAssembler::relocate()
+ - JDK-8294366: RISC-V: Partially mark out incompressible regions
+ - JDK-8294430: RISC-V: Small refactoring for movptr_with_offset
+ - JDK-8294492: RISC-V: Use li instead of patchable movptr at non-patchable callsites
+ - JDK-8294679: RISC-V: Misc crash dump improvements
+ - JDK-8294941: GHA: Cut down cross-compilation sysroots
+ - JDK-8294956: GHA: qemu-debootstrap is deprecated, use the regular one
+ - JDK-8295110: RISC-V: Mark out relocations as incompressible
+ - JDK-8295213: Run GHA manually with user-specified make and configure arguments
+ - JDK-8295270: RISC-V: Clean up and refactoring for assembler functions
+ - JDK-8295396: RISC-V: Cleanup useless CompressibleRegions
+ - JDK-8295657: SA: Allow larger object alignments
+ - JDK-8295737: macOS: Print content cut off when width > height with portrait orientation
+ - JDK-8295811: serviceability/sa/TestObjectAlignment.java fails on x86_32
+ - JDK-8295812: Skip the "half float" support in LittleCMS during the build
+ - JDK-8295894: Remove SECOM certificate that is expiring in September 2023
+ - JDK-8295926: RISC-V: C1: Fix LIRGenerator::do_LibmIntrinsic
+ - JDK-8295968: RISC-V: Rename some assembler intrinsic functions for RVV 1.0
+ - JDK-8296384: [TESTBUG] sun/security/provider/SecureRandom/AbstractDrbg/SpecTest.java intermittently timeout
+ - JDK-8296435: RISC-V: Small refactoring for increment/decrement
+ - JDK-8296447: RISC-V: Make the operands order of vrsub_vx/vrsub_vi consistent with RVV 1.0 spec
+ - JDK-8296448: RISC-V: Fix temp usages of heapbase register killed by MacroAssembler::en/decode_klass_not_null
+ - JDK-8296602: RISC-V: improve performance of copy_memory stub
+ - JDK-8296771: RISC-V: C2: assert(false) failed: bad AD file
+ - JDK-8296796: Provide clean, platform-agnostic interface to C-heap trimming
+ - JDK-8296916: RISC-V: Move some small macro-assembler functions to header file
+ - JDK-8297350: Update JMH devkit to 1.36
+ - JDK-8297359: RISC-V: improve performance of floating Max Min intrinsics
+ - JDK-8297476: Increase InlineSmallCode default from 1000 to 2500 for RISC-V
+ - JDK-8297644: RISC-V: Compilation error when shenandoah is disabled
+ - JDK-8297681: Unnecessary color conversion during 4BYTE_ABGR_PRE to INT_ARGB_PRE blit
+ - JDK-8297697: RISC-V: Add support for SATP mode detection
+ - JDK-8297715: RISC-V: C2: Use single-bit instructions from the Zbs extension
+ - JDK-8297887: Update Siphash
+ - JDK-8297923: java.awt.ScrollPane broken after multiple scroll up/down
+ - JDK-8298138: Shenandoah: HdrSeq asserts "sub-bucket index (512) overflow for value ( 1.00)"
+ - JDK-8298921: Create a regression test for JDK-8139581
+ - JDK-8298974: Add ftcolor.c to imported freetype sources
+ - JDK-8299158: Improve MD5 intrinsic on AArch64
+ - JDK-8299168: RISC-V: Fix MachNode size mismatch for MacroAssembler::_verify_oops*
+ - JDK-8299330: Minor improvements in MSYS2 Workflow handling
+ - JDK-8299617: CurrencySymbols.properties is missing the copyright notice
+ - JDK-8299658: C1 compilation crashes in LinearScan::resolve_exception_edge
+ - JDK-8299713: Test javax/swing/JTableHeader/6889007/bug6889007.java failed: Wrong type of cursor
+ - JDK-8299827: Add resolved IP address in connection exception for sockets
+ - JDK-8299847: RISC-V: Improve PrintOptoAssembly output of CMoveI/L nodes
+ - JDK-8299962: Speed up compiler/intrinsics/unsafe/DirectByteBufferTest.java and HeapByteBufferTest.java
+ - JDK-8300053: Shenandoah: Handle more GCCauses in ShenandoahControlThread::request_gc
+ - JDK-8300098: java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java fails with internal timeout when executed with TieredCompilation1/3
+ - JDK-8300109: RISC-V: Improve code generation for MinI/MaxI nodes
+ - JDK-8300405: Screen capture for test JFileChooserSetLocationTest.java, failure case
+ - JDK-8300584: Accelerate AVX-512 CRC32C for small buffers
+ - JDK-8300659: Refactor TestMemoryAwareness to use WhiteBox api for host values
+ - JDK-8300693: Lower the compile threshold and reduce the iterations of warmup loop in VarHandles tests
+ - JDK-8301033: RISC-V: Handle special cases for MinI/MaxI nodes for Zbb
+ - JDK-8301036: RISC-V: Factor out functions baseOffset & baseOffset32 from MacroAssembler
+ - JDK-8301067: RISC-V: better error message when reporting unsupported satp modes
+ - JDK-8301074: Replace NULL with nullptr in share/opto/
+ - JDK-8301097: Update GHA XCode to 12.5.1
+ - JDK-8301153: RISC-V: pipeline class for several instructions is not set correctly
+ - JDK-8301167: Update VerifySignedJar to actually exercise and test verification
+ - JDK-8301187: Memory leaks in OopMapCache
+ - JDK-8301269: Update Commons BCEL to Version 6.7.0
+ - JDK-8301313: RISC-V: C2: assert(false) failed: bad AD file due to missing match rule
+ - JDK-8301367: Add exception handler method to the BaseLdapServer
+ - JDK-8301628: RISC-V: c2 fix pipeline class for several instructions
+ - JDK-8301700: Increase the default TLS Diffie-Hellman group size from 1024-bit to 2048-bit
+ - JDK-8301818: RISC-V: Factor out function mvw from MacroAssembler
+ - JDK-8301852: RISC-V: Optimize class atomic when order is memory_order_relaxed
+ - JDK-8301959: Compile command in compiler.loopopts.TestRemoveEmptyCountedLoop does not work
+ - JDK-8302114: RISC-V: Several foreign jtreg tests fail with debug build after JDK-8301818
+ - JDK-8302150: Speed up compiler/codegen/Test7100757.java
+ - JDK-8302161: Upgrade jQuery UI to version 1.13.2
+ - JDK-8302182: Update Public Suffix List to 88467c9
+ - JDK-8302289: RISC-V: Use bgez instruction in arraycopy_simple_check when possible
+ - JDK-8302736: Major performance regression in Math.log on aarch64
+ - JDK-8302776: RISC-V: Fix typo CSR_INSTERT to CSR_INSTRET
+ - JDK-8303047: avoid NULL after 8301661
+ - JDK-8303154: Investigate and improve instruction cache flushing during compilation
+ - JDK-8303215: Make thread stacks not use huge pages
+ - JDK-8303279: C2: crash in SubTypeCheckNode::sub() at IGVN split if
+ - JDK-8304293: RISC-V: JDK-8276799 missed atomic intrinsic support for C1
+ - JDK-8304314: StackWalkTest.java fails after CODETOOLS-7903373
+ - JDK-8304353: Add lib-test tier1 testing in GHA
+ - JDK-8304725: AsyncGetCallTrace can cause SIGBUS on M1
+ - JDK-8304845: Update PCSC-Lite for Suse Linux to 1.9.9 and fix incomplete license wording
+ - JDK-8304976: Optimize DateTimeFormatterBuilder.ZoneTextPrinterParser.getTree()
+ - JDK-8305006: Use correct register in riscv_enc_fast_unlock()
+ - JDK-8305008: RISC-V: Factor out immediate checking functions from assembler_riscv.inline.hpp
+ - JDK-8305112: RISC-V: Typo fix for RVC description
+ - JDK-8305236: Some LoadLoad barriers in the interpreter are unnecessary after JDK-8220051
+ - JDK-8305421: Work around JDK-8305420 in CDSJDITest.java
+ - JDK-8305425: Thread.isAlive0 doesn't need to call into the VM
+ - JDK-8305512: RISC-V: Enable RVC extension by default on supported hardware
+ - JDK-8305670: Performance regression in LockSupport.unpark with lots of idle threads
+ - JDK-8305728: RISC-V: Use bexti instruction to do single-bit testing
+ - JDK-8305763: Parsing a URI with an underscore goes through a silent exception, negatively impacting performance
+ - JDK-8305766: ProblemList runtime/CompressedOops/CompressedClassPointers.java
+ - JDK-8305858: Resolve multiple definition of 'handleSocketError' when statically linking with JDK native libraries
+ - JDK-8305950: Have -XshowSettings option display tzdata version
+ - JDK-8305995: Footprint regression from JDK-8224957
+ - JDK-8306060: Open source few AWT Insets related tests
+ - JDK-8306076: Open source AWT misc tests
+ - JDK-8306134: Open source some AWT tests relating to Button and a few other classes
+ - JDK-8306135: Clean up and open source some AWT tests
+ - JDK-8306137: Open source several AWT ScrollPane related tests
+ - JDK-8306281: function isWsl() returns false on WSL2
+ - JDK-8306372: Open source AWT CardLayout and Checkbox tests
+ - JDK-8306428: RunThese30M.java crashed with assert(early->flag() == current->flag() || early->flag() == mtNone)
+ - JDK-8306430: Open source some AWT tests related to TextComponent and Toolkit
+ - JDK-8306435: Juggle04/TestDescription.java should be a booleanArr test and not a byteArr one
+ - JDK-8306484: Open source several AWT Choice jtreg tests
+ - JDK-8306566: Open source several clipboard AWT tests
+ - JDK-8306575: Clean up and open source four Dialog related tests
+ - JDK-8306636: Disable compiler/c2/Test6905845.java with -XX:TieredStopAtLevel=3
+ - JDK-8306638: Open source some AWT tests related to datatransfer and Toolkit
+ - JDK-8306667: RISC-V: Fix storeImmN0 matching rule by using zr register
+ - JDK-8306682: Open source a few more AWT Choice tests
+ - JDK-8306718: Optimize and opensource some old AWT tests
+ - JDK-8306738: Select num workers for safepoint ParallelCleanupTask
+ - JDK-8306765: Some client related jtreg problem list entries are malformed
+ - JDK-8306812: Open source several AWT Miscellaneous tests
+ - JDK-8307067: remove broken EnableThreadSMRExtraValidityChecks option
+ - JDK-8307068: store a JavaThread* in the java.lang.Thread object after the JavaThread* is added to the main ThreadsList
+ - JDK-8307078: Opensource and clean up five more AWT Focus related tests
+ - JDK-8307079: Update test java/awt/Choice/DragOffNoSelect.java
+ - JDK-8307083: Open source some drag and drop tests 3
+ - JDK-8307147: [x86] Dangling pointer warning for Assembler::_attributes
+ - JDK-8307150: RISC-V: Remove remaining StoreLoad barrier with UseCondCardMark for Serial/Parallel GC
+ - JDK-8307156: native_thread not protected by TLH
+ - JDK-8307165: java/awt/dnd/NoFormatsDropTest/NoFormatsDropTest.java timed out
+ - JDK-8307299: Move more DnD tests to open
+ - JDK-8307301: Update HarfBuzz to 7.2.0
+ - JDK-8307348: Parallelize heap walk for ObjectCount(AfterGC) JFR event collection
+ - JDK-8307395: Add missing STS to Shenandoah
+ - JDK-8307446: RISC-V: Improve performance of floating point to integer conversion
+ - JDK-8307526: [JFR] Better handling of tampered JFR repository
+ - JDK-8307555: Reduce memory reads in x86 MD5 intrinsic
+ - JDK-8307569: Build with gcc8 is broken after JDK-8307301
+ - JDK-8307572: AArch64: Vector registers are clobbered by some macroassemblers
+ - JDK-8307603: [AIX] Broken build after JDK-8307301
+ - JDK-8307604: gcc12 based Alpine build broken build after JDK-8307301
+ - JDK-8307651: RISC-V: stringL_indexof_char instruction has wrong format string
+ - JDK-8307653: Adjust delay time and gc log argument in TestAbortOnVMOperationTimeout
+ - JDK-8307683: Loop Predication should not hoist range checks with trap on success projection by negating their condition
+ - JDK-8307766: Linux: Provide the option to override the timer slack
+ - JDK-8308089: [riscv-port-jdk17u] Intrinsify Unsafe.storeStoreFence
+ - JDK-8308090: Add container tests for on-the-fly resource quota updates
+ - JDK-8308152: PropertyDescriptor should work with overridden generic getter method
+ - JDK-8308156: VerifyCACerts.java misses blank in error output
+ - JDK-8308192: Error in parsing replay file when staticfield is an array of single dimension
+ - JDK-8308232: nsk/jdb tests don't pass -verbose flag to the debuggee
+ - JDK-8308277: RISC-V: Improve vectorization of Match.sqrt() on floats
+ - JDK-8308283: Build failure with GCC12 & GCC13
+ - JDK-8308300: enhance exceptions in MappedMemoryUtils.c
+ - JDK-8308643: Incorrect value of 'used' jvmstat counter
+ - JDK-8308766: TLAB initialization may cause div by zero
+ - JDK-8308803: Improve java/util/UUID/UUIDTest.java
+ - JDK-8308872: enhance logging and some exception in krb5/Config.java
+ - JDK-8308997: RISC-V: Sign extend when comparing 32-bit value with zero instead of testing the sign bit
+ - JDK-8309088: security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java fails
+ - JDK-8309095: Remove UTF-8 character from TaskbarPositionTest.java
+ - JDK-8309107: Bump update version for OpenJDK: jdk-17.0.9
+ - JDK-8309119: [17u/11u] Redo JDK-8297951: C2: Create skeleton predicates for all If nodes in loop predication
+ - JDK-8309138: Fix container tests for jdks with symlinked conf dir
+ - JDK-8309228: Clarify EXPERIMENTAL flags comment in hotspot/share/runtime/globals.hpp
+ - JDK-8309254: Implement fast-path for ASCII-compatible CharsetEncoders on RISC-V
+ - JDK-8309266: C2: assert(final_con == (jlong)final_int) failed: final value should be integer
+ - JDK-8309297: Adjust ShenandoahHeap print_heap_regions_on
+ - JDK-8309340: Provide sctpHandleSocketErrorWithMessage
+ - JDK-8309427: [riscv-port-jdk17u] Remove unused RoundDoubleModeV C2 node
+ - JDK-8309550: jdk.jfr.internal.Utils::formatDataAmount method should gracefully handle amounts equal to Long.MIN_VALUE
+ - JDK-8309591: Socket.setOption(TCP_QUICKACK) uses wrong level
+ - JDK-8309613: [Windows] hs_err files sometimes miss information about the code containing the error
+ - JDK-8309746: Reconfigure check should include make/conf/version-numbers.conf
+ - JDK-8309862: Unsafe list operations in JfrStringPool
+ - JDK-8309956: Shenandoah: Strengthen the mark word check in string dedup
+ - JDK-8309959: JFR: Display N/A for missing data amount
+ - JDK-8310054: ScrollPane insets are incorrect
+ - JDK-8310126: C1: Missing receiver null check in Reference::get intrinsic
+ - JDK-8310259: Pin msys2/setup-msys2 github action to a specific commit
+ - JDK-8310549: avoid potential leaks in KeystoreImpl.m related to JNU_CHECK_EXCEPTION early returns
+ - JDK-8310551: vmTestbase/nsk/jdb/interrupt/interrupt001/interrupt001.java timed out due to missing prompt
+ - JDK-8310873: Re-enable locked_create_entry symbol check in runtime/NMT/CheckForProperDetailStackTrace.java for RISC-V
+ - JDK-8311033: [macos] PrinterJob does not take into account Sides attribute
+ - JDK-8311249: Remove unused MemAllocator::obj_memory_range
+ - JDK-8311285: report some fontconfig related environment variables in hs_err file
+ - JDK-8311689: Wrong visible amount in Adjustable of ScrollPane
+ - JDK-8311862: RISC-V: small improvements to shift immediate instructions
+ - JDK-8311923: TestIRMatching.java fails on RISC-V
+ - JDK-8312029: Add CriticalNative tests to ProblemList for 8312028
+ - JDK-8312511: GHA: Bump cross-compile runner to Ubuntu 22.04
+ - JDK-8312525: New test runtime/os/TestTrimNative.java#trimNative is failing: did not see the expected RSS reduction
+ - JDK-8312555: Ideographic characters aren't stretched by AffineTransform.scale(2, 1)
+ - JDK-8313262: C2: Sinking node may cause required cast to be dropped
+ - JDK-8313402: C1: Incorrect LoadIndexed value numbering
+ - JDK-8313428: GHA: Bump GCC versions for July 2023 updates
+ - JDK-8313576: GCC 7 reports compiler warning in bundled freetype 2.13.0
+ - JDK-8313676: Amend TestLoadIndexedMismatch test to target intrinsic directly
+ - JDK-8313678: SymbolTable can leak Symbols during cleanup
+ - JDK-8313701: GHA: RISC-V should use the official repository for bootstrap
+ - JDK-8313707: GHA: Bootstrap sysroots with --variant=minbase
+ - JDK-8313796: AsyncGetCallTrace crash on unreadable interpreter method pointer
+ - JDK-8313815: The exception messages printed by jcmd ManagementAgent.start are corrupted on Japanese Windows
+ - JDK-8313874: JNI NewWeakGlobalRef throws exception for null arg
+ - JDK-8314020: Print instruction blocks in byte units
+ - JDK-8314117: RISC-V: Incorrect VMReg encoding in RISCV64Frame.java
+ - JDK-8314118: Update JMH devkit to 1.37
+ - JDK-8314262: GHA: Cut down cross-compilation sysroots deeper
+ - JDK-8314426: runtime/os/TestTrimNative.java is failing on slow machines
+ - JDK-8314501: Shenandoah: sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java fails
+ - JDK-8314517: some tests fail in case ipv6 is disabled on the machine
+ - JDK-8314552: Fix javadoc tests to work with jtreg 7
+ - JDK-8314658: [17u] GHA: Sync up debian-version for cross-builds
+ - JDK-8314730: GHA: Drop libfreetype6-dev transitional package in favor of libfreetype-dev
+ - JDK-8314960: Add Certigna Root CA - 2
+ - JDK-8317040: Exclude cleaner test failing on older releases
+ - JDK-8317643: [17u] Remove designator DEFAULT_PROMOTED_VERSION_PRE=ea for release 17.0.9
+
+Notes on individual issues:
+===========================
+
+hotspot/compiler:
+
+JDK-8276799: Implementation of JEP 422: Linux/RISC-V Port
+=========================================================
+https://openjdk.org/jeps/422
+
+RISC-V is a free and open-source RISC instruction set architecture
+(ISA) designed originally at the University of California, Berkeley,
+and now developed collaboratively under the sponsorship of RISC-V
+International. It is already supported by a wide range of language
+toolchains. With the increasing availability of RISC-V hardware, the
+JDK port has been backported to 17u, following introduction in 19.
+
+security-libs/javax.net.ssl:
+
+JDK-8301700: The Default TLS Diffie-Hellman Group Size Has Been Increased from 1024-bit to 2048-bit
+===================================================================================================
+The JDK implementation of TLS 1.2 now uses a default Diffie Hellman
+keysize of 2048 bits when a TLS_DHE cipher suite is negotiated and
+either the client or server does not support FFDHE.
+
+The JDK TLS implementation supports FFDHE, which can negotiate a
+stronger keysize, and this is enabled by default.
+
+As a workaround, users can revert to the previous key size by setting
+the `jdk.tls.ephemeralDHKeySize` system property to 1024 (at their own
+risk).
+
+This change does not affect TLS 1.3 as the minimum DH group size is
+already 2048 bits.
+
+tools/launcher:
+
+JDK-8305950: `-XshowSettings:locale` Output Now Includes Tzdata Version
+=======================================================================
+The `-XshowSettings` launcher option has been enhanced to print the
+tzdata version used by the JDK. The tzdata version is displayed as
+part of the `locale` showSettings option.
+
+Example output using `-X:showSettings:locale`:
+
+Locale settings:
+ default locale = English
+ default display locale = English
+ default format locale = English
+ tzdata version = 2023c
+
+security-libs/java.security:
+
+JDK-8295894: Removed SECOM Trust System's RootCA1 Root Certificate
+==================================================================
+The following root certificate from SECOM Trust System has been
+removed from the `cacerts` keystore:
+
+Alias Name: secomscrootca1 [jdk]
+Distinguished Name: OU=Security Communication RootCA1, O=SECOM Trust.net, C=JP
+
+JDK-8314960: Added Certigna Root CA Certificate
+===============================================
+The following root certificate has been added to the cacerts
+truststore:
+
+Name: Certigna (Dhimyotis)
+Alias Name: certignarootca
+Distinguished Name: CN=Certigna Root CA, OU=0002 48146308100036, O=Dhimyotis, C=FR
+
+New in release OpenJDK 17.0.8.1 (2023-08-24):
+=============================================
+Live versions of these release notes can be found at:
+ * https://bit.ly/openjdk17081
+
+* Other changes
+ - JDK-8313765: Invalid CEN header (invalid zip64 extra data field size)
+ - JDK-8314677: Bump update version for OpenJDK: jdk-17.0.8.1
+
+Notes on individual issues:
+===========================
+
+core-libs/java.util.jar:
+
+JDK-8313765: Invalid CEN header (invalid zip64 extra data field size)
+=====================================================================
+Additional validity checks in the handling of Zip64 files,
+JDK-8302483, introduced in 17.0.8, caused the use of some valid zip
+files to now fail with the error, `Invalid CEN header (invalid zip64
+extra data field size)`
+
+This release, 17.0.8.1, allows for zero length headers and additional
+padding produced by some Zip64 creation tools.
+
+The following third party tools have also released patches to better
+adhere to the ZIP File Format Specification:
+
+* Apache Commons Compress fix for Empty CEN Zip64 Extra Headers fixed in Commons Compress release 1.11
+* Apache Ant fix for Empty CEN Zip64 Extra Headers fixed in Ant 1.10.14
+* BND issue with writing invalid Extra Headers fixed in BND 5.3
+
+The maven-bundle-plugin 5.1.5 includes the BND 5.3 patch.
+
+If these improved validation checks cause issues for deployed zip or
+jar files, check how the file was created and whether patches are
+available from the generating software to resolve the issue. With
+both JDK releases, the checks can be disabled by setting the new
+system property, `jdk.util.zip.disableZip64ExtraFieldValidation` to
+`true`.
+
New in release OpenJDK 17.0.8 (2023-07-18):
===========================================
Live versions of these release notes can be found at:
@@ -2913,4 +3397,3 @@ its introduction and the effort required to maintain it is
significant. Retain the experimental Java-level JVM compiler
interface (JVMCI) so that developers can continue to use
externally-built versions of the compiler for JIT compilation.
-
diff --git a/discover_trees.sh b/discover_trees.sh
new file mode 100755
index 0000000..8c31278
--- /dev/null
+++ b/discover_trees.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# Copyright (C) 2020 Red Hat, Inc.
+# Written by Andrew John Hughes <gnu.andrew(a)redhat.com>.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+TREE=${1}
+
+if test "x${TREE}" = "x"; then
+ TREE=${PWD}
+fi
+
+if [ -e ${TREE}/nashorn/.hg -o -e ${TREE}/nashorn/merge.changeset ] ; then
+ NASHORN="nashorn" ;
+fi
+
+if [ -e ${TREE}/corba/.hg -o -e ${TREE}/corba/merge.changeset ] ; then
+ CORBA="corba";
+fi
+
+if [ -e ${TREE}/jaxp/.hg -o -e ${TREE}/jaxp/merge.changeset ] ; then
+ JAXP="jaxp";
+fi
+
+if [ -e ${TREE}/jaxws/.hg -o -e ${TREE}/jaxws/merge.changeset ] ; then
+ JAXWS="jaxws";
+fi
+
+if [ -e ${TREE}/langtools/.hg -o -e ${TREE}/langtools/merge.changeset ] ; then
+ LANGTOOLS="langtools";
+fi
+
+if [ -e ${TREE}/jdk/.hg -o -e ${TREE}/jdk/merge.changeset ] ; then
+ JDK="jdk";
+fi
+
+if [ -e ${TREE}/hotspot/.hg -o -e ${TREE}/hotspot/merge.changeset ] ; then
+ HOTSPOT="hotspot";
+fi
+
+SUBTREES="${CORBA} ${JAXP} ${JAXWS} ${LANGTOOLS} ${NASHORN} ${JDK} ${HOTSPOT}";
+echo ${SUBTREES}
diff --git a/fips-17u-bf363eecce3.patch b/fips-17u-51e1d00be4e.patch
similarity index 99%
rename from fips-17u-bf363eecce3.patch
rename to fips-17u-51e1d00be4e.patch
index cd8565c..da1df4d 100644
--- a/fips-17u-bf363eecce3.patch
+++ b/fips-17u-51e1d00be4e.patch
@@ -116,7 +116,7 @@ index 00000000000..f48fc7f7e80
+ AC_SUBST(NSS_LIBDIR)
+])
diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
-index a65d91ee974..a8f054c1397 100644
+index 366682cf044..1f8d782f419 100644
--- a/make/autoconf/libraries.m4
+++ b/make/autoconf/libraries.m4
@@ -33,6 +33,7 @@ m4_include([lib-std.m4])
@@ -2508,7 +2508,7 @@ index 00000000000..dc8bc72fccb
+ }
+}
diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
-index fab52688c04..29337576f37 100644
+index 9be02033877..4dd055a9ccf 100644
--- a/src/java.base/share/conf/security/java.security
+++ b/src/java.base/share/conf/security/java.security
@@ -82,6 +82,17 @@ security.provider.tbd=Apple
@@ -3496,7 +3496,7 @@ index 00000000000..f8d505ca815
+}
\ No newline at end of file
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
-index 9b69072280e..5696b904979 100644
+index 0736ce997e4..0a937fef377 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
@@ -37,6 +37,8 @@ import javax.crypto.*;
@@ -3518,18 +3518,18 @@ index 9b69072280e..5696b904979 100644
private static final long serialVersionUID = -2575874101938349339L;
private static final String PUBLIC = "public";
-@@ -136,9 +141,7 @@ abstract class P11Key implements Key, Length {
+@@ -139,9 +144,7 @@ abstract class P11Key implements Key, Length {
this.tokenObject = tokenObject;
this.sensitive = sensitive;
this.extractable = extractable;
- char[] tokenLabel = this.token.tokenInfo.label;
-- boolean isNSS = (tokenLabel[0] == 'N' && tokenLabel[1] == 'S'
+- isNSS = (tokenLabel[0] == 'N' && tokenLabel[1] == 'S'
- && tokenLabel[2] == 'S');
-+ boolean isNSS = P11Util.isNSS(this.token);
++ isNSS = P11Util.isNSS(this.token);
boolean extractKeyInfo = (!DISABLE_NATIVE_KEYS_EXTRACTION && isNSS &&
extractable && !tokenObject);
this.keyIDHolder = new NativeKeyHolder(this, keyID, session,
-@@ -379,7 +382,9 @@ abstract class P11Key implements Key, Length {
+@@ -383,7 +386,9 @@ abstract class P11Key implements Key, Length {
new CK_ATTRIBUTE(CKA_SENSITIVE),
new CK_ATTRIBUTE(CKA_EXTRACTABLE),
});
@@ -3540,13 +3540,13 @@ index 9b69072280e..5696b904979 100644
return new P11PrivateKey
(session, keyID, algorithm, keyLength, attributes);
} else {
-@@ -461,7 +466,8 @@ abstract class P11Key implements Key, Length {
+@@ -465,7 +470,8 @@ abstract class P11Key implements Key, Length {
}
public String getFormat() {
token.ensureValid();
-- if (sensitive || (extractable == false)) {
+- if (sensitive || !extractable || (isNSS && tokenObject)) {
+ if (!plainKeySupportEnabled &&
-+ (sensitive || (extractable == false))) {
++ (sensitive || !extractable || (isNSS && tokenObject))) {
return null;
} else {
return "RAW";
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index fc8662a..7ff27d6 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -8,7 +8,7 @@
# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
# PROJECT_NAME=openjdk
# REPO_NAME=jdk17u
-# VERSION=jdk-17.0.7+7
+# VERSION=jdk-17.0.7+9
# or to eg prepare systemtap:
# icedtea7's jstack and other tapsets
# VERSION=6327cf1cea9e
@@ -29,8 +29,6 @@ set -e
OPENJDK_URL_DEFAULT=https://github.com
COMPRESSION_DEFAULT=xz
-# Corresponding IcedTea version
-ICEDTEA_VERSION=12.0
if [ "x$1" = "xhelp" ] ; then
echo -e "Behaviour may be specified by setting the following variables:\n"
@@ -40,8 +38,8 @@ if [ "x$1" = "xhelp" ] ; then
echo "OPENJDK_URL - the URL to retrieve code from (optional; defaults to ${OPENJDK_URL_DEFAULT})"
echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
- echo "REPO_ROOT - the location of the Git repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
- echo "TO_COMPRESS - what part of clone to pack (default is openjdk)"
+ echo "REPO_ROOT - the location of the Git repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME.git)"
+ echo "TO_COMPRESS - what part of clone to pack (default is ${VERSION})"
echo "BOOT_JDK - the bootstrap JDK to satisfy the configure run"
exit 1;
fi
@@ -52,6 +50,7 @@ if [ "x$VERSION" = "x" ] ; then
exit 2
fi
echo "Version: ${VERSION}"
+
NUM_VER=${VERSION##jdk-}
RELEASE_VER=${NUM_VER%%+*}
BUILD_VER=${NUM_VER##*+}
@@ -117,8 +116,8 @@ if [ "x$REPO_ROOT" = "x" ] ; then
fi;
if [ "x$TO_COMPRESS" = "x" ] ; then
- TO_COMPRESS="openjdk"
- echo "No targets to be compressed specified, ; default to ${TO_COMPRESS}"
+ TO_COMPRESS="${VERSION}"
+ echo "No targets to be compressed specified ; default to ${TO_COMPRESS}"
fi;
echo -e "Settings:"
@@ -140,9 +139,10 @@ else
mkdir "${FILE_NAME_ROOT}"
pushd "${FILE_NAME_ROOT}"
echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
- git clone -b ${VERSION} ${REPO_ROOT} openjdk
+ git clone -b ${VERSION} ${REPO_ROOT} ${VERSION}
popd
fi
+
pushd "${FILE_NAME_ROOT}"
# Generate .src-rev so build has knowledge of the revision the tarball was created from
mkdir build
@@ -153,22 +153,22 @@ pushd "${FILE_NAME_ROOT}"
rm -rf build
# Remove commit checks
- echo "Removing $(find openjdk -name '.jcheck' -print)"
- find openjdk -name '.jcheck' -print0 | xargs -0 rm -rf
+ echo "Removing $(find ${VERSION} -name '.jcheck' -print)"
+ find ${VERSION} -name '.jcheck' -print0 | xargs -0 rm -r
# Remove history and GHA
- echo "find openjdk -name '.hgtags'"
- find openjdk -name '.hgtags' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.hgignore'"
- find openjdk -name '.hgignore' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.gitattributes'"
- find openjdk -name '.gitattributes' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.gitignore'"
- find openjdk -name '.gitignore' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.git'"
- find openjdk -name '.git' -exec rm -rfv '{}' '+'
- echo "find openjdk -name '.github'"
- find openjdk -name '.github' -exec rm -rfv '{}' '+'
+ echo "find ${VERSION} -name '.hgtags'"
+ find ${VERSION} -name '.hgtags' -exec rm -fv '{}' '+'
+ echo "find ${VERSION} -name '.hgignore'"
+ find ${VERSION} -name '.hgignore' -exec rm -fv '{}' '+'
+ echo "find ${VERSION} -name '.gitattributes'"
+ find ${VERSION} -name '.gitattributes' -exec rm -fv '{}' '+'
+ echo "find ${VERSION} -name '.gitignore'"
+ find ${VERSION} -name '.gitignore' -exec rm -fv '{}' '+'
+ echo "find ${VERSION} -name '.git'"
+ find ${VERSION} -name '.git' -exec rm -rfv '{}' '+'
+ echo "find ${VERSION} -name '.github'"
+ find ${VERSION} -name '.github' -exec rm -rfv '{}' '+'
echo "Compressing remaining forest"
if [ "X$COMPRESSION" = "Xxz" ] ; then
diff --git a/icedtea_sync.sh b/icedtea_sync.sh
index e5c54f3..c1b8f6a 100755
--- a/icedtea_sync.sh
+++ b/icedtea_sync.sh
@@ -1,192 +1 @@
-#!/bin/bash
-
-# Copyright (C) 2019 Red Hat, Inc.
-# Written by Andrew John Hughes <gnu.andrew(a)redhat.com>.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-ICEDTEA_USE_VCS=true
-
-ICEDTEA_VERSION=3.15.0
-ICEDTEA_URL=https://icedtea.classpath.org/download/source
-ICEDTEA_SIGNING_KEY=CFDA0F9B35964222
-
-ICEDTEA_HG_URL=https://icedtea.classpath.org/hg/icedtea11
-
-set -e
-
-RPM_DIR=${PWD}
-if [ ! -f ${RPM_DIR}/jconsole.desktop.in ] ; then
- echo "Not in RPM source tree.";
- exit 1;
-fi
-
-if test "x${TMPDIR}" = "x"; then
- TMPDIR=/tmp;
-fi
-WORKDIR=${TMPDIR}/it.sync
-
-echo "Using working directory ${WORKDIR}"
-mkdir ${WORKDIR}
-pushd ${WORKDIR}
-
-if test "x${WGET}" = "x"; then
- WGET=$(which wget);
- if test "x${WGET}" = "x"; then
- echo "wget not found";
- exit 1;
- fi
-fi
-
-if test "x${TAR}" = "x"; then
- TAR=$(which tar)
- if test "x${TAR}" = "x"; then
- echo "tar not found";
- exit 2;
- fi
-fi
-
-echo "Dependencies:";
-echo -e "\tWGET: ${WGET}";
-echo -e "\tTAR: ${TAR}\n";
-
-if test "x${ICEDTEA_USE_VCS}" = "xtrue"; then
- echo "Mode: Using VCS";
-
- if test "x${GREP}" = "x"; then
- GREP=$(which grep);
- if test "x${GREP}" = "x"; then
- echo "grep not found";
- exit 3;
- fi
- fi
-
- if test "x${CUT}" = "x"; then
- CUT=$(which cut);
- if test "x${CUT}" = "x"; then
- echo "cut not found";
- exit 4;
- fi
- fi
-
- if test "x${TR}" = "x"; then
- TR=$(which tr);
- if test "x${TR}" = "x"; then
- echo "tr not found";
- exit 5;
- fi
- fi
-
- if test "x${HG}" = "x"; then
- HG=$(which hg);
- if test "x${HG}" = "x"; then
- echo "hg not found";
- exit 6;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tGREP: ${GREP}";
- echo -e "\tCUT: ${CUT}";
- echo -e "\tTR: ${TR}";
- echo -e "\tHG: ${HG}";
-
- echo "Checking out repository from VCS...";
- ${HG} clone ${ICEDTEA_HG_URL} icedtea
-
- echo "Obtaining version from configure.ac...";
- ROOT_VER=$(${GREP} '^AC_INIT' icedtea/configure.ac|${CUT} -d ',' -f 2|${TR} -d '[][:space:]')
- echo "Root version from configure: ${ROOT_VER}";
-
- VCS_REV=$(${HG} log -R icedtea --template '{node|short}' -r tip)
- echo "VCS revision: ${VCS_REV}";
-
- ICEDTEA_VERSION="${ROOT_VER}-${VCS_REV}"
- echo "Creating icedtea-${ICEDTEA_VERSION}";
- mkdir icedtea-${ICEDTEA_VERSION}
- echo "Copying required files from checkout to icedtea-${ICEDTEA_VERSION}";
- # Commented out for now as IcedTea 6's jconsole.desktop.in is outdated
- #cp -a icedtea/jconsole.desktop.in ../icedtea-${ICEDTEA_VERSION}
- cp -a ${RPM_DIR}/jconsole.desktop.in icedtea-${ICEDTEA_VERSION}
- cp -a icedtea/tapset icedtea-${ICEDTEA_VERSION}
-
- rm -rf icedtea
-else
- echo "Mode: Using tarball";
-
- if test "x${ICEDTEA_VERSION}" = "x"; then
- echo "No IcedTea version specified for tarball download.";
- exit 3;
- fi
-
- if test "x${CHECKSUM}" = "x"; then
- CHECKSUM=$(which sha256sum)
- if test "x${CHECKSUM}" = "x"; then
- echo "sha256sum not found";
- exit 4;
- fi
- fi
-
- if test "x${PGP}" = "x"; then
- PGP=$(which gpg)
- if test "x${PGP}" = "x"; then
- echo "gpg not found";
- exit 5;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tCHECKSUM: ${CHECKSUM}";
- echo -e "\tPGP: ${PGP}\n";
-
- echo "Checking for IcedTea signing key ${ICEDTEA_SIGNING_KEY}...";
- if ! gpg --list-keys ${ICEDTEA_SIGNING_KEY}; then
- echo "IcedTea signing key ${ICEDTEA_SIGNING_KEY} not installed.";
- exit 6;
- fi
-
- echo "Downloading IcedTea release tarball...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz
- echo "Downloading IcedTea tarball signature...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- echo "Downloading IcedTea tarball checksums...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Verifying checksums...";
- ${CHECKSUM} --check --ignore-missing icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Checking signature...";
- ${PGP} --verify icedtea-${ICEDTEA_VERSION}.tar.xz.sig
-
- echo "Extracting files...";
- ${TAR} xJf icedtea-${ICEDTEA_VERSION}.tar.xz \
- icedtea-${ICEDTEA_VERSION}/tapset \
- icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in
-
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- rm -vf icedtea-${ICEDTEA_VERSION}.sha256
-fi
-
-echo "Replacing desktop files...";
-mv -v icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in ${RPM_DIR}
-
-echo "Creating new tapset tarball...";
-mv -v icedtea-${ICEDTEA_VERSION} openjdk
-${TAR} cJf ${RPM_DIR}/tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz openjdk
-
-rm -rvf openjdk
-
-popd
-rm -rf ${WORKDIR}
+# this file is intentionally not here, as portable builds do not have desktop integration
diff --git a/java-17-openjdk-portable.spec b/java-17-openjdk-portable.spec
index 655ccd1..c4526aa 100644
--- a/java-17-openjdk-portable.spec
+++ b/java-17-openjdk-portable.spec
@@ -30,7 +30,7 @@
# Enable static library builds by default.
%bcond_without staticlibs
# Build a fresh libjvm.so for use in a copy of the bootstrap JDK
-%bcond_without fresh_libjvm
+%bcond_with fresh_libjvm
# Build with system libraries
%bcond_with system_libs
@@ -41,8 +41,6 @@
%define __os_install_post %{nil}
%endif
-%global unpacked_licenses %{_datarootdir}/licenses
-
# Workaround for stripping of debug symbols from static libraries
%if %{with staticlibs}
%define __brp_strip_static_archive %{nil}
@@ -66,10 +64,6 @@
# See: https://bugzilla.redhat.com/show_bug.cgi?id=1520879
%global _find_debuginfo_opts -g
-# With LTO flags enabled, debuginfo checks fail for some reason. Disable
-# LTO for a passing build. This really needs to be looked at.
-%define _lto_cflags %{nil}
-
# note: parametrized macros are order-sensitive (unlike not-parametrized) even with normal macros
# also necessary when passing it as parameter to other macros. If not macro, then it is considered a switch
# see the difference between global and define:
@@ -147,16 +141,16 @@
# Set of architectures which support the serviceability agent
%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm}
# Set of architectures which support class data sharing
-# See https://bugzilla.redhat.com/show_bug.cgi?id=513605
-# MetaspaceShared::generate_vtable_methods is not implemented for the PPC JIT
-%global share_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{arm} s390x
+# As of JDK-8005165 in OpenJDK 10, class sharing is not arch-specific
+# However, it does segfault on the Zero assembler port, so currently JIT only
+%global share_arches %{jit_arches}
# Set of architectures for which we build the Shenandoah garbage collector
%global shenandoah_arches x86_64 %{aarch64}
# Set of architectures for which we build the Z garbage collector
%global zgc_arches x86_64
# Set of architectures for which alt-java has SSB mitigation
%global ssbd_arches x86_64
-# Set of architectures for which java has short vector math library (libsvml.so)
+# Set of architectures for which java has short vector math library (libjsvml.so)
%global svml_arches x86_64
# Set of architectures where we verify backtraces with gdb
# s390x fails on RHEL 7 so we exclude it there
@@ -166,7 +160,7 @@
%global gdb_arches %{jit_arches} %{zero_arches}
%endif
-# By default, we build a debug build during main build on JIT architectures
+# By default, we build a slowdebug build during main build on JIT architectures
%if %{with slowdebug}
%ifarch %{debug_arches}
%global include_debug_build 1
@@ -237,17 +231,24 @@
%global static_libs_target %{nil}
%endif
-# RPM JDK builds keep the debug symbols internal, to be later stripped by RPM
-%global debug_symbols internal
-
-# unlike portables,the rpms have to use static_libs_target very dynamically
-%global bootstrap_targets images legacy-jre-image
-%global release_targets images docs-zip legacy-jre-image
+# The static libraries are produced under the same configuration as the main
+# build for portables, as we expect in-tree libraries to be used throughout.
+# If system libraries are enabled, the static libraries will also use them
+# which may cause issues.
+%global bootstrap_targets images %{static_libs_target} legacy-jre-image
+%global release_targets images docs-zip %{static_libs_target} legacy-jre-image
# No docs nor bootcycle for debug builds
-%global debug_targets images legacy-jre-image
+%global debug_targets images %{static_libs_target} legacy-jre-image
# Target to use to just build HotSpot
%global hotspot_target hotspot
+# DTS toolset to use to provide gcc & binutils
+%global dtsversion 10
+
+# Disable LTO as this causes build failures at the moment.
+# See RHBZ#1861401
+%define _lto_cflags %{nil}
+
# Filter out flags from the optflags macro that cause problems with the OpenJDK build
# We filter out -O flags so that the optimization of HotSpot is not lowered from O3 to O2
# We filter out -Wall which will otherwise cause HotSpot to produce hundreds of thousands of warnings (100+mb logs)
@@ -333,20 +334,20 @@
# New Version-String scheme-style defines
%global featurever 17
%global interimver 0
-%global updatever 8
+%global updatever 9
%global patchver 0
# buildjdkver is usually same as %%{featurever},
# but in time of bootstrap of next jdk, it is featurever-1,
# and this it is better to change it here, on single place
-%global buildjdkver %{featurever}
+%global buildjdkver 17
# We don't add any LTS designator for STS packages (Fedora and EPEL).
# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
%if 0%{?rhel} && !0%{?epel}
%global lts_designator "LTS"
%global lts_designator_zip -%{lts_designator}
%else
- %global lts_designator ""
- %global lts_designator_zip ""
+ %global lts_designator ""
+ %global lts_designator_zip ""
%endif
# JDK to use for bootstrapping
%global bootjdk /usr/lib/jvm/java-%{buildjdkver}-openjdk
@@ -372,26 +373,34 @@
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{name}&…
%else
%if 0%{?rhel}
-%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20…
+%global oj_vendor_bug_url https://access.redhat.com/support/cases/
%else
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi
%endif
%endif
%endif
-%global oj_vendor_version (Red_Hat-%{version}-%{release})
+%global oj_vendor_version (Red_Hat-%{version}-%{rpmrelease})
# Define IcedTea version used for SystemTap tapsets and desktop file
%global icedteaver 6.0.0pre00-c848b93a8598
# Define current Git revision for the FIPS support patches
-%global fipsver bf363eecce3
+%global fipsver 51e1d00be4e
+# Define JDK versions
+%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
+%global javaver %{featurever}
+# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
+%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
+# The tag used to create the OpenJDK tarball
+%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Standard JPackage naming and versioning defines
%global origin openjdk
%global origin_nice OpenJDK
-%global top_level_dir_name %{origin}
+%global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
-%global buildver 7
-%global rpmrelease 1
+%global buildver 9
+%global rpmrelease 2
+#%%global tagsuffix %%{nil}
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -404,14 +413,6 @@
# for techpreview, using 1, so slowdebugs can have 0
%global priority %( printf '%08d' 1 )
%endif
-%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
-%global javaver %{featurever}
-
-# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
-%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
-
-# The tag used to create the OpenJDK tarball
-%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Define milestone (EA for pre-releases, GA for releases)
# Release will be (where N is usually a number starting at 1):
@@ -421,7 +422,7 @@
%if %{is_ga}
%global build_type GA
%global ea_designator ""
-%global ea_designator_zip ""
+%global ea_designator_zip %{nil}
%global extraver %{nil}
%global eaprefix %{nil}
%else
@@ -438,12 +439,10 @@
# images directories from upstream build
%global jdkimage jdk
%global static_libs_image static-libs
-# installation directory for static libraries
-%global static_libs_root lib/static
-%global static_libs_arch_dir %{static_libs_root}/linux-%{archinstall}
-%global static_libs_install_dir %{static_libs_arch_dir}/glibc
# output dir stub
%define buildoutputdir() %{expand:build/jdk%{featurever}.build%{?1}}
+%define installoutputdir() %{expand:install/jdk%{featurever}.install%{?1}}
+%define packageoutputdir() %{expand:packages/jdk%{featurever}.packages%{?1}}
# we can copy the javadoc to not arched dir, or make it not noarch
%define uniquejavadocdir() %{expand:%{fullversion}.%{_arch}%{?1}}
# main id and dir of this jdk
@@ -464,6 +463,10 @@
# Intentionally use jdkportablenameimpl here since we want to have static-libs files overlayed on
# top of the JDK archive
%define staticlibsportablename() %{expand:%{jdkportablenameimpl -- %%{1}}}
+%define docportablename() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable.docs;g" | sed "s;openjdkportable;el;g")
+%define docportablearchive() %{docportablename}.tar.xz
+%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable.misc;g" | sed "s;openjdkportable;el;g")
+%define miscportablearchive() %{miscportablename}.tar.xz
# RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1}
# so we have to pass in "" but evaluate it, otherwise files record will include it
@@ -493,6 +496,12 @@
%global __requires_exclude ^(%{_privatelibs}|%{_publiclibs})$
%endif
+# VM variant being built
+%ifarch %{zero_arches}
+%global vm_variant zero
+%else
+%global vm_variant server
+%endif
%global etcjavasubdir %{_sysconfdir}/java/java-%{javaver}-%{origin}
%define etcjavadir() %{expand:%{etcjavasubdir}/%{uniquesuffix -- %{?1}}}
@@ -515,20 +524,6 @@
%global alternatives_requires %{_sbindir}/alternatives
%endif
-%if %{with_systemtap}
-# Where to install systemtap tapset (links)
-# We would like these to be in a package specific sub-dir,
-# but currently systemtap doesn't support that, so we have to
-# use the root tapset dir for now. To distinguish between 64
-# and 32 bit architectures we place the tapsets under the arch
-# specific dir (note that systemtap will only pickup the tapset
-# for the primary arch for now). Systemtap uses the machine name
-# aka target_cpu as architecture specific directory name.
-%global tapsetroot /usr/share/systemtap
-%global tapsetdirttapset %{tapsetroot}/tapset/
-%global tapsetdir %{tapsetdirttapset}/%{stapinstall}
-%endif
-
# x86 is no longer supported
%if 0%{?java_arches:1}
ExclusiveArch: %{java_arches}
@@ -536,8 +531,8 @@ ExclusiveArch: %{java_arches}
ExcludeArch: %{ix86}
%endif
-# Portables have no rpo (requires/provides), but thsoe are awesome for orientation in spec
-# also scriptlets are hapily missing and files are handled old fashion
+# Portables have no repo (requires/provides), but these are awesome for orientation in spec
+# Also scriptlets are happily missing and files are handled old fashion
# not-duplicated requires/provides/obsoletes for normal/debug packages
%define java_rpo() %{expand:
}
@@ -548,14 +543,18 @@ ExcludeArch: %{ix86}
%define java_static_libs_rpo() %{expand:
}
+%define java_unstripped_rpo() %{expand:
+}
+
+%define java_docs_rpo() %{expand:
+}
+
+%define java_misc_rpo() %{expand:
+}
# Prevent brp-java-repack-jars from being run
%global __jar_repack 0
-# portables have grown out of its component, moving back to java-x-vendor
-# this expression, when declared as global, filled component with java-x-vendor portable
-%define component %(echo %{name} | sed "s;-portable;;g")
-
Name: java-%{javaver}-%{origin}-portable
Version: %{newjavaver}.%{buildver}
Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
@@ -570,6 +569,11 @@ Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
# provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0".
Epoch: 1
+
+# portables have grown out of its component, moving back to java-x-vendor
+# this expression, when declared as global, filled component with java-x-vendor portable
+%define component %(echo %{name} | sed "s;-portable;;g")
+
Summary: %{origin_nice} %{featurever} Runtime Environment portable edition
# Groups are only used up to RHEL 8 and on Fedora versions prior to F30
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
@@ -593,9 +597,8 @@ Group: Development/Languages
License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib and ISC and FTL and RSA
URL: http://openjdk.java.net/
-
# The source tarball, generated using generate_source_tarball.sh
-Source0: openjdk-jdk%{featurever}u-%{vcstag}.tar.xz
+Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}%{ea_desi…
# Use 'icedtea_sync.sh' to update the following
# They are based on code contained in the IcedTea project (6.x).
@@ -614,8 +617,7 @@ Source10: NEWS
Source11: nss.cfg.in
# Removed libraries that we link instead
-# Disabled in portables
-#Source12: remove-intree-libraries.sh
+Source12: remove-intree-libraries.sh
# Ensure we aren't using the limited crypto policy
Source13: TestCryptoLevel.java
@@ -629,37 +631,22 @@ Source15: TestSecurityProperties.java
# Ensure vendor settings are correct
Source16: CheckVendor.java
-# nss fips configuration file
-Source17: nss.fips.cfg.in
-
# Ensure translations are available for new timezones
Source18: TestTranslations.java
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-# boot jdk for portable build root on
-Source1001: ojdk17-aarch64-17.35.tar.gz
-Source1002: ojdk17-ppc64le-17.35.tar.gz
-Source1003: ojdk17-x86_64-17.35.tar.gz
-Source1004: ojdk17-s390x-17.35.tar.gz
-%endif
-
############################################
#
# RPM/distribution specific patches
#
############################################
-# NSS via SunPKCS11 Provider (disabled comment
-# due to memory leak).
-Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
-# RH1750419: enable build of speculative store bypass hardened alt-java (CVE-2018-3639)
-Patch600: rh1750419-redhat_alt_java.patch
-
# Ignore AWTError when assistive technologies are loaded
Patch1: rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
-# Restrict access to java-atk-wrapper classes
-Patch2: rh1648644-java_access_bridge_privileged_security.patch
Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch
+# NSS via SunPKCS11 Provider (disabled due to memory leak).
+Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
+# RH1750419: enable build of speculative store bypass hardened alt-java (CVE-2018-3639)
+Patch600: rh1750419-redhat_alt_java.patch
# Depend on pcsc-lite-libs instead of pcsc-lite-devel as this is only in optional repo
Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
@@ -707,12 +694,27 @@ Patch1001: fips-17u-%{fipsver}.patch
#
#############################################
+# Currently empty
+
+#############################################
+#
+# OpenJDK patches appearing in 17.0.10
+#
+#############################################
+# JDK-8312489, OJ2095: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar
+Patch2000: jdk8312489-max_sig_default_increase.patch
+
#############################################
#
-# OpenJDK patches appearing in 17.0.8
+# Portable build specific patches
+#
+#############################################
+
+#############################################
+#
+# OpenJDK patches targetted for 17.0.6
#
#############################################
-Patch2003: jdk8305995-footprint_regression_from_jdk_8224957
BuildRequires: autoconf
BuildRequires: automake
@@ -722,11 +724,11 @@ BuildRequires: cups-devel
BuildRequires: desktop-file-utils
# elfutils only are OK for build without AOT
BuildRequires: elfutils-devel
+BuildRequires: file
BuildRequires: fontconfig-devel
-BuildRequires: freetype-devel
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-BuildRequires: devtoolset-8-gcc
-BuildRequires: devtoolset-8-gcc-c++
+BuildRequires: devtoolset-%{dtsversion}-gcc
+BuildRequires: devtoolset-%{dtsversion}-gcc-c++
%else
BuildRequires: gcc
# gcc-c++ is already needed
@@ -746,12 +748,11 @@ BuildRequires: libXrandr-devel
BuildRequires: libXrender-devel
BuildRequires: libXt-devel
BuildRequires: libXtst-devel
-# Requirement for setting up nss.cfg and nss.fips.cfg
+# Requirement for setting up nss.cfg
BuildRequires: nss-devel
# Requirement for system security property test
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-BuildRequires: crypto-policies
-%endif
+# N/A for portable. RHEL7 doesn't provide them
+#BuildRequires: crypto-policies
BuildRequires: pkgconfig
BuildRequires: xorg-x11-proto-devel
BuildRequires: zip
@@ -761,16 +762,18 @@ BuildRequires: unzip
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
# No javapackages-filesystem on el7,nor is needed for portables
%else
-BuildRequires: javapackages-filesystem
+# BuildRequires: javapackages-filesystem
BuildRequires: java-%{buildjdkver}-openjdk-devel
%endif
# Zero-assembler build requirement
%ifarch %{zero_arches}
BuildRequires: libffi-devel
%endif
+# Full documentation build requirements
+BuildRequires: graphviz
+BuildRequires: pandoc
# 2023c required as of JDK-8305113
BuildRequires: tzdata-java >= 2023c
-
# cacerts build requirement in portable mode
BuildRequires: ca-certificates
# Earlier versions have a bug in tree vectorization on PPC
@@ -789,18 +792,18 @@ BuildRequires: lcms2-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
%else
-# Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h
-Provides: bundled(freetype) = 2.12.1
+# Version in src/java.desktop/share/legal/freetype.md
+Provides: bundled(freetype) = 2.13.0
# Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
Provides: bundled(giflib) = 5.2.1
# Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
-Provides: bundled(harfbuzz) = 4.4.1
+Provides: bundled(harfbuzz) = 7.2.0
# Version in src/java.desktop/share/native/liblcms/lcms2.h
-Provides: bundled(lcms2) = 2.12.0
+Provides: bundled(lcms2) = 2.15.0
# Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
Provides: bundled(libjpeg) = 6b
# Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h
-Provides: bundled(libpng) = 1.6.37
+Provides: bundled(libpng) = 1.6.39
# We link statically against libstdc++ to increase portability
BuildRequires: libstdc++-static
%endif
@@ -875,7 +878,7 @@ Group: Development/Tools
%{java_devel_rpo -- %{fastdebug_suffix_unquoted}}
%description devel-fastdebug
-The %{origin_nice} %{featurever} development tools - portable edition.
+The %{origin_nice} %{featurever} runtime environment and development tools - portable edition
%{fastdebug_warning}
%endif
@@ -883,7 +886,7 @@ The %{origin_nice} %{featurever} development tools - portable edition.
%if %{include_normal_build}
%package static-libs
-Summary: %{origin_nice} %{featurever} libraries for static linking - portable edition.
+Summary: %{origin_nice} %{featurever} libraries for static linking - portable edition
%{java_static_libs_rpo %{nil}}
@@ -898,7 +901,7 @@ Summary: %{origin_nice} %{featurever} libraries for static linking - portable ed
%{java_static_libs_rpo -- %{debug_suffix_unquoted}}
%description static-libs-slowdebug
-The %{origin_nice} %{featurever} libraries for static linking - portable edition.
+The %{origin_nice} %{featurever} libraries for static linking - portable edition
%{debug_warning}
%endif
@@ -909,13 +912,42 @@ Summary: %{origin_nice} %{featurever} libraries for static linking - portable ed
%{java_static_libs_rpo -- %{fastdebug_suffix_unquoted}}
%description static-libs-fastdebug
-The %{origin_nice} %{featurever} libraries for static linking - portable edition.
+The %{origin_nice} %{featurever} libraries for static linking - portable edition
%{fastdebug_warning}
%endif
# staticlibs
%endif
+%if %{include_normal_build}
+%package unstripped
+Summary: The %{origin_nice} %{featurever} runtime environment.
+
+%{java_unstripped_rpo %{nil}}
+
+%description unstripped
+The %{origin_nice} %{featurever} runtime environment.
+
+%endif
+
+%if %{include_normal_build}
+%package docs
+Summary: %{origin_nice} %{featurever} API documentation
+
+%{java_docs_rpo %{nil}}
+
+%description docs
+The %{origin_nice} %{featurever} API documentation.
+
+%package misc
+Summary: %{origin_nice} %{featurever} miscellany
+
+%{java_misc_rpo %{nil}}
+
+%description misc
+The %{origin_nice} %{featurever} miscellany.
+%endif
+
%package sources
Summary: %{origin_nice} %{featurever} full patched sources of portable JDK
@@ -951,7 +983,6 @@ else
echo "include_fastdebug_build is %{include_fastdebug_build}, that is invalid. Use 1 for yes or 0 for no"
exit 13
fi
-
if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 -a %{include_fastdebug_build} -eq 0 ] ; then
echo "You have disabled all builds (normal,fastdebug,slowdebug). That is a no go."
exit 14
@@ -980,17 +1011,18 @@ sh %{SOURCE12} %{top_level_dir_name}
# Patch the JDK
pushd %{top_level_dir_name}
%patch1 -p1
-%patch2 -p1
%patch3 -p1
%patch6 -p1
# Add crypto policy and FIPS support
%patch1001 -p1
# nss.cfg PKCS11 support; must come last as it also alters java.security
%patch1000 -p1
-%patch2003 -p1
+# JDK-8312489 backport, coming in 17.0.10
+%patch2000 -p1
+# alt-java support
+%patch600 -p1
popd # openjdk
-%patch600
# The OpenJDK version file includes the current
# upstream version information. For some reason,
@@ -1009,37 +1041,12 @@ if [ "x${UPSTREAM_EA_DESIGNATOR}" != "x%{ea_designator}" ] ; then
echo "WARNING: Designator mismatch";
echo "Spec file is configured for a %{build_type} build with designator '%{ea_designator}'"
echo "Upstream version-pre setting is '${UPSTREAM_EA_DESIGNATOR}'";
- exit 17
+ # Temporarily commented out as local copy of jdk-17.0.8+7 has the wrong setting
+ # This is fixed in the final upstream version
+ # exit 17
fi
-# Extract systemtap tapsets
-%if %{with_systemtap}
-tar --strip-components=1 -x -I xz -f %{SOURCE8}
-%if %{include_debug_build}
-cp -r tapset tapset%{debug_suffix}
-%endif
-%if %{include_fastdebug_build}
-cp -r tapset tapset%{fastdebug_suffix}
-%endif
-
-for suffix in %{build_loop} ; do
- for file in "tapset"$suffix/*.in; do
- OUTPUT_FILE=`echo $file | sed -e "s:\.stp\.in$:-%{version}-%{release}.%{_arch}.stp:g"`
- sed -e "s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/server/libjvm.so:g" $file > $file.1
- sed -e "s:@JAVA_SPEC_VER@:%{javaver}:g" $file.1 > $file.2
-# TODO find out which architectures other than i686 have a client vm
-%ifarch %{ix86}
- sed -e "s:@ABS_CLIENT_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/client/libjvm.so:g" $file.2 > $OUTPUT_FILE
-%else
- sed -e "/@ABS_CLIENT_LIBJVM_SO@/d" $file.2 > $OUTPUT_FILE
-%endif
- sed -i -e "s:@ABS_JAVA_HOME_DIR@:%{_jvmdir}/%{sdkdir -- $suffix}:g" $OUTPUT_FILE
- sed -i -e "s:@INSTALL_ARCH_DIR@:%{archinstall}:g" $OUTPUT_FILE
- sed -i -e "s:@prefix@:%{_jvmdir}/%{sdkdir -- $suffix}/:g" $OUTPUT_FILE
- done
-done
-# systemtap tapsets ends
-%endif
+# Systemtap is processed in rpms
# Prepare desktop files
# Portables do not have desktop integration
@@ -1047,30 +1054,7 @@ done
# Setup nss.cfg
sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE11} > nss.cfg
-# Setup nss.fips.cfg
-sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE17} > nss.fips.cfg
-
%build
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-mkdir bootjdk
-pushd bootjdk
-%ifarch %{aarch64}
-tar --strip-components=1 -xf %{SOURCE1001}
-%endif
-%ifarch %{ppc64le}
-tar --strip-components=1 -xf %{SOURCE1002}
-%endif
-%ifarch x86_64
-tar --strip-components=1 -xf %{SOURCE1003}
-%endif
-%ifarch s390x
-tar --strip-components=1 -xf %{SOURCE1004}
-%endif
-BOOT_JDK=$PWD
-popd
-%else
-BOOT_JDK=%{bootjdk}
-%endif
# How many CPU's do we have?
export NUM_PROC=%(/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :)
@@ -1104,12 +1088,15 @@ EXTRA_CPP_FLAGS="$(echo ${EXTRA_CPP_FLAGS} | sed -e 's|-mstackrealign|-mincoming
%endif
export EXTRA_CFLAGS EXTRA_CPP_FLAGS
+echo "Building %{newjavaver}-%{buildver}, pre=%{ea_designator}, opt=%{lts_designator}"
+
function buildjdk() {
local outputdir=${1}
local buildjdk=${2}
local maketargets="${3}"
local debuglevel=${4}
local link_opt=${5}
+ local debug_symbols=${6}
local top_dir_abs_src_path=$(pwd)/%{top_level_dir_name}
local top_dir_abs_build_path=$(pwd)/${outputdir}
@@ -1128,6 +1115,7 @@ function buildjdk() {
echo "Using make targets: ${maketargets}"
echo "Using debuglevel: ${debuglevel}"
echo "Using link_opt: ${link_opt}"
+ echo "Using debug_symbols: ${debug_symbols}"
echo "Building %{newjavaver}-%{buildver}, pre=%{ea_designator}, opt=%{lts_designator}"
mkdir -p ${outputdir}
@@ -1138,7 +1126,7 @@ function buildjdk() {
# are always used in a system_libs build, even
# for the static library build
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
- scl enable devtoolset-8 -- bash ${top_dir_abs_src_path}/configure \
+ scl enable devtoolset-%{dtsversion} -- bash ${top_dir_abs_src_path}/configure \
%else
bash ${top_dir_abs_src_path}/configure \
%endif
@@ -1150,7 +1138,7 @@ function buildjdk() {
%endif
--with-version-build=%{buildver} \
--with-version-pre="%{ea_designator}" \
- --with-version-opt=%{lts_designator} \
+ --with-version-opt="%{lts_designator}" \
--with-vendor-version-string="%{oj_vendor_version}" \
--with-vendor-name="%{oj_vendor}" \
--with-vendor-url="%{oj_vendor_url}" \
@@ -1158,7 +1146,7 @@ function buildjdk() {
--with-vendor-vm-bug-url="%{oj_vendor_bug_url}" \
--with-boot-jdk=${buildjdk} \
--with-debug-level=${debuglevel} \
- --with-native-debug-symbols="%{debug_symbols}" \
+ --with-native-debug-symbols="${debug_symbols}" \
--disable-sysconf-nss \
--enable-unlimited-crypto \
--with-zlib=%{link_type} \
@@ -1182,7 +1170,7 @@ function buildjdk() {
cat spec.gmk
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
- scl enable devtoolset-8 -- make \
+ scl enable devtoolset-%{dtsversion} -- make \
%else
make \
%endif
@@ -1190,311 +1178,325 @@ function buildjdk() {
WARNINGS_ARE_ERRORS="-Wno-error" \
CFLAGS_WARNINGS_ARE_ERRORS="-Wno-error" \
$maketargets || ( pwd; find ${top_dir_abs_src_path} ${top_dir_abs_build_path} -name "hs_err_pid*.log" | xargs cat && false )
-
popd
}
-function installjdk() {
- local imagepath=${1}
-
- if [ -d ${imagepath} ] ; then
- # the build (erroneously) removes read permissions from some jars
- # this is a regression in OpenJDK 7 (our compiler):
- # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
- find ${imagepath} -iname '*.jar' -exec chmod ugo+r {} \;
-
- # Build screws up permissions on binaries
- # https://bugs.openjdk.java.net/browse/JDK-8173610
- find ${imagepath} -iname '*.so' -exec chmod +x {} \;
- find ${imagepath}/bin/ -exec chmod +x {} \;
+function stripjdk() {
+ local outputdir=${1}
+ local jdkimagepath=${outputdir}/images/%{jdkimage}
+ local jreimagepath=${outputdir}/images/%{jreimage}
+ local jmodimagepath=${outputdir}/images/jmods
+ local supportdir=${outputdir}/support
+
+ if [ "x$suffix" = "x" ] ; then
+ # Keep the unstripped version for consumption by RHEL RPMs
+ cp -a ${jdkimagepath}{,.unstripped}
+
+ # Strip the files
+ for file in $(find ${jdkimagepath} ${jreimagepath} ${supportdir} -type f) ; do
+ if file ${file} | grep -q 'ELF'; then
+ noextfile=${file/.so/};
+ objcopy --only-keep-debug ${file} ${noextfile}.debuginfo;
+ objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file};
+ strip -g ${file};
+ fi
+ done
- # Install nss.cfg right away as we will be using the JRE above
- install -m 644 nss.cfg ${imagepath}/conf/security/
+ # Rebuild jmod files against the stripped binaries
+ if [ ! -d ${supportdir} ] ; then
+ echo "Support directory missing.";
+ exit 15
+ fi
+ for cmd in $(find ${supportdir} -name '*.jmod_exec.cmdline') ; do
+ pre=${cmd/_exec/_pre};
+ post=${cmd/_exec/_post};
+ jmod=$(echo ${cmd}|sed 's#.*_create_##'|sed 's#_exec.cmdline##')
+ echo "Rebuilding ${jmod} against stripped binaries...";
+ if [ -e ${pre} ] ; then
+ echo "Executing ${pre}...";
+ cat ${pre} | sh -s ;
+ fi
+ echo "Executing ${cmd}...";
+ cat ${cmd} | sh -s ;
+ if [ -e ${post} ] ; then
+ echo "Executing ${post}...";
+ cat ${post} | sh -s ;
+ fi
+ done
+ rm -rf ${jdkimagepath}/jmods
+ cp -a ${jmodimagepath} ${jdkimagepath}
+ fi
+}
- # Install nss.fips.cfg: NSS configuration for global FIPS mode (crypto-policies)
- install -m 644 nss.fips.cfg ${imagepath}/conf/security/
+function installjdk() {
+ local outputdir=${1}
+ local installdir=${2}
+ local jdkimagepath=${installdir}/images/%{jdkimage}
+ local jreimagepath=${installdir}/images/%{jreimage}
+ local unstripped=${jdkimagepath}.unstripped
+
+ echo "Installing build from ${outputdir} to ${installdir}..."
+ mkdir -p ${installdir}
+ echo "Installing images..."
+ mv ${outputdir}/images ${installdir}
+ if [ -d ${outputdir}/bundles ] ; then
+ echo "Installing bundles...";
+ mv ${outputdir}/bundles ${installdir} ;
+ fi
- # Create fake alt-java as a placeholder for future alt-java
- if [ -d man/man1 ] ; then
- pushd ${imagepath}
+%if !%{with artifacts}
+ echo "Removing output directory...";
+ rm -rf ${outputdir}
+%endif
+
+ # legacy-jre-image target does not install any man pages for the JRE
+ # We copy the jdk man directory and then remove pages for binaries that
+ # don't exist in the JRE
+ cp -a ${jdkimagepath}/man ${jreimagepath}
+ for manpage in $(find ${jreimagepath}/man -name '*.1'); do
+ filename=$(basename ${manpage});
+ binary=${filename/.1/};
+ if [ ! -f ${jreimagepath}/bin/${binary} ] ; then
+ echo "Removing ${manpage} from JRE for which no binary ${binary} exists";
+ rm -f ${manpage};
+ fi;
+ done
+
+ for imagepath in ${jdkimagepath} ${jreimagepath} ${unstripped}; do
+
+ if [ -d ${imagepath} ] ; then
+ # the build (erroneously) removes read permissions from some jars
+ # this is a regression in OpenJDK 7 (our compiler):
+ # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
+ find ${imagepath} -iname '*.jar' -exec chmod ugo+r {} \;
+
+ # Build screws up permissions on binaries
+ # https://bugs.openjdk.java.net/browse/JDK-8173610
+ find ${imagepath} -iname '*.so' -exec chmod +x {} \;
+ find ${imagepath}/bin/ -exec chmod +x {} \;
+
+ # Install local files which are distributed with the JDK
+ install -m 644 %{SOURCE10} ${imagepath}
+ install -m 644 nss.cfg ${imagepath}/conf/security/
+
+ # Create fake alt-java as a placeholder for future alt-java
+ pushd ${imagepath}
# add alt-java man page
echo "Hardened java binary recommended for launching untrusted code from the Web e.g. javaws" > man/man1/%{alt_java_name}.1
cat man/man1/java.1 >> man/man1/%{alt_java_name}.1
- popd
- fi
- fi
+ popd
+
+ # Print release information
+ cat ${imagepath}/release
+ fi
+ done
}
-# Checks on debuginfo must be performed before the files are stripped
-# by the RPM installation stage
-function debugcheckjdk() {
- local imagepath=${1}
-
- if [ -d ${imagepath} ] ; then
-
- so_suffix="so"
- # Check debug symbols are present and can identify code
- find "${imagepath}" -iname "*.$so_suffix" -print0 | while read -d $'\0' lib
- do
- if [ -f "$lib" ] ; then
- echo "Testing $lib for debug symbols"
- # All these tests rely on RPM failing the build if the exit code of any set
- # of piped commands is non-zero.
-
- # Test for .debug_* sections in the shared object. This is the main test
- # Stripped objects will not contain these
- eu-readelf -S "$lib" | grep "] .debug_"
- test $(eu-readelf -S "$lib" | grep -E "\]\ .debug_(info|abbrev)" | wc --lines) == 2
-
- # Test FILE symbols. These will most likely be removed by anything that
- # manipulates symbol tables because it's generally useless. So a nice test
- # that nothing has messed with symbols
- old_IFS="$IFS"
- IFS=$'\n'
- for line in $(eu-readelf -s "$lib" | grep "00000000 0 FILE LOCAL DEFAULT")
- do
- # We expect to see .cpp and .S files, except for architectures like aarch64 and
- # s390 where we expect .o and .oS files
- echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|S|oS))?$"
- done
- IFS="$old_IFS"
-
- # If this is the JVM, look for javaCalls.(cpp|o) in FILEs, for extra sanity checking
- if [ "`basename $lib`" = "libjvm.so" ]; then
- eu-readelf -s "$lib" | \
- grep -E "00000000 0 FILE LOCAL DEFAULT ABS javaCalls.(cpp|o)$"
- fi
-
- # Test that there are no .gnu_debuglink sections pointing to another
- # debuginfo file. There shouldn't be any debuginfo files, so the link makes
- # no sense either
- eu-readelf -S "$lib" | grep 'gnu'
- if eu-readelf -S "$lib" | grep "\] .gnu_debuglink" | grep PROGBITS; then
- echo "bad .gnu_debuglink section."
- eu-readelf -x .gnu_debuglink "$lib"
- false
- fi
- fi
+function genchecksum() {
+ local checkedfile=${1}
+
+ checkdir=$(dirname ${1})
+ checkfile=$(basename ${1})
+
+ echo "Generating checksum for ${checkfile} in ${checkdir}..."
+ pushd ${checkdir}
+ sha256sum ${checkfile} > ${checkfile}.sha256sum
+ sha256sum --check ${checkfile}.sha256sum
+ popd
+}
+
+function packFullPatchedSources() {
+ srcpackagesdir=`pwd`
+ tar -cJf ${srcpackagesdir}/%{jdkportablesourcesarchive -- ""} --transform "s|^|%{jdkportablesourcesname -- ""}/|" %{top_level_dir_name} nss*
+ genchecksum ${srcpackagesdir}/%{jdkportablesourcesarchive -- ""}
+}
+
+function packagejdk() {
+ local imagesdir=$(pwd)/${1}/images
+ local docdir=$(pwd)/${1}/images/docs
+ local bundledir=$(pwd)/${1}/bundles
+ local packagesdir=$(pwd)/${2}
+ local srcdir=$(pwd)/%{top_level_dir_name}
+ local tapsetdir=$(pwd)/tapset
+
+ echo "Packaging build from ${imagesdir} to ${packagesdir}..."
+ mkdir -p ${packagesdir}
+ pushd ${imagesdir}
+
+ if [ "x$suffix" = "x" ] ; then
+ nameSuffix=""
+ else
+ nameSuffix=`echo "$suffix"| sed s/-/./`
+ fi
+
+ jdkname=%{jdkportablename -- "$nameSuffix"}
+ jdkarchive=${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
+ jrename=%{jreportablename -- "$nameSuffix"}
+ jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
+ staticname=%{staticlibsportablename -- "$nameSuffix"}
+ staticarchive=${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
+ debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
+ unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
+ if [ "x$suffix" = "x" ] ; then
+ docname=%{docportablename}
+ docarchive=${packagesdir}/%{docportablearchive}
+ built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
+ fi
+ # These are from the source tree so no debug variants
+ miscname=%{miscportablename}
+ miscarchive=${packagesdir}/%{miscportablearchive}
+
+ if [ "x$suffix" = "x" ] ; then
+ # Keep the unstripped version for consumption by RHEL RPMs
+ mv %{jdkimage}.unstripped ${jdkname}
+ tar -cJf ${unstrippedarchive} ${jdkname}
+ genchecksum ${unstrippedarchive}
+ mv ${jdkname} %{jdkimage}.unstripped
+ fi
+
+ # Rename directories for packaging
+ mv %{jdkimage} ${jdkname}
+ mv %{jreimage} ${jrename}
+
+ # Release images have external debug symbols
+ if [ "x$suffix" = "x" ] ; then
+ tar -cJf ${debugarchive} $(find ${jdkname} -name \*.debuginfo)
+ genchecksum ${debugarchive}
+
+ mkdir ${docname}
+ mv ${docdir} ${docname}
+ mv ${bundledir}/${built_doc_archive} ${docname}
+ tar -cJf ${docarchive} ${docname}
+ genchecksum ${docarchive}
+
+ mkdir ${miscname}
+ for s in 16 24 32 48 ; do
+ cp -av ${srcdir}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png ${miscname}
done
+ cp -a ${srcdir}/src/sample ${miscname}
+%if %{with_systemtap}
+ cp -a ${tapsetdir}* ${miscname}
+%endif
+ tar -cJf ${miscarchive} ${miscname}
+ genchecksum ${miscarchive}
+ fi
- # Make sure gdb can do a backtrace based on line numbers on libjvm.so
- # javaCalls.cpp:58 should map to:
- # http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/…
- # Using line number 1 might cause build problems. See:
- # https://bugzilla.redhat.com/show_bug.cgi?id=1539664
- # https://bugzilla.redhat.com/show_bug.cgi?id=1538767
- gdb -q "${imagepath}/bin/java" <<EOF | tee gdb.out
-handle SIGSEGV pass nostop noprint
-handle SIGILL pass nostop noprint
-set breakpoint pending on
-break javaCalls.cpp:58
-commands 1
-backtrace
-quit
-end
-run -version
-EOF
-%ifarch %{gdb_arches}
- grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
+ tar -cJf ${jdkarchive} --exclude='**.debuginfo' ${jdkname}
+ genchecksum ${jdkarchive}
+
+ tar -cJf ${jrearchive} --exclude='**.debuginfo' ${jrename}
+ genchecksum ${jrearchive}
+
+%if %{include_staticlibs}
+ # Static libraries (needed for building graal vm with native image)
+ # Tar as overlay. Transform to the JDK name, since we just want to "add"
+ # static libraries to that folder
+ tar -cJf ${staticarchive} \
+ --transform "s|^%{static_libs_image}/lib/*|${staticname}/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib"
+ genchecksum ${staticarchive}
%endif
- fi
+ # Revert directory renaming so testing will run
+ # TODO: testing should run on the packaged JDK
+ mv ${jdkname} %{jdkimage}
+ mv ${jrename} %{jreimage}
+
+ popd #images
+
}
-pwd
-ls -l
-tar -cJf ../%{jdkportablesourcesarchive -- ""} --transform "s|^|%{jdkportablesourcesname -- ""}/|" openjdk nss*
-sha256sum ../%{jdkportablesourcesarchive -- ""} > ../%{jdkportablesourcesarchive -- ""}.sha256sum
+packFullPatchedSources
%if %{build_hotspot_first}
# Build a fresh libjvm.so first and use it to bootstrap
cp -LR --preserve=mode,timestamps %{bootjdk} newboot
systemjdk=$(pwd)/newboot
- buildjdk build/newboot ${systemjdk} %{hotspot_target} "release" "bundled"
- mv build/newboot/jdk/lib/server/libjvm.so newboot/lib/server
+ buildjdk build/newboot ${systemjdk} %{hotspot_target} "release" "bundled" "internal"
+ mv build/newboot/jdk/lib/%{vm_variant}/libjvm.so newboot/lib/%{vm_variant}
%else
systemjdk=%{bootjdk}
%endif
for suffix in %{build_loop} ; do
+
if [ "x$suffix" = "x" ] ; then
debugbuild=release
else
# change --something to something
debugbuild=`echo $suffix | sed "s/-//g"`
fi
- for loop in %{main_suffix} %{staticlibs_loop} ; do
- builddir=%{buildoutputdir -- ${suffix}${loop}}
- bootbuilddir=boot${builddir}
- if test "x${loop}" = "x%{main_suffix}" ; then
- link_opt="%{link_type}"
-%if %{system_libs}
- # Copy the source tree so we can remove all in-tree libraries
- cp -a %{top_level_dir_name} %{top_level_dir_name_backup}
- # Remove all libraries that are linked
- sh %{SOURCE12} %{top_level_dir_name} full
-%endif
- # Debug builds don't need same targets as release for
- # build speed-up. We also avoid bootstrapping these
- # slower builds.
- if echo $debugbuild | grep -q "debug" ; then
- maketargets="%{debug_targets}"
- run_bootstrap=false
- else
- maketargets="%{release_targets}"
- run_bootstrap=%{bootstrap_build}
- fi
- if ${run_bootstrap} ; then
- buildjdk ${bootbuilddir} ${systemjdk} "%{bootstrap_targets}" ${debugbuild} ${link_opt}
- buildjdk ${builddir} $(pwd)/${bootbuilddir}/images/%{jdkimage} "${maketargets}" ${debugbuild} ${link_opt}
- rm -rf ${bootbuilddir}
- else
- buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt}
- fi
+ # We build with internal debug symbols and do
+ # our own stripping for one version of the
+ # release build
+ debug_symbols=internal
+
+ builddir=%{buildoutputdir -- ${suffix}}
+ bootbuilddir=boot${builddir}
+ installdir=%{installoutputdir -- ${suffix}}
+ bootinstalldir=boot${installdir}
+ packagesdir=%{packageoutputdir -- ${suffix}}
+
+ link_opt="%{link_type}"
%if %{system_libs}
- # Restore original source tree we modified by removing full in-tree sources
- rm -rf %{top_level_dir_name}
- mv %{top_level_dir_name_backup} %{top_level_dir_name}
-%endif
- else
- # Use bundled libraries for building statically
- link_opt="bundled"
- # Static library cycle only builds the static libraries
- maketargets="%{static_libs_target}"
- # Always just do the one build for the static libraries
- buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt}
- fi
-
- done # end of main / staticlibs loop
-
- # Final setup on the main image
- top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
- for image in %{jdkimage} %{jreimage} ; do
- imagePath=${top_dir_abs_main_build_path}/images/${image}
- installjdk ${imagePath}
- done
- # Check debug symbols were built into the dynamic libraries; todo, why it passes in JDK only?
- debugcheckjdk ${top_dir_abs_main_build_path}/images/%{jdkimage}
-
- # Print release information
- cat ${top_dir_abs_main_build_path}/images/%{jdkimage}/release
+ # Copy the source tree so we can remove all in-tree libraries
+ cp -a %{top_level_dir_name} %{top_level_dir_name_backup}
+ # Remove all libraries that are linked
+ sh %{SOURCE12} %{top_level_dir_name} full
+%endif
+ # Debug builds don't need same targets as release for
+ # build speed-up. We also avoid bootstrapping these
+ # slower builds.
+ if echo $debugbuild | grep -q "debug" ; then
+ maketargets="%{debug_targets}"
+ run_bootstrap=false
+ else
+ maketargets="%{release_targets}"
+ run_bootstrap=%{bootstrap_build}
+ fi
+ if ${run_bootstrap} ; then
+ buildjdk ${bootbuilddir} ${systemjdk} "%{bootstrap_targets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ installjdk ${bootbuilddir} ${bootinstalldir}
+ buildjdk ${builddir} $(pwd)/${bootinstalldir}/images/%{jdkimage} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ stripjdk ${builddir}
+ installjdk ${builddir} ${installdir}
+ %{!?with_artifacts:rm -rf ${bootinstalldir}}
+ else
+ buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ stripjdk ${builddir}
+ installjdk ${builddir} ${installdir}
+ fi
+ packagejdk ${installdir} ${packagesdir}
-################################################################################
- pushd ${top_dir_abs_main_build_path}/images
- if [ "x$suffix" == "x" ] ; then
- nameSuffix=""
- else
- nameSuffix=`echo "$suffix"| sed s/-/./`
- fi
- # additional steps needed for fluent repack; most of them done twice, as images are already populated
- # maybe most of them should be done in upstream build?
- for imagedir in %{jdkimage} %{jreimage} ; do
- pushd $imagedir
- # Convert man pages to UTF8 encoding
- if [ -d man/man1 ] ; then # jre do not have man pages...
- for manpage in man/man1/* ; do
- iconv -f ISO_8859-1 -t UTF8 $manpage -o $manpage.tmp
- mv -f $manpage.tmp $manpage
- done
- fi
- # Install release notes
- cp -a %{SOURCE10} `pwd`
- cp -a %{SOURCE10} `pwd`/legal
- # stabilize permissions; aprtially duplicated in instalojdk
- find `pwd` -name "*.so" -exec chmod 755 {} \; -exec echo "set 755 to so {}" \; ;
- find `pwd` -type d -exec chmod 755 {} \; -exec echo "set 755 to dir {}" \; ;
- find `pwd`/legal -type f -exec chmod 644 {} \; -exec echo "set 644 to licences {}" \; ;
- popd # jdkimage/jreimage
- done # jre/sdk work in loop
- # javadoc is done only for release sdkimage
- if ! echo $suffix | grep -q "debug" ; then
- # Install Javadoc documentation
- #cp -a docs %{jdkimage} # not sure if the plaintext javadoc is for some use
- built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
- cp -a `pwd`/../bundles/${built_doc_archive} `pwd`/%{jdkimage}/javadocs.zip || ls -l `pwd`/../bundles
- fi
- # end of additional steps
-
- mv %{jdkimage} %{jdkportablename -- "$nameSuffix"}
- mv %{jreimage} %{jreportablename -- "$nameSuffix"}
- tar -cJf ../../../../%{jdkportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jdkportablename -- "$nameSuffix"}
- sha256sum ../../../../%{jdkportablearchive -- "$nameSuffix"} > ../../../../%{jdkportablearchive -- "$nameSuffix"}.sha256sum
- tar -cJf ../../../../%{jreportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jreportablename -- "$nameSuffix"}
- sha256sum ../../../../%{jreportablearchive -- "$nameSuffix"} > ../../../../%{jreportablearchive -- "$nameSuffix"}.sha256sum
- # copy licenses so they are avialable out of tarball
- cp -rf %{jdkportablename -- "$nameSuffix"}/legal ../../../../%{jdkportablearchive -- "%{normal_suffix}"}-legal
- mv %{jdkportablename -- "$nameSuffix"} %{jdkimage}
- mv %{jreportablename -- "$nameSuffix"} %{jreimage}
- popd #images
-%if %{include_staticlibs}
- top_dir_abs_staticlibs_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{staticlibs_suffix}}
- pushd ${top_dir_abs_staticlibs_build_path}/images
- # Static libraries (needed for building graal vm with native image)
- # Tar as overlay. Transform to the JDK name, since we just want to "add"
- # static libraries to that folder
- portableJDKname=%{staticlibsportablename -- "$nameSuffix"}
- tar -cJf ../../../../%{staticlibsportablearchive -- "$nameSuffix"} --transform "s|^%{static_libs_image}/lib/*|$portableJDKname/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib"
- sha256sum ../../../../%{staticlibsportablearchive -- "$nameSuffix"} > ../../../../%{staticlibsportablearchive -- "$nameSuffix"}.sha256sum
- popd #staticlibs-images
+%if %{system_libs}
+ # Restore original source tree we modified by removing full in-tree sources
+ rm -rf %{top_level_dir_name}
+ mv %{top_level_dir_name_backup} %{top_level_dir_name}
%endif
-################################################################################
-# note, currently no debuginfo, consult portbale spec for external (zipped) debuginfo, being tarred alone
-################################################################################
# build cycles
done # end of release / debug cycle loop
-%install
-mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
-mv ../%{jdkportablesourcesarchive -- ""} $RPM_BUILD_ROOT%{_jvmdir}/
-mv ../%{jdkportablesourcesarchive -- ""}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+%check
+# We test debug first as it will give better diagnostics on a crash
for suffix in %{build_loop} ; do
-top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
-################################################################################
- if [ "x$suffix" == "x" ] ; then
- nameSuffix=""
- else
- nameSuffix=`echo "$suffix"| sed s/-/./`
- fi
- mv ../%{jdkportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{jdkportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{jreportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{jreportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+# portable builds have static_libs embedded, thus top_dir_abs_main_build_path is same as top_dir_abs_staticlibs_build_path
+top_dir_abs_main_build_path=$(pwd)/%{installoutputdir -- ${suffix}}
%if %{include_staticlibs}
- mv ../%{staticlibsportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{staticlibsportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
-%endif
- if [ "x$suffix" == "x" ] ; then
- dnameSuffix="$nameSuffix".debuginfo
-# todo handle debuginfo, see note at build (we will need to pack one stripped and one unstripped release build)
-# mv ../%{jdkportablearchive -- "$dnameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
-# mv ../%{jdkportablearchive -- "$dnameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
- fi
-################################################################################
-# end, dual install
-done
-################################################################################
-# the licenses are packed onloy once and shared
-mkdir -p $RPM_BUILD_ROOT%{unpacked_licenses}
-mv ../%{jdkportablearchive -- "%{normal_suffix}"}-legal $RPM_BUILD_ROOT%{unpacked_licenses}/%{jdkportablesourcesarchive -- "%{normal_suffix}"}
-# To show sha in the build log
-for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do ls -l $file ; cat $file ; done
-################################################################################
+top_dir_abs_staticlibs_build_path=${top_dir_abs_main_build_path}
+%endif
-%check
+export JAVA_HOME=${top_dir_abs_main_build_path}/images/%{jdkimage}
-# We test debug first as it will give better diagnostics on a crash
-for suffix in %{build_loop} ; do
+# Pre-test setup
-# Tests in the check stage are performed on the installed image
-# rpmbuild operates as follows: build -> install -> test
-# however in portbales, we test built image instead of installed one
-top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
-export JAVA_HOME=${top_dir_abs_main_build_path}/images/%{jdkimage}
+# System security properties are disabled by default on portable.
+# Turn on system security properties
+#sed -i -e "s:^security.useSystemPropertiesFile=.*:security.useSystemPropertiesFile=true:" \
+#${JAVA_HOME}/conf/security/java.security
-#check Shenandoah is enabled
+# Check Shenandoah is enabled
%if %{use_shenandoah_hotspot}
$JAVA_HOME/bin/java -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -version
%endif
@@ -1507,14 +1509,19 @@ $JAVA_HOME/bin/java --add-opens java.base/javax.crypto=ALL-UNNAMED TestCryptoLev
$JAVA_HOME/bin/javac -d . %{SOURCE14}
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||")
-# Check system crypto (policy) is deactive and can not be enabled
+# Check system crypto (policy) is active and can be disabled
# Test takes a single argument - true or false - to state whether system
# security properties are enabled or not.
$JAVA_HOME/bin/javac -d . %{SOURCE15}
export PROG=$(echo $(basename %{SOURCE15})|sed "s|\.java||")
export SEC_DEBUG="-Djava.security.debug=properties"
+# Specific to portable:System security properties to be off by default
$JAVA_HOME/bin/java ${SEC_DEBUG} ${PROG} false
-$JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=false ${PROG} false
+$JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=true ${PROG} false
+
+# Check correct vendor values have been set
+$JAVA_HOME/bin/javac -d . %{SOURCE16}
+$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
# Check java launcher has no SSB mitigation
if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
@@ -1526,14 +1533,10 @@ nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation
if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi
%endif
-# Check correct vendor values have been set
-$JAVA_HOME/bin/javac -d . %{SOURCE16}
-$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
-
%if ! 0%{?flatpak}
# Check translations are available for new timezones (during flatpak builds, the
# tzdb.dat used by this test is not where the test expects it, so this is
-# disabled for flatpak builds)
+# disabled for flatpak builds)
$JAVA_HOME/bin/javac -d . %{SOURCE18}
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE
$JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR
@@ -1541,9 +1544,83 @@ $JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|
%if %{include_staticlibs}
# Check debug symbols in static libraries (smoke test)
-export STATIC_LIBS_HOME=${top_dir_abs_main_build_path}/../../%{buildoutputdir -- ${suffix}%{staticlibs_suffix}}/images/static-libs/lib/
-readelf --debug-dump $STATIC_LIBS_HOME/libfdlibm.a | grep w_remainder.c
-readelf --debug-dump $STATIC_LIBS_HOME/libfdlibm.a | grep e_remainder.c
+export STATIC_LIBS_HOME=${top_dir_abs_staticlibs_build_path}/images/%{static_libs_image}
+ls -l $STATIC_LIBS_HOME
+ls -l $STATIC_LIBS_HOME/lib
+# they are here, but grep do not find the remainders
+#readelf --debug-dump $STATIC_LIBS_HOME/lib/libfdlibm.a | grep w_remainder.c
+#readelf --debug-dump $STATIC_LIBS_HOME/lib/libfdlibm.a | grep e_remainder.c
+%endif
+
+# Release builds strip the debug symbols into external .debuginfo files
+if [ "x$suffix" = "x" ] ; then
+ so_suffix="debuginfo"
+else
+ so_suffix="so"
+fi
+# Check debug symbols are present and can identify code
+find "$JAVA_HOME" -iname "*.$so_suffix" -print0 | while read -d $'\0' lib
+do
+ if [ -f "$lib" ] ; then
+ echo "Testing $lib for debug symbols"
+ # All these tests rely on RPM failing the build if the exit code of any set
+ # of piped commands is non-zero.
+
+ # Test for .debug_* sections in the shared object. This is the main test
+ # Stripped objects will not contain these
+ eu-readelf -S "$lib" | grep "] .debug_"
+ test $(eu-readelf -S "$lib" | grep -E "\]\ .debug_(info|abbrev)" | wc --lines) == 2
+
+ # Test FILE symbols. These will most likely be removed by anything that
+ # manipulates symbol tables because it's generally useless. So a nice test
+ # that nothing has messed with symbols
+ old_IFS="$IFS"
+ IFS=$'\n'
+ for line in $(eu-readelf -s "$lib" | grep "00000000 0 FILE LOCAL DEFAULT")
+ do
+ # We expect to see .cpp and .S files, except for architectures like aarch64 and
+ # s390 where we expect .o and .oS files
+ echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|S|oS))?$"
+ done
+ IFS="$old_IFS"
+
+ # If this is the JVM, look for javaCalls.(cpp|o) in FILEs, for extra sanity checking
+ if [ "`basename $lib`" = "libjvm.so" ]; then
+ eu-readelf -s "$lib" | \
+ grep -E "00000000 0 FILE LOCAL DEFAULT ABS javaCalls.(cpp|o)$"
+ fi
+
+ # Test that there are no .gnu_debuglink sections pointing to another
+ # debuginfo file. There shouldn't be any debuginfo files, so the link makes
+ # no sense either
+ eu-readelf -S "$lib" | grep 'gnu'
+ if eu-readelf -S "$lib" | grep '] .gnu_debuglink' | grep PROGBITS; then
+ echo "bad .gnu_debuglink section."
+ eu-readelf -x .gnu_debuglink "$lib"
+ false
+ fi
+ fi
+done
+
+# Make sure gdb can do a backtrace based on line numbers on libjvm.so
+# javaCalls.cpp:58 should map to:
+# http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/…
+# Using line number 1 might cause build problems. See:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1539664
+# https://bugzilla.redhat.com/show_bug.cgi?id=1538767
+gdb -q "$JAVA_HOME/bin/java" <<EOF | tee gdb.out
+handle SIGSEGV pass nostop noprint
+handle SIGILL pass nostop noprint
+set breakpoint pending on
+break javaCalls.cpp:58
+commands 1
+backtrace
+quit
+end
+run -version
+EOF
+%ifarch %{gdb_arches}
+grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
%endif
# Check src.zip has all sources. See RHBZ#1130490
@@ -1562,12 +1639,70 @@ $JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LocalVariableTable
# build cycles check
done
+%install
+
+ mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
+ mv %{jdkportablesourcesarchive -- ""} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv %{jdkportablesourcesarchive -- ""}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+
+for suffix in %{build_loop} ; do
+
+ packagesdir=%{packageoutputdir -- ${suffix}}
+
+ if [ "x$suffix" == "x" ] ; then
+ nameSuffix=""
+ else
+ nameSuffix=`echo "$suffix"| sed s/-/./`
+ fi
+
+ # These definitions should match those in installjdk
+ jdkarchive=${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
+ jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
+ staticarchive=${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
+ debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
+ unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
+
+ mv ${jdkarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jdkarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jrearchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jrearchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+
+%if %{include_staticlibs}
+ mv ${staticarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${staticarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+%endif
+
+ if [ "x$suffix" = "x" ] ; then
+ mv ${debugarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${debugarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${unstrippedarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${unstrippedarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ fi
+done
+
+ if [ "x$suffix" = "x" ] ; then
+ # These definitions should match those in installjdk
+ # Install outside the loop as there are no debug variants
+ docarchive=${packagesdir}/%{docportablearchive}
+ miscarchive=${packagesdir}/%{miscportablearchive}
+ mv ${docarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${docarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${miscarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${miscarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ fi
+
+# To show sha in the build log
+for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do
+ ls -l $file ;
+ cat $file ;
+done
+
%if %{include_normal_build}
+
%files
# main package builds always
%{_jvmdir}/%{jreportablearchiveForFiles}
%{_jvmdir}/%{jreportablearchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%else
%files
# placeholder
@@ -1576,10 +1711,9 @@ done
%if %{include_normal_build}
%files devel
%{_jvmdir}/%{jdkportablearchiveForFiles}
-#%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
+%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
%{_jvmdir}/%{jdkportablearchiveForFiles}.sha256sum
-#%{_jvmdir}/%{jdkportablearchive -- .debuginfo}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
+%{_jvmdir}/%{jdkportablearchive -- .debuginfo}.sha256sum
%endif
%if %{include_normal_build}
@@ -1587,26 +1721,26 @@ done
%files static-libs
%{_jvmdir}/%{staticlibsportablearchiveForFiles}
%{_jvmdir}/%{staticlibsportablearchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
+
+%files unstripped
+%{_jvmdir}/%{jdkportablearchive -- .unstripped}
+%{_jvmdir}/%{jdkportablearchive -- .unstripped}.sha256sum
%endif
%if %{include_debug_build}
%files slowdebug
%{_jvmdir}/%{jreportablearchive -- .slowdebug}
%{_jvmdir}/%{jreportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%files devel-slowdebug
%{_jvmdir}/%{jdkportablearchive -- .slowdebug}
%{_jvmdir}/%{jdkportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%if %{include_staticlibs}
%files static-libs-slowdebug
%{_jvmdir}/%{staticlibsportablearchive -- .slowdebug}
%{_jvmdir}/%{staticlibsportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
%endif
@@ -1614,27 +1748,47 @@ done
%files fastdebug
%{_jvmdir}/%{jreportablearchive -- .fastdebug}
%{_jvmdir}/%{jreportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%files devel-fastdebug
%{_jvmdir}/%{jdkportablearchive -- .fastdebug}
%{_jvmdir}/%{jdkportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%if %{include_staticlibs}
%files static-libs-fastdebug
%{_jvmdir}/%{staticlibsportablearchive -- .fastdebug}
%{_jvmdir}/%{staticlibsportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
%endif
%files sources
%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}
%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
+
+%if %{include_normal_build}
+%files docs
+%{_jvmdir}/%{docportablearchive}
+%{_jvmdir}/%{docportablearchive}.sha256sum
+
+%files misc
+%{_jvmdir}/%{miscportablearchive}
+%{_jvmdir}/%{miscportablearchive}.sha256sum
+%endif
%changelog
+* Wed Nov 22 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:17.0.9.0.9-2
+- updated to OpenJDK 17.0.9 (2023-10-17)
+- adjsuted generate_source_tarball
+- removed icedtea_sync
+- dropped standalone licenses
+- added usntripped subpkg
+- added docs subpkg
+- adjsuted versions of bundled libraries
+- build refactored to several solid methods following gnu_andrew
+- removed no longer needed jdk8305995-footprint_regression_from_jdk_8224957, nss.fips.cfg.in, rh1648644-java_access_bridge_privileged_security.patch
+- added jdk8312489-max_sig_default_increase.patch
+- aligned fips-17u-51e1d00be4e.patch (gnu_andrew)
+- fixed '--without release' build-ability by moving docs and misc to if-release only
+
* Thu Aug 03 2023 Jiri Vanek <jvanekw(a)redhat.com> - 1:17.0.8.0.7-1
- Update to jdk-17.0.8.0+7
- Update release notes to 17.0.8.0+7
diff --git a/jconsole.desktop.in b/jconsole.desktop.in
index 8a3b04d..c1b8f6a 100644
--- a/jconsole.desktop.in
+++ b/jconsole.desktop.in
@@ -1,10 +1 @@
-[Desktop Entry]
-Name=OpenJDK @JAVA_VER@ for @target_cpu@ Monitoring & Management Console (@OPENJDK_VER@)
-Comment=Monitor and manage OpenJDK applications
-Exec=_SDKBINDIR_/jconsole
-Icon=java-@JAVA_VER@-@JAVA_VENDOR@
-Terminal=false
-Type=Application
-StartupWMClass=sun-tools-jconsole-JConsole
-Categories=Development;Profiling;Java;
-Version=1.0
+# this file is intentionally not here, as portable builds do not have desktop integration
diff --git a/jdk8305995-footprint_regression_from_jdk_8224957 b/jdk8305995-footprint_regression_from_jdk_8224957
deleted file mode 100644
index a5119a0..0000000
--- a/jdk8305995-footprint_regression_from_jdk_8224957
+++ /dev/null
@@ -1,1255 +0,0 @@
-diff --git a/src/hotspot/share/opto/node.cpp b/src/hotspot/share/opto/node.cpp
-index 9a9d3f0149a..7c85e73989e 100644
---- a/src/hotspot/share/opto/node.cpp
-+++ b/src/hotspot/share/opto/node.cpp
-@@ -1301,7 +1301,7 @@ bool Node::dominates(Node* sub, Node_List &nlist) {
- } else if (sub == up && sub->is_Region() && sub->req() == 2) {
- // Take in(1) path on the way up to 'dom' for regions with only one input
- up = sub->in(1);
-- } else if (sub == up && sub->is_Region() && sub->req() == 3) {
-+ } else if (sub == up && sub->is_Region()) {
- // Try both paths for Regions with 2 input paths (it may be a loop head).
- // It could give conservative 'false' answer without information
- // which region's input is the entry path.
-diff --git a/test/micro/org/openjdk/bench/vm/compiler/RBTreeSearch.java b/test/micro/org/openjdk/bench/vm/compiler/RBTreeSearch.java
-new file mode 100644
-index 00000000000..9b7430ccc13
---- /dev/null
-+++ b/test/micro/org/openjdk/bench/vm/compiler/RBTreeSearch.java
-@@ -0,0 +1,1236 @@
-+/*
-+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package org.openjdk.bench.vm.compiler;
-+
-+import org.openjdk.jmh.annotations.Benchmark;
-+import org.openjdk.jmh.annotations.Fork;
-+import org.openjdk.jmh.annotations.Measurement;
-+import org.openjdk.jmh.annotations.OutputTimeUnit;
-+import org.openjdk.jmh.annotations.Scope;
-+import org.openjdk.jmh.annotations.State;
-+import org.openjdk.jmh.annotations.Warmup;
-+
-+import java.util.concurrent.TimeUnit;
-+
-+/*
-+ * This benchmark is used as easy reproducer of JDK-8305995
-+ *
-+ * This benchmark contains simplified and minimized RB-tree
-+ * which is based on fasutils with iterators that jumps.
-+ *
-+ * At the end it contains a tree serialized as lines, and
-+ * maxPattern which is used to search in this tree.
-+ */
-+(a)State(Scope.Thread)
-+(a)OutputTimeUnit(TimeUnit.MICROSECONDS)
-+@Warmup(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
-+@Measurement(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
-+@Fork(value = 3)
-+public class RBTreeSearch {
-+
-+ private final Tree pattern;
-+
-+ private final Tree[] nodes;
-+
-+ private final Tree root;
-+
-+ private final int[] idxStack;
-+ private final Tree[] objStack;
-+
-+ public RBTreeSearch() {
-+ idxStack = new int[maxPattern];
-+
-+ objStack = new Tree[maxPattern];
-+
-+ pattern = new Tree();
-+ for (int i = 0; i <= maxPattern; i++) {
-+ pattern.put(i, i);
-+ }
-+
-+ nodes = new Tree[directions.length];
-+ for (int i = 0; i < directions.length; i++) {
-+ if (directions[i] == null) {
-+ continue;
-+ }
-+ Tree kids = new Tree();
-+ nodes[i] = kids;
-+ for (String pair : directions[i].split(", ")) {
-+ String[] kv = pair.split("=>");
-+ kids.put(Integer.parseInt(kv[0]), Integer.parseInt(kv[1]));
-+ }
-+ }
-+
-+ root = nodes[0];
-+ }
-+
-+ @Benchmark
-+ public void search() {
-+ Tree.Iterator sliceIt = pattern.keyIterator();
-+
-+ int stackSize = 0;
-+ idxStack[stackSize] = pattern.firstIntKey();
-+ objStack[stackSize++] = root;
-+
-+ while (stackSize > 0) {
-+ stackSize--;
-+ Tree node = objStack[stackSize];
-+
-+ final int startPoint = Math.max(idxStack[stackSize], node.firstIntKey()) - 1;
-+ final Tree.Iterator rootIt = node.keyIterator(startPoint);
-+
-+ sliceIt.jump(startPoint);
-+ while (sliceIt.hasNext() && rootIt.hasNext()) {
-+ final int sliceElem = sliceIt.nextInt();
-+ final int rootElem = rootIt.nextInt();
-+ if (sliceElem < rootElem) {
-+ rootIt.previousInt();
-+ if (sliceIt.nextInt() >= rootElem) {
-+ sliceIt.previousInt();
-+ } else {
-+ sliceIt.jump(rootElem - 1);
-+ }
-+ } else if (sliceElem == rootElem) {
-+ final int childrenIdx = node.get(sliceElem);
-+ final Tree children = nodes[childrenIdx];
-+
-+ if (children != null) {
-+ idxStack[stackSize] = sliceElem;
-+ objStack[stackSize++] = children;
-+ }
-+ }
-+ }
-+ }
-+ }
-+
-+ public static class Tree {
-+
-+ protected transient Entry root;
-+
-+ protected transient Entry firstEntry;
-+
-+ protected transient Entry lastEntry;
-+
-+ private final transient boolean[] dirPath = new boolean[64];
-+
-+ private final transient Entry[] nodePath = new Entry[64];
-+
-+ public int put(final int k, final int v) {
-+ Entry e = add(k);
-+ final int oldValue = e.value;
-+ e.value = v;
-+ return oldValue;
-+ }
-+
-+ private Entry add(final int k) {
-+ int maxDepth = 0;
-+ Entry e;
-+ if (root == null) {
-+ e = root = lastEntry = firstEntry = new Entry(k, 0);
-+ }
-+ else {
-+ Entry p = root;
-+ int cmp, i = 0;
-+ while(true) {
-+ if ((cmp = Integer.compare(k, p.key)) == 0) {
-+ while(i-- != 0) nodePath[i] = null;
-+ return p;
-+ }
-+ nodePath[i] = p;
-+ if (dirPath[i++] = cmp > 0) {
-+ if (p.succ()) {
-+ e = new Entry(k, 0);
-+ if (p.right == null) lastEntry = e;
-+ e.left = p;
-+ e.right = p.right;
-+ p.right(e);
-+ break;
-+ }
-+ p = p.right;
-+ }
-+ else {
-+ if (p.pred()) {
-+ e = new Entry(k, 0);
-+ if (p.left == null) firstEntry = e;
-+ e.right = p;
-+ e.left = p.left;
-+ p.left(e);
-+ break;
-+ }
-+ p = p.left;
-+ }
-+ }
-+ maxDepth = i--;
-+ while(i > 0 && ! nodePath[i].black()) {
-+ if (! dirPath[i - 1]) {
-+ Entry y = nodePath[i - 1].right;
-+ if (! nodePath[i - 1].succ() && ! y.black()) {
-+ nodePath[i].black(true);
-+ y.black(true);
-+ nodePath[i - 1].black(false);
-+ i -= 2;
-+ }
-+ else {
-+ Entry x;
-+ if (! dirPath[i]) y = nodePath[i];
-+ else {
-+ x = nodePath[i];
-+ y = x.right;
-+ x.right = y.left;
-+ y.left = x;
-+ nodePath[i - 1].left = y;
-+ if (y.pred()) {
-+ y.pred(false);
-+ x.succ(y);
-+ }
-+ }
-+ x = nodePath[i - 1];
-+ x.black(false);
-+ y.black(true);
-+ x.left = y.right;
-+ y.right = x;
-+ if (i < 2) root = y;
-+ else {
-+ if (dirPath[i - 2]) nodePath[i - 2].right = y;
-+ else nodePath[i - 2].left = y;
-+ }
-+ if (y.succ()) {
-+ y.succ(false);
-+ x.pred(y);
-+ }
-+ break;
-+ }
-+ }
-+ else {
-+ Entry y = nodePath[i - 1].left;
-+ if (! nodePath[i - 1].pred() && ! y.black()) {
-+ nodePath[i].black(true);
-+ y.black(true);
-+ nodePath[i - 1].black(false);
-+ i -= 2;
-+ }
-+ else {
-+ Entry x;
-+ if (dirPath[i]) y = nodePath[i];
-+ else {
-+ x = nodePath[i];
-+ y = x.left;
-+ x.left = y.right;
-+ y.right = x;
-+ nodePath[i - 1].right = y;
-+ if (y.succ()) {
-+ y.succ(false);
-+ x.pred(y);
-+ }
-+ }
-+ x = nodePath[i - 1];
-+ x.black(false);
-+ y.black(true);
-+ x.right = y.left;
-+ y.left = x;
-+ if (i < 2) root = y;
-+ else {
-+ if (dirPath[i - 2]) nodePath[i - 2].right = y;
-+ else nodePath[i - 2].left = y;
-+ }
-+ if (y.pred()){
-+ y.pred(false);
-+ x.succ(y);
-+ }
-+ break;
-+ }
-+ }
-+ }
-+ }
-+ root.black(true);
-+ while(maxDepth-- != 0) nodePath[maxDepth] = null;
-+ return e;
-+ }
-+
-+ private static final class Entry {
-+ int key;
-+ int value;
-+
-+ private static final int BLACK_MASK = 1;
-+
-+ private static final int SUCC_MASK = 1 << 31;
-+
-+ private static final int PRED_MASK = 1 << 30;
-+
-+ Entry left, right;
-+
-+ int info;
-+
-+ Entry(final int k, final int v) {
-+ key = k;
-+ value = v;
-+ info = SUCC_MASK | PRED_MASK;
-+ }
-+
-+ Entry left() {
-+ return (info & PRED_MASK) != 0 ? null : left;
-+ }
-+
-+ Entry right() {
-+ return (info & SUCC_MASK) != 0 ? null : right;
-+ }
-+
-+ boolean pred() {
-+ return (info & PRED_MASK) != 0;
-+ }
-+
-+ boolean succ() {
-+ return (info & SUCC_MASK) != 0;
-+ }
-+
-+ void pred(final boolean pred) {
-+ if (pred) info |= PRED_MASK;
-+ else info &= ~PRED_MASK;
-+ }
-+
-+ void succ(final boolean succ) {
-+ if (succ) info |= SUCC_MASK;
-+ else info &= ~SUCC_MASK;
-+ }
-+
-+ void pred(final Entry pred) {
-+ info |= PRED_MASK;
-+ left = pred;
-+ }
-+
-+ void succ(final Entry succ) {
-+ info |= SUCC_MASK;
-+ right = succ;
-+ }
-+
-+ void left(final Entry left) {
-+ info &= ~PRED_MASK;
-+ this.left = left;
-+ }
-+
-+ void right(final Entry right) {
-+ info &= ~SUCC_MASK;
-+ this.right = right;
-+ }
-+
-+ boolean black() {
-+ return (info & BLACK_MASK) != 0;
-+ }
-+
-+ void black(final boolean black) {
-+ if (black) info |= BLACK_MASK;
-+ else info &= ~BLACK_MASK;
-+ }
-+
-+ Entry next() {
-+ Entry next = this.right;
-+ if ((info & SUCC_MASK) == 0) while ((next.info & PRED_MASK) == 0) next = next.left;
-+ return next;
-+ }
-+
-+ Entry prev() {
-+ Entry prev = this.left;
-+ if ((info & PRED_MASK) == 0) while ((prev.info & SUCC_MASK) == 0) prev = prev.right;
-+ return prev;
-+ }
-+ }
-+
-+ public int get(final int k) {
-+ Entry e = root;
-+ int cmp;
-+ while (e != null && (cmp = Integer.compare(k, e.key)) != 0) {
-+ e = cmp < 0 ? e.left() : e.right();
-+ }
-+ return e == null ? 0 : e.value;
-+ }
-+
-+ public int firstIntKey() {
-+ return firstEntry.key;
-+ }
-+
-+ interface Iterator {
-+ boolean hasNext();
-+ int nextInt();
-+ int previousInt();
-+ void jump(final int fromElement);
-+ }
-+
-+ private class KeyIteratorImpl implements Iterator {
-+ Entry prev;
-+
-+ Entry next;
-+
-+ Entry curr;
-+
-+ int index = 0;
-+
-+ KeyIteratorImpl() {
-+ next = firstEntry;
-+ }
-+
-+ KeyIteratorImpl(final int k) {
-+ if ((next = locateKey(k)) != null) {
-+ if (next.key <= k) {
-+ prev = next;
-+ next = next.next();
-+ }
-+ else prev = next.prev();
-+ }
-+ }
-+
-+ private Entry locateKey(final int k) {
-+ Entry e = root, last = root;
-+ int cmp = 0;
-+ while (e != null && (cmp = Integer.compare(k, e.key)) != 0) {
-+ last = e;
-+ e = cmp < 0 ? e.left() : e.right();
-+ }
-+ return cmp == 0 ? e : last;
-+ }
-+
-+ public boolean hasNext() { return next != null; }
-+
-+ Entry nextEntry() {
-+ curr = prev = next;
-+ index++;
-+ next = next.next();
-+ return curr;
-+ }
-+
-+ Entry previousEntry() {
-+ curr = next = prev;
-+ index--;
-+ prev = prev.prev();
-+ return curr;
-+ }
-+ public void jump(final int fromElement) {
-+ if ((next = locateKey(fromElement)) != null) {
-+ if (next.key <= fromElement) {
-+ prev = next;
-+ next = next.next();
-+ }
-+ else prev = next.prev();
-+ }
-+ }
-+
-+ public int nextInt() { return nextEntry().key; }
-+
-+ public int previousInt() { return previousEntry().key; }
-+
-+ }
-+
-+ public Iterator keyIterator() {
-+ return new KeyIteratorImpl();
-+ }
-+
-+ public Iterator keyIterator(final int from) {
-+ return new KeyIteratorImpl(from);
-+ }
-+ }
-+
-+ private static final int maxPattern = 39;
-+
-+ private static final String[] directions = {
-+ "0=>1, 1=>4, 2=>2, 4=>3, 7=>5",
-+ "13=>628, 14=>627, 15=>626, 17=>629, 18=>630",
-+ "13=>473, 14=>472, 15=>471, 17=>474, 18=>475",
-+ "13=>318, 14=>317, 15=>316, 17=>319, 18=>320",
-+ "13=>163, 14=>162, 15=>161, 17=>164, 18=>165",
-+ "13=>8, 14=>7, 15=>6, 17=>9, 18=>10",
-+ "22=>135, 23=>134, 24=>132, 26=>133, 27=>131",
-+ "22=>105, 23=>104, 24=>102, 26=>103, 27=>101",
-+ "22=>75, 23=>74, 24=>72, 26=>73, 27=>71",
-+ "22=>45, 23=>44, 24=>42, 26=>43, 27=>41",
-+ "22=>15, 23=>14, 24=>12, 26=>13, 27=>11",
-+ "31=>38, 32=>39, 33=>36, 34=>40, 35=>37",
-+ "31=>33, 32=>34, 33=>31, 34=>35, 35=>32",
-+ "31=>28, 32=>29, 33=>26, 34=>30, 35=>27",
-+ "31=>23, 32=>24, 33=>21, 34=>25, 35=>22",
-+ "31=>18, 32=>19, 33=>16, 34=>20, 35=>17",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>68, 32=>69, 33=>66, 34=>70, 35=>67",
-+ "31=>63, 32=>64, 33=>61, 34=>65, 35=>62",
-+ "31=>58, 32=>59, 33=>56, 34=>60, 35=>57",
-+ "31=>53, 32=>54, 33=>51, 34=>55, 35=>52",
-+ "31=>48, 32=>49, 33=>46, 34=>50, 35=>47",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>98, 32=>99, 33=>96, 34=>100, 35=>97",
-+ "31=>93, 32=>94, 33=>91, 34=>95, 35=>92",
-+ "31=>88, 32=>89, 33=>86, 34=>90, 35=>87",
-+ "31=>83, 32=>84, 33=>81, 34=>85, 35=>82",
-+ "31=>78, 32=>79, 33=>76, 34=>80, 35=>77",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>128, 32=>129, 33=>126, 34=>130, 35=>127",
-+ "31=>123, 32=>124, 33=>121, 34=>125, 35=>122",
-+ "31=>118, 32=>119, 33=>116, 34=>120, 35=>117",
-+ "31=>113, 32=>114, 33=>111, 34=>115, 35=>112",
-+ "31=>108, 32=>109, 33=>106, 34=>110, 35=>107",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>158, 32=>159, 33=>156, 34=>160, 35=>157",
-+ "31=>153, 32=>154, 33=>151, 34=>155, 35=>152",
-+ "31=>148, 32=>149, 33=>146, 34=>150, 35=>147",
-+ "31=>143, 32=>144, 33=>141, 34=>145, 35=>142",
-+ "31=>138, 32=>139, 33=>136, 34=>140, 35=>137",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "22=>290, 23=>289, 24=>287, 26=>288, 27=>286",
-+ "22=>260, 23=>259, 24=>257, 26=>258, 27=>256",
-+ "22=>230, 23=>229, 24=>227, 26=>228, 27=>226",
-+ "22=>200, 23=>199, 24=>197, 26=>198, 27=>196",
-+ "22=>170, 23=>169, 24=>167, 26=>168, 27=>166",
-+ "31=>193, 32=>194, 33=>191, 34=>195, 35=>192",
-+ "31=>188, 32=>189, 33=>186, 34=>190, 35=>187",
-+ "31=>183, 32=>184, 33=>181, 34=>185, 35=>182",
-+ "31=>178, 32=>179, 33=>176, 34=>180, 35=>177",
-+ "31=>173, 32=>174, 33=>171, 34=>175, 35=>172",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>223, 32=>224, 33=>221, 34=>225, 35=>222",
-+ "31=>218, 32=>219, 33=>216, 34=>220, 35=>217",
-+ "31=>213, 32=>214, 33=>211, 34=>215, 35=>212",
-+ "31=>208, 32=>209, 33=>206, 34=>210, 35=>207",
-+ "31=>203, 32=>204, 33=>201, 34=>205, 35=>202",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>253, 32=>254, 33=>251, 34=>255, 35=>252",
-+ "31=>248, 32=>249, 33=>246, 34=>250, 35=>247",
-+ "31=>243, 32=>244, 33=>241, 34=>245, 35=>242",
-+ "31=>238, 32=>239, 33=>236, 34=>240, 35=>237",
-+ "31=>233, 32=>234, 33=>231, 34=>235, 35=>232",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>283, 32=>284, 33=>281, 34=>285, 35=>282",
-+ "31=>278, 32=>279, 33=>276, 34=>280, 35=>277",
-+ "31=>273, 32=>274, 33=>271, 34=>275, 35=>272",
-+ "31=>268, 32=>269, 33=>266, 34=>270, 35=>267",
-+ "31=>263, 32=>264, 33=>261, 34=>265, 35=>262",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>313, 32=>314, 33=>311, 34=>315, 35=>312",
-+ "31=>308, 32=>309, 33=>306, 34=>310, 35=>307",
-+ "31=>303, 32=>304, 33=>301, 34=>305, 35=>302",
-+ "31=>298, 32=>299, 33=>296, 34=>300, 35=>297",
-+ "31=>293, 32=>294, 33=>291, 34=>295, 35=>292",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "22=>445, 23=>444, 24=>442, 26=>443, 27=>441",
-+ "22=>415, 23=>414, 24=>412, 26=>413, 27=>411",
-+ "22=>385, 23=>384, 24=>382, 26=>383, 27=>381",
-+ "22=>355, 23=>354, 24=>352, 26=>353, 27=>351",
-+ "22=>325, 23=>324, 24=>322, 26=>323, 27=>321",
-+ "31=>348, 32=>349, 33=>346, 34=>350, 35=>347",
-+ "31=>343, 32=>344, 33=>341, 34=>345, 35=>342",
-+ "31=>338, 32=>339, 33=>336, 34=>340, 35=>337",
-+ "31=>333, 32=>334, 33=>331, 34=>335, 35=>332",
-+ "31=>328, 32=>329, 33=>326, 34=>330, 35=>327",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>378, 32=>379, 33=>376, 34=>380, 35=>377",
-+ "31=>373, 32=>374, 33=>371, 34=>375, 35=>372",
-+ "31=>368, 32=>369, 33=>366, 34=>370, 35=>367",
-+ "31=>363, 32=>364, 33=>361, 34=>365, 35=>362",
-+ "31=>358, 32=>359, 33=>356, 34=>360, 35=>357",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>408, 32=>409, 33=>406, 34=>410, 35=>407",
-+ "31=>403, 32=>404, 33=>401, 34=>405, 35=>402",
-+ "31=>398, 32=>399, 33=>396, 34=>400, 35=>397",
-+ "31=>393, 32=>394, 33=>391, 34=>395, 35=>392",
-+ "31=>388, 32=>389, 33=>386, 34=>390, 35=>387",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>438, 32=>439, 33=>436, 34=>440, 35=>437",
-+ "31=>433, 32=>434, 33=>431, 34=>435, 35=>432",
-+ "31=>428, 32=>429, 33=>426, 34=>430, 35=>427",
-+ "31=>423, 32=>424, 33=>421, 34=>425, 35=>422",
-+ "31=>418, 32=>419, 33=>416, 34=>420, 35=>417",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>468, 32=>469, 33=>466, 34=>470, 35=>467",
-+ "31=>463, 32=>464, 33=>461, 34=>465, 35=>462",
-+ "31=>458, 32=>459, 33=>456, 34=>460, 35=>457",
-+ "31=>453, 32=>454, 33=>451, 34=>455, 35=>452",
-+ "31=>448, 32=>449, 33=>446, 34=>450, 35=>447",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "22=>600, 23=>599, 24=>597, 26=>598, 27=>596",
-+ "22=>570, 23=>569, 24=>567, 26=>568, 27=>566",
-+ "22=>540, 23=>539, 24=>537, 26=>538, 27=>536",
-+ "22=>510, 23=>509, 24=>507, 26=>508, 27=>506",
-+ "22=>480, 23=>479, 24=>477, 26=>478, 27=>476",
-+ "31=>503, 32=>504, 33=>501, 34=>505, 35=>502",
-+ "31=>498, 32=>499, 33=>496, 34=>500, 35=>497",
-+ "31=>493, 32=>494, 33=>491, 34=>495, 35=>492",
-+ "31=>488, 32=>489, 33=>486, 34=>490, 35=>487",
-+ "31=>483, 32=>484, 33=>481, 34=>485, 35=>482",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>533, 32=>534, 33=>531, 34=>535, 35=>532",
-+ "31=>528, 32=>529, 33=>526, 34=>530, 35=>527",
-+ "31=>523, 32=>524, 33=>521, 34=>525, 35=>522",
-+ "31=>518, 32=>519, 33=>516, 34=>520, 35=>517",
-+ "31=>513, 32=>514, 33=>511, 34=>515, 35=>512",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>563, 32=>564, 33=>561, 34=>565, 35=>562",
-+ "31=>558, 32=>559, 33=>556, 34=>560, 35=>557",
-+ "31=>553, 32=>554, 33=>551, 34=>555, 35=>552",
-+ "31=>548, 32=>549, 33=>546, 34=>550, 35=>547",
-+ "31=>543, 32=>544, 33=>541, 34=>545, 35=>542",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>593, 32=>594, 33=>591, 34=>595, 35=>592",
-+ "31=>588, 32=>589, 33=>586, 34=>590, 35=>587",
-+ "31=>583, 32=>584, 33=>581, 34=>585, 35=>582",
-+ "31=>578, 32=>579, 33=>576, 34=>580, 35=>577",
-+ "31=>573, 32=>574, 33=>571, 34=>575, 35=>572",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>623, 32=>624, 33=>621, 34=>625, 35=>622",
-+ "31=>618, 32=>619, 33=>616, 34=>620, 35=>617",
-+ "31=>613, 32=>614, 33=>611, 34=>615, 35=>612",
-+ "31=>608, 32=>609, 33=>606, 34=>610, 35=>607",
-+ "31=>603, 32=>604, 33=>601, 34=>605, 35=>602",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "22=>755, 23=>754, 24=>752, 26=>753, 27=>751",
-+ "22=>725, 23=>724, 24=>722, 26=>723, 27=>721",
-+ "22=>695, 23=>694, 24=>692, 26=>693, 27=>691",
-+ "22=>665, 23=>664, 24=>662, 26=>663, 27=>661",
-+ "22=>635, 23=>634, 24=>632, 26=>633, 27=>631",
-+ "31=>658, 32=>659, 33=>656, 34=>660, 35=>657",
-+ "31=>653, 32=>654, 33=>651, 34=>655, 35=>652",
-+ "31=>648, 32=>649, 33=>646, 34=>650, 35=>647",
-+ "31=>643, 32=>644, 33=>641, 34=>645, 35=>642",
-+ "31=>638, 32=>639, 33=>636, 34=>640, 35=>637",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>688, 32=>689, 33=>686, 34=>690, 35=>687",
-+ "31=>683, 32=>684, 33=>681, 34=>685, 35=>682",
-+ "31=>678, 32=>679, 33=>676, 34=>680, 35=>677",
-+ "31=>673, 32=>674, 33=>671, 34=>675, 35=>672",
-+ "31=>668, 32=>669, 33=>666, 34=>670, 35=>667",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>718, 32=>719, 33=>716, 34=>720, 35=>717",
-+ "31=>713, 32=>714, 33=>711, 34=>715, 35=>712",
-+ "31=>708, 32=>709, 33=>706, 34=>710, 35=>707",
-+ "31=>703, 32=>704, 33=>701, 34=>705, 35=>702",
-+ "31=>698, 32=>699, 33=>696, 34=>700, 35=>697",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>748, 32=>749, 33=>746, 34=>750, 35=>747",
-+ "31=>743, 32=>744, 33=>741, 34=>745, 35=>742",
-+ "31=>738, 32=>739, 33=>736, 34=>740, 35=>737",
-+ "31=>733, 32=>734, 33=>731, 34=>735, 35=>732",
-+ "31=>728, 32=>729, 33=>726, 34=>730, 35=>727",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>778, 32=>779, 33=>776, 34=>780, 35=>777",
-+ "31=>773, 32=>774, 33=>771, 34=>775, 35=>772",
-+ "31=>768, 32=>769, 33=>766, 34=>770, 35=>767",
-+ "31=>763, 32=>764, 33=>761, 34=>765, 35=>762",
-+ "31=>758, 32=>759, 33=>756, 34=>760, 35=>757",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null
-+ };
-+}
diff --git a/jdk8312489-max_sig_default_increase.patch b/jdk8312489-max_sig_default_increase.patch
new file mode 100644
index 0000000..8aeb261
--- /dev/null
+++ b/jdk8312489-max_sig_default_increase.patch
@@ -0,0 +1,50 @@
+commit 5b613e3ebed6c141146e743e64c894fe4f39421e
+Author: Andrew John Hughes <andrew(a)openjdk.org>
+Date: Fri Sep 1 15:53:41 2023 +0000
+
+ 8312489: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar
+
+ Backport-of: e47a84f23dd2608c6f5748093eefe301fb5bf750
+
+diff --git a/src/java.base/share/classes/java/util/jar/JarFile.java b/src/java.base/share/classes/java/util/jar/JarFile.java
+index bd538649a4f..70cf99504e4 100644
+--- a/src/java.base/share/classes/java/util/jar/JarFile.java
++++ b/src/java.base/share/classes/java/util/jar/JarFile.java
+@@ -803,7 +803,9 @@ private byte[] getBytes(ZipEntry ze) throws IOException {
+ throw new IOException("Unsupported size: " + uncompressedSize +
+ " for JarEntry " + ze.getName() +
+ ". Allowed max size: " +
+- SignatureFileVerifier.MAX_SIG_FILE_SIZE + " bytes");
++ SignatureFileVerifier.MAX_SIG_FILE_SIZE + " bytes. " +
++ "You can use the jdk.jar.maxSignatureFileSize " +
++ "system property to increase the default value.");
+ }
+ int len = (int)uncompressedSize;
+ int bytesRead;
+diff --git a/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
+index 4ea9255ba0a..05acdcb9474 100644
+--- a/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
++++ b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
+@@ -856,16 +856,16 @@ private static int initializeMaxSigFileSize() {
+ * the maximum allowed number of bytes for the signature-related files
+ * in a JAR file.
+ */
+- Integer tmp = GetIntegerAction.privilegedGetProperty(
+- "jdk.jar.maxSignatureFileSize", 8000000);
++ int tmp = GetIntegerAction.privilegedGetProperty(
++ "jdk.jar.maxSignatureFileSize", 16000000);
+ if (tmp < 0 || tmp > MAX_ARRAY_SIZE) {
+ if (debug != null) {
+- debug.println("Default signature file size 8000000 bytes " +
+- "is used as the specified size for the " +
+- "jdk.jar.maxSignatureFileSize system property " +
++ debug.println("The default signature file size of 16000000 bytes " +
++ "will be used for the jdk.jar.maxSignatureFileSize " +
++ "system property since the specified value " +
+ "is out of range: " + tmp);
+ }
+- tmp = 8000000;
++ tmp = 16000000;
+ }
+ return tmp;
+ }
diff --git a/nss.fips.cfg.in b/nss.fips.cfg.in
deleted file mode 100644
index 2d9ec35..0000000
--- a/nss.fips.cfg.in
+++ /dev/null
@@ -1,8 +0,0 @@
-name = NSS-FIPS
-nssLibraryDirectory = @NSS_LIBDIR@
-nssSecmodDirectory = sql:/etc/pki/nssdb
-nssDbMode = readOnly
-nssModule = fips
-
-attributes(*,CKO_SECRET_KEY,CKK_GENERIC_SECRET)={ CKA_SIGN=true }
-
diff --git a/openjdk_news.sh b/openjdk_news.sh
index 560b356..386aa53 100755
--- a/openjdk_news.sh
+++ b/openjdk_news.sh
@@ -18,8 +18,8 @@
OLD_RELEASE=$1
NEW_RELEASE=$2
-SUBDIR=$3
-REPO=$4
+REPO=$3
+SUBDIR=$4
SCRIPT_DIR=$(dirname ${0})
if test "x${SUBDIR}" = "x"; then
diff --git a/rh1648644-java_access_bridge_privileged_security.patch b/rh1648644-java_access_bridge_privileged_security.patch
deleted file mode 100644
index 53026ad..0000000
--- a/rh1648644-java_access_bridge_privileged_security.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- openjdk/src/java.base/share/conf/security/java.security
-+++ openjdk/src/java.base/share/conf/security/java.security
-@@ -304,6 +304,8 @@
- #
- package.access=sun.misc.,\
- sun.reflect.,\
-+ org.GNOME.Accessibility.,\
-+ org.GNOME.Bonobo.,\
-
- #
- # List of comma-separated packages that start with or equal this string
-@@ -316,6 +318,8 @@
- #
- package.definition=sun.misc.,\
- sun.reflect.,\
-+ org.GNOME.Accessibility.,\
-+ org.GNOME.Bonobo.,\
-
- #
- # Determines whether this properties file can be appended to
diff --git a/sources b/sources
index 47996d1..0c780d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openjdk-jdk17u-jdk-17.0.8+7.tar.xz) = 52bd1002cffafc6fc613b3ee1c62bfc3f27f31d5e1810ebb8f556a725ebb310508885762079589f15be5da63388214525128b77d2a665bae9fccfc419ab5d6a1
+SHA512 (openjdk-17.0.9+9.tar.xz) = 33225a1070077c9504b4857734305f301e51b93a929274d460ddc3dc042ce15943030f8af928c11962743a928619ea39daa453d8fb1c8ea5a334a4b6490a00ee
1
0
Architecture specific change in rpms/java-17-openjdk-portable.git
by githook-noreply＠fedoraproject.org 23 Nov '23
by githook-noreply＠fedoraproject.org 23 Nov '23
23 Nov '23
The package rpms/java-17-openjdk-portable.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-17-openjdk-portable.git/commit….
Change:
+%ifarch %{gdb_arches}
Thanks.
Full change:
============
commit 289d0e958f24fa8759c01d48b05c8a4b71e599e2
Author: Jiri <jvanek(a)redhat.com>
Date: Thu Nov 23 16:12:18 2023 +0100
updated to OpenJDK 17.0.9 (2023-10-17)
- adjsuted generate_source_tarball
- removed icedtea_sync
- dropped standalone licenses
- added usntripped subpkg
- added docs subpkg
- adjsuted versions of bundled libraries
- build refactored to several solid methods following gnu_andrew
- removed no longer needed jdk8305995-footprint_regression_from_jdk_8224957, nss.fips.cfg.in, rh1648644-java_access_bridge_privileged_security.patch
- added jdk8312489-max_sig_default_increase.patch
- aligned fips-17u-51e1d00be4e.patch (gnu_andrew)
- fixed '--without release' build-ability by moving docs and misc to
if-release only
diff --git a/.gitignore b/.gitignore
index 6c2c596..f79d052 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@
/openjdk-jdk17u-jdk-17.0.6+10.tar.xz
/openjdk-jdk17u-jdk-17.0.7+7.tar.xz
/openjdk-jdk17u-jdk-17.0.8+7.tar.xz
+/openjdk-17.0.9+9.tar.xz
diff --git a/NEWS b/NEWS
index a7be73f..4edebb8 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,490 @@ Key:
JDK-X - https://bugs.openjdk.java.net/browse/JDK-X
CVE-XXXX-YYYY: https://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
+New in release OpenJDK 17.0.9 (2023-10-17):
+===========================================
+Live versions of these release notes can be found at:
+ * https://bit.ly/openjdk1709
+
+* CVEs
+ - CVE-2023-22081
+ - CVE-2023-22025
+* Security fixes
+ - JDK-8286503, JDK-8312367: Enhance security classes
+ - JDK-8296581: Better system proxy support
+ - JDK-8297856: Improve handling of Bidi characters
+ - JDK-8305815, JDK-8307278: Update Libpng to 1.6.39
+ - JDK-8306881, JDK-8307286: Update FreeType to 2.13.0
+ - JDK-8309966: Enhanced TLS connections
+ - JDK-8312248: Enhanced archival support redux
+ - JDK-8314649: Enhanced archival support redux
+ - JDK-8317121: vector_masked_load instruction is moved too early after JDK-8286941
+* New features
+ - JDK-8276799: Implementation of JEP 422: Linux/RISC-V Port
+* Other changes
+ - JDK-6176679: Application freezes when copying an animated gif image to the system clipboard
+ - JDK-6381945: (cal) Japanese calendar unit test system should avoid multiple static imports
+ - JDK-8040793: vmTestbase/nsk/monitoring/stress/lowmem fails on calling isCollectionUsageThresholdExceeded()
+ - JDK-8153837: AArch64: Handle special cases for MaxINode & MinINode
+ - JDK-8156889: ListKeychainStore.sh fails in some virtualized environments
+ - JDK-8171221: Remove -XX:+CheckMemoryInitialization
+ - JDK-8180266: Convert sun/security/provider/KeyStore/DKSTest.sh to Java Jtreg Test
+ - JDK-8195589: T6587786.java failed after JDK-8189997
+ - JDK-8209398: sun/security/pkcs11/KeyStore/SecretKeysBasic.sh failed with "PKCS11Exception: CKR_ATTRIBUTE_SENSITIVE"
+ - JDK-8225012: sanity/client/SwingSet/src/ToolTipDemoTest.java fails on Windows
+ - JDK-8229147: Linux os::create_thread() overcounts guardpage size with newer glibc (>=2.27)
+ - JDK-8252713: jtreg time out of CtrlASCII.java seems to hang the Xserver.
+ - JDK-8255548: Missing coverage for javax.xml.crypto.dom.DOMCryptoContext
+ - JDK-8263044: jdk/jfr/jvm/TestDumpOnCrash.java timed out
+ - JDK-8267188: gc/stringdedup/TestStringDeduplicationInterned.java fails with Shenandoah
+ - JDK-8267341: macos attempt_reserve_memory_at(arg1, arg2, true) failure
+ - JDK-8267517: async logging for stdout and stderr
+ - JDK-8267860: Off-by-one bug when searching arrays in AlpnGreaseTest
+ - JDK-8268852: AsyncLogWriter should not overide is_Named_thread()
+ - JDK-8269091: javax/sound/sampled/Clip/SetPositionHang.java failed with ArrayIndexOutOfBoundsException: Array index out of range: -4
+ - JDK-8269466: Factor out the common code for initializing and starting internal VM JavaThreads
+ - JDK-8270331: [TESTBUG] Error: Not a test or directory containing tests: java/awt/print/PrinterJob/InitToBlack.java
+ - JDK-8270794: Avoid loading Klass* twice in TypeArrayKlass::oop_size()
+ - JDK-8270894: Use acquire semantics in ObjectSynchronizer::read_stable_mark()
+ - JDK-8271707: migrate tests to use jdk.test.whitebox.WhiteBox
+ - JDK-8271898: disable os.release_multi_mappings_vm on macOS-X64
+ - JDK-8272586: emit abstract machine code in hs-err logs
+ - JDK-8272654: Mark word accesses should not use Access API
+ - JDK-8273092: Sort classlist in JDK image
+ - JDK-8273803: Zero: Handle "zero" variant in CommandLineOptionTest.java
+ - JDK-8274986: max code printed in hs-err logs should be configurable
+ - JDK-8275031: runtime/ErrorHandling/MachCodeFramesInErrorFile.java fails when hsdis is present
+ - JDK-8275303: sun/java2d/pipe/InterpolationQualityTest.java fails with D3D basic render driver
+ - JDK-8275415: Prepare Leak Profiler for Lilliput
+ - JDK-8275662: remove test/lib/sun/hotspot
+ - JDK-8276333: jdk/jfr/event/oldobject/TestLargeRootSet.java failed "assert(!contains(edge->reference())) failed: invariant"
+ - JDK-8276651: java/lang/ProcessHandle tests fail with "RuntimeException: Input/output error" in java.lang.ProcessHandleImpl$Info.info0
+ - JDK-8276696: ParallelObjectIterator freed at the wrong time in VM_HeapDumper
+ - JDK-8277102: Dubious PrintCompilation output
+ - JDK-8277353: java/security/MessageDigest/ThreadSafetyTest.java test times out
+ - JDK-8277417: C1 LIR instruction for load-klass
+ - JDK-8277427: Update jib-profiles.js to use JMH 1.33 devkit
+ - JDK-8277654: Shenandoah: Don't produce new memory state in C2 LRB runtime call
+ - JDK-8277860: PPC: Remove duplicate info != NULL check
+ - JDK-8278141: LIR_OpLoadKlass::_info shadows the field of the same name from LIR_Op
+ - JDK-8278456: Define jtreg jdk_desktop test group time-based sub-tasks for use by headful testing.
+ - JDK-8279545: Buffer overrun in reverse_words of sharedRuntime_x86_64.cpp:3517
+ - JDK-8280032: Update jib-profiles.js to use JMH 1.34 devkit
+ - JDK-8280396: G1: Full gc mark stack draining should prefer to make work available to other threads
+ - JDK-8280885: Shenandoah: Some tests failed with "EA: missing allocation reference path"
+ - JDK-8281507: Two javac tests have bad jtreg `@clean` tags
+ - JDK-8281717: Cover logout method for several LoginModule
+ - JDK-8282404: DrawStringWithInfiniteXform.java failed with "RuntimeException: drawString with InfiniteXform transform takes long time"
+ - JDK-8282651: ZGC: vmTestbase/gc/ArrayJuggle/ tests fails intermittently with exit code 97
+ - JDK-8282665: [REDO] ByteBufferTest.java: replace endless recursion with RuntimeException in void ck(double x, double y)
+ - JDK-8283056: show abstract machine code in hs-err for all VM crashes
+ - JDK-8283276: java/io/ObjectStreamClass/ObjectStreamClassCaching.java fails with various GCs
+ - JDK-8283326: Implement SafeFetch statically
+ - JDK-8283724: Incorrect description for jtreg-failure-handler option
+ - JDK-8283756: (zipfs) ZipFSOutputStreamTest.testOutputStream should only check inflated bytes
+ - JDK-8283865: riscv: Break down -XX:+UseRVB into seperate options for each bitmanip extension
+ - JDK-8283929: GHA: Add RISC-V build config
+ - JDK-8284068: riscv: should call Atomic::release_store in JavaThread::set_thread_state
+ - JDK-8284090: com/sun/security/auth/module/AllPlatforms.java fails to compile
+ - JDK-8284273: Early crashes in os::print_context on AArch64
+ - JDK-8284760: Correct type/array element offset in LibraryCallKit::get_state_from_digest_object()
+ - JDK-8284772: GHA: Use GCC Major Version Dependencies Only
+ - JDK-8284910: Buffer clean in PasswordCallback
+ - JDK-8284937: riscv: should not allocate special register for temp
+ - JDK-8284997: arm32 build crashes since JDK-8283326
+ - JDK-8285303: riscv: Incorrect register mask in call_native_base
+ - JDK-8285437: riscv: Fix MachNode size mismatch for MacroAssembler::verify_oops*
+ - JDK-8285630: Fix a configure error in RISC-V cross build
+ - JDK-8285675: Temporary fix for arm32 SafeFetch
+ - JDK-8285699: riscv: Provide information when hitting a HaltNode
+ - JDK-8285711: riscv: RVC: Support disassembler show-bytes option
+ - JDK-8285756: clean up use of bad arguments for `@clean` in langtools tests
+ - JDK-8285980: Several tests in compiler/c2/irTests miss @requires vm.compiler2.enabled
+ - JDK-8286481: Exception printed to stdout on Windows when storing transparent image in clipboard
+ - JDK-8286620: Create regression test for verifying setMargin() of JRadioButton
+ - JDK-8286623: Bundle zlib by default with JDK on macos aarch64
+ - JDK-8287227: Shenandoah: A couple of virtual thread tests failed with iu mode even without Loom enabled.
+ - JDK-8287418: riscv: Fix correctness issue of MacroAssembler::movptr
+ - JDK-8287552: riscv: Fix comment typo in li64
+ - JDK-8287970: riscv: jdk/incubator/vector/*VectorTests failing
+ - JDK-8288719: [arm32] SafeFetch32 thumb interleaving causes random crashes
+ - JDK-8289077: Add manual tests to open
+ - JDK-8289238: Refactoring changes to PassFailJFrame Test Framework
+ - JDK-8289510: Improve test coverage for XPath Axes: namespace
+ - JDK-8289512: Fix GCC 12 warnings for adlc output_c.cpp
+ - JDK-8289547: Update javax/swing/Popup/TaskbarPositionTest.java
+ - JDK-8289646: configure script failed on WSL
+ - JDK-8289688: jfr command hangs when it processes invalid file
+ - JDK-8289748: C2 compiled code crashes with SIGFPE with -XX:+StressLCM and -XX:+StressGCM
+ - JDK-8289797: tools/launcher/I18NArgTest.java fails on Japanese Windows environment
+ - JDK-8289917: Metadata for regionsRefilled of G1EvacuationStatistics event is wrong
+ - JDK-8290137: riscv: small refactoring for add_memory_int32/64
+ - JDK-8290164: compiler/runtime/TestConstantsInError.java fails on riscv
+ - JDK-8290464: Optimize ResourceArea zapping on ResourceMark release
+ - JDK-8290469: Add new positioning options to PassFailJFrame test framework
+ - JDK-8290496: riscv: Fix build warnings-as-errors with GCC 11
+ - JDK-8291444: GHA builds/tests won't run manually if disabled from automatic running
+ - JDK-8291830: jvmti/RedefineClasses/StressRedefine failed: assert(!is_null(v)) failed: narrow klass value can never be zero
+ - JDK-8291893: riscv: remove fence.i used in user space
+ - JDK-8291947: riscv: fail to build after JDK-8290840
+ - JDK-8291952: riscv: Remove PRAGMA_NONNULL_IGNORED
+ - JDK-8292182: [TESTLIB] Enhance JAXPPolicyManager to setup required permissions for jtreg version 7 jar
+ - JDK-8292315: Tests should not rely on specific JAR file names (hotspot)
+ - JDK-8292316: Tests should not rely on specific JAR file names (jpackage)
+ - JDK-8292683: Remove BadKeyUsageTest.java from Problem List
+ - JDK-8292698: Improve performance of DataInputStream
+ - JDK-8292716: Configure should check that jtreg is of the required version
+ - JDK-8292763: JDK-8292716 breaks configure without jtreg
+ - JDK-8292867: RISC-V: Simplify weak CAS return value handling
+ - JDK-8293012: ConstantPool::print_on can crash if _cache is NULL
+ - JDK-8293050: RISC-V: Remove redundant non-null assertions about macro-assembler
+ - JDK-8293098: GHA: Harmonize GCC version handling for host and cross builds
+ - JDK-8293100: RISC-V: Need to save and restore callee-saved FloatRegisters in StubGenerator::generate_call_stub
+ - JDK-8293107: GHA: Bump to Ubuntu 22.04
+ - JDK-8293114: JVM should trim the native heap
+ - JDK-8293166: jdk/jfr/jvm/TestDumpOnCrash.java fails on Linux ppc64le and Linux aarch64
+ - JDK-8293177: Verify version numbers in legal files
+ - JDK-8293180: JQuery UI license file not updated
+ - JDK-8293252: Shenandoah: ThreadMXBean synchronizer tests crash with aggressive heuristics
+ - JDK-8293361: GHA: dump config.log in case of configure failure
+ - JDK-8293474: RISC-V: Unify the way of moving function pointer
+ - JDK-8293524: RISC-V: Use macro-assembler functions as appropriate
+ - JDK-8293566: RISC-V: Clean up push and pop registers
+ - JDK-8293811: Provide a reason for PassFailJFrame.forceFail
+ - JDK-8293851: hs_err should print more stack in hex dump
+ - JDK-8294012: RISC-V: get/put_native_u8 missing the case when address&7 is 6
+ - JDK-8294083: RISC-V: Minimal build failed with --disable-precompiled-headers
+ - JDK-8294086: RISC-V: Cleanup InstructionMark usages in the backend
+ - JDK-8294087: RISC-V: RVC: Fix a potential alignment issue and add more alignment assertions for the patchable calls/nops
+ - JDK-8294149: JMH 1.34 and later requires jopt-simple 5.0.4
+ - JDK-8294187: RISC-V: Unify all relocations for the backend into AbstractAssembler::relocate()
+ - JDK-8294366: RISC-V: Partially mark out incompressible regions
+ - JDK-8294430: RISC-V: Small refactoring for movptr_with_offset
+ - JDK-8294492: RISC-V: Use li instead of patchable movptr at non-patchable callsites
+ - JDK-8294679: RISC-V: Misc crash dump improvements
+ - JDK-8294941: GHA: Cut down cross-compilation sysroots
+ - JDK-8294956: GHA: qemu-debootstrap is deprecated, use the regular one
+ - JDK-8295110: RISC-V: Mark out relocations as incompressible
+ - JDK-8295213: Run GHA manually with user-specified make and configure arguments
+ - JDK-8295270: RISC-V: Clean up and refactoring for assembler functions
+ - JDK-8295396: RISC-V: Cleanup useless CompressibleRegions
+ - JDK-8295657: SA: Allow larger object alignments
+ - JDK-8295737: macOS: Print content cut off when width > height with portrait orientation
+ - JDK-8295811: serviceability/sa/TestObjectAlignment.java fails on x86_32
+ - JDK-8295812: Skip the "half float" support in LittleCMS during the build
+ - JDK-8295894: Remove SECOM certificate that is expiring in September 2023
+ - JDK-8295926: RISC-V: C1: Fix LIRGenerator::do_LibmIntrinsic
+ - JDK-8295968: RISC-V: Rename some assembler intrinsic functions for RVV 1.0
+ - JDK-8296384: [TESTBUG] sun/security/provider/SecureRandom/AbstractDrbg/SpecTest.java intermittently timeout
+ - JDK-8296435: RISC-V: Small refactoring for increment/decrement
+ - JDK-8296447: RISC-V: Make the operands order of vrsub_vx/vrsub_vi consistent with RVV 1.0 spec
+ - JDK-8296448: RISC-V: Fix temp usages of heapbase register killed by MacroAssembler::en/decode_klass_not_null
+ - JDK-8296602: RISC-V: improve performance of copy_memory stub
+ - JDK-8296771: RISC-V: C2: assert(false) failed: bad AD file
+ - JDK-8296796: Provide clean, platform-agnostic interface to C-heap trimming
+ - JDK-8296916: RISC-V: Move some small macro-assembler functions to header file
+ - JDK-8297350: Update JMH devkit to 1.36
+ - JDK-8297359: RISC-V: improve performance of floating Max Min intrinsics
+ - JDK-8297476: Increase InlineSmallCode default from 1000 to 2500 for RISC-V
+ - JDK-8297644: RISC-V: Compilation error when shenandoah is disabled
+ - JDK-8297681: Unnecessary color conversion during 4BYTE_ABGR_PRE to INT_ARGB_PRE blit
+ - JDK-8297697: RISC-V: Add support for SATP mode detection
+ - JDK-8297715: RISC-V: C2: Use single-bit instructions from the Zbs extension
+ - JDK-8297887: Update Siphash
+ - JDK-8297923: java.awt.ScrollPane broken after multiple scroll up/down
+ - JDK-8298138: Shenandoah: HdrSeq asserts "sub-bucket index (512) overflow for value ( 1.00)"
+ - JDK-8298921: Create a regression test for JDK-8139581
+ - JDK-8298974: Add ftcolor.c to imported freetype sources
+ - JDK-8299158: Improve MD5 intrinsic on AArch64
+ - JDK-8299168: RISC-V: Fix MachNode size mismatch for MacroAssembler::_verify_oops*
+ - JDK-8299330: Minor improvements in MSYS2 Workflow handling
+ - JDK-8299617: CurrencySymbols.properties is missing the copyright notice
+ - JDK-8299658: C1 compilation crashes in LinearScan::resolve_exception_edge
+ - JDK-8299713: Test javax/swing/JTableHeader/6889007/bug6889007.java failed: Wrong type of cursor
+ - JDK-8299827: Add resolved IP address in connection exception for sockets
+ - JDK-8299847: RISC-V: Improve PrintOptoAssembly output of CMoveI/L nodes
+ - JDK-8299962: Speed up compiler/intrinsics/unsafe/DirectByteBufferTest.java and HeapByteBufferTest.java
+ - JDK-8300053: Shenandoah: Handle more GCCauses in ShenandoahControlThread::request_gc
+ - JDK-8300098: java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java fails with internal timeout when executed with TieredCompilation1/3
+ - JDK-8300109: RISC-V: Improve code generation for MinI/MaxI nodes
+ - JDK-8300405: Screen capture for test JFileChooserSetLocationTest.java, failure case
+ - JDK-8300584: Accelerate AVX-512 CRC32C for small buffers
+ - JDK-8300659: Refactor TestMemoryAwareness to use WhiteBox api for host values
+ - JDK-8300693: Lower the compile threshold and reduce the iterations of warmup loop in VarHandles tests
+ - JDK-8301033: RISC-V: Handle special cases for MinI/MaxI nodes for Zbb
+ - JDK-8301036: RISC-V: Factor out functions baseOffset & baseOffset32 from MacroAssembler
+ - JDK-8301067: RISC-V: better error message when reporting unsupported satp modes
+ - JDK-8301074: Replace NULL with nullptr in share/opto/
+ - JDK-8301097: Update GHA XCode to 12.5.1
+ - JDK-8301153: RISC-V: pipeline class for several instructions is not set correctly
+ - JDK-8301167: Update VerifySignedJar to actually exercise and test verification
+ - JDK-8301187: Memory leaks in OopMapCache
+ - JDK-8301269: Update Commons BCEL to Version 6.7.0
+ - JDK-8301313: RISC-V: C2: assert(false) failed: bad AD file due to missing match rule
+ - JDK-8301367: Add exception handler method to the BaseLdapServer
+ - JDK-8301628: RISC-V: c2 fix pipeline class for several instructions
+ - JDK-8301700: Increase the default TLS Diffie-Hellman group size from 1024-bit to 2048-bit
+ - JDK-8301818: RISC-V: Factor out function mvw from MacroAssembler
+ - JDK-8301852: RISC-V: Optimize class atomic when order is memory_order_relaxed
+ - JDK-8301959: Compile command in compiler.loopopts.TestRemoveEmptyCountedLoop does not work
+ - JDK-8302114: RISC-V: Several foreign jtreg tests fail with debug build after JDK-8301818
+ - JDK-8302150: Speed up compiler/codegen/Test7100757.java
+ - JDK-8302161: Upgrade jQuery UI to version 1.13.2
+ - JDK-8302182: Update Public Suffix List to 88467c9
+ - JDK-8302289: RISC-V: Use bgez instruction in arraycopy_simple_check when possible
+ - JDK-8302736: Major performance regression in Math.log on aarch64
+ - JDK-8302776: RISC-V: Fix typo CSR_INSTERT to CSR_INSTRET
+ - JDK-8303047: avoid NULL after 8301661
+ - JDK-8303154: Investigate and improve instruction cache flushing during compilation
+ - JDK-8303215: Make thread stacks not use huge pages
+ - JDK-8303279: C2: crash in SubTypeCheckNode::sub() at IGVN split if
+ - JDK-8304293: RISC-V: JDK-8276799 missed atomic intrinsic support for C1
+ - JDK-8304314: StackWalkTest.java fails after CODETOOLS-7903373
+ - JDK-8304353: Add lib-test tier1 testing in GHA
+ - JDK-8304725: AsyncGetCallTrace can cause SIGBUS on M1
+ - JDK-8304845: Update PCSC-Lite for Suse Linux to 1.9.9 and fix incomplete license wording
+ - JDK-8304976: Optimize DateTimeFormatterBuilder.ZoneTextPrinterParser.getTree()
+ - JDK-8305006: Use correct register in riscv_enc_fast_unlock()
+ - JDK-8305008: RISC-V: Factor out immediate checking functions from assembler_riscv.inline.hpp
+ - JDK-8305112: RISC-V: Typo fix for RVC description
+ - JDK-8305236: Some LoadLoad barriers in the interpreter are unnecessary after JDK-8220051
+ - JDK-8305421: Work around JDK-8305420 in CDSJDITest.java
+ - JDK-8305425: Thread.isAlive0 doesn't need to call into the VM
+ - JDK-8305512: RISC-V: Enable RVC extension by default on supported hardware
+ - JDK-8305670: Performance regression in LockSupport.unpark with lots of idle threads
+ - JDK-8305728: RISC-V: Use bexti instruction to do single-bit testing
+ - JDK-8305763: Parsing a URI with an underscore goes through a silent exception, negatively impacting performance
+ - JDK-8305766: ProblemList runtime/CompressedOops/CompressedClassPointers.java
+ - JDK-8305858: Resolve multiple definition of 'handleSocketError' when statically linking with JDK native libraries
+ - JDK-8305950: Have -XshowSettings option display tzdata version
+ - JDK-8305995: Footprint regression from JDK-8224957
+ - JDK-8306060: Open source few AWT Insets related tests
+ - JDK-8306076: Open source AWT misc tests
+ - JDK-8306134: Open source some AWT tests relating to Button and a few other classes
+ - JDK-8306135: Clean up and open source some AWT tests
+ - JDK-8306137: Open source several AWT ScrollPane related tests
+ - JDK-8306281: function isWsl() returns false on WSL2
+ - JDK-8306372: Open source AWT CardLayout and Checkbox tests
+ - JDK-8306428: RunThese30M.java crashed with assert(early->flag() == current->flag() || early->flag() == mtNone)
+ - JDK-8306430: Open source some AWT tests related to TextComponent and Toolkit
+ - JDK-8306435: Juggle04/TestDescription.java should be a booleanArr test and not a byteArr one
+ - JDK-8306484: Open source several AWT Choice jtreg tests
+ - JDK-8306566: Open source several clipboard AWT tests
+ - JDK-8306575: Clean up and open source four Dialog related tests
+ - JDK-8306636: Disable compiler/c2/Test6905845.java with -XX:TieredStopAtLevel=3
+ - JDK-8306638: Open source some AWT tests related to datatransfer and Toolkit
+ - JDK-8306667: RISC-V: Fix storeImmN0 matching rule by using zr register
+ - JDK-8306682: Open source a few more AWT Choice tests
+ - JDK-8306718: Optimize and opensource some old AWT tests
+ - JDK-8306738: Select num workers for safepoint ParallelCleanupTask
+ - JDK-8306765: Some client related jtreg problem list entries are malformed
+ - JDK-8306812: Open source several AWT Miscellaneous tests
+ - JDK-8307067: remove broken EnableThreadSMRExtraValidityChecks option
+ - JDK-8307068: store a JavaThread* in the java.lang.Thread object after the JavaThread* is added to the main ThreadsList
+ - JDK-8307078: Opensource and clean up five more AWT Focus related tests
+ - JDK-8307079: Update test java/awt/Choice/DragOffNoSelect.java
+ - JDK-8307083: Open source some drag and drop tests 3
+ - JDK-8307147: [x86] Dangling pointer warning for Assembler::_attributes
+ - JDK-8307150: RISC-V: Remove remaining StoreLoad barrier with UseCondCardMark for Serial/Parallel GC
+ - JDK-8307156: native_thread not protected by TLH
+ - JDK-8307165: java/awt/dnd/NoFormatsDropTest/NoFormatsDropTest.java timed out
+ - JDK-8307299: Move more DnD tests to open
+ - JDK-8307301: Update HarfBuzz to 7.2.0
+ - JDK-8307348: Parallelize heap walk for ObjectCount(AfterGC) JFR event collection
+ - JDK-8307395: Add missing STS to Shenandoah
+ - JDK-8307446: RISC-V: Improve performance of floating point to integer conversion
+ - JDK-8307526: [JFR] Better handling of tampered JFR repository
+ - JDK-8307555: Reduce memory reads in x86 MD5 intrinsic
+ - JDK-8307569: Build with gcc8 is broken after JDK-8307301
+ - JDK-8307572: AArch64: Vector registers are clobbered by some macroassemblers
+ - JDK-8307603: [AIX] Broken build after JDK-8307301
+ - JDK-8307604: gcc12 based Alpine build broken build after JDK-8307301
+ - JDK-8307651: RISC-V: stringL_indexof_char instruction has wrong format string
+ - JDK-8307653: Adjust delay time and gc log argument in TestAbortOnVMOperationTimeout
+ - JDK-8307683: Loop Predication should not hoist range checks with trap on success projection by negating their condition
+ - JDK-8307766: Linux: Provide the option to override the timer slack
+ - JDK-8308089: [riscv-port-jdk17u] Intrinsify Unsafe.storeStoreFence
+ - JDK-8308090: Add container tests for on-the-fly resource quota updates
+ - JDK-8308152: PropertyDescriptor should work with overridden generic getter method
+ - JDK-8308156: VerifyCACerts.java misses blank in error output
+ - JDK-8308192: Error in parsing replay file when staticfield is an array of single dimension
+ - JDK-8308232: nsk/jdb tests don't pass -verbose flag to the debuggee
+ - JDK-8308277: RISC-V: Improve vectorization of Match.sqrt() on floats
+ - JDK-8308283: Build failure with GCC12 & GCC13
+ - JDK-8308300: enhance exceptions in MappedMemoryUtils.c
+ - JDK-8308643: Incorrect value of 'used' jvmstat counter
+ - JDK-8308766: TLAB initialization may cause div by zero
+ - JDK-8308803: Improve java/util/UUID/UUIDTest.java
+ - JDK-8308872: enhance logging and some exception in krb5/Config.java
+ - JDK-8308997: RISC-V: Sign extend when comparing 32-bit value with zero instead of testing the sign bit
+ - JDK-8309088: security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java fails
+ - JDK-8309095: Remove UTF-8 character from TaskbarPositionTest.java
+ - JDK-8309107: Bump update version for OpenJDK: jdk-17.0.9
+ - JDK-8309119: [17u/11u] Redo JDK-8297951: C2: Create skeleton predicates for all If nodes in loop predication
+ - JDK-8309138: Fix container tests for jdks with symlinked conf dir
+ - JDK-8309228: Clarify EXPERIMENTAL flags comment in hotspot/share/runtime/globals.hpp
+ - JDK-8309254: Implement fast-path for ASCII-compatible CharsetEncoders on RISC-V
+ - JDK-8309266: C2: assert(final_con == (jlong)final_int) failed: final value should be integer
+ - JDK-8309297: Adjust ShenandoahHeap print_heap_regions_on
+ - JDK-8309340: Provide sctpHandleSocketErrorWithMessage
+ - JDK-8309427: [riscv-port-jdk17u] Remove unused RoundDoubleModeV C2 node
+ - JDK-8309550: jdk.jfr.internal.Utils::formatDataAmount method should gracefully handle amounts equal to Long.MIN_VALUE
+ - JDK-8309591: Socket.setOption(TCP_QUICKACK) uses wrong level
+ - JDK-8309613: [Windows] hs_err files sometimes miss information about the code containing the error
+ - JDK-8309746: Reconfigure check should include make/conf/version-numbers.conf
+ - JDK-8309862: Unsafe list operations in JfrStringPool
+ - JDK-8309956: Shenandoah: Strengthen the mark word check in string dedup
+ - JDK-8309959: JFR: Display N/A for missing data amount
+ - JDK-8310054: ScrollPane insets are incorrect
+ - JDK-8310126: C1: Missing receiver null check in Reference::get intrinsic
+ - JDK-8310259: Pin msys2/setup-msys2 github action to a specific commit
+ - JDK-8310549: avoid potential leaks in KeystoreImpl.m related to JNU_CHECK_EXCEPTION early returns
+ - JDK-8310551: vmTestbase/nsk/jdb/interrupt/interrupt001/interrupt001.java timed out due to missing prompt
+ - JDK-8310873: Re-enable locked_create_entry symbol check in runtime/NMT/CheckForProperDetailStackTrace.java for RISC-V
+ - JDK-8311033: [macos] PrinterJob does not take into account Sides attribute
+ - JDK-8311249: Remove unused MemAllocator::obj_memory_range
+ - JDK-8311285: report some fontconfig related environment variables in hs_err file
+ - JDK-8311689: Wrong visible amount in Adjustable of ScrollPane
+ - JDK-8311862: RISC-V: small improvements to shift immediate instructions
+ - JDK-8311923: TestIRMatching.java fails on RISC-V
+ - JDK-8312029: Add CriticalNative tests to ProblemList for 8312028
+ - JDK-8312511: GHA: Bump cross-compile runner to Ubuntu 22.04
+ - JDK-8312525: New test runtime/os/TestTrimNative.java#trimNative is failing: did not see the expected RSS reduction
+ - JDK-8312555: Ideographic characters aren't stretched by AffineTransform.scale(2, 1)
+ - JDK-8313262: C2: Sinking node may cause required cast to be dropped
+ - JDK-8313402: C1: Incorrect LoadIndexed value numbering
+ - JDK-8313428: GHA: Bump GCC versions for July 2023 updates
+ - JDK-8313576: GCC 7 reports compiler warning in bundled freetype 2.13.0
+ - JDK-8313676: Amend TestLoadIndexedMismatch test to target intrinsic directly
+ - JDK-8313678: SymbolTable can leak Symbols during cleanup
+ - JDK-8313701: GHA: RISC-V should use the official repository for bootstrap
+ - JDK-8313707: GHA: Bootstrap sysroots with --variant=minbase
+ - JDK-8313796: AsyncGetCallTrace crash on unreadable interpreter method pointer
+ - JDK-8313815: The exception messages printed by jcmd ManagementAgent.start are corrupted on Japanese Windows
+ - JDK-8313874: JNI NewWeakGlobalRef throws exception for null arg
+ - JDK-8314020: Print instruction blocks in byte units
+ - JDK-8314117: RISC-V: Incorrect VMReg encoding in RISCV64Frame.java
+ - JDK-8314118: Update JMH devkit to 1.37
+ - JDK-8314262: GHA: Cut down cross-compilation sysroots deeper
+ - JDK-8314426: runtime/os/TestTrimNative.java is failing on slow machines
+ - JDK-8314501: Shenandoah: sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java fails
+ - JDK-8314517: some tests fail in case ipv6 is disabled on the machine
+ - JDK-8314552: Fix javadoc tests to work with jtreg 7
+ - JDK-8314658: [17u] GHA: Sync up debian-version for cross-builds
+ - JDK-8314730: GHA: Drop libfreetype6-dev transitional package in favor of libfreetype-dev
+ - JDK-8314960: Add Certigna Root CA - 2
+ - JDK-8317040: Exclude cleaner test failing on older releases
+ - JDK-8317643: [17u] Remove designator DEFAULT_PROMOTED_VERSION_PRE=ea for release 17.0.9
+
+Notes on individual issues:
+===========================
+
+hotspot/compiler:
+
+JDK-8276799: Implementation of JEP 422: Linux/RISC-V Port
+=========================================================
+https://openjdk.org/jeps/422
+
+RISC-V is a free and open-source RISC instruction set architecture
+(ISA) designed originally at the University of California, Berkeley,
+and now developed collaboratively under the sponsorship of RISC-V
+International. It is already supported by a wide range of language
+toolchains. With the increasing availability of RISC-V hardware, the
+JDK port has been backported to 17u, following introduction in 19.
+
+security-libs/javax.net.ssl:
+
+JDK-8301700: The Default TLS Diffie-Hellman Group Size Has Been Increased from 1024-bit to 2048-bit
+===================================================================================================
+The JDK implementation of TLS 1.2 now uses a default Diffie Hellman
+keysize of 2048 bits when a TLS_DHE cipher suite is negotiated and
+either the client or server does not support FFDHE.
+
+The JDK TLS implementation supports FFDHE, which can negotiate a
+stronger keysize, and this is enabled by default.
+
+As a workaround, users can revert to the previous key size by setting
+the `jdk.tls.ephemeralDHKeySize` system property to 1024 (at their own
+risk).
+
+This change does not affect TLS 1.3 as the minimum DH group size is
+already 2048 bits.
+
+tools/launcher:
+
+JDK-8305950: `-XshowSettings:locale` Output Now Includes Tzdata Version
+=======================================================================
+The `-XshowSettings` launcher option has been enhanced to print the
+tzdata version used by the JDK. The tzdata version is displayed as
+part of the `locale` showSettings option.
+
+Example output using `-X:showSettings:locale`:
+
+Locale settings:
+ default locale = English
+ default display locale = English
+ default format locale = English
+ tzdata version = 2023c
+
+security-libs/java.security:
+
+JDK-8295894: Removed SECOM Trust System's RootCA1 Root Certificate
+==================================================================
+The following root certificate from SECOM Trust System has been
+removed from the `cacerts` keystore:
+
+Alias Name: secomscrootca1 [jdk]
+Distinguished Name: OU=Security Communication RootCA1, O=SECOM Trust.net, C=JP
+
+JDK-8314960: Added Certigna Root CA Certificate
+===============================================
+The following root certificate has been added to the cacerts
+truststore:
+
+Name: Certigna (Dhimyotis)
+Alias Name: certignarootca
+Distinguished Name: CN=Certigna Root CA, OU=0002 48146308100036, O=Dhimyotis, C=FR
+
+New in release OpenJDK 17.0.8.1 (2023-08-24):
+=============================================
+Live versions of these release notes can be found at:
+ * https://bit.ly/openjdk17081
+
+* Other changes
+ - JDK-8313765: Invalid CEN header (invalid zip64 extra data field size)
+ - JDK-8314677: Bump update version for OpenJDK: jdk-17.0.8.1
+
+Notes on individual issues:
+===========================
+
+core-libs/java.util.jar:
+
+JDK-8313765: Invalid CEN header (invalid zip64 extra data field size)
+=====================================================================
+Additional validity checks in the handling of Zip64 files,
+JDK-8302483, introduced in 17.0.8, caused the use of some valid zip
+files to now fail with the error, `Invalid CEN header (invalid zip64
+extra data field size)`
+
+This release, 17.0.8.1, allows for zero length headers and additional
+padding produced by some Zip64 creation tools.
+
+The following third party tools have also released patches to better
+adhere to the ZIP File Format Specification:
+
+* Apache Commons Compress fix for Empty CEN Zip64 Extra Headers fixed in Commons Compress release 1.11
+* Apache Ant fix for Empty CEN Zip64 Extra Headers fixed in Ant 1.10.14
+* BND issue with writing invalid Extra Headers fixed in BND 5.3
+
+The maven-bundle-plugin 5.1.5 includes the BND 5.3 patch.
+
+If these improved validation checks cause issues for deployed zip or
+jar files, check how the file was created and whether patches are
+available from the generating software to resolve the issue. With
+both JDK releases, the checks can be disabled by setting the new
+system property, `jdk.util.zip.disableZip64ExtraFieldValidation` to
+`true`.
+
New in release OpenJDK 17.0.8 (2023-07-18):
===========================================
Live versions of these release notes can be found at:
@@ -2913,4 +3397,3 @@ its introduction and the effort required to maintain it is
significant. Retain the experimental Java-level JVM compiler
interface (JVMCI) so that developers can continue to use
externally-built versions of the compiler for JIT compilation.
-
diff --git a/discover_trees.sh b/discover_trees.sh
new file mode 100755
index 0000000..8c31278
--- /dev/null
+++ b/discover_trees.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# Copyright (C) 2020 Red Hat, Inc.
+# Written by Andrew John Hughes <gnu.andrew(a)redhat.com>.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+TREE=${1}
+
+if test "x${TREE}" = "x"; then
+ TREE=${PWD}
+fi
+
+if [ -e ${TREE}/nashorn/.hg -o -e ${TREE}/nashorn/merge.changeset ] ; then
+ NASHORN="nashorn" ;
+fi
+
+if [ -e ${TREE}/corba/.hg -o -e ${TREE}/corba/merge.changeset ] ; then
+ CORBA="corba";
+fi
+
+if [ -e ${TREE}/jaxp/.hg -o -e ${TREE}/jaxp/merge.changeset ] ; then
+ JAXP="jaxp";
+fi
+
+if [ -e ${TREE}/jaxws/.hg -o -e ${TREE}/jaxws/merge.changeset ] ; then
+ JAXWS="jaxws";
+fi
+
+if [ -e ${TREE}/langtools/.hg -o -e ${TREE}/langtools/merge.changeset ] ; then
+ LANGTOOLS="langtools";
+fi
+
+if [ -e ${TREE}/jdk/.hg -o -e ${TREE}/jdk/merge.changeset ] ; then
+ JDK="jdk";
+fi
+
+if [ -e ${TREE}/hotspot/.hg -o -e ${TREE}/hotspot/merge.changeset ] ; then
+ HOTSPOT="hotspot";
+fi
+
+SUBTREES="${CORBA} ${JAXP} ${JAXWS} ${LANGTOOLS} ${NASHORN} ${JDK} ${HOTSPOT}";
+echo ${SUBTREES}
diff --git a/fips-17u-bf363eecce3.patch b/fips-17u-51e1d00be4e.patch
similarity index 99%
rename from fips-17u-bf363eecce3.patch
rename to fips-17u-51e1d00be4e.patch
index cd8565c..da1df4d 100644
--- a/fips-17u-bf363eecce3.patch
+++ b/fips-17u-51e1d00be4e.patch
@@ -116,7 +116,7 @@ index 00000000000..f48fc7f7e80
+ AC_SUBST(NSS_LIBDIR)
+])
diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
-index a65d91ee974..a8f054c1397 100644
+index 366682cf044..1f8d782f419 100644
--- a/make/autoconf/libraries.m4
+++ b/make/autoconf/libraries.m4
@@ -33,6 +33,7 @@ m4_include([lib-std.m4])
@@ -2508,7 +2508,7 @@ index 00000000000..dc8bc72fccb
+ }
+}
diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
-index fab52688c04..29337576f37 100644
+index 9be02033877..4dd055a9ccf 100644
--- a/src/java.base/share/conf/security/java.security
+++ b/src/java.base/share/conf/security/java.security
@@ -82,6 +82,17 @@ security.provider.tbd=Apple
@@ -3496,7 +3496,7 @@ index 00000000000..f8d505ca815
+}
\ No newline at end of file
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
-index 9b69072280e..5696b904979 100644
+index 0736ce997e4..0a937fef377 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
@@ -37,6 +37,8 @@ import javax.crypto.*;
@@ -3518,18 +3518,18 @@ index 9b69072280e..5696b904979 100644
private static final long serialVersionUID = -2575874101938349339L;
private static final String PUBLIC = "public";
-@@ -136,9 +141,7 @@ abstract class P11Key implements Key, Length {
+@@ -139,9 +144,7 @@ abstract class P11Key implements Key, Length {
this.tokenObject = tokenObject;
this.sensitive = sensitive;
this.extractable = extractable;
- char[] tokenLabel = this.token.tokenInfo.label;
-- boolean isNSS = (tokenLabel[0] == 'N' && tokenLabel[1] == 'S'
+- isNSS = (tokenLabel[0] == 'N' && tokenLabel[1] == 'S'
- && tokenLabel[2] == 'S');
-+ boolean isNSS = P11Util.isNSS(this.token);
++ isNSS = P11Util.isNSS(this.token);
boolean extractKeyInfo = (!DISABLE_NATIVE_KEYS_EXTRACTION && isNSS &&
extractable && !tokenObject);
this.keyIDHolder = new NativeKeyHolder(this, keyID, session,
-@@ -379,7 +382,9 @@ abstract class P11Key implements Key, Length {
+@@ -383,7 +386,9 @@ abstract class P11Key implements Key, Length {
new CK_ATTRIBUTE(CKA_SENSITIVE),
new CK_ATTRIBUTE(CKA_EXTRACTABLE),
});
@@ -3540,13 +3540,13 @@ index 9b69072280e..5696b904979 100644
return new P11PrivateKey
(session, keyID, algorithm, keyLength, attributes);
} else {
-@@ -461,7 +466,8 @@ abstract class P11Key implements Key, Length {
+@@ -465,7 +470,8 @@ abstract class P11Key implements Key, Length {
}
public String getFormat() {
token.ensureValid();
-- if (sensitive || (extractable == false)) {
+- if (sensitive || !extractable || (isNSS && tokenObject)) {
+ if (!plainKeySupportEnabled &&
-+ (sensitive || (extractable == false))) {
++ (sensitive || !extractable || (isNSS && tokenObject))) {
return null;
} else {
return "RAW";
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index fc8662a..7ff27d6 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -8,7 +8,7 @@
# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
# PROJECT_NAME=openjdk
# REPO_NAME=jdk17u
-# VERSION=jdk-17.0.7+7
+# VERSION=jdk-17.0.7+9
# or to eg prepare systemtap:
# icedtea7's jstack and other tapsets
# VERSION=6327cf1cea9e
@@ -29,8 +29,6 @@ set -e
OPENJDK_URL_DEFAULT=https://github.com
COMPRESSION_DEFAULT=xz
-# Corresponding IcedTea version
-ICEDTEA_VERSION=12.0
if [ "x$1" = "xhelp" ] ; then
echo -e "Behaviour may be specified by setting the following variables:\n"
@@ -40,8 +38,8 @@ if [ "x$1" = "xhelp" ] ; then
echo "OPENJDK_URL - the URL to retrieve code from (optional; defaults to ${OPENJDK_URL_DEFAULT})"
echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
- echo "REPO_ROOT - the location of the Git repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
- echo "TO_COMPRESS - what part of clone to pack (default is openjdk)"
+ echo "REPO_ROOT - the location of the Git repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME.git)"
+ echo "TO_COMPRESS - what part of clone to pack (default is ${VERSION})"
echo "BOOT_JDK - the bootstrap JDK to satisfy the configure run"
exit 1;
fi
@@ -52,6 +50,7 @@ if [ "x$VERSION" = "x" ] ; then
exit 2
fi
echo "Version: ${VERSION}"
+
NUM_VER=${VERSION##jdk-}
RELEASE_VER=${NUM_VER%%+*}
BUILD_VER=${NUM_VER##*+}
@@ -117,8 +116,8 @@ if [ "x$REPO_ROOT" = "x" ] ; then
fi;
if [ "x$TO_COMPRESS" = "x" ] ; then
- TO_COMPRESS="openjdk"
- echo "No targets to be compressed specified, ; default to ${TO_COMPRESS}"
+ TO_COMPRESS="${VERSION}"
+ echo "No targets to be compressed specified ; default to ${TO_COMPRESS}"
fi;
echo -e "Settings:"
@@ -140,9 +139,10 @@ else
mkdir "${FILE_NAME_ROOT}"
pushd "${FILE_NAME_ROOT}"
echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
- git clone -b ${VERSION} ${REPO_ROOT} openjdk
+ git clone -b ${VERSION} ${REPO_ROOT} ${VERSION}
popd
fi
+
pushd "${FILE_NAME_ROOT}"
# Generate .src-rev so build has knowledge of the revision the tarball was created from
mkdir build
@@ -153,22 +153,22 @@ pushd "${FILE_NAME_ROOT}"
rm -rf build
# Remove commit checks
- echo "Removing $(find openjdk -name '.jcheck' -print)"
- find openjdk -name '.jcheck' -print0 | xargs -0 rm -rf
+ echo "Removing $(find ${VERSION} -name '.jcheck' -print)"
+ find ${VERSION} -name '.jcheck' -print0 | xargs -0 rm -r
# Remove history and GHA
- echo "find openjdk -name '.hgtags'"
- find openjdk -name '.hgtags' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.hgignore'"
- find openjdk -name '.hgignore' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.gitattributes'"
- find openjdk -name '.gitattributes' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.gitignore'"
- find openjdk -name '.gitignore' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.git'"
- find openjdk -name '.git' -exec rm -rfv '{}' '+'
- echo "find openjdk -name '.github'"
- find openjdk -name '.github' -exec rm -rfv '{}' '+'
+ echo "find ${VERSION} -name '.hgtags'"
+ find ${VERSION} -name '.hgtags' -exec rm -fv '{}' '+'
+ echo "find ${VERSION} -name '.hgignore'"
+ find ${VERSION} -name '.hgignore' -exec rm -fv '{}' '+'
+ echo "find ${VERSION} -name '.gitattributes'"
+ find ${VERSION} -name '.gitattributes' -exec rm -fv '{}' '+'
+ echo "find ${VERSION} -name '.gitignore'"
+ find ${VERSION} -name '.gitignore' -exec rm -fv '{}' '+'
+ echo "find ${VERSION} -name '.git'"
+ find ${VERSION} -name '.git' -exec rm -rfv '{}' '+'
+ echo "find ${VERSION} -name '.github'"
+ find ${VERSION} -name '.github' -exec rm -rfv '{}' '+'
echo "Compressing remaining forest"
if [ "X$COMPRESSION" = "Xxz" ] ; then
diff --git a/icedtea_sync.sh b/icedtea_sync.sh
index e5c54f3..c1b8f6a 100755
--- a/icedtea_sync.sh
+++ b/icedtea_sync.sh
@@ -1,192 +1 @@
-#!/bin/bash
-
-# Copyright (C) 2019 Red Hat, Inc.
-# Written by Andrew John Hughes <gnu.andrew(a)redhat.com>.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-ICEDTEA_USE_VCS=true
-
-ICEDTEA_VERSION=3.15.0
-ICEDTEA_URL=https://icedtea.classpath.org/download/source
-ICEDTEA_SIGNING_KEY=CFDA0F9B35964222
-
-ICEDTEA_HG_URL=https://icedtea.classpath.org/hg/icedtea11
-
-set -e
-
-RPM_DIR=${PWD}
-if [ ! -f ${RPM_DIR}/jconsole.desktop.in ] ; then
- echo "Not in RPM source tree.";
- exit 1;
-fi
-
-if test "x${TMPDIR}" = "x"; then
- TMPDIR=/tmp;
-fi
-WORKDIR=${TMPDIR}/it.sync
-
-echo "Using working directory ${WORKDIR}"
-mkdir ${WORKDIR}
-pushd ${WORKDIR}
-
-if test "x${WGET}" = "x"; then
- WGET=$(which wget);
- if test "x${WGET}" = "x"; then
- echo "wget not found";
- exit 1;
- fi
-fi
-
-if test "x${TAR}" = "x"; then
- TAR=$(which tar)
- if test "x${TAR}" = "x"; then
- echo "tar not found";
- exit 2;
- fi
-fi
-
-echo "Dependencies:";
-echo -e "\tWGET: ${WGET}";
-echo -e "\tTAR: ${TAR}\n";
-
-if test "x${ICEDTEA_USE_VCS}" = "xtrue"; then
- echo "Mode: Using VCS";
-
- if test "x${GREP}" = "x"; then
- GREP=$(which grep);
- if test "x${GREP}" = "x"; then
- echo "grep not found";
- exit 3;
- fi
- fi
-
- if test "x${CUT}" = "x"; then
- CUT=$(which cut);
- if test "x${CUT}" = "x"; then
- echo "cut not found";
- exit 4;
- fi
- fi
-
- if test "x${TR}" = "x"; then
- TR=$(which tr);
- if test "x${TR}" = "x"; then
- echo "tr not found";
- exit 5;
- fi
- fi
-
- if test "x${HG}" = "x"; then
- HG=$(which hg);
- if test "x${HG}" = "x"; then
- echo "hg not found";
- exit 6;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tGREP: ${GREP}";
- echo -e "\tCUT: ${CUT}";
- echo -e "\tTR: ${TR}";
- echo -e "\tHG: ${HG}";
-
- echo "Checking out repository from VCS...";
- ${HG} clone ${ICEDTEA_HG_URL} icedtea
-
- echo "Obtaining version from configure.ac...";
- ROOT_VER=$(${GREP} '^AC_INIT' icedtea/configure.ac|${CUT} -d ',' -f 2|${TR} -d '[][:space:]')
- echo "Root version from configure: ${ROOT_VER}";
-
- VCS_REV=$(${HG} log -R icedtea --template '{node|short}' -r tip)
- echo "VCS revision: ${VCS_REV}";
-
- ICEDTEA_VERSION="${ROOT_VER}-${VCS_REV}"
- echo "Creating icedtea-${ICEDTEA_VERSION}";
- mkdir icedtea-${ICEDTEA_VERSION}
- echo "Copying required files from checkout to icedtea-${ICEDTEA_VERSION}";
- # Commented out for now as IcedTea 6's jconsole.desktop.in is outdated
- #cp -a icedtea/jconsole.desktop.in ../icedtea-${ICEDTEA_VERSION}
- cp -a ${RPM_DIR}/jconsole.desktop.in icedtea-${ICEDTEA_VERSION}
- cp -a icedtea/tapset icedtea-${ICEDTEA_VERSION}
-
- rm -rf icedtea
-else
- echo "Mode: Using tarball";
-
- if test "x${ICEDTEA_VERSION}" = "x"; then
- echo "No IcedTea version specified for tarball download.";
- exit 3;
- fi
-
- if test "x${CHECKSUM}" = "x"; then
- CHECKSUM=$(which sha256sum)
- if test "x${CHECKSUM}" = "x"; then
- echo "sha256sum not found";
- exit 4;
- fi
- fi
-
- if test "x${PGP}" = "x"; then
- PGP=$(which gpg)
- if test "x${PGP}" = "x"; then
- echo "gpg not found";
- exit 5;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tCHECKSUM: ${CHECKSUM}";
- echo -e "\tPGP: ${PGP}\n";
-
- echo "Checking for IcedTea signing key ${ICEDTEA_SIGNING_KEY}...";
- if ! gpg --list-keys ${ICEDTEA_SIGNING_KEY}; then
- echo "IcedTea signing key ${ICEDTEA_SIGNING_KEY} not installed.";
- exit 6;
- fi
-
- echo "Downloading IcedTea release tarball...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz
- echo "Downloading IcedTea tarball signature...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- echo "Downloading IcedTea tarball checksums...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Verifying checksums...";
- ${CHECKSUM} --check --ignore-missing icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Checking signature...";
- ${PGP} --verify icedtea-${ICEDTEA_VERSION}.tar.xz.sig
-
- echo "Extracting files...";
- ${TAR} xJf icedtea-${ICEDTEA_VERSION}.tar.xz \
- icedtea-${ICEDTEA_VERSION}/tapset \
- icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in
-
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- rm -vf icedtea-${ICEDTEA_VERSION}.sha256
-fi
-
-echo "Replacing desktop files...";
-mv -v icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in ${RPM_DIR}
-
-echo "Creating new tapset tarball...";
-mv -v icedtea-${ICEDTEA_VERSION} openjdk
-${TAR} cJf ${RPM_DIR}/tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz openjdk
-
-rm -rvf openjdk
-
-popd
-rm -rf ${WORKDIR}
+# this file is intentionally not here, as portable builds do not have desktop integration
diff --git a/java-17-openjdk-portable.spec b/java-17-openjdk-portable.spec
index 655ccd1..c4526aa 100644
--- a/java-17-openjdk-portable.spec
+++ b/java-17-openjdk-portable.spec
@@ -30,7 +30,7 @@
# Enable static library builds by default.
%bcond_without staticlibs
# Build a fresh libjvm.so for use in a copy of the bootstrap JDK
-%bcond_without fresh_libjvm
+%bcond_with fresh_libjvm
# Build with system libraries
%bcond_with system_libs
@@ -41,8 +41,6 @@
%define __os_install_post %{nil}
%endif
-%global unpacked_licenses %{_datarootdir}/licenses
-
# Workaround for stripping of debug symbols from static libraries
%if %{with staticlibs}
%define __brp_strip_static_archive %{nil}
@@ -66,10 +64,6 @@
# See: https://bugzilla.redhat.com/show_bug.cgi?id=1520879
%global _find_debuginfo_opts -g
-# With LTO flags enabled, debuginfo checks fail for some reason. Disable
-# LTO for a passing build. This really needs to be looked at.
-%define _lto_cflags %{nil}
-
# note: parametrized macros are order-sensitive (unlike not-parametrized) even with normal macros
# also necessary when passing it as parameter to other macros. If not macro, then it is considered a switch
# see the difference between global and define:
@@ -147,16 +141,16 @@
# Set of architectures which support the serviceability agent
%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm}
# Set of architectures which support class data sharing
-# See https://bugzilla.redhat.com/show_bug.cgi?id=513605
-# MetaspaceShared::generate_vtable_methods is not implemented for the PPC JIT
-%global share_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{arm} s390x
+# As of JDK-8005165 in OpenJDK 10, class sharing is not arch-specific
+# However, it does segfault on the Zero assembler port, so currently JIT only
+%global share_arches %{jit_arches}
# Set of architectures for which we build the Shenandoah garbage collector
%global shenandoah_arches x86_64 %{aarch64}
# Set of architectures for which we build the Z garbage collector
%global zgc_arches x86_64
# Set of architectures for which alt-java has SSB mitigation
%global ssbd_arches x86_64
-# Set of architectures for which java has short vector math library (libsvml.so)
+# Set of architectures for which java has short vector math library (libjsvml.so)
%global svml_arches x86_64
# Set of architectures where we verify backtraces with gdb
# s390x fails on RHEL 7 so we exclude it there
@@ -166,7 +160,7 @@
%global gdb_arches %{jit_arches} %{zero_arches}
%endif
-# By default, we build a debug build during main build on JIT architectures
+# By default, we build a slowdebug build during main build on JIT architectures
%if %{with slowdebug}
%ifarch %{debug_arches}
%global include_debug_build 1
@@ -237,17 +231,24 @@
%global static_libs_target %{nil}
%endif
-# RPM JDK builds keep the debug symbols internal, to be later stripped by RPM
-%global debug_symbols internal
-
-# unlike portables,the rpms have to use static_libs_target very dynamically
-%global bootstrap_targets images legacy-jre-image
-%global release_targets images docs-zip legacy-jre-image
+# The static libraries are produced under the same configuration as the main
+# build for portables, as we expect in-tree libraries to be used throughout.
+# If system libraries are enabled, the static libraries will also use them
+# which may cause issues.
+%global bootstrap_targets images %{static_libs_target} legacy-jre-image
+%global release_targets images docs-zip %{static_libs_target} legacy-jre-image
# No docs nor bootcycle for debug builds
-%global debug_targets images legacy-jre-image
+%global debug_targets images %{static_libs_target} legacy-jre-image
# Target to use to just build HotSpot
%global hotspot_target hotspot
+# DTS toolset to use to provide gcc & binutils
+%global dtsversion 10
+
+# Disable LTO as this causes build failures at the moment.
+# See RHBZ#1861401
+%define _lto_cflags %{nil}
+
# Filter out flags from the optflags macro that cause problems with the OpenJDK build
# We filter out -O flags so that the optimization of HotSpot is not lowered from O3 to O2
# We filter out -Wall which will otherwise cause HotSpot to produce hundreds of thousands of warnings (100+mb logs)
@@ -333,20 +334,20 @@
# New Version-String scheme-style defines
%global featurever 17
%global interimver 0
-%global updatever 8
+%global updatever 9
%global patchver 0
# buildjdkver is usually same as %%{featurever},
# but in time of bootstrap of next jdk, it is featurever-1,
# and this it is better to change it here, on single place
-%global buildjdkver %{featurever}
+%global buildjdkver 17
# We don't add any LTS designator for STS packages (Fedora and EPEL).
# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
%if 0%{?rhel} && !0%{?epel}
%global lts_designator "LTS"
%global lts_designator_zip -%{lts_designator}
%else
- %global lts_designator ""
- %global lts_designator_zip ""
+ %global lts_designator ""
+ %global lts_designator_zip ""
%endif
# JDK to use for bootstrapping
%global bootjdk /usr/lib/jvm/java-%{buildjdkver}-openjdk
@@ -372,26 +373,34 @@
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{name}&…
%else
%if 0%{?rhel}
-%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20…
+%global oj_vendor_bug_url https://access.redhat.com/support/cases/
%else
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi
%endif
%endif
%endif
-%global oj_vendor_version (Red_Hat-%{version}-%{release})
+%global oj_vendor_version (Red_Hat-%{version}-%{rpmrelease})
# Define IcedTea version used for SystemTap tapsets and desktop file
%global icedteaver 6.0.0pre00-c848b93a8598
# Define current Git revision for the FIPS support patches
-%global fipsver bf363eecce3
+%global fipsver 51e1d00be4e
+# Define JDK versions
+%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
+%global javaver %{featurever}
+# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
+%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
+# The tag used to create the OpenJDK tarball
+%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Standard JPackage naming and versioning defines
%global origin openjdk
%global origin_nice OpenJDK
-%global top_level_dir_name %{origin}
+%global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
-%global buildver 7
-%global rpmrelease 1
+%global buildver 9
+%global rpmrelease 2
+#%%global tagsuffix %%{nil}
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -404,14 +413,6 @@
# for techpreview, using 1, so slowdebugs can have 0
%global priority %( printf '%08d' 1 )
%endif
-%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
-%global javaver %{featurever}
-
-# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
-%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
-
-# The tag used to create the OpenJDK tarball
-%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Define milestone (EA for pre-releases, GA for releases)
# Release will be (where N is usually a number starting at 1):
@@ -421,7 +422,7 @@
%if %{is_ga}
%global build_type GA
%global ea_designator ""
-%global ea_designator_zip ""
+%global ea_designator_zip %{nil}
%global extraver %{nil}
%global eaprefix %{nil}
%else
@@ -438,12 +439,10 @@
# images directories from upstream build
%global jdkimage jdk
%global static_libs_image static-libs
-# installation directory for static libraries
-%global static_libs_root lib/static
-%global static_libs_arch_dir %{static_libs_root}/linux-%{archinstall}
-%global static_libs_install_dir %{static_libs_arch_dir}/glibc
# output dir stub
%define buildoutputdir() %{expand:build/jdk%{featurever}.build%{?1}}
+%define installoutputdir() %{expand:install/jdk%{featurever}.install%{?1}}
+%define packageoutputdir() %{expand:packages/jdk%{featurever}.packages%{?1}}
# we can copy the javadoc to not arched dir, or make it not noarch
%define uniquejavadocdir() %{expand:%{fullversion}.%{_arch}%{?1}}
# main id and dir of this jdk
@@ -464,6 +463,10 @@
# Intentionally use jdkportablenameimpl here since we want to have static-libs files overlayed on
# top of the JDK archive
%define staticlibsportablename() %{expand:%{jdkportablenameimpl -- %%{1}}}
+%define docportablename() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable.docs;g" | sed "s;openjdkportable;el;g")
+%define docportablearchive() %{docportablename}.tar.xz
+%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable.misc;g" | sed "s;openjdkportable;el;g")
+%define miscportablearchive() %{miscportablename}.tar.xz
# RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1}
# so we have to pass in "" but evaluate it, otherwise files record will include it
@@ -493,6 +496,12 @@
%global __requires_exclude ^(%{_privatelibs}|%{_publiclibs})$
%endif
+# VM variant being built
+%ifarch %{zero_arches}
+%global vm_variant zero
+%else
+%global vm_variant server
+%endif
%global etcjavasubdir %{_sysconfdir}/java/java-%{javaver}-%{origin}
%define etcjavadir() %{expand:%{etcjavasubdir}/%{uniquesuffix -- %{?1}}}
@@ -515,20 +524,6 @@
%global alternatives_requires %{_sbindir}/alternatives
%endif
-%if %{with_systemtap}
-# Where to install systemtap tapset (links)
-# We would like these to be in a package specific sub-dir,
-# but currently systemtap doesn't support that, so we have to
-# use the root tapset dir for now. To distinguish between 64
-# and 32 bit architectures we place the tapsets under the arch
-# specific dir (note that systemtap will only pickup the tapset
-# for the primary arch for now). Systemtap uses the machine name
-# aka target_cpu as architecture specific directory name.
-%global tapsetroot /usr/share/systemtap
-%global tapsetdirttapset %{tapsetroot}/tapset/
-%global tapsetdir %{tapsetdirttapset}/%{stapinstall}
-%endif
-
# x86 is no longer supported
%if 0%{?java_arches:1}
ExclusiveArch: %{java_arches}
@@ -536,8 +531,8 @@ ExclusiveArch: %{java_arches}
ExcludeArch: %{ix86}
%endif
-# Portables have no rpo (requires/provides), but thsoe are awesome for orientation in spec
-# also scriptlets are hapily missing and files are handled old fashion
+# Portables have no repo (requires/provides), but these are awesome for orientation in spec
+# Also scriptlets are happily missing and files are handled old fashion
# not-duplicated requires/provides/obsoletes for normal/debug packages
%define java_rpo() %{expand:
}
@@ -548,14 +543,18 @@ ExcludeArch: %{ix86}
%define java_static_libs_rpo() %{expand:
}
+%define java_unstripped_rpo() %{expand:
+}
+
+%define java_docs_rpo() %{expand:
+}
+
+%define java_misc_rpo() %{expand:
+}
# Prevent brp-java-repack-jars from being run
%global __jar_repack 0
-# portables have grown out of its component, moving back to java-x-vendor
-# this expression, when declared as global, filled component with java-x-vendor portable
-%define component %(echo %{name} | sed "s;-portable;;g")
-
Name: java-%{javaver}-%{origin}-portable
Version: %{newjavaver}.%{buildver}
Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
@@ -570,6 +569,11 @@ Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
# provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0".
Epoch: 1
+
+# portables have grown out of its component, moving back to java-x-vendor
+# this expression, when declared as global, filled component with java-x-vendor portable
+%define component %(echo %{name} | sed "s;-portable;;g")
+
Summary: %{origin_nice} %{featurever} Runtime Environment portable edition
# Groups are only used up to RHEL 8 and on Fedora versions prior to F30
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
@@ -593,9 +597,8 @@ Group: Development/Languages
License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib and ISC and FTL and RSA
URL: http://openjdk.java.net/
-
# The source tarball, generated using generate_source_tarball.sh
-Source0: openjdk-jdk%{featurever}u-%{vcstag}.tar.xz
+Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}%{ea_desi…
# Use 'icedtea_sync.sh' to update the following
# They are based on code contained in the IcedTea project (6.x).
@@ -614,8 +617,7 @@ Source10: NEWS
Source11: nss.cfg.in
# Removed libraries that we link instead
-# Disabled in portables
-#Source12: remove-intree-libraries.sh
+Source12: remove-intree-libraries.sh
# Ensure we aren't using the limited crypto policy
Source13: TestCryptoLevel.java
@@ -629,37 +631,22 @@ Source15: TestSecurityProperties.java
# Ensure vendor settings are correct
Source16: CheckVendor.java
-# nss fips configuration file
-Source17: nss.fips.cfg.in
-
# Ensure translations are available for new timezones
Source18: TestTranslations.java
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-# boot jdk for portable build root on
-Source1001: ojdk17-aarch64-17.35.tar.gz
-Source1002: ojdk17-ppc64le-17.35.tar.gz
-Source1003: ojdk17-x86_64-17.35.tar.gz
-Source1004: ojdk17-s390x-17.35.tar.gz
-%endif
-
############################################
#
# RPM/distribution specific patches
#
############################################
-# NSS via SunPKCS11 Provider (disabled comment
-# due to memory leak).
-Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
-# RH1750419: enable build of speculative store bypass hardened alt-java (CVE-2018-3639)
-Patch600: rh1750419-redhat_alt_java.patch
-
# Ignore AWTError when assistive technologies are loaded
Patch1: rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
-# Restrict access to java-atk-wrapper classes
-Patch2: rh1648644-java_access_bridge_privileged_security.patch
Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch
+# NSS via SunPKCS11 Provider (disabled due to memory leak).
+Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
+# RH1750419: enable build of speculative store bypass hardened alt-java (CVE-2018-3639)
+Patch600: rh1750419-redhat_alt_java.patch
# Depend on pcsc-lite-libs instead of pcsc-lite-devel as this is only in optional repo
Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
@@ -707,12 +694,27 @@ Patch1001: fips-17u-%{fipsver}.patch
#
#############################################
+# Currently empty
+
+#############################################
+#
+# OpenJDK patches appearing in 17.0.10
+#
+#############################################
+# JDK-8312489, OJ2095: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar
+Patch2000: jdk8312489-max_sig_default_increase.patch
+
#############################################
#
-# OpenJDK patches appearing in 17.0.8
+# Portable build specific patches
+#
+#############################################
+
+#############################################
+#
+# OpenJDK patches targetted for 17.0.6
#
#############################################
-Patch2003: jdk8305995-footprint_regression_from_jdk_8224957
BuildRequires: autoconf
BuildRequires: automake
@@ -722,11 +724,11 @@ BuildRequires: cups-devel
BuildRequires: desktop-file-utils
# elfutils only are OK for build without AOT
BuildRequires: elfutils-devel
+BuildRequires: file
BuildRequires: fontconfig-devel
-BuildRequires: freetype-devel
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-BuildRequires: devtoolset-8-gcc
-BuildRequires: devtoolset-8-gcc-c++
+BuildRequires: devtoolset-%{dtsversion}-gcc
+BuildRequires: devtoolset-%{dtsversion}-gcc-c++
%else
BuildRequires: gcc
# gcc-c++ is already needed
@@ -746,12 +748,11 @@ BuildRequires: libXrandr-devel
BuildRequires: libXrender-devel
BuildRequires: libXt-devel
BuildRequires: libXtst-devel
-# Requirement for setting up nss.cfg and nss.fips.cfg
+# Requirement for setting up nss.cfg
BuildRequires: nss-devel
# Requirement for system security property test
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-BuildRequires: crypto-policies
-%endif
+# N/A for portable. RHEL7 doesn't provide them
+#BuildRequires: crypto-policies
BuildRequires: pkgconfig
BuildRequires: xorg-x11-proto-devel
BuildRequires: zip
@@ -761,16 +762,18 @@ BuildRequires: unzip
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
# No javapackages-filesystem on el7,nor is needed for portables
%else
-BuildRequires: javapackages-filesystem
+# BuildRequires: javapackages-filesystem
BuildRequires: java-%{buildjdkver}-openjdk-devel
%endif
# Zero-assembler build requirement
%ifarch %{zero_arches}
BuildRequires: libffi-devel
%endif
+# Full documentation build requirements
+BuildRequires: graphviz
+BuildRequires: pandoc
# 2023c required as of JDK-8305113
BuildRequires: tzdata-java >= 2023c
-
# cacerts build requirement in portable mode
BuildRequires: ca-certificates
# Earlier versions have a bug in tree vectorization on PPC
@@ -789,18 +792,18 @@ BuildRequires: lcms2-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
%else
-# Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h
-Provides: bundled(freetype) = 2.12.1
+# Version in src/java.desktop/share/legal/freetype.md
+Provides: bundled(freetype) = 2.13.0
# Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
Provides: bundled(giflib) = 5.2.1
# Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
-Provides: bundled(harfbuzz) = 4.4.1
+Provides: bundled(harfbuzz) = 7.2.0
# Version in src/java.desktop/share/native/liblcms/lcms2.h
-Provides: bundled(lcms2) = 2.12.0
+Provides: bundled(lcms2) = 2.15.0
# Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
Provides: bundled(libjpeg) = 6b
# Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h
-Provides: bundled(libpng) = 1.6.37
+Provides: bundled(libpng) = 1.6.39
# We link statically against libstdc++ to increase portability
BuildRequires: libstdc++-static
%endif
@@ -875,7 +878,7 @@ Group: Development/Tools
%{java_devel_rpo -- %{fastdebug_suffix_unquoted}}
%description devel-fastdebug
-The %{origin_nice} %{featurever} development tools - portable edition.
+The %{origin_nice} %{featurever} runtime environment and development tools - portable edition
%{fastdebug_warning}
%endif
@@ -883,7 +886,7 @@ The %{origin_nice} %{featurever} development tools - portable edition.
%if %{include_normal_build}
%package static-libs
-Summary: %{origin_nice} %{featurever} libraries for static linking - portable edition.
+Summary: %{origin_nice} %{featurever} libraries for static linking - portable edition
%{java_static_libs_rpo %{nil}}
@@ -898,7 +901,7 @@ Summary: %{origin_nice} %{featurever} libraries for static linking - portable ed
%{java_static_libs_rpo -- %{debug_suffix_unquoted}}
%description static-libs-slowdebug
-The %{origin_nice} %{featurever} libraries for static linking - portable edition.
+The %{origin_nice} %{featurever} libraries for static linking - portable edition
%{debug_warning}
%endif
@@ -909,13 +912,42 @@ Summary: %{origin_nice} %{featurever} libraries for static linking - portable ed
%{java_static_libs_rpo -- %{fastdebug_suffix_unquoted}}
%description static-libs-fastdebug
-The %{origin_nice} %{featurever} libraries for static linking - portable edition.
+The %{origin_nice} %{featurever} libraries for static linking - portable edition
%{fastdebug_warning}
%endif
# staticlibs
%endif
+%if %{include_normal_build}
+%package unstripped
+Summary: The %{origin_nice} %{featurever} runtime environment.
+
+%{java_unstripped_rpo %{nil}}
+
+%description unstripped
+The %{origin_nice} %{featurever} runtime environment.
+
+%endif
+
+%if %{include_normal_build}
+%package docs
+Summary: %{origin_nice} %{featurever} API documentation
+
+%{java_docs_rpo %{nil}}
+
+%description docs
+The %{origin_nice} %{featurever} API documentation.
+
+%package misc
+Summary: %{origin_nice} %{featurever} miscellany
+
+%{java_misc_rpo %{nil}}
+
+%description misc
+The %{origin_nice} %{featurever} miscellany.
+%endif
+
%package sources
Summary: %{origin_nice} %{featurever} full patched sources of portable JDK
@@ -951,7 +983,6 @@ else
echo "include_fastdebug_build is %{include_fastdebug_build}, that is invalid. Use 1 for yes or 0 for no"
exit 13
fi
-
if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 -a %{include_fastdebug_build} -eq 0 ] ; then
echo "You have disabled all builds (normal,fastdebug,slowdebug). That is a no go."
exit 14
@@ -980,17 +1011,18 @@ sh %{SOURCE12} %{top_level_dir_name}
# Patch the JDK
pushd %{top_level_dir_name}
%patch1 -p1
-%patch2 -p1
%patch3 -p1
%patch6 -p1
# Add crypto policy and FIPS support
%patch1001 -p1
# nss.cfg PKCS11 support; must come last as it also alters java.security
%patch1000 -p1
-%patch2003 -p1
+# JDK-8312489 backport, coming in 17.0.10
+%patch2000 -p1
+# alt-java support
+%patch600 -p1
popd # openjdk
-%patch600
# The OpenJDK version file includes the current
# upstream version information. For some reason,
@@ -1009,37 +1041,12 @@ if [ "x${UPSTREAM_EA_DESIGNATOR}" != "x%{ea_designator}" ] ; then
echo "WARNING: Designator mismatch";
echo "Spec file is configured for a %{build_type} build with designator '%{ea_designator}'"
echo "Upstream version-pre setting is '${UPSTREAM_EA_DESIGNATOR}'";
- exit 17
+ # Temporarily commented out as local copy of jdk-17.0.8+7 has the wrong setting
+ # This is fixed in the final upstream version
+ # exit 17
fi
-# Extract systemtap tapsets
-%if %{with_systemtap}
-tar --strip-components=1 -x -I xz -f %{SOURCE8}
-%if %{include_debug_build}
-cp -r tapset tapset%{debug_suffix}
-%endif
-%if %{include_fastdebug_build}
-cp -r tapset tapset%{fastdebug_suffix}
-%endif
-
-for suffix in %{build_loop} ; do
- for file in "tapset"$suffix/*.in; do
- OUTPUT_FILE=`echo $file | sed -e "s:\.stp\.in$:-%{version}-%{release}.%{_arch}.stp:g"`
- sed -e "s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/server/libjvm.so:g" $file > $file.1
- sed -e "s:@JAVA_SPEC_VER@:%{javaver}:g" $file.1 > $file.2
-# TODO find out which architectures other than i686 have a client vm
-%ifarch %{ix86}
- sed -e "s:@ABS_CLIENT_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/client/libjvm.so:g" $file.2 > $OUTPUT_FILE
-%else
- sed -e "/@ABS_CLIENT_LIBJVM_SO@/d" $file.2 > $OUTPUT_FILE
-%endif
- sed -i -e "s:@ABS_JAVA_HOME_DIR@:%{_jvmdir}/%{sdkdir -- $suffix}:g" $OUTPUT_FILE
- sed -i -e "s:@INSTALL_ARCH_DIR@:%{archinstall}:g" $OUTPUT_FILE
- sed -i -e "s:@prefix@:%{_jvmdir}/%{sdkdir -- $suffix}/:g" $OUTPUT_FILE
- done
-done
-# systemtap tapsets ends
-%endif
+# Systemtap is processed in rpms
# Prepare desktop files
# Portables do not have desktop integration
@@ -1047,30 +1054,7 @@ done
# Setup nss.cfg
sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE11} > nss.cfg
-# Setup nss.fips.cfg
-sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE17} > nss.fips.cfg
-
%build
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-mkdir bootjdk
-pushd bootjdk
-%ifarch %{aarch64}
-tar --strip-components=1 -xf %{SOURCE1001}
-%endif
-%ifarch %{ppc64le}
-tar --strip-components=1 -xf %{SOURCE1002}
-%endif
-%ifarch x86_64
-tar --strip-components=1 -xf %{SOURCE1003}
-%endif
-%ifarch s390x
-tar --strip-components=1 -xf %{SOURCE1004}
-%endif
-BOOT_JDK=$PWD
-popd
-%else
-BOOT_JDK=%{bootjdk}
-%endif
# How many CPU's do we have?
export NUM_PROC=%(/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :)
@@ -1104,12 +1088,15 @@ EXTRA_CPP_FLAGS="$(echo ${EXTRA_CPP_FLAGS} | sed -e 's|-mstackrealign|-mincoming
%endif
export EXTRA_CFLAGS EXTRA_CPP_FLAGS
+echo "Building %{newjavaver}-%{buildver}, pre=%{ea_designator}, opt=%{lts_designator}"
+
function buildjdk() {
local outputdir=${1}
local buildjdk=${2}
local maketargets="${3}"
local debuglevel=${4}
local link_opt=${5}
+ local debug_symbols=${6}
local top_dir_abs_src_path=$(pwd)/%{top_level_dir_name}
local top_dir_abs_build_path=$(pwd)/${outputdir}
@@ -1128,6 +1115,7 @@ function buildjdk() {
echo "Using make targets: ${maketargets}"
echo "Using debuglevel: ${debuglevel}"
echo "Using link_opt: ${link_opt}"
+ echo "Using debug_symbols: ${debug_symbols}"
echo "Building %{newjavaver}-%{buildver}, pre=%{ea_designator}, opt=%{lts_designator}"
mkdir -p ${outputdir}
@@ -1138,7 +1126,7 @@ function buildjdk() {
# are always used in a system_libs build, even
# for the static library build
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
- scl enable devtoolset-8 -- bash ${top_dir_abs_src_path}/configure \
+ scl enable devtoolset-%{dtsversion} -- bash ${top_dir_abs_src_path}/configure \
%else
bash ${top_dir_abs_src_path}/configure \
%endif
@@ -1150,7 +1138,7 @@ function buildjdk() {
%endif
--with-version-build=%{buildver} \
--with-version-pre="%{ea_designator}" \
- --with-version-opt=%{lts_designator} \
+ --with-version-opt="%{lts_designator}" \
--with-vendor-version-string="%{oj_vendor_version}" \
--with-vendor-name="%{oj_vendor}" \
--with-vendor-url="%{oj_vendor_url}" \
@@ -1158,7 +1146,7 @@ function buildjdk() {
--with-vendor-vm-bug-url="%{oj_vendor_bug_url}" \
--with-boot-jdk=${buildjdk} \
--with-debug-level=${debuglevel} \
- --with-native-debug-symbols="%{debug_symbols}" \
+ --with-native-debug-symbols="${debug_symbols}" \
--disable-sysconf-nss \
--enable-unlimited-crypto \
--with-zlib=%{link_type} \
@@ -1182,7 +1170,7 @@ function buildjdk() {
cat spec.gmk
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
- scl enable devtoolset-8 -- make \
+ scl enable devtoolset-%{dtsversion} -- make \
%else
make \
%endif
@@ -1190,311 +1178,325 @@ function buildjdk() {
WARNINGS_ARE_ERRORS="-Wno-error" \
CFLAGS_WARNINGS_ARE_ERRORS="-Wno-error" \
$maketargets || ( pwd; find ${top_dir_abs_src_path} ${top_dir_abs_build_path} -name "hs_err_pid*.log" | xargs cat && false )
-
popd
}
-function installjdk() {
- local imagepath=${1}
-
- if [ -d ${imagepath} ] ; then
- # the build (erroneously) removes read permissions from some jars
- # this is a regression in OpenJDK 7 (our compiler):
- # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
- find ${imagepath} -iname '*.jar' -exec chmod ugo+r {} \;
-
- # Build screws up permissions on binaries
- # https://bugs.openjdk.java.net/browse/JDK-8173610
- find ${imagepath} -iname '*.so' -exec chmod +x {} \;
- find ${imagepath}/bin/ -exec chmod +x {} \;
+function stripjdk() {
+ local outputdir=${1}
+ local jdkimagepath=${outputdir}/images/%{jdkimage}
+ local jreimagepath=${outputdir}/images/%{jreimage}
+ local jmodimagepath=${outputdir}/images/jmods
+ local supportdir=${outputdir}/support
+
+ if [ "x$suffix" = "x" ] ; then
+ # Keep the unstripped version for consumption by RHEL RPMs
+ cp -a ${jdkimagepath}{,.unstripped}
+
+ # Strip the files
+ for file in $(find ${jdkimagepath} ${jreimagepath} ${supportdir} -type f) ; do
+ if file ${file} | grep -q 'ELF'; then
+ noextfile=${file/.so/};
+ objcopy --only-keep-debug ${file} ${noextfile}.debuginfo;
+ objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file};
+ strip -g ${file};
+ fi
+ done
- # Install nss.cfg right away as we will be using the JRE above
- install -m 644 nss.cfg ${imagepath}/conf/security/
+ # Rebuild jmod files against the stripped binaries
+ if [ ! -d ${supportdir} ] ; then
+ echo "Support directory missing.";
+ exit 15
+ fi
+ for cmd in $(find ${supportdir} -name '*.jmod_exec.cmdline') ; do
+ pre=${cmd/_exec/_pre};
+ post=${cmd/_exec/_post};
+ jmod=$(echo ${cmd}|sed 's#.*_create_##'|sed 's#_exec.cmdline##')
+ echo "Rebuilding ${jmod} against stripped binaries...";
+ if [ -e ${pre} ] ; then
+ echo "Executing ${pre}...";
+ cat ${pre} | sh -s ;
+ fi
+ echo "Executing ${cmd}...";
+ cat ${cmd} | sh -s ;
+ if [ -e ${post} ] ; then
+ echo "Executing ${post}...";
+ cat ${post} | sh -s ;
+ fi
+ done
+ rm -rf ${jdkimagepath}/jmods
+ cp -a ${jmodimagepath} ${jdkimagepath}
+ fi
+}
- # Install nss.fips.cfg: NSS configuration for global FIPS mode (crypto-policies)
- install -m 644 nss.fips.cfg ${imagepath}/conf/security/
+function installjdk() {
+ local outputdir=${1}
+ local installdir=${2}
+ local jdkimagepath=${installdir}/images/%{jdkimage}
+ local jreimagepath=${installdir}/images/%{jreimage}
+ local unstripped=${jdkimagepath}.unstripped
+
+ echo "Installing build from ${outputdir} to ${installdir}..."
+ mkdir -p ${installdir}
+ echo "Installing images..."
+ mv ${outputdir}/images ${installdir}
+ if [ -d ${outputdir}/bundles ] ; then
+ echo "Installing bundles...";
+ mv ${outputdir}/bundles ${installdir} ;
+ fi
- # Create fake alt-java as a placeholder for future alt-java
- if [ -d man/man1 ] ; then
- pushd ${imagepath}
+%if !%{with artifacts}
+ echo "Removing output directory...";
+ rm -rf ${outputdir}
+%endif
+
+ # legacy-jre-image target does not install any man pages for the JRE
+ # We copy the jdk man directory and then remove pages for binaries that
+ # don't exist in the JRE
+ cp -a ${jdkimagepath}/man ${jreimagepath}
+ for manpage in $(find ${jreimagepath}/man -name '*.1'); do
+ filename=$(basename ${manpage});
+ binary=${filename/.1/};
+ if [ ! -f ${jreimagepath}/bin/${binary} ] ; then
+ echo "Removing ${manpage} from JRE for which no binary ${binary} exists";
+ rm -f ${manpage};
+ fi;
+ done
+
+ for imagepath in ${jdkimagepath} ${jreimagepath} ${unstripped}; do
+
+ if [ -d ${imagepath} ] ; then
+ # the build (erroneously) removes read permissions from some jars
+ # this is a regression in OpenJDK 7 (our compiler):
+ # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
+ find ${imagepath} -iname '*.jar' -exec chmod ugo+r {} \;
+
+ # Build screws up permissions on binaries
+ # https://bugs.openjdk.java.net/browse/JDK-8173610
+ find ${imagepath} -iname '*.so' -exec chmod +x {} \;
+ find ${imagepath}/bin/ -exec chmod +x {} \;
+
+ # Install local files which are distributed with the JDK
+ install -m 644 %{SOURCE10} ${imagepath}
+ install -m 644 nss.cfg ${imagepath}/conf/security/
+
+ # Create fake alt-java as a placeholder for future alt-java
+ pushd ${imagepath}
# add alt-java man page
echo "Hardened java binary recommended for launching untrusted code from the Web e.g. javaws" > man/man1/%{alt_java_name}.1
cat man/man1/java.1 >> man/man1/%{alt_java_name}.1
- popd
- fi
- fi
+ popd
+
+ # Print release information
+ cat ${imagepath}/release
+ fi
+ done
}
-# Checks on debuginfo must be performed before the files are stripped
-# by the RPM installation stage
-function debugcheckjdk() {
- local imagepath=${1}
-
- if [ -d ${imagepath} ] ; then
-
- so_suffix="so"
- # Check debug symbols are present and can identify code
- find "${imagepath}" -iname "*.$so_suffix" -print0 | while read -d $'\0' lib
- do
- if [ -f "$lib" ] ; then
- echo "Testing $lib for debug symbols"
- # All these tests rely on RPM failing the build if the exit code of any set
- # of piped commands is non-zero.
-
- # Test for .debug_* sections in the shared object. This is the main test
- # Stripped objects will not contain these
- eu-readelf -S "$lib" | grep "] .debug_"
- test $(eu-readelf -S "$lib" | grep -E "\]\ .debug_(info|abbrev)" | wc --lines) == 2
-
- # Test FILE symbols. These will most likely be removed by anything that
- # manipulates symbol tables because it's generally useless. So a nice test
- # that nothing has messed with symbols
- old_IFS="$IFS"
- IFS=$'\n'
- for line in $(eu-readelf -s "$lib" | grep "00000000 0 FILE LOCAL DEFAULT")
- do
- # We expect to see .cpp and .S files, except for architectures like aarch64 and
- # s390 where we expect .o and .oS files
- echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|S|oS))?$"
- done
- IFS="$old_IFS"
-
- # If this is the JVM, look for javaCalls.(cpp|o) in FILEs, for extra sanity checking
- if [ "`basename $lib`" = "libjvm.so" ]; then
- eu-readelf -s "$lib" | \
- grep -E "00000000 0 FILE LOCAL DEFAULT ABS javaCalls.(cpp|o)$"
- fi
-
- # Test that there are no .gnu_debuglink sections pointing to another
- # debuginfo file. There shouldn't be any debuginfo files, so the link makes
- # no sense either
- eu-readelf -S "$lib" | grep 'gnu'
- if eu-readelf -S "$lib" | grep "\] .gnu_debuglink" | grep PROGBITS; then
- echo "bad .gnu_debuglink section."
- eu-readelf -x .gnu_debuglink "$lib"
- false
- fi
- fi
+function genchecksum() {
+ local checkedfile=${1}
+
+ checkdir=$(dirname ${1})
+ checkfile=$(basename ${1})
+
+ echo "Generating checksum for ${checkfile} in ${checkdir}..."
+ pushd ${checkdir}
+ sha256sum ${checkfile} > ${checkfile}.sha256sum
+ sha256sum --check ${checkfile}.sha256sum
+ popd
+}
+
+function packFullPatchedSources() {
+ srcpackagesdir=`pwd`
+ tar -cJf ${srcpackagesdir}/%{jdkportablesourcesarchive -- ""} --transform "s|^|%{jdkportablesourcesname -- ""}/|" %{top_level_dir_name} nss*
+ genchecksum ${srcpackagesdir}/%{jdkportablesourcesarchive -- ""}
+}
+
+function packagejdk() {
+ local imagesdir=$(pwd)/${1}/images
+ local docdir=$(pwd)/${1}/images/docs
+ local bundledir=$(pwd)/${1}/bundles
+ local packagesdir=$(pwd)/${2}
+ local srcdir=$(pwd)/%{top_level_dir_name}
+ local tapsetdir=$(pwd)/tapset
+
+ echo "Packaging build from ${imagesdir} to ${packagesdir}..."
+ mkdir -p ${packagesdir}
+ pushd ${imagesdir}
+
+ if [ "x$suffix" = "x" ] ; then
+ nameSuffix=""
+ else
+ nameSuffix=`echo "$suffix"| sed s/-/./`
+ fi
+
+ jdkname=%{jdkportablename -- "$nameSuffix"}
+ jdkarchive=${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
+ jrename=%{jreportablename -- "$nameSuffix"}
+ jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
+ staticname=%{staticlibsportablename -- "$nameSuffix"}
+ staticarchive=${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
+ debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
+ unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
+ if [ "x$suffix" = "x" ] ; then
+ docname=%{docportablename}
+ docarchive=${packagesdir}/%{docportablearchive}
+ built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
+ fi
+ # These are from the source tree so no debug variants
+ miscname=%{miscportablename}
+ miscarchive=${packagesdir}/%{miscportablearchive}
+
+ if [ "x$suffix" = "x" ] ; then
+ # Keep the unstripped version for consumption by RHEL RPMs
+ mv %{jdkimage}.unstripped ${jdkname}
+ tar -cJf ${unstrippedarchive} ${jdkname}
+ genchecksum ${unstrippedarchive}
+ mv ${jdkname} %{jdkimage}.unstripped
+ fi
+
+ # Rename directories for packaging
+ mv %{jdkimage} ${jdkname}
+ mv %{jreimage} ${jrename}
+
+ # Release images have external debug symbols
+ if [ "x$suffix" = "x" ] ; then
+ tar -cJf ${debugarchive} $(find ${jdkname} -name \*.debuginfo)
+ genchecksum ${debugarchive}
+
+ mkdir ${docname}
+ mv ${docdir} ${docname}
+ mv ${bundledir}/${built_doc_archive} ${docname}
+ tar -cJf ${docarchive} ${docname}
+ genchecksum ${docarchive}
+
+ mkdir ${miscname}
+ for s in 16 24 32 48 ; do
+ cp -av ${srcdir}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png ${miscname}
done
+ cp -a ${srcdir}/src/sample ${miscname}
+%if %{with_systemtap}
+ cp -a ${tapsetdir}* ${miscname}
+%endif
+ tar -cJf ${miscarchive} ${miscname}
+ genchecksum ${miscarchive}
+ fi
- # Make sure gdb can do a backtrace based on line numbers on libjvm.so
- # javaCalls.cpp:58 should map to:
- # http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/…
- # Using line number 1 might cause build problems. See:
- # https://bugzilla.redhat.com/show_bug.cgi?id=1539664
- # https://bugzilla.redhat.com/show_bug.cgi?id=1538767
- gdb -q "${imagepath}/bin/java" <<EOF | tee gdb.out
-handle SIGSEGV pass nostop noprint
-handle SIGILL pass nostop noprint
-set breakpoint pending on
-break javaCalls.cpp:58
-commands 1
-backtrace
-quit
-end
-run -version
-EOF
-%ifarch %{gdb_arches}
- grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
+ tar -cJf ${jdkarchive} --exclude='**.debuginfo' ${jdkname}
+ genchecksum ${jdkarchive}
+
+ tar -cJf ${jrearchive} --exclude='**.debuginfo' ${jrename}
+ genchecksum ${jrearchive}
+
+%if %{include_staticlibs}
+ # Static libraries (needed for building graal vm with native image)
+ # Tar as overlay. Transform to the JDK name, since we just want to "add"
+ # static libraries to that folder
+ tar -cJf ${staticarchive} \
+ --transform "s|^%{static_libs_image}/lib/*|${staticname}/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib"
+ genchecksum ${staticarchive}
%endif
- fi
+ # Revert directory renaming so testing will run
+ # TODO: testing should run on the packaged JDK
+ mv ${jdkname} %{jdkimage}
+ mv ${jrename} %{jreimage}
+
+ popd #images
+
}
-pwd
-ls -l
-tar -cJf ../%{jdkportablesourcesarchive -- ""} --transform "s|^|%{jdkportablesourcesname -- ""}/|" openjdk nss*
-sha256sum ../%{jdkportablesourcesarchive -- ""} > ../%{jdkportablesourcesarchive -- ""}.sha256sum
+packFullPatchedSources
%if %{build_hotspot_first}
# Build a fresh libjvm.so first and use it to bootstrap
cp -LR --preserve=mode,timestamps %{bootjdk} newboot
systemjdk=$(pwd)/newboot
- buildjdk build/newboot ${systemjdk} %{hotspot_target} "release" "bundled"
- mv build/newboot/jdk/lib/server/libjvm.so newboot/lib/server
+ buildjdk build/newboot ${systemjdk} %{hotspot_target} "release" "bundled" "internal"
+ mv build/newboot/jdk/lib/%{vm_variant}/libjvm.so newboot/lib/%{vm_variant}
%else
systemjdk=%{bootjdk}
%endif
for suffix in %{build_loop} ; do
+
if [ "x$suffix" = "x" ] ; then
debugbuild=release
else
# change --something to something
debugbuild=`echo $suffix | sed "s/-//g"`
fi
- for loop in %{main_suffix} %{staticlibs_loop} ; do
- builddir=%{buildoutputdir -- ${suffix}${loop}}
- bootbuilddir=boot${builddir}
- if test "x${loop}" = "x%{main_suffix}" ; then
- link_opt="%{link_type}"
-%if %{system_libs}
- # Copy the source tree so we can remove all in-tree libraries
- cp -a %{top_level_dir_name} %{top_level_dir_name_backup}
- # Remove all libraries that are linked
- sh %{SOURCE12} %{top_level_dir_name} full
-%endif
- # Debug builds don't need same targets as release for
- # build speed-up. We also avoid bootstrapping these
- # slower builds.
- if echo $debugbuild | grep -q "debug" ; then
- maketargets="%{debug_targets}"
- run_bootstrap=false
- else
- maketargets="%{release_targets}"
- run_bootstrap=%{bootstrap_build}
- fi
- if ${run_bootstrap} ; then
- buildjdk ${bootbuilddir} ${systemjdk} "%{bootstrap_targets}" ${debugbuild} ${link_opt}
- buildjdk ${builddir} $(pwd)/${bootbuilddir}/images/%{jdkimage} "${maketargets}" ${debugbuild} ${link_opt}
- rm -rf ${bootbuilddir}
- else
- buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt}
- fi
+ # We build with internal debug symbols and do
+ # our own stripping for one version of the
+ # release build
+ debug_symbols=internal
+
+ builddir=%{buildoutputdir -- ${suffix}}
+ bootbuilddir=boot${builddir}
+ installdir=%{installoutputdir -- ${suffix}}
+ bootinstalldir=boot${installdir}
+ packagesdir=%{packageoutputdir -- ${suffix}}
+
+ link_opt="%{link_type}"
%if %{system_libs}
- # Restore original source tree we modified by removing full in-tree sources
- rm -rf %{top_level_dir_name}
- mv %{top_level_dir_name_backup} %{top_level_dir_name}
-%endif
- else
- # Use bundled libraries for building statically
- link_opt="bundled"
- # Static library cycle only builds the static libraries
- maketargets="%{static_libs_target}"
- # Always just do the one build for the static libraries
- buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt}
- fi
-
- done # end of main / staticlibs loop
-
- # Final setup on the main image
- top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
- for image in %{jdkimage} %{jreimage} ; do
- imagePath=${top_dir_abs_main_build_path}/images/${image}
- installjdk ${imagePath}
- done
- # Check debug symbols were built into the dynamic libraries; todo, why it passes in JDK only?
- debugcheckjdk ${top_dir_abs_main_build_path}/images/%{jdkimage}
-
- # Print release information
- cat ${top_dir_abs_main_build_path}/images/%{jdkimage}/release
+ # Copy the source tree so we can remove all in-tree libraries
+ cp -a %{top_level_dir_name} %{top_level_dir_name_backup}
+ # Remove all libraries that are linked
+ sh %{SOURCE12} %{top_level_dir_name} full
+%endif
+ # Debug builds don't need same targets as release for
+ # build speed-up. We also avoid bootstrapping these
+ # slower builds.
+ if echo $debugbuild | grep -q "debug" ; then
+ maketargets="%{debug_targets}"
+ run_bootstrap=false
+ else
+ maketargets="%{release_targets}"
+ run_bootstrap=%{bootstrap_build}
+ fi
+ if ${run_bootstrap} ; then
+ buildjdk ${bootbuilddir} ${systemjdk} "%{bootstrap_targets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ installjdk ${bootbuilddir} ${bootinstalldir}
+ buildjdk ${builddir} $(pwd)/${bootinstalldir}/images/%{jdkimage} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ stripjdk ${builddir}
+ installjdk ${builddir} ${installdir}
+ %{!?with_artifacts:rm -rf ${bootinstalldir}}
+ else
+ buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ stripjdk ${builddir}
+ installjdk ${builddir} ${installdir}
+ fi
+ packagejdk ${installdir} ${packagesdir}
-################################################################################
- pushd ${top_dir_abs_main_build_path}/images
- if [ "x$suffix" == "x" ] ; then
- nameSuffix=""
- else
- nameSuffix=`echo "$suffix"| sed s/-/./`
- fi
- # additional steps needed for fluent repack; most of them done twice, as images are already populated
- # maybe most of them should be done in upstream build?
- for imagedir in %{jdkimage} %{jreimage} ; do
- pushd $imagedir
- # Convert man pages to UTF8 encoding
- if [ -d man/man1 ] ; then # jre do not have man pages...
- for manpage in man/man1/* ; do
- iconv -f ISO_8859-1 -t UTF8 $manpage -o $manpage.tmp
- mv -f $manpage.tmp $manpage
- done
- fi
- # Install release notes
- cp -a %{SOURCE10} `pwd`
- cp -a %{SOURCE10} `pwd`/legal
- # stabilize permissions; aprtially duplicated in instalojdk
- find `pwd` -name "*.so" -exec chmod 755 {} \; -exec echo "set 755 to so {}" \; ;
- find `pwd` -type d -exec chmod 755 {} \; -exec echo "set 755 to dir {}" \; ;
- find `pwd`/legal -type f -exec chmod 644 {} \; -exec echo "set 644 to licences {}" \; ;
- popd # jdkimage/jreimage
- done # jre/sdk work in loop
- # javadoc is done only for release sdkimage
- if ! echo $suffix | grep -q "debug" ; then
- # Install Javadoc documentation
- #cp -a docs %{jdkimage} # not sure if the plaintext javadoc is for some use
- built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
- cp -a `pwd`/../bundles/${built_doc_archive} `pwd`/%{jdkimage}/javadocs.zip || ls -l `pwd`/../bundles
- fi
- # end of additional steps
-
- mv %{jdkimage} %{jdkportablename -- "$nameSuffix"}
- mv %{jreimage} %{jreportablename -- "$nameSuffix"}
- tar -cJf ../../../../%{jdkportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jdkportablename -- "$nameSuffix"}
- sha256sum ../../../../%{jdkportablearchive -- "$nameSuffix"} > ../../../../%{jdkportablearchive -- "$nameSuffix"}.sha256sum
- tar -cJf ../../../../%{jreportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jreportablename -- "$nameSuffix"}
- sha256sum ../../../../%{jreportablearchive -- "$nameSuffix"} > ../../../../%{jreportablearchive -- "$nameSuffix"}.sha256sum
- # copy licenses so they are avialable out of tarball
- cp -rf %{jdkportablename -- "$nameSuffix"}/legal ../../../../%{jdkportablearchive -- "%{normal_suffix}"}-legal
- mv %{jdkportablename -- "$nameSuffix"} %{jdkimage}
- mv %{jreportablename -- "$nameSuffix"} %{jreimage}
- popd #images
-%if %{include_staticlibs}
- top_dir_abs_staticlibs_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{staticlibs_suffix}}
- pushd ${top_dir_abs_staticlibs_build_path}/images
- # Static libraries (needed for building graal vm with native image)
- # Tar as overlay. Transform to the JDK name, since we just want to "add"
- # static libraries to that folder
- portableJDKname=%{staticlibsportablename -- "$nameSuffix"}
- tar -cJf ../../../../%{staticlibsportablearchive -- "$nameSuffix"} --transform "s|^%{static_libs_image}/lib/*|$portableJDKname/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib"
- sha256sum ../../../../%{staticlibsportablearchive -- "$nameSuffix"} > ../../../../%{staticlibsportablearchive -- "$nameSuffix"}.sha256sum
- popd #staticlibs-images
+%if %{system_libs}
+ # Restore original source tree we modified by removing full in-tree sources
+ rm -rf %{top_level_dir_name}
+ mv %{top_level_dir_name_backup} %{top_level_dir_name}
%endif
-################################################################################
-# note, currently no debuginfo, consult portbale spec for external (zipped) debuginfo, being tarred alone
-################################################################################
# build cycles
done # end of release / debug cycle loop
-%install
-mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
-mv ../%{jdkportablesourcesarchive -- ""} $RPM_BUILD_ROOT%{_jvmdir}/
-mv ../%{jdkportablesourcesarchive -- ""}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+%check
+# We test debug first as it will give better diagnostics on a crash
for suffix in %{build_loop} ; do
-top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
-################################################################################
- if [ "x$suffix" == "x" ] ; then
- nameSuffix=""
- else
- nameSuffix=`echo "$suffix"| sed s/-/./`
- fi
- mv ../%{jdkportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{jdkportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{jreportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{jreportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+# portable builds have static_libs embedded, thus top_dir_abs_main_build_path is same as top_dir_abs_staticlibs_build_path
+top_dir_abs_main_build_path=$(pwd)/%{installoutputdir -- ${suffix}}
%if %{include_staticlibs}
- mv ../%{staticlibsportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{staticlibsportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
-%endif
- if [ "x$suffix" == "x" ] ; then
- dnameSuffix="$nameSuffix".debuginfo
-# todo handle debuginfo, see note at build (we will need to pack one stripped and one unstripped release build)
-# mv ../%{jdkportablearchive -- "$dnameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
-# mv ../%{jdkportablearchive -- "$dnameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
- fi
-################################################################################
-# end, dual install
-done
-################################################################################
-# the licenses are packed onloy once and shared
-mkdir -p $RPM_BUILD_ROOT%{unpacked_licenses}
-mv ../%{jdkportablearchive -- "%{normal_suffix}"}-legal $RPM_BUILD_ROOT%{unpacked_licenses}/%{jdkportablesourcesarchive -- "%{normal_suffix}"}
-# To show sha in the build log
-for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do ls -l $file ; cat $file ; done
-################################################################################
+top_dir_abs_staticlibs_build_path=${top_dir_abs_main_build_path}
+%endif
-%check
+export JAVA_HOME=${top_dir_abs_main_build_path}/images/%{jdkimage}
-# We test debug first as it will give better diagnostics on a crash
-for suffix in %{build_loop} ; do
+# Pre-test setup
-# Tests in the check stage are performed on the installed image
-# rpmbuild operates as follows: build -> install -> test
-# however in portbales, we test built image instead of installed one
-top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
-export JAVA_HOME=${top_dir_abs_main_build_path}/images/%{jdkimage}
+# System security properties are disabled by default on portable.
+# Turn on system security properties
+#sed -i -e "s:^security.useSystemPropertiesFile=.*:security.useSystemPropertiesFile=true:" \
+#${JAVA_HOME}/conf/security/java.security
-#check Shenandoah is enabled
+# Check Shenandoah is enabled
%if %{use_shenandoah_hotspot}
$JAVA_HOME/bin/java -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -version
%endif
@@ -1507,14 +1509,19 @@ $JAVA_HOME/bin/java --add-opens java.base/javax.crypto=ALL-UNNAMED TestCryptoLev
$JAVA_HOME/bin/javac -d . %{SOURCE14}
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||")
-# Check system crypto (policy) is deactive and can not be enabled
+# Check system crypto (policy) is active and can be disabled
# Test takes a single argument - true or false - to state whether system
# security properties are enabled or not.
$JAVA_HOME/bin/javac -d . %{SOURCE15}
export PROG=$(echo $(basename %{SOURCE15})|sed "s|\.java||")
export SEC_DEBUG="-Djava.security.debug=properties"
+# Specific to portable:System security properties to be off by default
$JAVA_HOME/bin/java ${SEC_DEBUG} ${PROG} false
-$JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=false ${PROG} false
+$JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=true ${PROG} false
+
+# Check correct vendor values have been set
+$JAVA_HOME/bin/javac -d . %{SOURCE16}
+$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
# Check java launcher has no SSB mitigation
if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
@@ -1526,14 +1533,10 @@ nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation
if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi
%endif
-# Check correct vendor values have been set
-$JAVA_HOME/bin/javac -d . %{SOURCE16}
-$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
-
%if ! 0%{?flatpak}
# Check translations are available for new timezones (during flatpak builds, the
# tzdb.dat used by this test is not where the test expects it, so this is
-# disabled for flatpak builds)
+# disabled for flatpak builds)
$JAVA_HOME/bin/javac -d . %{SOURCE18}
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE
$JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR
@@ -1541,9 +1544,83 @@ $JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|
%if %{include_staticlibs}
# Check debug symbols in static libraries (smoke test)
-export STATIC_LIBS_HOME=${top_dir_abs_main_build_path}/../../%{buildoutputdir -- ${suffix}%{staticlibs_suffix}}/images/static-libs/lib/
-readelf --debug-dump $STATIC_LIBS_HOME/libfdlibm.a | grep w_remainder.c
-readelf --debug-dump $STATIC_LIBS_HOME/libfdlibm.a | grep e_remainder.c
+export STATIC_LIBS_HOME=${top_dir_abs_staticlibs_build_path}/images/%{static_libs_image}
+ls -l $STATIC_LIBS_HOME
+ls -l $STATIC_LIBS_HOME/lib
+# they are here, but grep do not find the remainders
+#readelf --debug-dump $STATIC_LIBS_HOME/lib/libfdlibm.a | grep w_remainder.c
+#readelf --debug-dump $STATIC_LIBS_HOME/lib/libfdlibm.a | grep e_remainder.c
+%endif
+
+# Release builds strip the debug symbols into external .debuginfo files
+if [ "x$suffix" = "x" ] ; then
+ so_suffix="debuginfo"
+else
+ so_suffix="so"
+fi
+# Check debug symbols are present and can identify code
+find "$JAVA_HOME" -iname "*.$so_suffix" -print0 | while read -d $'\0' lib
+do
+ if [ -f "$lib" ] ; then
+ echo "Testing $lib for debug symbols"
+ # All these tests rely on RPM failing the build if the exit code of any set
+ # of piped commands is non-zero.
+
+ # Test for .debug_* sections in the shared object. This is the main test
+ # Stripped objects will not contain these
+ eu-readelf -S "$lib" | grep "] .debug_"
+ test $(eu-readelf -S "$lib" | grep -E "\]\ .debug_(info|abbrev)" | wc --lines) == 2
+
+ # Test FILE symbols. These will most likely be removed by anything that
+ # manipulates symbol tables because it's generally useless. So a nice test
+ # that nothing has messed with symbols
+ old_IFS="$IFS"
+ IFS=$'\n'
+ for line in $(eu-readelf -s "$lib" | grep "00000000 0 FILE LOCAL DEFAULT")
+ do
+ # We expect to see .cpp and .S files, except for architectures like aarch64 and
+ # s390 where we expect .o and .oS files
+ echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|S|oS))?$"
+ done
+ IFS="$old_IFS"
+
+ # If this is the JVM, look for javaCalls.(cpp|o) in FILEs, for extra sanity checking
+ if [ "`basename $lib`" = "libjvm.so" ]; then
+ eu-readelf -s "$lib" | \
+ grep -E "00000000 0 FILE LOCAL DEFAULT ABS javaCalls.(cpp|o)$"
+ fi
+
+ # Test that there are no .gnu_debuglink sections pointing to another
+ # debuginfo file. There shouldn't be any debuginfo files, so the link makes
+ # no sense either
+ eu-readelf -S "$lib" | grep 'gnu'
+ if eu-readelf -S "$lib" | grep '] .gnu_debuglink' | grep PROGBITS; then
+ echo "bad .gnu_debuglink section."
+ eu-readelf -x .gnu_debuglink "$lib"
+ false
+ fi
+ fi
+done
+
+# Make sure gdb can do a backtrace based on line numbers on libjvm.so
+# javaCalls.cpp:58 should map to:
+# http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/…
+# Using line number 1 might cause build problems. See:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1539664
+# https://bugzilla.redhat.com/show_bug.cgi?id=1538767
+gdb -q "$JAVA_HOME/bin/java" <<EOF | tee gdb.out
+handle SIGSEGV pass nostop noprint
+handle SIGILL pass nostop noprint
+set breakpoint pending on
+break javaCalls.cpp:58
+commands 1
+backtrace
+quit
+end
+run -version
+EOF
+%ifarch %{gdb_arches}
+grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
%endif
# Check src.zip has all sources. See RHBZ#1130490
@@ -1562,12 +1639,70 @@ $JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LocalVariableTable
# build cycles check
done
+%install
+
+ mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
+ mv %{jdkportablesourcesarchive -- ""} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv %{jdkportablesourcesarchive -- ""}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+
+for suffix in %{build_loop} ; do
+
+ packagesdir=%{packageoutputdir -- ${suffix}}
+
+ if [ "x$suffix" == "x" ] ; then
+ nameSuffix=""
+ else
+ nameSuffix=`echo "$suffix"| sed s/-/./`
+ fi
+
+ # These definitions should match those in installjdk
+ jdkarchive=${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
+ jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
+ staticarchive=${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
+ debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
+ unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
+
+ mv ${jdkarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jdkarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jrearchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jrearchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+
+%if %{include_staticlibs}
+ mv ${staticarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${staticarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+%endif
+
+ if [ "x$suffix" = "x" ] ; then
+ mv ${debugarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${debugarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${unstrippedarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${unstrippedarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ fi
+done
+
+ if [ "x$suffix" = "x" ] ; then
+ # These definitions should match those in installjdk
+ # Install outside the loop as there are no debug variants
+ docarchive=${packagesdir}/%{docportablearchive}
+ miscarchive=${packagesdir}/%{miscportablearchive}
+ mv ${docarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${docarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${miscarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${miscarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ fi
+
+# To show sha in the build log
+for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do
+ ls -l $file ;
+ cat $file ;
+done
+
%if %{include_normal_build}
+
%files
# main package builds always
%{_jvmdir}/%{jreportablearchiveForFiles}
%{_jvmdir}/%{jreportablearchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%else
%files
# placeholder
@@ -1576,10 +1711,9 @@ done
%if %{include_normal_build}
%files devel
%{_jvmdir}/%{jdkportablearchiveForFiles}
-#%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
+%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
%{_jvmdir}/%{jdkportablearchiveForFiles}.sha256sum
-#%{_jvmdir}/%{jdkportablearchive -- .debuginfo}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
+%{_jvmdir}/%{jdkportablearchive -- .debuginfo}.sha256sum
%endif
%if %{include_normal_build}
@@ -1587,26 +1721,26 @@ done
%files static-libs
%{_jvmdir}/%{staticlibsportablearchiveForFiles}
%{_jvmdir}/%{staticlibsportablearchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
+
+%files unstripped
+%{_jvmdir}/%{jdkportablearchive -- .unstripped}
+%{_jvmdir}/%{jdkportablearchive -- .unstripped}.sha256sum
%endif
%if %{include_debug_build}
%files slowdebug
%{_jvmdir}/%{jreportablearchive -- .slowdebug}
%{_jvmdir}/%{jreportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%files devel-slowdebug
%{_jvmdir}/%{jdkportablearchive -- .slowdebug}
%{_jvmdir}/%{jdkportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%if %{include_staticlibs}
%files static-libs-slowdebug
%{_jvmdir}/%{staticlibsportablearchive -- .slowdebug}
%{_jvmdir}/%{staticlibsportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
%endif
@@ -1614,27 +1748,47 @@ done
%files fastdebug
%{_jvmdir}/%{jreportablearchive -- .fastdebug}
%{_jvmdir}/%{jreportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%files devel-fastdebug
%{_jvmdir}/%{jdkportablearchive -- .fastdebug}
%{_jvmdir}/%{jdkportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%if %{include_staticlibs}
%files static-libs-fastdebug
%{_jvmdir}/%{staticlibsportablearchive -- .fastdebug}
%{_jvmdir}/%{staticlibsportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
%endif
%files sources
%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}
%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
+
+%if %{include_normal_build}
+%files docs
+%{_jvmdir}/%{docportablearchive}
+%{_jvmdir}/%{docportablearchive}.sha256sum
+
+%files misc
+%{_jvmdir}/%{miscportablearchive}
+%{_jvmdir}/%{miscportablearchive}.sha256sum
+%endif
%changelog
+* Wed Nov 22 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:17.0.9.0.9-2
+- updated to OpenJDK 17.0.9 (2023-10-17)
+- adjsuted generate_source_tarball
+- removed icedtea_sync
+- dropped standalone licenses
+- added usntripped subpkg
+- added docs subpkg
+- adjsuted versions of bundled libraries
+- build refactored to several solid methods following gnu_andrew
+- removed no longer needed jdk8305995-footprint_regression_from_jdk_8224957, nss.fips.cfg.in, rh1648644-java_access_bridge_privileged_security.patch
+- added jdk8312489-max_sig_default_increase.patch
+- aligned fips-17u-51e1d00be4e.patch (gnu_andrew)
+- fixed '--without release' build-ability by moving docs and misc to if-release only
+
* Thu Aug 03 2023 Jiri Vanek <jvanekw(a)redhat.com> - 1:17.0.8.0.7-1
- Update to jdk-17.0.8.0+7
- Update release notes to 17.0.8.0+7
diff --git a/jconsole.desktop.in b/jconsole.desktop.in
index 8a3b04d..c1b8f6a 100644
--- a/jconsole.desktop.in
+++ b/jconsole.desktop.in
@@ -1,10 +1 @@
-[Desktop Entry]
-Name=OpenJDK @JAVA_VER@ for @target_cpu@ Monitoring & Management Console (@OPENJDK_VER@)
-Comment=Monitor and manage OpenJDK applications
-Exec=_SDKBINDIR_/jconsole
-Icon=java-@JAVA_VER@-@JAVA_VENDOR@
-Terminal=false
-Type=Application
-StartupWMClass=sun-tools-jconsole-JConsole
-Categories=Development;Profiling;Java;
-Version=1.0
+# this file is intentionally not here, as portable builds do not have desktop integration
diff --git a/jdk8305995-footprint_regression_from_jdk_8224957 b/jdk8305995-footprint_regression_from_jdk_8224957
deleted file mode 100644
index a5119a0..0000000
--- a/jdk8305995-footprint_regression_from_jdk_8224957
+++ /dev/null
@@ -1,1255 +0,0 @@
-diff --git a/src/hotspot/share/opto/node.cpp b/src/hotspot/share/opto/node.cpp
-index 9a9d3f0149a..7c85e73989e 100644
---- a/src/hotspot/share/opto/node.cpp
-+++ b/src/hotspot/share/opto/node.cpp
-@@ -1301,7 +1301,7 @@ bool Node::dominates(Node* sub, Node_List &nlist) {
- } else if (sub == up && sub->is_Region() && sub->req() == 2) {
- // Take in(1) path on the way up to 'dom' for regions with only one input
- up = sub->in(1);
-- } else if (sub == up && sub->is_Region() && sub->req() == 3) {
-+ } else if (sub == up && sub->is_Region()) {
- // Try both paths for Regions with 2 input paths (it may be a loop head).
- // It could give conservative 'false' answer without information
- // which region's input is the entry path.
-diff --git a/test/micro/org/openjdk/bench/vm/compiler/RBTreeSearch.java b/test/micro/org/openjdk/bench/vm/compiler/RBTreeSearch.java
-new file mode 100644
-index 00000000000..9b7430ccc13
---- /dev/null
-+++ b/test/micro/org/openjdk/bench/vm/compiler/RBTreeSearch.java
-@@ -0,0 +1,1236 @@
-+/*
-+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package org.openjdk.bench.vm.compiler;
-+
-+import org.openjdk.jmh.annotations.Benchmark;
-+import org.openjdk.jmh.annotations.Fork;
-+import org.openjdk.jmh.annotations.Measurement;
-+import org.openjdk.jmh.annotations.OutputTimeUnit;
-+import org.openjdk.jmh.annotations.Scope;
-+import org.openjdk.jmh.annotations.State;
-+import org.openjdk.jmh.annotations.Warmup;
-+
-+import java.util.concurrent.TimeUnit;
-+
-+/*
-+ * This benchmark is used as easy reproducer of JDK-8305995
-+ *
-+ * This benchmark contains simplified and minimized RB-tree
-+ * which is based on fasutils with iterators that jumps.
-+ *
-+ * At the end it contains a tree serialized as lines, and
-+ * maxPattern which is used to search in this tree.
-+ */
-+(a)State(Scope.Thread)
-+(a)OutputTimeUnit(TimeUnit.MICROSECONDS)
-+@Warmup(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
-+@Measurement(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
-+@Fork(value = 3)
-+public class RBTreeSearch {
-+
-+ private final Tree pattern;
-+
-+ private final Tree[] nodes;
-+
-+ private final Tree root;
-+
-+ private final int[] idxStack;
-+ private final Tree[] objStack;
-+
-+ public RBTreeSearch() {
-+ idxStack = new int[maxPattern];
-+
-+ objStack = new Tree[maxPattern];
-+
-+ pattern = new Tree();
-+ for (int i = 0; i <= maxPattern; i++) {
-+ pattern.put(i, i);
-+ }
-+
-+ nodes = new Tree[directions.length];
-+ for (int i = 0; i < directions.length; i++) {
-+ if (directions[i] == null) {
-+ continue;
-+ }
-+ Tree kids = new Tree();
-+ nodes[i] = kids;
-+ for (String pair : directions[i].split(", ")) {
-+ String[] kv = pair.split("=>");
-+ kids.put(Integer.parseInt(kv[0]), Integer.parseInt(kv[1]));
-+ }
-+ }
-+
-+ root = nodes[0];
-+ }
-+
-+ @Benchmark
-+ public void search() {
-+ Tree.Iterator sliceIt = pattern.keyIterator();
-+
-+ int stackSize = 0;
-+ idxStack[stackSize] = pattern.firstIntKey();
-+ objStack[stackSize++] = root;
-+
-+ while (stackSize > 0) {
-+ stackSize--;
-+ Tree node = objStack[stackSize];
-+
-+ final int startPoint = Math.max(idxStack[stackSize], node.firstIntKey()) - 1;
-+ final Tree.Iterator rootIt = node.keyIterator(startPoint);
-+
-+ sliceIt.jump(startPoint);
-+ while (sliceIt.hasNext() && rootIt.hasNext()) {
-+ final int sliceElem = sliceIt.nextInt();
-+ final int rootElem = rootIt.nextInt();
-+ if (sliceElem < rootElem) {
-+ rootIt.previousInt();
-+ if (sliceIt.nextInt() >= rootElem) {
-+ sliceIt.previousInt();
-+ } else {
-+ sliceIt.jump(rootElem - 1);
-+ }
-+ } else if (sliceElem == rootElem) {
-+ final int childrenIdx = node.get(sliceElem);
-+ final Tree children = nodes[childrenIdx];
-+
-+ if (children != null) {
-+ idxStack[stackSize] = sliceElem;
-+ objStack[stackSize++] = children;
-+ }
-+ }
-+ }
-+ }
-+ }
-+
-+ public static class Tree {
-+
-+ protected transient Entry root;
-+
-+ protected transient Entry firstEntry;
-+
-+ protected transient Entry lastEntry;
-+
-+ private final transient boolean[] dirPath = new boolean[64];
-+
-+ private final transient Entry[] nodePath = new Entry[64];
-+
-+ public int put(final int k, final int v) {
-+ Entry e = add(k);
-+ final int oldValue = e.value;
-+ e.value = v;
-+ return oldValue;
-+ }
-+
-+ private Entry add(final int k) {
-+ int maxDepth = 0;
-+ Entry e;
-+ if (root == null) {
-+ e = root = lastEntry = firstEntry = new Entry(k, 0);
-+ }
-+ else {
-+ Entry p = root;
-+ int cmp, i = 0;
-+ while(true) {
-+ if ((cmp = Integer.compare(k, p.key)) == 0) {
-+ while(i-- != 0) nodePath[i] = null;
-+ return p;
-+ }
-+ nodePath[i] = p;
-+ if (dirPath[i++] = cmp > 0) {
-+ if (p.succ()) {
-+ e = new Entry(k, 0);
-+ if (p.right == null) lastEntry = e;
-+ e.left = p;
-+ e.right = p.right;
-+ p.right(e);
-+ break;
-+ }
-+ p = p.right;
-+ }
-+ else {
-+ if (p.pred()) {
-+ e = new Entry(k, 0);
-+ if (p.left == null) firstEntry = e;
-+ e.right = p;
-+ e.left = p.left;
-+ p.left(e);
-+ break;
-+ }
-+ p = p.left;
-+ }
-+ }
-+ maxDepth = i--;
-+ while(i > 0 && ! nodePath[i].black()) {
-+ if (! dirPath[i - 1]) {
-+ Entry y = nodePath[i - 1].right;
-+ if (! nodePath[i - 1].succ() && ! y.black()) {
-+ nodePath[i].black(true);
-+ y.black(true);
-+ nodePath[i - 1].black(false);
-+ i -= 2;
-+ }
-+ else {
-+ Entry x;
-+ if (! dirPath[i]) y = nodePath[i];
-+ else {
-+ x = nodePath[i];
-+ y = x.right;
-+ x.right = y.left;
-+ y.left = x;
-+ nodePath[i - 1].left = y;
-+ if (y.pred()) {
-+ y.pred(false);
-+ x.succ(y);
-+ }
-+ }
-+ x = nodePath[i - 1];
-+ x.black(false);
-+ y.black(true);
-+ x.left = y.right;
-+ y.right = x;
-+ if (i < 2) root = y;
-+ else {
-+ if (dirPath[i - 2]) nodePath[i - 2].right = y;
-+ else nodePath[i - 2].left = y;
-+ }
-+ if (y.succ()) {
-+ y.succ(false);
-+ x.pred(y);
-+ }
-+ break;
-+ }
-+ }
-+ else {
-+ Entry y = nodePath[i - 1].left;
-+ if (! nodePath[i - 1].pred() && ! y.black()) {
-+ nodePath[i].black(true);
-+ y.black(true);
-+ nodePath[i - 1].black(false);
-+ i -= 2;
-+ }
-+ else {
-+ Entry x;
-+ if (dirPath[i]) y = nodePath[i];
-+ else {
-+ x = nodePath[i];
-+ y = x.left;
-+ x.left = y.right;
-+ y.right = x;
-+ nodePath[i - 1].right = y;
-+ if (y.succ()) {
-+ y.succ(false);
-+ x.pred(y);
-+ }
-+ }
-+ x = nodePath[i - 1];
-+ x.black(false);
-+ y.black(true);
-+ x.right = y.left;
-+ y.left = x;
-+ if (i < 2) root = y;
-+ else {
-+ if (dirPath[i - 2]) nodePath[i - 2].right = y;
-+ else nodePath[i - 2].left = y;
-+ }
-+ if (y.pred()){
-+ y.pred(false);
-+ x.succ(y);
-+ }
-+ break;
-+ }
-+ }
-+ }
-+ }
-+ root.black(true);
-+ while(maxDepth-- != 0) nodePath[maxDepth] = null;
-+ return e;
-+ }
-+
-+ private static final class Entry {
-+ int key;
-+ int value;
-+
-+ private static final int BLACK_MASK = 1;
-+
-+ private static final int SUCC_MASK = 1 << 31;
-+
-+ private static final int PRED_MASK = 1 << 30;
-+
-+ Entry left, right;
-+
-+ int info;
-+
-+ Entry(final int k, final int v) {
-+ key = k;
-+ value = v;
-+ info = SUCC_MASK | PRED_MASK;
-+ }
-+
-+ Entry left() {
-+ return (info & PRED_MASK) != 0 ? null : left;
-+ }
-+
-+ Entry right() {
-+ return (info & SUCC_MASK) != 0 ? null : right;
-+ }
-+
-+ boolean pred() {
-+ return (info & PRED_MASK) != 0;
-+ }
-+
-+ boolean succ() {
-+ return (info & SUCC_MASK) != 0;
-+ }
-+
-+ void pred(final boolean pred) {
-+ if (pred) info |= PRED_MASK;
-+ else info &= ~PRED_MASK;
-+ }
-+
-+ void succ(final boolean succ) {
-+ if (succ) info |= SUCC_MASK;
-+ else info &= ~SUCC_MASK;
-+ }
-+
-+ void pred(final Entry pred) {
-+ info |= PRED_MASK;
-+ left = pred;
-+ }
-+
-+ void succ(final Entry succ) {
-+ info |= SUCC_MASK;
-+ right = succ;
-+ }
-+
-+ void left(final Entry left) {
-+ info &= ~PRED_MASK;
-+ this.left = left;
-+ }
-+
-+ void right(final Entry right) {
-+ info &= ~SUCC_MASK;
-+ this.right = right;
-+ }
-+
-+ boolean black() {
-+ return (info & BLACK_MASK) != 0;
-+ }
-+
-+ void black(final boolean black) {
-+ if (black) info |= BLACK_MASK;
-+ else info &= ~BLACK_MASK;
-+ }
-+
-+ Entry next() {
-+ Entry next = this.right;
-+ if ((info & SUCC_MASK) == 0) while ((next.info & PRED_MASK) == 0) next = next.left;
-+ return next;
-+ }
-+
-+ Entry prev() {
-+ Entry prev = this.left;
-+ if ((info & PRED_MASK) == 0) while ((prev.info & SUCC_MASK) == 0) prev = prev.right;
-+ return prev;
-+ }
-+ }
-+
-+ public int get(final int k) {
-+ Entry e = root;
-+ int cmp;
-+ while (e != null && (cmp = Integer.compare(k, e.key)) != 0) {
-+ e = cmp < 0 ? e.left() : e.right();
-+ }
-+ return e == null ? 0 : e.value;
-+ }
-+
-+ public int firstIntKey() {
-+ return firstEntry.key;
-+ }
-+
-+ interface Iterator {
-+ boolean hasNext();
-+ int nextInt();
-+ int previousInt();
-+ void jump(final int fromElement);
-+ }
-+
-+ private class KeyIteratorImpl implements Iterator {
-+ Entry prev;
-+
-+ Entry next;
-+
-+ Entry curr;
-+
-+ int index = 0;
-+
-+ KeyIteratorImpl() {
-+ next = firstEntry;
-+ }
-+
-+ KeyIteratorImpl(final int k) {
-+ if ((next = locateKey(k)) != null) {
-+ if (next.key <= k) {
-+ prev = next;
-+ next = next.next();
-+ }
-+ else prev = next.prev();
-+ }
-+ }
-+
-+ private Entry locateKey(final int k) {
-+ Entry e = root, last = root;
-+ int cmp = 0;
-+ while (e != null && (cmp = Integer.compare(k, e.key)) != 0) {
-+ last = e;
-+ e = cmp < 0 ? e.left() : e.right();
-+ }
-+ return cmp == 0 ? e : last;
-+ }
-+
-+ public boolean hasNext() { return next != null; }
-+
-+ Entry nextEntry() {
-+ curr = prev = next;
-+ index++;
-+ next = next.next();
-+ return curr;
-+ }
-+
-+ Entry previousEntry() {
-+ curr = next = prev;
-+ index--;
-+ prev = prev.prev();
-+ return curr;
-+ }
-+ public void jump(final int fromElement) {
-+ if ((next = locateKey(fromElement)) != null) {
-+ if (next.key <= fromElement) {
-+ prev = next;
-+ next = next.next();
-+ }
-+ else prev = next.prev();
-+ }
-+ }
-+
-+ public int nextInt() { return nextEntry().key; }
-+
-+ public int previousInt() { return previousEntry().key; }
-+
-+ }
-+
-+ public Iterator keyIterator() {
-+ return new KeyIteratorImpl();
-+ }
-+
-+ public Iterator keyIterator(final int from) {
-+ return new KeyIteratorImpl(from);
-+ }
-+ }
-+
-+ private static final int maxPattern = 39;
-+
-+ private static final String[] directions = {
-+ "0=>1, 1=>4, 2=>2, 4=>3, 7=>5",
-+ "13=>628, 14=>627, 15=>626, 17=>629, 18=>630",
-+ "13=>473, 14=>472, 15=>471, 17=>474, 18=>475",
-+ "13=>318, 14=>317, 15=>316, 17=>319, 18=>320",
-+ "13=>163, 14=>162, 15=>161, 17=>164, 18=>165",
-+ "13=>8, 14=>7, 15=>6, 17=>9, 18=>10",
-+ "22=>135, 23=>134, 24=>132, 26=>133, 27=>131",
-+ "22=>105, 23=>104, 24=>102, 26=>103, 27=>101",
-+ "22=>75, 23=>74, 24=>72, 26=>73, 27=>71",
-+ "22=>45, 23=>44, 24=>42, 26=>43, 27=>41",
-+ "22=>15, 23=>14, 24=>12, 26=>13, 27=>11",
-+ "31=>38, 32=>39, 33=>36, 34=>40, 35=>37",
-+ "31=>33, 32=>34, 33=>31, 34=>35, 35=>32",
-+ "31=>28, 32=>29, 33=>26, 34=>30, 35=>27",
-+ "31=>23, 32=>24, 33=>21, 34=>25, 35=>22",
-+ "31=>18, 32=>19, 33=>16, 34=>20, 35=>17",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>68, 32=>69, 33=>66, 34=>70, 35=>67",
-+ "31=>63, 32=>64, 33=>61, 34=>65, 35=>62",
-+ "31=>58, 32=>59, 33=>56, 34=>60, 35=>57",
-+ "31=>53, 32=>54, 33=>51, 34=>55, 35=>52",
-+ "31=>48, 32=>49, 33=>46, 34=>50, 35=>47",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>98, 32=>99, 33=>96, 34=>100, 35=>97",
-+ "31=>93, 32=>94, 33=>91, 34=>95, 35=>92",
-+ "31=>88, 32=>89, 33=>86, 34=>90, 35=>87",
-+ "31=>83, 32=>84, 33=>81, 34=>85, 35=>82",
-+ "31=>78, 32=>79, 33=>76, 34=>80, 35=>77",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>128, 32=>129, 33=>126, 34=>130, 35=>127",
-+ "31=>123, 32=>124, 33=>121, 34=>125, 35=>122",
-+ "31=>118, 32=>119, 33=>116, 34=>120, 35=>117",
-+ "31=>113, 32=>114, 33=>111, 34=>115, 35=>112",
-+ "31=>108, 32=>109, 33=>106, 34=>110, 35=>107",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>158, 32=>159, 33=>156, 34=>160, 35=>157",
-+ "31=>153, 32=>154, 33=>151, 34=>155, 35=>152",
-+ "31=>148, 32=>149, 33=>146, 34=>150, 35=>147",
-+ "31=>143, 32=>144, 33=>141, 34=>145, 35=>142",
-+ "31=>138, 32=>139, 33=>136, 34=>140, 35=>137",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "22=>290, 23=>289, 24=>287, 26=>288, 27=>286",
-+ "22=>260, 23=>259, 24=>257, 26=>258, 27=>256",
-+ "22=>230, 23=>229, 24=>227, 26=>228, 27=>226",
-+ "22=>200, 23=>199, 24=>197, 26=>198, 27=>196",
-+ "22=>170, 23=>169, 24=>167, 26=>168, 27=>166",
-+ "31=>193, 32=>194, 33=>191, 34=>195, 35=>192",
-+ "31=>188, 32=>189, 33=>186, 34=>190, 35=>187",
-+ "31=>183, 32=>184, 33=>181, 34=>185, 35=>182",
-+ "31=>178, 32=>179, 33=>176, 34=>180, 35=>177",
-+ "31=>173, 32=>174, 33=>171, 34=>175, 35=>172",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>223, 32=>224, 33=>221, 34=>225, 35=>222",
-+ "31=>218, 32=>219, 33=>216, 34=>220, 35=>217",
-+ "31=>213, 32=>214, 33=>211, 34=>215, 35=>212",
-+ "31=>208, 32=>209, 33=>206, 34=>210, 35=>207",
-+ "31=>203, 32=>204, 33=>201, 34=>205, 35=>202",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>253, 32=>254, 33=>251, 34=>255, 35=>252",
-+ "31=>248, 32=>249, 33=>246, 34=>250, 35=>247",
-+ "31=>243, 32=>244, 33=>241, 34=>245, 35=>242",
-+ "31=>238, 32=>239, 33=>236, 34=>240, 35=>237",
-+ "31=>233, 32=>234, 33=>231, 34=>235, 35=>232",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>283, 32=>284, 33=>281, 34=>285, 35=>282",
-+ "31=>278, 32=>279, 33=>276, 34=>280, 35=>277",
-+ "31=>273, 32=>274, 33=>271, 34=>275, 35=>272",
-+ "31=>268, 32=>269, 33=>266, 34=>270, 35=>267",
-+ "31=>263, 32=>264, 33=>261, 34=>265, 35=>262",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>313, 32=>314, 33=>311, 34=>315, 35=>312",
-+ "31=>308, 32=>309, 33=>306, 34=>310, 35=>307",
-+ "31=>303, 32=>304, 33=>301, 34=>305, 35=>302",
-+ "31=>298, 32=>299, 33=>296, 34=>300, 35=>297",
-+ "31=>293, 32=>294, 33=>291, 34=>295, 35=>292",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "22=>445, 23=>444, 24=>442, 26=>443, 27=>441",
-+ "22=>415, 23=>414, 24=>412, 26=>413, 27=>411",
-+ "22=>385, 23=>384, 24=>382, 26=>383, 27=>381",
-+ "22=>355, 23=>354, 24=>352, 26=>353, 27=>351",
-+ "22=>325, 23=>324, 24=>322, 26=>323, 27=>321",
-+ "31=>348, 32=>349, 33=>346, 34=>350, 35=>347",
-+ "31=>343, 32=>344, 33=>341, 34=>345, 35=>342",
-+ "31=>338, 32=>339, 33=>336, 34=>340, 35=>337",
-+ "31=>333, 32=>334, 33=>331, 34=>335, 35=>332",
-+ "31=>328, 32=>329, 33=>326, 34=>330, 35=>327",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>378, 32=>379, 33=>376, 34=>380, 35=>377",
-+ "31=>373, 32=>374, 33=>371, 34=>375, 35=>372",
-+ "31=>368, 32=>369, 33=>366, 34=>370, 35=>367",
-+ "31=>363, 32=>364, 33=>361, 34=>365, 35=>362",
-+ "31=>358, 32=>359, 33=>356, 34=>360, 35=>357",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>408, 32=>409, 33=>406, 34=>410, 35=>407",
-+ "31=>403, 32=>404, 33=>401, 34=>405, 35=>402",
-+ "31=>398, 32=>399, 33=>396, 34=>400, 35=>397",
-+ "31=>393, 32=>394, 33=>391, 34=>395, 35=>392",
-+ "31=>388, 32=>389, 33=>386, 34=>390, 35=>387",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>438, 32=>439, 33=>436, 34=>440, 35=>437",
-+ "31=>433, 32=>434, 33=>431, 34=>435, 35=>432",
-+ "31=>428, 32=>429, 33=>426, 34=>430, 35=>427",
-+ "31=>423, 32=>424, 33=>421, 34=>425, 35=>422",
-+ "31=>418, 32=>419, 33=>416, 34=>420, 35=>417",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>468, 32=>469, 33=>466, 34=>470, 35=>467",
-+ "31=>463, 32=>464, 33=>461, 34=>465, 35=>462",
-+ "31=>458, 32=>459, 33=>456, 34=>460, 35=>457",
-+ "31=>453, 32=>454, 33=>451, 34=>455, 35=>452",
-+ "31=>448, 32=>449, 33=>446, 34=>450, 35=>447",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "22=>600, 23=>599, 24=>597, 26=>598, 27=>596",
-+ "22=>570, 23=>569, 24=>567, 26=>568, 27=>566",
-+ "22=>540, 23=>539, 24=>537, 26=>538, 27=>536",
-+ "22=>510, 23=>509, 24=>507, 26=>508, 27=>506",
-+ "22=>480, 23=>479, 24=>477, 26=>478, 27=>476",
-+ "31=>503, 32=>504, 33=>501, 34=>505, 35=>502",
-+ "31=>498, 32=>499, 33=>496, 34=>500, 35=>497",
-+ "31=>493, 32=>494, 33=>491, 34=>495, 35=>492",
-+ "31=>488, 32=>489, 33=>486, 34=>490, 35=>487",
-+ "31=>483, 32=>484, 33=>481, 34=>485, 35=>482",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>533, 32=>534, 33=>531, 34=>535, 35=>532",
-+ "31=>528, 32=>529, 33=>526, 34=>530, 35=>527",
-+ "31=>523, 32=>524, 33=>521, 34=>525, 35=>522",
-+ "31=>518, 32=>519, 33=>516, 34=>520, 35=>517",
-+ "31=>513, 32=>514, 33=>511, 34=>515, 35=>512",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>563, 32=>564, 33=>561, 34=>565, 35=>562",
-+ "31=>558, 32=>559, 33=>556, 34=>560, 35=>557",
-+ "31=>553, 32=>554, 33=>551, 34=>555, 35=>552",
-+ "31=>548, 32=>549, 33=>546, 34=>550, 35=>547",
-+ "31=>543, 32=>544, 33=>541, 34=>545, 35=>542",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>593, 32=>594, 33=>591, 34=>595, 35=>592",
-+ "31=>588, 32=>589, 33=>586, 34=>590, 35=>587",
-+ "31=>583, 32=>584, 33=>581, 34=>585, 35=>582",
-+ "31=>578, 32=>579, 33=>576, 34=>580, 35=>577",
-+ "31=>573, 32=>574, 33=>571, 34=>575, 35=>572",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>623, 32=>624, 33=>621, 34=>625, 35=>622",
-+ "31=>618, 32=>619, 33=>616, 34=>620, 35=>617",
-+ "31=>613, 32=>614, 33=>611, 34=>615, 35=>612",
-+ "31=>608, 32=>609, 33=>606, 34=>610, 35=>607",
-+ "31=>603, 32=>604, 33=>601, 34=>605, 35=>602",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "22=>755, 23=>754, 24=>752, 26=>753, 27=>751",
-+ "22=>725, 23=>724, 24=>722, 26=>723, 27=>721",
-+ "22=>695, 23=>694, 24=>692, 26=>693, 27=>691",
-+ "22=>665, 23=>664, 24=>662, 26=>663, 27=>661",
-+ "22=>635, 23=>634, 24=>632, 26=>633, 27=>631",
-+ "31=>658, 32=>659, 33=>656, 34=>660, 35=>657",
-+ "31=>653, 32=>654, 33=>651, 34=>655, 35=>652",
-+ "31=>648, 32=>649, 33=>646, 34=>650, 35=>647",
-+ "31=>643, 32=>644, 33=>641, 34=>645, 35=>642",
-+ "31=>638, 32=>639, 33=>636, 34=>640, 35=>637",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>688, 32=>689, 33=>686, 34=>690, 35=>687",
-+ "31=>683, 32=>684, 33=>681, 34=>685, 35=>682",
-+ "31=>678, 32=>679, 33=>676, 34=>680, 35=>677",
-+ "31=>673, 32=>674, 33=>671, 34=>675, 35=>672",
-+ "31=>668, 32=>669, 33=>666, 34=>670, 35=>667",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>718, 32=>719, 33=>716, 34=>720, 35=>717",
-+ "31=>713, 32=>714, 33=>711, 34=>715, 35=>712",
-+ "31=>708, 32=>709, 33=>706, 34=>710, 35=>707",
-+ "31=>703, 32=>704, 33=>701, 34=>705, 35=>702",
-+ "31=>698, 32=>699, 33=>696, 34=>700, 35=>697",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>748, 32=>749, 33=>746, 34=>750, 35=>747",
-+ "31=>743, 32=>744, 33=>741, 34=>745, 35=>742",
-+ "31=>738, 32=>739, 33=>736, 34=>740, 35=>737",
-+ "31=>733, 32=>734, 33=>731, 34=>735, 35=>732",
-+ "31=>728, 32=>729, 33=>726, 34=>730, 35=>727",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>778, 32=>779, 33=>776, 34=>780, 35=>777",
-+ "31=>773, 32=>774, 33=>771, 34=>775, 35=>772",
-+ "31=>768, 32=>769, 33=>766, 34=>770, 35=>767",
-+ "31=>763, 32=>764, 33=>761, 34=>765, 35=>762",
-+ "31=>758, 32=>759, 33=>756, 34=>760, 35=>757",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null
-+ };
-+}
diff --git a/jdk8312489-max_sig_default_increase.patch b/jdk8312489-max_sig_default_increase.patch
new file mode 100644
index 0000000..8aeb261
--- /dev/null
+++ b/jdk8312489-max_sig_default_increase.patch
@@ -0,0 +1,50 @@
+commit 5b613e3ebed6c141146e743e64c894fe4f39421e
+Author: Andrew John Hughes <andrew(a)openjdk.org>
+Date: Fri Sep 1 15:53:41 2023 +0000
+
+ 8312489: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar
+
+ Backport-of: e47a84f23dd2608c6f5748093eefe301fb5bf750
+
+diff --git a/src/java.base/share/classes/java/util/jar/JarFile.java b/src/java.base/share/classes/java/util/jar/JarFile.java
+index bd538649a4f..70cf99504e4 100644
+--- a/src/java.base/share/classes/java/util/jar/JarFile.java
++++ b/src/java.base/share/classes/java/util/jar/JarFile.java
+@@ -803,7 +803,9 @@ private byte[] getBytes(ZipEntry ze) throws IOException {
+ throw new IOException("Unsupported size: " + uncompressedSize +
+ " for JarEntry " + ze.getName() +
+ ". Allowed max size: " +
+- SignatureFileVerifier.MAX_SIG_FILE_SIZE + " bytes");
++ SignatureFileVerifier.MAX_SIG_FILE_SIZE + " bytes. " +
++ "You can use the jdk.jar.maxSignatureFileSize " +
++ "system property to increase the default value.");
+ }
+ int len = (int)uncompressedSize;
+ int bytesRead;
+diff --git a/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
+index 4ea9255ba0a..05acdcb9474 100644
+--- a/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
++++ b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
+@@ -856,16 +856,16 @@ private static int initializeMaxSigFileSize() {
+ * the maximum allowed number of bytes for the signature-related files
+ * in a JAR file.
+ */
+- Integer tmp = GetIntegerAction.privilegedGetProperty(
+- "jdk.jar.maxSignatureFileSize", 8000000);
++ int tmp = GetIntegerAction.privilegedGetProperty(
++ "jdk.jar.maxSignatureFileSize", 16000000);
+ if (tmp < 0 || tmp > MAX_ARRAY_SIZE) {
+ if (debug != null) {
+- debug.println("Default signature file size 8000000 bytes " +
+- "is used as the specified size for the " +
+- "jdk.jar.maxSignatureFileSize system property " +
++ debug.println("The default signature file size of 16000000 bytes " +
++ "will be used for the jdk.jar.maxSignatureFileSize " +
++ "system property since the specified value " +
+ "is out of range: " + tmp);
+ }
+- tmp = 8000000;
++ tmp = 16000000;
+ }
+ return tmp;
+ }
diff --git a/nss.fips.cfg.in b/nss.fips.cfg.in
deleted file mode 100644
index 2d9ec35..0000000
--- a/nss.fips.cfg.in
+++ /dev/null
@@ -1,8 +0,0 @@
-name = NSS-FIPS
-nssLibraryDirectory = @NSS_LIBDIR@
-nssSecmodDirectory = sql:/etc/pki/nssdb
-nssDbMode = readOnly
-nssModule = fips
-
-attributes(*,CKO_SECRET_KEY,CKK_GENERIC_SECRET)={ CKA_SIGN=true }
-
diff --git a/openjdk_news.sh b/openjdk_news.sh
index 560b356..386aa53 100755
--- a/openjdk_news.sh
+++ b/openjdk_news.sh
@@ -18,8 +18,8 @@
OLD_RELEASE=$1
NEW_RELEASE=$2
-SUBDIR=$3
-REPO=$4
+REPO=$3
+SUBDIR=$4
SCRIPT_DIR=$(dirname ${0})
if test "x${SUBDIR}" = "x"; then
diff --git a/rh1648644-java_access_bridge_privileged_security.patch b/rh1648644-java_access_bridge_privileged_security.patch
deleted file mode 100644
index 53026ad..0000000
--- a/rh1648644-java_access_bridge_privileged_security.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- openjdk/src/java.base/share/conf/security/java.security
-+++ openjdk/src/java.base/share/conf/security/java.security
-@@ -304,6 +304,8 @@
- #
- package.access=sun.misc.,\
- sun.reflect.,\
-+ org.GNOME.Accessibility.,\
-+ org.GNOME.Bonobo.,\
-
- #
- # List of comma-separated packages that start with or equal this string
-@@ -316,6 +318,8 @@
- #
- package.definition=sun.misc.,\
- sun.reflect.,\
-+ org.GNOME.Accessibility.,\
-+ org.GNOME.Bonobo.,\
-
- #
- # Determines whether this properties file can be appended to
diff --git a/sources b/sources
index 47996d1..0c780d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openjdk-jdk17u-jdk-17.0.8+7.tar.xz) = 52bd1002cffafc6fc613b3ee1c62bfc3f27f31d5e1810ebb8f556a725ebb310508885762079589f15be5da63388214525128b77d2a665bae9fccfc419ab5d6a1
+SHA512 (openjdk-17.0.9+9.tar.xz) = 33225a1070077c9504b4857734305f301e51b93a929274d460ddc3dc042ce15943030f8af928c11962743a928619ea39daa453d8fb1c8ea5a334a4b6490a00ee
1
0
Architecture specific change in rpms/java-17-openjdk-portable.git
by githook-noreply＠fedoraproject.org 23 Nov '23
by githook-noreply＠fedoraproject.org 23 Nov '23
23 Nov '23
The package rpms/java-17-openjdk-portable.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-17-openjdk-portable.git/commit….
Change:
+%ifarch %{gdb_arches}
Thanks.
Full change:
============
commit 289d0e958f24fa8759c01d48b05c8a4b71e599e2
Author: Jiri <jvanek(a)redhat.com>
Date: Thu Nov 23 16:12:18 2023 +0100
updated to OpenJDK 17.0.9 (2023-10-17)
- adjsuted generate_source_tarball
- removed icedtea_sync
- dropped standalone licenses
- added usntripped subpkg
- added docs subpkg
- adjsuted versions of bundled libraries
- build refactored to several solid methods following gnu_andrew
- removed no longer needed jdk8305995-footprint_regression_from_jdk_8224957, nss.fips.cfg.in, rh1648644-java_access_bridge_privileged_security.patch
- added jdk8312489-max_sig_default_increase.patch
- aligned fips-17u-51e1d00be4e.patch (gnu_andrew)
- fixed '--without release' build-ability by moving docs and misc to
if-release only
diff --git a/.gitignore b/.gitignore
index 6c2c596..f79d052 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@
/openjdk-jdk17u-jdk-17.0.6+10.tar.xz
/openjdk-jdk17u-jdk-17.0.7+7.tar.xz
/openjdk-jdk17u-jdk-17.0.8+7.tar.xz
+/openjdk-17.0.9+9.tar.xz
diff --git a/NEWS b/NEWS
index a7be73f..4edebb8 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,490 @@ Key:
JDK-X - https://bugs.openjdk.java.net/browse/JDK-X
CVE-XXXX-YYYY: https://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
+New in release OpenJDK 17.0.9 (2023-10-17):
+===========================================
+Live versions of these release notes can be found at:
+ * https://bit.ly/openjdk1709
+
+* CVEs
+ - CVE-2023-22081
+ - CVE-2023-22025
+* Security fixes
+ - JDK-8286503, JDK-8312367: Enhance security classes
+ - JDK-8296581: Better system proxy support
+ - JDK-8297856: Improve handling of Bidi characters
+ - JDK-8305815, JDK-8307278: Update Libpng to 1.6.39
+ - JDK-8306881, JDK-8307286: Update FreeType to 2.13.0
+ - JDK-8309966: Enhanced TLS connections
+ - JDK-8312248: Enhanced archival support redux
+ - JDK-8314649: Enhanced archival support redux
+ - JDK-8317121: vector_masked_load instruction is moved too early after JDK-8286941
+* New features
+ - JDK-8276799: Implementation of JEP 422: Linux/RISC-V Port
+* Other changes
+ - JDK-6176679: Application freezes when copying an animated gif image to the system clipboard
+ - JDK-6381945: (cal) Japanese calendar unit test system should avoid multiple static imports
+ - JDK-8040793: vmTestbase/nsk/monitoring/stress/lowmem fails on calling isCollectionUsageThresholdExceeded()
+ - JDK-8153837: AArch64: Handle special cases for MaxINode & MinINode
+ - JDK-8156889: ListKeychainStore.sh fails in some virtualized environments
+ - JDK-8171221: Remove -XX:+CheckMemoryInitialization
+ - JDK-8180266: Convert sun/security/provider/KeyStore/DKSTest.sh to Java Jtreg Test
+ - JDK-8195589: T6587786.java failed after JDK-8189997
+ - JDK-8209398: sun/security/pkcs11/KeyStore/SecretKeysBasic.sh failed with "PKCS11Exception: CKR_ATTRIBUTE_SENSITIVE"
+ - JDK-8225012: sanity/client/SwingSet/src/ToolTipDemoTest.java fails on Windows
+ - JDK-8229147: Linux os::create_thread() overcounts guardpage size with newer glibc (>=2.27)
+ - JDK-8252713: jtreg time out of CtrlASCII.java seems to hang the Xserver.
+ - JDK-8255548: Missing coverage for javax.xml.crypto.dom.DOMCryptoContext
+ - JDK-8263044: jdk/jfr/jvm/TestDumpOnCrash.java timed out
+ - JDK-8267188: gc/stringdedup/TestStringDeduplicationInterned.java fails with Shenandoah
+ - JDK-8267341: macos attempt_reserve_memory_at(arg1, arg2, true) failure
+ - JDK-8267517: async logging for stdout and stderr
+ - JDK-8267860: Off-by-one bug when searching arrays in AlpnGreaseTest
+ - JDK-8268852: AsyncLogWriter should not overide is_Named_thread()
+ - JDK-8269091: javax/sound/sampled/Clip/SetPositionHang.java failed with ArrayIndexOutOfBoundsException: Array index out of range: -4
+ - JDK-8269466: Factor out the common code for initializing and starting internal VM JavaThreads
+ - JDK-8270331: [TESTBUG] Error: Not a test or directory containing tests: java/awt/print/PrinterJob/InitToBlack.java
+ - JDK-8270794: Avoid loading Klass* twice in TypeArrayKlass::oop_size()
+ - JDK-8270894: Use acquire semantics in ObjectSynchronizer::read_stable_mark()
+ - JDK-8271707: migrate tests to use jdk.test.whitebox.WhiteBox
+ - JDK-8271898: disable os.release_multi_mappings_vm on macOS-X64
+ - JDK-8272586: emit abstract machine code in hs-err logs
+ - JDK-8272654: Mark word accesses should not use Access API
+ - JDK-8273092: Sort classlist in JDK image
+ - JDK-8273803: Zero: Handle "zero" variant in CommandLineOptionTest.java
+ - JDK-8274986: max code printed in hs-err logs should be configurable
+ - JDK-8275031: runtime/ErrorHandling/MachCodeFramesInErrorFile.java fails when hsdis is present
+ - JDK-8275303: sun/java2d/pipe/InterpolationQualityTest.java fails with D3D basic render driver
+ - JDK-8275415: Prepare Leak Profiler for Lilliput
+ - JDK-8275662: remove test/lib/sun/hotspot
+ - JDK-8276333: jdk/jfr/event/oldobject/TestLargeRootSet.java failed "assert(!contains(edge->reference())) failed: invariant"
+ - JDK-8276651: java/lang/ProcessHandle tests fail with "RuntimeException: Input/output error" in java.lang.ProcessHandleImpl$Info.info0
+ - JDK-8276696: ParallelObjectIterator freed at the wrong time in VM_HeapDumper
+ - JDK-8277102: Dubious PrintCompilation output
+ - JDK-8277353: java/security/MessageDigest/ThreadSafetyTest.java test times out
+ - JDK-8277417: C1 LIR instruction for load-klass
+ - JDK-8277427: Update jib-profiles.js to use JMH 1.33 devkit
+ - JDK-8277654: Shenandoah: Don't produce new memory state in C2 LRB runtime call
+ - JDK-8277860: PPC: Remove duplicate info != NULL check
+ - JDK-8278141: LIR_OpLoadKlass::_info shadows the field of the same name from LIR_Op
+ - JDK-8278456: Define jtreg jdk_desktop test group time-based sub-tasks for use by headful testing.
+ - JDK-8279545: Buffer overrun in reverse_words of sharedRuntime_x86_64.cpp:3517
+ - JDK-8280032: Update jib-profiles.js to use JMH 1.34 devkit
+ - JDK-8280396: G1: Full gc mark stack draining should prefer to make work available to other threads
+ - JDK-8280885: Shenandoah: Some tests failed with "EA: missing allocation reference path"
+ - JDK-8281507: Two javac tests have bad jtreg `@clean` tags
+ - JDK-8281717: Cover logout method for several LoginModule
+ - JDK-8282404: DrawStringWithInfiniteXform.java failed with "RuntimeException: drawString with InfiniteXform transform takes long time"
+ - JDK-8282651: ZGC: vmTestbase/gc/ArrayJuggle/ tests fails intermittently with exit code 97
+ - JDK-8282665: [REDO] ByteBufferTest.java: replace endless recursion with RuntimeException in void ck(double x, double y)
+ - JDK-8283056: show abstract machine code in hs-err for all VM crashes
+ - JDK-8283276: java/io/ObjectStreamClass/ObjectStreamClassCaching.java fails with various GCs
+ - JDK-8283326: Implement SafeFetch statically
+ - JDK-8283724: Incorrect description for jtreg-failure-handler option
+ - JDK-8283756: (zipfs) ZipFSOutputStreamTest.testOutputStream should only check inflated bytes
+ - JDK-8283865: riscv: Break down -XX:+UseRVB into seperate options for each bitmanip extension
+ - JDK-8283929: GHA: Add RISC-V build config
+ - JDK-8284068: riscv: should call Atomic::release_store in JavaThread::set_thread_state
+ - JDK-8284090: com/sun/security/auth/module/AllPlatforms.java fails to compile
+ - JDK-8284273: Early crashes in os::print_context on AArch64
+ - JDK-8284760: Correct type/array element offset in LibraryCallKit::get_state_from_digest_object()
+ - JDK-8284772: GHA: Use GCC Major Version Dependencies Only
+ - JDK-8284910: Buffer clean in PasswordCallback
+ - JDK-8284937: riscv: should not allocate special register for temp
+ - JDK-8284997: arm32 build crashes since JDK-8283326
+ - JDK-8285303: riscv: Incorrect register mask in call_native_base
+ - JDK-8285437: riscv: Fix MachNode size mismatch for MacroAssembler::verify_oops*
+ - JDK-8285630: Fix a configure error in RISC-V cross build
+ - JDK-8285675: Temporary fix for arm32 SafeFetch
+ - JDK-8285699: riscv: Provide information when hitting a HaltNode
+ - JDK-8285711: riscv: RVC: Support disassembler show-bytes option
+ - JDK-8285756: clean up use of bad arguments for `@clean` in langtools tests
+ - JDK-8285980: Several tests in compiler/c2/irTests miss @requires vm.compiler2.enabled
+ - JDK-8286481: Exception printed to stdout on Windows when storing transparent image in clipboard
+ - JDK-8286620: Create regression test for verifying setMargin() of JRadioButton
+ - JDK-8286623: Bundle zlib by default with JDK on macos aarch64
+ - JDK-8287227: Shenandoah: A couple of virtual thread tests failed with iu mode even without Loom enabled.
+ - JDK-8287418: riscv: Fix correctness issue of MacroAssembler::movptr
+ - JDK-8287552: riscv: Fix comment typo in li64
+ - JDK-8287970: riscv: jdk/incubator/vector/*VectorTests failing
+ - JDK-8288719: [arm32] SafeFetch32 thumb interleaving causes random crashes
+ - JDK-8289077: Add manual tests to open
+ - JDK-8289238: Refactoring changes to PassFailJFrame Test Framework
+ - JDK-8289510: Improve test coverage for XPath Axes: namespace
+ - JDK-8289512: Fix GCC 12 warnings for adlc output_c.cpp
+ - JDK-8289547: Update javax/swing/Popup/TaskbarPositionTest.java
+ - JDK-8289646: configure script failed on WSL
+ - JDK-8289688: jfr command hangs when it processes invalid file
+ - JDK-8289748: C2 compiled code crashes with SIGFPE with -XX:+StressLCM and -XX:+StressGCM
+ - JDK-8289797: tools/launcher/I18NArgTest.java fails on Japanese Windows environment
+ - JDK-8289917: Metadata for regionsRefilled of G1EvacuationStatistics event is wrong
+ - JDK-8290137: riscv: small refactoring for add_memory_int32/64
+ - JDK-8290164: compiler/runtime/TestConstantsInError.java fails on riscv
+ - JDK-8290464: Optimize ResourceArea zapping on ResourceMark release
+ - JDK-8290469: Add new positioning options to PassFailJFrame test framework
+ - JDK-8290496: riscv: Fix build warnings-as-errors with GCC 11
+ - JDK-8291444: GHA builds/tests won't run manually if disabled from automatic running
+ - JDK-8291830: jvmti/RedefineClasses/StressRedefine failed: assert(!is_null(v)) failed: narrow klass value can never be zero
+ - JDK-8291893: riscv: remove fence.i used in user space
+ - JDK-8291947: riscv: fail to build after JDK-8290840
+ - JDK-8291952: riscv: Remove PRAGMA_NONNULL_IGNORED
+ - JDK-8292182: [TESTLIB] Enhance JAXPPolicyManager to setup required permissions for jtreg version 7 jar
+ - JDK-8292315: Tests should not rely on specific JAR file names (hotspot)
+ - JDK-8292316: Tests should not rely on specific JAR file names (jpackage)
+ - JDK-8292683: Remove BadKeyUsageTest.java from Problem List
+ - JDK-8292698: Improve performance of DataInputStream
+ - JDK-8292716: Configure should check that jtreg is of the required version
+ - JDK-8292763: JDK-8292716 breaks configure without jtreg
+ - JDK-8292867: RISC-V: Simplify weak CAS return value handling
+ - JDK-8293012: ConstantPool::print_on can crash if _cache is NULL
+ - JDK-8293050: RISC-V: Remove redundant non-null assertions about macro-assembler
+ - JDK-8293098: GHA: Harmonize GCC version handling for host and cross builds
+ - JDK-8293100: RISC-V: Need to save and restore callee-saved FloatRegisters in StubGenerator::generate_call_stub
+ - JDK-8293107: GHA: Bump to Ubuntu 22.04
+ - JDK-8293114: JVM should trim the native heap
+ - JDK-8293166: jdk/jfr/jvm/TestDumpOnCrash.java fails on Linux ppc64le and Linux aarch64
+ - JDK-8293177: Verify version numbers in legal files
+ - JDK-8293180: JQuery UI license file not updated
+ - JDK-8293252: Shenandoah: ThreadMXBean synchronizer tests crash with aggressive heuristics
+ - JDK-8293361: GHA: dump config.log in case of configure failure
+ - JDK-8293474: RISC-V: Unify the way of moving function pointer
+ - JDK-8293524: RISC-V: Use macro-assembler functions as appropriate
+ - JDK-8293566: RISC-V: Clean up push and pop registers
+ - JDK-8293811: Provide a reason for PassFailJFrame.forceFail
+ - JDK-8293851: hs_err should print more stack in hex dump
+ - JDK-8294012: RISC-V: get/put_native_u8 missing the case when address&7 is 6
+ - JDK-8294083: RISC-V: Minimal build failed with --disable-precompiled-headers
+ - JDK-8294086: RISC-V: Cleanup InstructionMark usages in the backend
+ - JDK-8294087: RISC-V: RVC: Fix a potential alignment issue and add more alignment assertions for the patchable calls/nops
+ - JDK-8294149: JMH 1.34 and later requires jopt-simple 5.0.4
+ - JDK-8294187: RISC-V: Unify all relocations for the backend into AbstractAssembler::relocate()
+ - JDK-8294366: RISC-V: Partially mark out incompressible regions
+ - JDK-8294430: RISC-V: Small refactoring for movptr_with_offset
+ - JDK-8294492: RISC-V: Use li instead of patchable movptr at non-patchable callsites
+ - JDK-8294679: RISC-V: Misc crash dump improvements
+ - JDK-8294941: GHA: Cut down cross-compilation sysroots
+ - JDK-8294956: GHA: qemu-debootstrap is deprecated, use the regular one
+ - JDK-8295110: RISC-V: Mark out relocations as incompressible
+ - JDK-8295213: Run GHA manually with user-specified make and configure arguments
+ - JDK-8295270: RISC-V: Clean up and refactoring for assembler functions
+ - JDK-8295396: RISC-V: Cleanup useless CompressibleRegions
+ - JDK-8295657: SA: Allow larger object alignments
+ - JDK-8295737: macOS: Print content cut off when width > height with portrait orientation
+ - JDK-8295811: serviceability/sa/TestObjectAlignment.java fails on x86_32
+ - JDK-8295812: Skip the "half float" support in LittleCMS during the build
+ - JDK-8295894: Remove SECOM certificate that is expiring in September 2023
+ - JDK-8295926: RISC-V: C1: Fix LIRGenerator::do_LibmIntrinsic
+ - JDK-8295968: RISC-V: Rename some assembler intrinsic functions for RVV 1.0
+ - JDK-8296384: [TESTBUG] sun/security/provider/SecureRandom/AbstractDrbg/SpecTest.java intermittently timeout
+ - JDK-8296435: RISC-V: Small refactoring for increment/decrement
+ - JDK-8296447: RISC-V: Make the operands order of vrsub_vx/vrsub_vi consistent with RVV 1.0 spec
+ - JDK-8296448: RISC-V: Fix temp usages of heapbase register killed by MacroAssembler::en/decode_klass_not_null
+ - JDK-8296602: RISC-V: improve performance of copy_memory stub
+ - JDK-8296771: RISC-V: C2: assert(false) failed: bad AD file
+ - JDK-8296796: Provide clean, platform-agnostic interface to C-heap trimming
+ - JDK-8296916: RISC-V: Move some small macro-assembler functions to header file
+ - JDK-8297350: Update JMH devkit to 1.36
+ - JDK-8297359: RISC-V: improve performance of floating Max Min intrinsics
+ - JDK-8297476: Increase InlineSmallCode default from 1000 to 2500 for RISC-V
+ - JDK-8297644: RISC-V: Compilation error when shenandoah is disabled
+ - JDK-8297681: Unnecessary color conversion during 4BYTE_ABGR_PRE to INT_ARGB_PRE blit
+ - JDK-8297697: RISC-V: Add support for SATP mode detection
+ - JDK-8297715: RISC-V: C2: Use single-bit instructions from the Zbs extension
+ - JDK-8297887: Update Siphash
+ - JDK-8297923: java.awt.ScrollPane broken after multiple scroll up/down
+ - JDK-8298138: Shenandoah: HdrSeq asserts "sub-bucket index (512) overflow for value ( 1.00)"
+ - JDK-8298921: Create a regression test for JDK-8139581
+ - JDK-8298974: Add ftcolor.c to imported freetype sources
+ - JDK-8299158: Improve MD5 intrinsic on AArch64
+ - JDK-8299168: RISC-V: Fix MachNode size mismatch for MacroAssembler::_verify_oops*
+ - JDK-8299330: Minor improvements in MSYS2 Workflow handling
+ - JDK-8299617: CurrencySymbols.properties is missing the copyright notice
+ - JDK-8299658: C1 compilation crashes in LinearScan::resolve_exception_edge
+ - JDK-8299713: Test javax/swing/JTableHeader/6889007/bug6889007.java failed: Wrong type of cursor
+ - JDK-8299827: Add resolved IP address in connection exception for sockets
+ - JDK-8299847: RISC-V: Improve PrintOptoAssembly output of CMoveI/L nodes
+ - JDK-8299962: Speed up compiler/intrinsics/unsafe/DirectByteBufferTest.java and HeapByteBufferTest.java
+ - JDK-8300053: Shenandoah: Handle more GCCauses in ShenandoahControlThread::request_gc
+ - JDK-8300098: java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java fails with internal timeout when executed with TieredCompilation1/3
+ - JDK-8300109: RISC-V: Improve code generation for MinI/MaxI nodes
+ - JDK-8300405: Screen capture for test JFileChooserSetLocationTest.java, failure case
+ - JDK-8300584: Accelerate AVX-512 CRC32C for small buffers
+ - JDK-8300659: Refactor TestMemoryAwareness to use WhiteBox api for host values
+ - JDK-8300693: Lower the compile threshold and reduce the iterations of warmup loop in VarHandles tests
+ - JDK-8301033: RISC-V: Handle special cases for MinI/MaxI nodes for Zbb
+ - JDK-8301036: RISC-V: Factor out functions baseOffset & baseOffset32 from MacroAssembler
+ - JDK-8301067: RISC-V: better error message when reporting unsupported satp modes
+ - JDK-8301074: Replace NULL with nullptr in share/opto/
+ - JDK-8301097: Update GHA XCode to 12.5.1
+ - JDK-8301153: RISC-V: pipeline class for several instructions is not set correctly
+ - JDK-8301167: Update VerifySignedJar to actually exercise and test verification
+ - JDK-8301187: Memory leaks in OopMapCache
+ - JDK-8301269: Update Commons BCEL to Version 6.7.0
+ - JDK-8301313: RISC-V: C2: assert(false) failed: bad AD file due to missing match rule
+ - JDK-8301367: Add exception handler method to the BaseLdapServer
+ - JDK-8301628: RISC-V: c2 fix pipeline class for several instructions
+ - JDK-8301700: Increase the default TLS Diffie-Hellman group size from 1024-bit to 2048-bit
+ - JDK-8301818: RISC-V: Factor out function mvw from MacroAssembler
+ - JDK-8301852: RISC-V: Optimize class atomic when order is memory_order_relaxed
+ - JDK-8301959: Compile command in compiler.loopopts.TestRemoveEmptyCountedLoop does not work
+ - JDK-8302114: RISC-V: Several foreign jtreg tests fail with debug build after JDK-8301818
+ - JDK-8302150: Speed up compiler/codegen/Test7100757.java
+ - JDK-8302161: Upgrade jQuery UI to version 1.13.2
+ - JDK-8302182: Update Public Suffix List to 88467c9
+ - JDK-8302289: RISC-V: Use bgez instruction in arraycopy_simple_check when possible
+ - JDK-8302736: Major performance regression in Math.log on aarch64
+ - JDK-8302776: RISC-V: Fix typo CSR_INSTERT to CSR_INSTRET
+ - JDK-8303047: avoid NULL after 8301661
+ - JDK-8303154: Investigate and improve instruction cache flushing during compilation
+ - JDK-8303215: Make thread stacks not use huge pages
+ - JDK-8303279: C2: crash in SubTypeCheckNode::sub() at IGVN split if
+ - JDK-8304293: RISC-V: JDK-8276799 missed atomic intrinsic support for C1
+ - JDK-8304314: StackWalkTest.java fails after CODETOOLS-7903373
+ - JDK-8304353: Add lib-test tier1 testing in GHA
+ - JDK-8304725: AsyncGetCallTrace can cause SIGBUS on M1
+ - JDK-8304845: Update PCSC-Lite for Suse Linux to 1.9.9 and fix incomplete license wording
+ - JDK-8304976: Optimize DateTimeFormatterBuilder.ZoneTextPrinterParser.getTree()
+ - JDK-8305006: Use correct register in riscv_enc_fast_unlock()
+ - JDK-8305008: RISC-V: Factor out immediate checking functions from assembler_riscv.inline.hpp
+ - JDK-8305112: RISC-V: Typo fix for RVC description
+ - JDK-8305236: Some LoadLoad barriers in the interpreter are unnecessary after JDK-8220051
+ - JDK-8305421: Work around JDK-8305420 in CDSJDITest.java
+ - JDK-8305425: Thread.isAlive0 doesn't need to call into the VM
+ - JDK-8305512: RISC-V: Enable RVC extension by default on supported hardware
+ - JDK-8305670: Performance regression in LockSupport.unpark with lots of idle threads
+ - JDK-8305728: RISC-V: Use bexti instruction to do single-bit testing
+ - JDK-8305763: Parsing a URI with an underscore goes through a silent exception, negatively impacting performance
+ - JDK-8305766: ProblemList runtime/CompressedOops/CompressedClassPointers.java
+ - JDK-8305858: Resolve multiple definition of 'handleSocketError' when statically linking with JDK native libraries
+ - JDK-8305950: Have -XshowSettings option display tzdata version
+ - JDK-8305995: Footprint regression from JDK-8224957
+ - JDK-8306060: Open source few AWT Insets related tests
+ - JDK-8306076: Open source AWT misc tests
+ - JDK-8306134: Open source some AWT tests relating to Button and a few other classes
+ - JDK-8306135: Clean up and open source some AWT tests
+ - JDK-8306137: Open source several AWT ScrollPane related tests
+ - JDK-8306281: function isWsl() returns false on WSL2
+ - JDK-8306372: Open source AWT CardLayout and Checkbox tests
+ - JDK-8306428: RunThese30M.java crashed with assert(early->flag() == current->flag() || early->flag() == mtNone)
+ - JDK-8306430: Open source some AWT tests related to TextComponent and Toolkit
+ - JDK-8306435: Juggle04/TestDescription.java should be a booleanArr test and not a byteArr one
+ - JDK-8306484: Open source several AWT Choice jtreg tests
+ - JDK-8306566: Open source several clipboard AWT tests
+ - JDK-8306575: Clean up and open source four Dialog related tests
+ - JDK-8306636: Disable compiler/c2/Test6905845.java with -XX:TieredStopAtLevel=3
+ - JDK-8306638: Open source some AWT tests related to datatransfer and Toolkit
+ - JDK-8306667: RISC-V: Fix storeImmN0 matching rule by using zr register
+ - JDK-8306682: Open source a few more AWT Choice tests
+ - JDK-8306718: Optimize and opensource some old AWT tests
+ - JDK-8306738: Select num workers for safepoint ParallelCleanupTask
+ - JDK-8306765: Some client related jtreg problem list entries are malformed
+ - JDK-8306812: Open source several AWT Miscellaneous tests
+ - JDK-8307067: remove broken EnableThreadSMRExtraValidityChecks option
+ - JDK-8307068: store a JavaThread* in the java.lang.Thread object after the JavaThread* is added to the main ThreadsList
+ - JDK-8307078: Opensource and clean up five more AWT Focus related tests
+ - JDK-8307079: Update test java/awt/Choice/DragOffNoSelect.java
+ - JDK-8307083: Open source some drag and drop tests 3
+ - JDK-8307147: [x86] Dangling pointer warning for Assembler::_attributes
+ - JDK-8307150: RISC-V: Remove remaining StoreLoad barrier with UseCondCardMark for Serial/Parallel GC
+ - JDK-8307156: native_thread not protected by TLH
+ - JDK-8307165: java/awt/dnd/NoFormatsDropTest/NoFormatsDropTest.java timed out
+ - JDK-8307299: Move more DnD tests to open
+ - JDK-8307301: Update HarfBuzz to 7.2.0
+ - JDK-8307348: Parallelize heap walk for ObjectCount(AfterGC) JFR event collection
+ - JDK-8307395: Add missing STS to Shenandoah
+ - JDK-8307446: RISC-V: Improve performance of floating point to integer conversion
+ - JDK-8307526: [JFR] Better handling of tampered JFR repository
+ - JDK-8307555: Reduce memory reads in x86 MD5 intrinsic
+ - JDK-8307569: Build with gcc8 is broken after JDK-8307301
+ - JDK-8307572: AArch64: Vector registers are clobbered by some macroassemblers
+ - JDK-8307603: [AIX] Broken build after JDK-8307301
+ - JDK-8307604: gcc12 based Alpine build broken build after JDK-8307301
+ - JDK-8307651: RISC-V: stringL_indexof_char instruction has wrong format string
+ - JDK-8307653: Adjust delay time and gc log argument in TestAbortOnVMOperationTimeout
+ - JDK-8307683: Loop Predication should not hoist range checks with trap on success projection by negating their condition
+ - JDK-8307766: Linux: Provide the option to override the timer slack
+ - JDK-8308089: [riscv-port-jdk17u] Intrinsify Unsafe.storeStoreFence
+ - JDK-8308090: Add container tests for on-the-fly resource quota updates
+ - JDK-8308152: PropertyDescriptor should work with overridden generic getter method
+ - JDK-8308156: VerifyCACerts.java misses blank in error output
+ - JDK-8308192: Error in parsing replay file when staticfield is an array of single dimension
+ - JDK-8308232: nsk/jdb tests don't pass -verbose flag to the debuggee
+ - JDK-8308277: RISC-V: Improve vectorization of Match.sqrt() on floats
+ - JDK-8308283: Build failure with GCC12 & GCC13
+ - JDK-8308300: enhance exceptions in MappedMemoryUtils.c
+ - JDK-8308643: Incorrect value of 'used' jvmstat counter
+ - JDK-8308766: TLAB initialization may cause div by zero
+ - JDK-8308803: Improve java/util/UUID/UUIDTest.java
+ - JDK-8308872: enhance logging and some exception in krb5/Config.java
+ - JDK-8308997: RISC-V: Sign extend when comparing 32-bit value with zero instead of testing the sign bit
+ - JDK-8309088: security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java fails
+ - JDK-8309095: Remove UTF-8 character from TaskbarPositionTest.java
+ - JDK-8309107: Bump update version for OpenJDK: jdk-17.0.9
+ - JDK-8309119: [17u/11u] Redo JDK-8297951: C2: Create skeleton predicates for all If nodes in loop predication
+ - JDK-8309138: Fix container tests for jdks with symlinked conf dir
+ - JDK-8309228: Clarify EXPERIMENTAL flags comment in hotspot/share/runtime/globals.hpp
+ - JDK-8309254: Implement fast-path for ASCII-compatible CharsetEncoders on RISC-V
+ - JDK-8309266: C2: assert(final_con == (jlong)final_int) failed: final value should be integer
+ - JDK-8309297: Adjust ShenandoahHeap print_heap_regions_on
+ - JDK-8309340: Provide sctpHandleSocketErrorWithMessage
+ - JDK-8309427: [riscv-port-jdk17u] Remove unused RoundDoubleModeV C2 node
+ - JDK-8309550: jdk.jfr.internal.Utils::formatDataAmount method should gracefully handle amounts equal to Long.MIN_VALUE
+ - JDK-8309591: Socket.setOption(TCP_QUICKACK) uses wrong level
+ - JDK-8309613: [Windows] hs_err files sometimes miss information about the code containing the error
+ - JDK-8309746: Reconfigure check should include make/conf/version-numbers.conf
+ - JDK-8309862: Unsafe list operations in JfrStringPool
+ - JDK-8309956: Shenandoah: Strengthen the mark word check in string dedup
+ - JDK-8309959: JFR: Display N/A for missing data amount
+ - JDK-8310054: ScrollPane insets are incorrect
+ - JDK-8310126: C1: Missing receiver null check in Reference::get intrinsic
+ - JDK-8310259: Pin msys2/setup-msys2 github action to a specific commit
+ - JDK-8310549: avoid potential leaks in KeystoreImpl.m related to JNU_CHECK_EXCEPTION early returns
+ - JDK-8310551: vmTestbase/nsk/jdb/interrupt/interrupt001/interrupt001.java timed out due to missing prompt
+ - JDK-8310873: Re-enable locked_create_entry symbol check in runtime/NMT/CheckForProperDetailStackTrace.java for RISC-V
+ - JDK-8311033: [macos] PrinterJob does not take into account Sides attribute
+ - JDK-8311249: Remove unused MemAllocator::obj_memory_range
+ - JDK-8311285: report some fontconfig related environment variables in hs_err file
+ - JDK-8311689: Wrong visible amount in Adjustable of ScrollPane
+ - JDK-8311862: RISC-V: small improvements to shift immediate instructions
+ - JDK-8311923: TestIRMatching.java fails on RISC-V
+ - JDK-8312029: Add CriticalNative tests to ProblemList for 8312028
+ - JDK-8312511: GHA: Bump cross-compile runner to Ubuntu 22.04
+ - JDK-8312525: New test runtime/os/TestTrimNative.java#trimNative is failing: did not see the expected RSS reduction
+ - JDK-8312555: Ideographic characters aren't stretched by AffineTransform.scale(2, 1)
+ - JDK-8313262: C2: Sinking node may cause required cast to be dropped
+ - JDK-8313402: C1: Incorrect LoadIndexed value numbering
+ - JDK-8313428: GHA: Bump GCC versions for July 2023 updates
+ - JDK-8313576: GCC 7 reports compiler warning in bundled freetype 2.13.0
+ - JDK-8313676: Amend TestLoadIndexedMismatch test to target intrinsic directly
+ - JDK-8313678: SymbolTable can leak Symbols during cleanup
+ - JDK-8313701: GHA: RISC-V should use the official repository for bootstrap
+ - JDK-8313707: GHA: Bootstrap sysroots with --variant=minbase
+ - JDK-8313796: AsyncGetCallTrace crash on unreadable interpreter method pointer
+ - JDK-8313815: The exception messages printed by jcmd ManagementAgent.start are corrupted on Japanese Windows
+ - JDK-8313874: JNI NewWeakGlobalRef throws exception for null arg
+ - JDK-8314020: Print instruction blocks in byte units
+ - JDK-8314117: RISC-V: Incorrect VMReg encoding in RISCV64Frame.java
+ - JDK-8314118: Update JMH devkit to 1.37
+ - JDK-8314262: GHA: Cut down cross-compilation sysroots deeper
+ - JDK-8314426: runtime/os/TestTrimNative.java is failing on slow machines
+ - JDK-8314501: Shenandoah: sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java fails
+ - JDK-8314517: some tests fail in case ipv6 is disabled on the machine
+ - JDK-8314552: Fix javadoc tests to work with jtreg 7
+ - JDK-8314658: [17u] GHA: Sync up debian-version for cross-builds
+ - JDK-8314730: GHA: Drop libfreetype6-dev transitional package in favor of libfreetype-dev
+ - JDK-8314960: Add Certigna Root CA - 2
+ - JDK-8317040: Exclude cleaner test failing on older releases
+ - JDK-8317643: [17u] Remove designator DEFAULT_PROMOTED_VERSION_PRE=ea for release 17.0.9
+
+Notes on individual issues:
+===========================
+
+hotspot/compiler:
+
+JDK-8276799: Implementation of JEP 422: Linux/RISC-V Port
+=========================================================
+https://openjdk.org/jeps/422
+
+RISC-V is a free and open-source RISC instruction set architecture
+(ISA) designed originally at the University of California, Berkeley,
+and now developed collaboratively under the sponsorship of RISC-V
+International. It is already supported by a wide range of language
+toolchains. With the increasing availability of RISC-V hardware, the
+JDK port has been backported to 17u, following introduction in 19.
+
+security-libs/javax.net.ssl:
+
+JDK-8301700: The Default TLS Diffie-Hellman Group Size Has Been Increased from 1024-bit to 2048-bit
+===================================================================================================
+The JDK implementation of TLS 1.2 now uses a default Diffie Hellman
+keysize of 2048 bits when a TLS_DHE cipher suite is negotiated and
+either the client or server does not support FFDHE.
+
+The JDK TLS implementation supports FFDHE, which can negotiate a
+stronger keysize, and this is enabled by default.
+
+As a workaround, users can revert to the previous key size by setting
+the `jdk.tls.ephemeralDHKeySize` system property to 1024 (at their own
+risk).
+
+This change does not affect TLS 1.3 as the minimum DH group size is
+already 2048 bits.
+
+tools/launcher:
+
+JDK-8305950: `-XshowSettings:locale` Output Now Includes Tzdata Version
+=======================================================================
+The `-XshowSettings` launcher option has been enhanced to print the
+tzdata version used by the JDK. The tzdata version is displayed as
+part of the `locale` showSettings option.
+
+Example output using `-X:showSettings:locale`:
+
+Locale settings:
+ default locale = English
+ default display locale = English
+ default format locale = English
+ tzdata version = 2023c
+
+security-libs/java.security:
+
+JDK-8295894: Removed SECOM Trust System's RootCA1 Root Certificate
+==================================================================
+The following root certificate from SECOM Trust System has been
+removed from the `cacerts` keystore:
+
+Alias Name: secomscrootca1 [jdk]
+Distinguished Name: OU=Security Communication RootCA1, O=SECOM Trust.net, C=JP
+
+JDK-8314960: Added Certigna Root CA Certificate
+===============================================
+The following root certificate has been added to the cacerts
+truststore:
+
+Name: Certigna (Dhimyotis)
+Alias Name: certignarootca
+Distinguished Name: CN=Certigna Root CA, OU=0002 48146308100036, O=Dhimyotis, C=FR
+
+New in release OpenJDK 17.0.8.1 (2023-08-24):
+=============================================
+Live versions of these release notes can be found at:
+ * https://bit.ly/openjdk17081
+
+* Other changes
+ - JDK-8313765: Invalid CEN header (invalid zip64 extra data field size)
+ - JDK-8314677: Bump update version for OpenJDK: jdk-17.0.8.1
+
+Notes on individual issues:
+===========================
+
+core-libs/java.util.jar:
+
+JDK-8313765: Invalid CEN header (invalid zip64 extra data field size)
+=====================================================================
+Additional validity checks in the handling of Zip64 files,
+JDK-8302483, introduced in 17.0.8, caused the use of some valid zip
+files to now fail with the error, `Invalid CEN header (invalid zip64
+extra data field size)`
+
+This release, 17.0.8.1, allows for zero length headers and additional
+padding produced by some Zip64 creation tools.
+
+The following third party tools have also released patches to better
+adhere to the ZIP File Format Specification:
+
+* Apache Commons Compress fix for Empty CEN Zip64 Extra Headers fixed in Commons Compress release 1.11
+* Apache Ant fix for Empty CEN Zip64 Extra Headers fixed in Ant 1.10.14
+* BND issue with writing invalid Extra Headers fixed in BND 5.3
+
+The maven-bundle-plugin 5.1.5 includes the BND 5.3 patch.
+
+If these improved validation checks cause issues for deployed zip or
+jar files, check how the file was created and whether patches are
+available from the generating software to resolve the issue. With
+both JDK releases, the checks can be disabled by setting the new
+system property, `jdk.util.zip.disableZip64ExtraFieldValidation` to
+`true`.
+
New in release OpenJDK 17.0.8 (2023-07-18):
===========================================
Live versions of these release notes can be found at:
@@ -2913,4 +3397,3 @@ its introduction and the effort required to maintain it is
significant. Retain the experimental Java-level JVM compiler
interface (JVMCI) so that developers can continue to use
externally-built versions of the compiler for JIT compilation.
-
diff --git a/discover_trees.sh b/discover_trees.sh
new file mode 100755
index 0000000..8c31278
--- /dev/null
+++ b/discover_trees.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# Copyright (C) 2020 Red Hat, Inc.
+# Written by Andrew John Hughes <gnu.andrew(a)redhat.com>.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+TREE=${1}
+
+if test "x${TREE}" = "x"; then
+ TREE=${PWD}
+fi
+
+if [ -e ${TREE}/nashorn/.hg -o -e ${TREE}/nashorn/merge.changeset ] ; then
+ NASHORN="nashorn" ;
+fi
+
+if [ -e ${TREE}/corba/.hg -o -e ${TREE}/corba/merge.changeset ] ; then
+ CORBA="corba";
+fi
+
+if [ -e ${TREE}/jaxp/.hg -o -e ${TREE}/jaxp/merge.changeset ] ; then
+ JAXP="jaxp";
+fi
+
+if [ -e ${TREE}/jaxws/.hg -o -e ${TREE}/jaxws/merge.changeset ] ; then
+ JAXWS="jaxws";
+fi
+
+if [ -e ${TREE}/langtools/.hg -o -e ${TREE}/langtools/merge.changeset ] ; then
+ LANGTOOLS="langtools";
+fi
+
+if [ -e ${TREE}/jdk/.hg -o -e ${TREE}/jdk/merge.changeset ] ; then
+ JDK="jdk";
+fi
+
+if [ -e ${TREE}/hotspot/.hg -o -e ${TREE}/hotspot/merge.changeset ] ; then
+ HOTSPOT="hotspot";
+fi
+
+SUBTREES="${CORBA} ${JAXP} ${JAXWS} ${LANGTOOLS} ${NASHORN} ${JDK} ${HOTSPOT}";
+echo ${SUBTREES}
diff --git a/fips-17u-bf363eecce3.patch b/fips-17u-51e1d00be4e.patch
similarity index 99%
rename from fips-17u-bf363eecce3.patch
rename to fips-17u-51e1d00be4e.patch
index cd8565c..da1df4d 100644
--- a/fips-17u-bf363eecce3.patch
+++ b/fips-17u-51e1d00be4e.patch
@@ -116,7 +116,7 @@ index 00000000000..f48fc7f7e80
+ AC_SUBST(NSS_LIBDIR)
+])
diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
-index a65d91ee974..a8f054c1397 100644
+index 366682cf044..1f8d782f419 100644
--- a/make/autoconf/libraries.m4
+++ b/make/autoconf/libraries.m4
@@ -33,6 +33,7 @@ m4_include([lib-std.m4])
@@ -2508,7 +2508,7 @@ index 00000000000..dc8bc72fccb
+ }
+}
diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
-index fab52688c04..29337576f37 100644
+index 9be02033877..4dd055a9ccf 100644
--- a/src/java.base/share/conf/security/java.security
+++ b/src/java.base/share/conf/security/java.security
@@ -82,6 +82,17 @@ security.provider.tbd=Apple
@@ -3496,7 +3496,7 @@ index 00000000000..f8d505ca815
+}
\ No newline at end of file
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
-index 9b69072280e..5696b904979 100644
+index 0736ce997e4..0a937fef377 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
@@ -37,6 +37,8 @@ import javax.crypto.*;
@@ -3518,18 +3518,18 @@ index 9b69072280e..5696b904979 100644
private static final long serialVersionUID = -2575874101938349339L;
private static final String PUBLIC = "public";
-@@ -136,9 +141,7 @@ abstract class P11Key implements Key, Length {
+@@ -139,9 +144,7 @@ abstract class P11Key implements Key, Length {
this.tokenObject = tokenObject;
this.sensitive = sensitive;
this.extractable = extractable;
- char[] tokenLabel = this.token.tokenInfo.label;
-- boolean isNSS = (tokenLabel[0] == 'N' && tokenLabel[1] == 'S'
+- isNSS = (tokenLabel[0] == 'N' && tokenLabel[1] == 'S'
- && tokenLabel[2] == 'S');
-+ boolean isNSS = P11Util.isNSS(this.token);
++ isNSS = P11Util.isNSS(this.token);
boolean extractKeyInfo = (!DISABLE_NATIVE_KEYS_EXTRACTION && isNSS &&
extractable && !tokenObject);
this.keyIDHolder = new NativeKeyHolder(this, keyID, session,
-@@ -379,7 +382,9 @@ abstract class P11Key implements Key, Length {
+@@ -383,7 +386,9 @@ abstract class P11Key implements Key, Length {
new CK_ATTRIBUTE(CKA_SENSITIVE),
new CK_ATTRIBUTE(CKA_EXTRACTABLE),
});
@@ -3540,13 +3540,13 @@ index 9b69072280e..5696b904979 100644
return new P11PrivateKey
(session, keyID, algorithm, keyLength, attributes);
} else {
-@@ -461,7 +466,8 @@ abstract class P11Key implements Key, Length {
+@@ -465,7 +470,8 @@ abstract class P11Key implements Key, Length {
}
public String getFormat() {
token.ensureValid();
-- if (sensitive || (extractable == false)) {
+- if (sensitive || !extractable || (isNSS && tokenObject)) {
+ if (!plainKeySupportEnabled &&
-+ (sensitive || (extractable == false))) {
++ (sensitive || !extractable || (isNSS && tokenObject))) {
return null;
} else {
return "RAW";
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index fc8662a..7ff27d6 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -8,7 +8,7 @@
# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
# PROJECT_NAME=openjdk
# REPO_NAME=jdk17u
-# VERSION=jdk-17.0.7+7
+# VERSION=jdk-17.0.7+9
# or to eg prepare systemtap:
# icedtea7's jstack and other tapsets
# VERSION=6327cf1cea9e
@@ -29,8 +29,6 @@ set -e
OPENJDK_URL_DEFAULT=https://github.com
COMPRESSION_DEFAULT=xz
-# Corresponding IcedTea version
-ICEDTEA_VERSION=12.0
if [ "x$1" = "xhelp" ] ; then
echo -e "Behaviour may be specified by setting the following variables:\n"
@@ -40,8 +38,8 @@ if [ "x$1" = "xhelp" ] ; then
echo "OPENJDK_URL - the URL to retrieve code from (optional; defaults to ${OPENJDK_URL_DEFAULT})"
echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
- echo "REPO_ROOT - the location of the Git repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
- echo "TO_COMPRESS - what part of clone to pack (default is openjdk)"
+ echo "REPO_ROOT - the location of the Git repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME.git)"
+ echo "TO_COMPRESS - what part of clone to pack (default is ${VERSION})"
echo "BOOT_JDK - the bootstrap JDK to satisfy the configure run"
exit 1;
fi
@@ -52,6 +50,7 @@ if [ "x$VERSION" = "x" ] ; then
exit 2
fi
echo "Version: ${VERSION}"
+
NUM_VER=${VERSION##jdk-}
RELEASE_VER=${NUM_VER%%+*}
BUILD_VER=${NUM_VER##*+}
@@ -117,8 +116,8 @@ if [ "x$REPO_ROOT" = "x" ] ; then
fi;
if [ "x$TO_COMPRESS" = "x" ] ; then
- TO_COMPRESS="openjdk"
- echo "No targets to be compressed specified, ; default to ${TO_COMPRESS}"
+ TO_COMPRESS="${VERSION}"
+ echo "No targets to be compressed specified ; default to ${TO_COMPRESS}"
fi;
echo -e "Settings:"
@@ -140,9 +139,10 @@ else
mkdir "${FILE_NAME_ROOT}"
pushd "${FILE_NAME_ROOT}"
echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
- git clone -b ${VERSION} ${REPO_ROOT} openjdk
+ git clone -b ${VERSION} ${REPO_ROOT} ${VERSION}
popd
fi
+
pushd "${FILE_NAME_ROOT}"
# Generate .src-rev so build has knowledge of the revision the tarball was created from
mkdir build
@@ -153,22 +153,22 @@ pushd "${FILE_NAME_ROOT}"
rm -rf build
# Remove commit checks
- echo "Removing $(find openjdk -name '.jcheck' -print)"
- find openjdk -name '.jcheck' -print0 | xargs -0 rm -rf
+ echo "Removing $(find ${VERSION} -name '.jcheck' -print)"
+ find ${VERSION} -name '.jcheck' -print0 | xargs -0 rm -r
# Remove history and GHA
- echo "find openjdk -name '.hgtags'"
- find openjdk -name '.hgtags' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.hgignore'"
- find openjdk -name '.hgignore' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.gitattributes'"
- find openjdk -name '.gitattributes' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.gitignore'"
- find openjdk -name '.gitignore' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.git'"
- find openjdk -name '.git' -exec rm -rfv '{}' '+'
- echo "find openjdk -name '.github'"
- find openjdk -name '.github' -exec rm -rfv '{}' '+'
+ echo "find ${VERSION} -name '.hgtags'"
+ find ${VERSION} -name '.hgtags' -exec rm -fv '{}' '+'
+ echo "find ${VERSION} -name '.hgignore'"
+ find ${VERSION} -name '.hgignore' -exec rm -fv '{}' '+'
+ echo "find ${VERSION} -name '.gitattributes'"
+ find ${VERSION} -name '.gitattributes' -exec rm -fv '{}' '+'
+ echo "find ${VERSION} -name '.gitignore'"
+ find ${VERSION} -name '.gitignore' -exec rm -fv '{}' '+'
+ echo "find ${VERSION} -name '.git'"
+ find ${VERSION} -name '.git' -exec rm -rfv '{}' '+'
+ echo "find ${VERSION} -name '.github'"
+ find ${VERSION} -name '.github' -exec rm -rfv '{}' '+'
echo "Compressing remaining forest"
if [ "X$COMPRESSION" = "Xxz" ] ; then
diff --git a/icedtea_sync.sh b/icedtea_sync.sh
index e5c54f3..c1b8f6a 100755
--- a/icedtea_sync.sh
+++ b/icedtea_sync.sh
@@ -1,192 +1 @@
-#!/bin/bash
-
-# Copyright (C) 2019 Red Hat, Inc.
-# Written by Andrew John Hughes <gnu.andrew(a)redhat.com>.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-ICEDTEA_USE_VCS=true
-
-ICEDTEA_VERSION=3.15.0
-ICEDTEA_URL=https://icedtea.classpath.org/download/source
-ICEDTEA_SIGNING_KEY=CFDA0F9B35964222
-
-ICEDTEA_HG_URL=https://icedtea.classpath.org/hg/icedtea11
-
-set -e
-
-RPM_DIR=${PWD}
-if [ ! -f ${RPM_DIR}/jconsole.desktop.in ] ; then
- echo "Not in RPM source tree.";
- exit 1;
-fi
-
-if test "x${TMPDIR}" = "x"; then
- TMPDIR=/tmp;
-fi
-WORKDIR=${TMPDIR}/it.sync
-
-echo "Using working directory ${WORKDIR}"
-mkdir ${WORKDIR}
-pushd ${WORKDIR}
-
-if test "x${WGET}" = "x"; then
- WGET=$(which wget);
- if test "x${WGET}" = "x"; then
- echo "wget not found";
- exit 1;
- fi
-fi
-
-if test "x${TAR}" = "x"; then
- TAR=$(which tar)
- if test "x${TAR}" = "x"; then
- echo "tar not found";
- exit 2;
- fi
-fi
-
-echo "Dependencies:";
-echo -e "\tWGET: ${WGET}";
-echo -e "\tTAR: ${TAR}\n";
-
-if test "x${ICEDTEA_USE_VCS}" = "xtrue"; then
- echo "Mode: Using VCS";
-
- if test "x${GREP}" = "x"; then
- GREP=$(which grep);
- if test "x${GREP}" = "x"; then
- echo "grep not found";
- exit 3;
- fi
- fi
-
- if test "x${CUT}" = "x"; then
- CUT=$(which cut);
- if test "x${CUT}" = "x"; then
- echo "cut not found";
- exit 4;
- fi
- fi
-
- if test "x${TR}" = "x"; then
- TR=$(which tr);
- if test "x${TR}" = "x"; then
- echo "tr not found";
- exit 5;
- fi
- fi
-
- if test "x${HG}" = "x"; then
- HG=$(which hg);
- if test "x${HG}" = "x"; then
- echo "hg not found";
- exit 6;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tGREP: ${GREP}";
- echo -e "\tCUT: ${CUT}";
- echo -e "\tTR: ${TR}";
- echo -e "\tHG: ${HG}";
-
- echo "Checking out repository from VCS...";
- ${HG} clone ${ICEDTEA_HG_URL} icedtea
-
- echo "Obtaining version from configure.ac...";
- ROOT_VER=$(${GREP} '^AC_INIT' icedtea/configure.ac|${CUT} -d ',' -f 2|${TR} -d '[][:space:]')
- echo "Root version from configure: ${ROOT_VER}";
-
- VCS_REV=$(${HG} log -R icedtea --template '{node|short}' -r tip)
- echo "VCS revision: ${VCS_REV}";
-
- ICEDTEA_VERSION="${ROOT_VER}-${VCS_REV}"
- echo "Creating icedtea-${ICEDTEA_VERSION}";
- mkdir icedtea-${ICEDTEA_VERSION}
- echo "Copying required files from checkout to icedtea-${ICEDTEA_VERSION}";
- # Commented out for now as IcedTea 6's jconsole.desktop.in is outdated
- #cp -a icedtea/jconsole.desktop.in ../icedtea-${ICEDTEA_VERSION}
- cp -a ${RPM_DIR}/jconsole.desktop.in icedtea-${ICEDTEA_VERSION}
- cp -a icedtea/tapset icedtea-${ICEDTEA_VERSION}
-
- rm -rf icedtea
-else
- echo "Mode: Using tarball";
-
- if test "x${ICEDTEA_VERSION}" = "x"; then
- echo "No IcedTea version specified for tarball download.";
- exit 3;
- fi
-
- if test "x${CHECKSUM}" = "x"; then
- CHECKSUM=$(which sha256sum)
- if test "x${CHECKSUM}" = "x"; then
- echo "sha256sum not found";
- exit 4;
- fi
- fi
-
- if test "x${PGP}" = "x"; then
- PGP=$(which gpg)
- if test "x${PGP}" = "x"; then
- echo "gpg not found";
- exit 5;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tCHECKSUM: ${CHECKSUM}";
- echo -e "\tPGP: ${PGP}\n";
-
- echo "Checking for IcedTea signing key ${ICEDTEA_SIGNING_KEY}...";
- if ! gpg --list-keys ${ICEDTEA_SIGNING_KEY}; then
- echo "IcedTea signing key ${ICEDTEA_SIGNING_KEY} not installed.";
- exit 6;
- fi
-
- echo "Downloading IcedTea release tarball...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz
- echo "Downloading IcedTea tarball signature...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- echo "Downloading IcedTea tarball checksums...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Verifying checksums...";
- ${CHECKSUM} --check --ignore-missing icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Checking signature...";
- ${PGP} --verify icedtea-${ICEDTEA_VERSION}.tar.xz.sig
-
- echo "Extracting files...";
- ${TAR} xJf icedtea-${ICEDTEA_VERSION}.tar.xz \
- icedtea-${ICEDTEA_VERSION}/tapset \
- icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in
-
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- rm -vf icedtea-${ICEDTEA_VERSION}.sha256
-fi
-
-echo "Replacing desktop files...";
-mv -v icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in ${RPM_DIR}
-
-echo "Creating new tapset tarball...";
-mv -v icedtea-${ICEDTEA_VERSION} openjdk
-${TAR} cJf ${RPM_DIR}/tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz openjdk
-
-rm -rvf openjdk
-
-popd
-rm -rf ${WORKDIR}
+# this file is intentionally not here, as portable builds do not have desktop integration
diff --git a/java-17-openjdk-portable.spec b/java-17-openjdk-portable.spec
index 655ccd1..c4526aa 100644
--- a/java-17-openjdk-portable.spec
+++ b/java-17-openjdk-portable.spec
@@ -30,7 +30,7 @@
# Enable static library builds by default.
%bcond_without staticlibs
# Build a fresh libjvm.so for use in a copy of the bootstrap JDK
-%bcond_without fresh_libjvm
+%bcond_with fresh_libjvm
# Build with system libraries
%bcond_with system_libs
@@ -41,8 +41,6 @@
%define __os_install_post %{nil}
%endif
-%global unpacked_licenses %{_datarootdir}/licenses
-
# Workaround for stripping of debug symbols from static libraries
%if %{with staticlibs}
%define __brp_strip_static_archive %{nil}
@@ -66,10 +64,6 @@
# See: https://bugzilla.redhat.com/show_bug.cgi?id=1520879
%global _find_debuginfo_opts -g
-# With LTO flags enabled, debuginfo checks fail for some reason. Disable
-# LTO for a passing build. This really needs to be looked at.
-%define _lto_cflags %{nil}
-
# note: parametrized macros are order-sensitive (unlike not-parametrized) even with normal macros
# also necessary when passing it as parameter to other macros. If not macro, then it is considered a switch
# see the difference between global and define:
@@ -147,16 +141,16 @@
# Set of architectures which support the serviceability agent
%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm}
# Set of architectures which support class data sharing
-# See https://bugzilla.redhat.com/show_bug.cgi?id=513605
-# MetaspaceShared::generate_vtable_methods is not implemented for the PPC JIT
-%global share_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{arm} s390x
+# As of JDK-8005165 in OpenJDK 10, class sharing is not arch-specific
+# However, it does segfault on the Zero assembler port, so currently JIT only
+%global share_arches %{jit_arches}
# Set of architectures for which we build the Shenandoah garbage collector
%global shenandoah_arches x86_64 %{aarch64}
# Set of architectures for which we build the Z garbage collector
%global zgc_arches x86_64
# Set of architectures for which alt-java has SSB mitigation
%global ssbd_arches x86_64
-# Set of architectures for which java has short vector math library (libsvml.so)
+# Set of architectures for which java has short vector math library (libjsvml.so)
%global svml_arches x86_64
# Set of architectures where we verify backtraces with gdb
# s390x fails on RHEL 7 so we exclude it there
@@ -166,7 +160,7 @@
%global gdb_arches %{jit_arches} %{zero_arches}
%endif
-# By default, we build a debug build during main build on JIT architectures
+# By default, we build a slowdebug build during main build on JIT architectures
%if %{with slowdebug}
%ifarch %{debug_arches}
%global include_debug_build 1
@@ -237,17 +231,24 @@
%global static_libs_target %{nil}
%endif
-# RPM JDK builds keep the debug symbols internal, to be later stripped by RPM
-%global debug_symbols internal
-
-# unlike portables,the rpms have to use static_libs_target very dynamically
-%global bootstrap_targets images legacy-jre-image
-%global release_targets images docs-zip legacy-jre-image
+# The static libraries are produced under the same configuration as the main
+# build for portables, as we expect in-tree libraries to be used throughout.
+# If system libraries are enabled, the static libraries will also use them
+# which may cause issues.
+%global bootstrap_targets images %{static_libs_target} legacy-jre-image
+%global release_targets images docs-zip %{static_libs_target} legacy-jre-image
# No docs nor bootcycle for debug builds
-%global debug_targets images legacy-jre-image
+%global debug_targets images %{static_libs_target} legacy-jre-image
# Target to use to just build HotSpot
%global hotspot_target hotspot
+# DTS toolset to use to provide gcc & binutils
+%global dtsversion 10
+
+# Disable LTO as this causes build failures at the moment.
+# See RHBZ#1861401
+%define _lto_cflags %{nil}
+
# Filter out flags from the optflags macro that cause problems with the OpenJDK build
# We filter out -O flags so that the optimization of HotSpot is not lowered from O3 to O2
# We filter out -Wall which will otherwise cause HotSpot to produce hundreds of thousands of warnings (100+mb logs)
@@ -333,20 +334,20 @@
# New Version-String scheme-style defines
%global featurever 17
%global interimver 0
-%global updatever 8
+%global updatever 9
%global patchver 0
# buildjdkver is usually same as %%{featurever},
# but in time of bootstrap of next jdk, it is featurever-1,
# and this it is better to change it here, on single place
-%global buildjdkver %{featurever}
+%global buildjdkver 17
# We don't add any LTS designator for STS packages (Fedora and EPEL).
# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
%if 0%{?rhel} && !0%{?epel}
%global lts_designator "LTS"
%global lts_designator_zip -%{lts_designator}
%else
- %global lts_designator ""
- %global lts_designator_zip ""
+ %global lts_designator ""
+ %global lts_designator_zip ""
%endif
# JDK to use for bootstrapping
%global bootjdk /usr/lib/jvm/java-%{buildjdkver}-openjdk
@@ -372,26 +373,34 @@
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{name}&…
%else
%if 0%{?rhel}
-%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20…
+%global oj_vendor_bug_url https://access.redhat.com/support/cases/
%else
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi
%endif
%endif
%endif
-%global oj_vendor_version (Red_Hat-%{version}-%{release})
+%global oj_vendor_version (Red_Hat-%{version}-%{rpmrelease})
# Define IcedTea version used for SystemTap tapsets and desktop file
%global icedteaver 6.0.0pre00-c848b93a8598
# Define current Git revision for the FIPS support patches
-%global fipsver bf363eecce3
+%global fipsver 51e1d00be4e
+# Define JDK versions
+%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
+%global javaver %{featurever}
+# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
+%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
+# The tag used to create the OpenJDK tarball
+%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Standard JPackage naming and versioning defines
%global origin openjdk
%global origin_nice OpenJDK
-%global top_level_dir_name %{origin}
+%global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
-%global buildver 7
-%global rpmrelease 1
+%global buildver 9
+%global rpmrelease 2
+#%%global tagsuffix %%{nil}
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -404,14 +413,6 @@
# for techpreview, using 1, so slowdebugs can have 0
%global priority %( printf '%08d' 1 )
%endif
-%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
-%global javaver %{featurever}
-
-# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
-%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
-
-# The tag used to create the OpenJDK tarball
-%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Define milestone (EA for pre-releases, GA for releases)
# Release will be (where N is usually a number starting at 1):
@@ -421,7 +422,7 @@
%if %{is_ga}
%global build_type GA
%global ea_designator ""
-%global ea_designator_zip ""
+%global ea_designator_zip %{nil}
%global extraver %{nil}
%global eaprefix %{nil}
%else
@@ -438,12 +439,10 @@
# images directories from upstream build
%global jdkimage jdk
%global static_libs_image static-libs
-# installation directory for static libraries
-%global static_libs_root lib/static
-%global static_libs_arch_dir %{static_libs_root}/linux-%{archinstall}
-%global static_libs_install_dir %{static_libs_arch_dir}/glibc
# output dir stub
%define buildoutputdir() %{expand:build/jdk%{featurever}.build%{?1}}
+%define installoutputdir() %{expand:install/jdk%{featurever}.install%{?1}}
+%define packageoutputdir() %{expand:packages/jdk%{featurever}.packages%{?1}}
# we can copy the javadoc to not arched dir, or make it not noarch
%define uniquejavadocdir() %{expand:%{fullversion}.%{_arch}%{?1}}
# main id and dir of this jdk
@@ -464,6 +463,10 @@
# Intentionally use jdkportablenameimpl here since we want to have static-libs files overlayed on
# top of the JDK archive
%define staticlibsportablename() %{expand:%{jdkportablenameimpl -- %%{1}}}
+%define docportablename() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable.docs;g" | sed "s;openjdkportable;el;g")
+%define docportablearchive() %{docportablename}.tar.xz
+%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable.misc;g" | sed "s;openjdkportable;el;g")
+%define miscportablearchive() %{miscportablename}.tar.xz
# RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1}
# so we have to pass in "" but evaluate it, otherwise files record will include it
@@ -493,6 +496,12 @@
%global __requires_exclude ^(%{_privatelibs}|%{_publiclibs})$
%endif
+# VM variant being built
+%ifarch %{zero_arches}
+%global vm_variant zero
+%else
+%global vm_variant server
+%endif
%global etcjavasubdir %{_sysconfdir}/java/java-%{javaver}-%{origin}
%define etcjavadir() %{expand:%{etcjavasubdir}/%{uniquesuffix -- %{?1}}}
@@ -515,20 +524,6 @@
%global alternatives_requires %{_sbindir}/alternatives
%endif
-%if %{with_systemtap}
-# Where to install systemtap tapset (links)
-# We would like these to be in a package specific sub-dir,
-# but currently systemtap doesn't support that, so we have to
-# use the root tapset dir for now. To distinguish between 64
-# and 32 bit architectures we place the tapsets under the arch
-# specific dir (note that systemtap will only pickup the tapset
-# for the primary arch for now). Systemtap uses the machine name
-# aka target_cpu as architecture specific directory name.
-%global tapsetroot /usr/share/systemtap
-%global tapsetdirttapset %{tapsetroot}/tapset/
-%global tapsetdir %{tapsetdirttapset}/%{stapinstall}
-%endif
-
# x86 is no longer supported
%if 0%{?java_arches:1}
ExclusiveArch: %{java_arches}
@@ -536,8 +531,8 @@ ExclusiveArch: %{java_arches}
ExcludeArch: %{ix86}
%endif
-# Portables have no rpo (requires/provides), but thsoe are awesome for orientation in spec
-# also scriptlets are hapily missing and files are handled old fashion
+# Portables have no repo (requires/provides), but these are awesome for orientation in spec
+# Also scriptlets are happily missing and files are handled old fashion
# not-duplicated requires/provides/obsoletes for normal/debug packages
%define java_rpo() %{expand:
}
@@ -548,14 +543,18 @@ ExcludeArch: %{ix86}
%define java_static_libs_rpo() %{expand:
}
+%define java_unstripped_rpo() %{expand:
+}
+
+%define java_docs_rpo() %{expand:
+}
+
+%define java_misc_rpo() %{expand:
+}
# Prevent brp-java-repack-jars from being run
%global __jar_repack 0
-# portables have grown out of its component, moving back to java-x-vendor
-# this expression, when declared as global, filled component with java-x-vendor portable
-%define component %(echo %{name} | sed "s;-portable;;g")
-
Name: java-%{javaver}-%{origin}-portable
Version: %{newjavaver}.%{buildver}
Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
@@ -570,6 +569,11 @@ Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
# provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0".
Epoch: 1
+
+# portables have grown out of its component, moving back to java-x-vendor
+# this expression, when declared as global, filled component with java-x-vendor portable
+%define component %(echo %{name} | sed "s;-portable;;g")
+
Summary: %{origin_nice} %{featurever} Runtime Environment portable edition
# Groups are only used up to RHEL 8 and on Fedora versions prior to F30
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
@@ -593,9 +597,8 @@ Group: Development/Languages
License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib and ISC and FTL and RSA
URL: http://openjdk.java.net/
-
# The source tarball, generated using generate_source_tarball.sh
-Source0: openjdk-jdk%{featurever}u-%{vcstag}.tar.xz
+Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}%{ea_desi…
# Use 'icedtea_sync.sh' to update the following
# They are based on code contained in the IcedTea project (6.x).
@@ -614,8 +617,7 @@ Source10: NEWS
Source11: nss.cfg.in
# Removed libraries that we link instead
-# Disabled in portables
-#Source12: remove-intree-libraries.sh
+Source12: remove-intree-libraries.sh
# Ensure we aren't using the limited crypto policy
Source13: TestCryptoLevel.java
@@ -629,37 +631,22 @@ Source15: TestSecurityProperties.java
# Ensure vendor settings are correct
Source16: CheckVendor.java
-# nss fips configuration file
-Source17: nss.fips.cfg.in
-
# Ensure translations are available for new timezones
Source18: TestTranslations.java
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-# boot jdk for portable build root on
-Source1001: ojdk17-aarch64-17.35.tar.gz
-Source1002: ojdk17-ppc64le-17.35.tar.gz
-Source1003: ojdk17-x86_64-17.35.tar.gz
-Source1004: ojdk17-s390x-17.35.tar.gz
-%endif
-
############################################
#
# RPM/distribution specific patches
#
############################################
-# NSS via SunPKCS11 Provider (disabled comment
-# due to memory leak).
-Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
-# RH1750419: enable build of speculative store bypass hardened alt-java (CVE-2018-3639)
-Patch600: rh1750419-redhat_alt_java.patch
-
# Ignore AWTError when assistive technologies are loaded
Patch1: rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
-# Restrict access to java-atk-wrapper classes
-Patch2: rh1648644-java_access_bridge_privileged_security.patch
Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch
+# NSS via SunPKCS11 Provider (disabled due to memory leak).
+Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
+# RH1750419: enable build of speculative store bypass hardened alt-java (CVE-2018-3639)
+Patch600: rh1750419-redhat_alt_java.patch
# Depend on pcsc-lite-libs instead of pcsc-lite-devel as this is only in optional repo
Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
@@ -707,12 +694,27 @@ Patch1001: fips-17u-%{fipsver}.patch
#
#############################################
+# Currently empty
+
+#############################################
+#
+# OpenJDK patches appearing in 17.0.10
+#
+#############################################
+# JDK-8312489, OJ2095: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar
+Patch2000: jdk8312489-max_sig_default_increase.patch
+
#############################################
#
-# OpenJDK patches appearing in 17.0.8
+# Portable build specific patches
+#
+#############################################
+
+#############################################
+#
+# OpenJDK patches targetted for 17.0.6
#
#############################################
-Patch2003: jdk8305995-footprint_regression_from_jdk_8224957
BuildRequires: autoconf
BuildRequires: automake
@@ -722,11 +724,11 @@ BuildRequires: cups-devel
BuildRequires: desktop-file-utils
# elfutils only are OK for build without AOT
BuildRequires: elfutils-devel
+BuildRequires: file
BuildRequires: fontconfig-devel
-BuildRequires: freetype-devel
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-BuildRequires: devtoolset-8-gcc
-BuildRequires: devtoolset-8-gcc-c++
+BuildRequires: devtoolset-%{dtsversion}-gcc
+BuildRequires: devtoolset-%{dtsversion}-gcc-c++
%else
BuildRequires: gcc
# gcc-c++ is already needed
@@ -746,12 +748,11 @@ BuildRequires: libXrandr-devel
BuildRequires: libXrender-devel
BuildRequires: libXt-devel
BuildRequires: libXtst-devel
-# Requirement for setting up nss.cfg and nss.fips.cfg
+# Requirement for setting up nss.cfg
BuildRequires: nss-devel
# Requirement for system security property test
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-BuildRequires: crypto-policies
-%endif
+# N/A for portable. RHEL7 doesn't provide them
+#BuildRequires: crypto-policies
BuildRequires: pkgconfig
BuildRequires: xorg-x11-proto-devel
BuildRequires: zip
@@ -761,16 +762,18 @@ BuildRequires: unzip
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
# No javapackages-filesystem on el7,nor is needed for portables
%else
-BuildRequires: javapackages-filesystem
+# BuildRequires: javapackages-filesystem
BuildRequires: java-%{buildjdkver}-openjdk-devel
%endif
# Zero-assembler build requirement
%ifarch %{zero_arches}
BuildRequires: libffi-devel
%endif
+# Full documentation build requirements
+BuildRequires: graphviz
+BuildRequires: pandoc
# 2023c required as of JDK-8305113
BuildRequires: tzdata-java >= 2023c
-
# cacerts build requirement in portable mode
BuildRequires: ca-certificates
# Earlier versions have a bug in tree vectorization on PPC
@@ -789,18 +792,18 @@ BuildRequires: lcms2-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
%else
-# Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h
-Provides: bundled(freetype) = 2.12.1
+# Version in src/java.desktop/share/legal/freetype.md
+Provides: bundled(freetype) = 2.13.0
# Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
Provides: bundled(giflib) = 5.2.1
# Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
-Provides: bundled(harfbuzz) = 4.4.1
+Provides: bundled(harfbuzz) = 7.2.0
# Version in src/java.desktop/share/native/liblcms/lcms2.h
-Provides: bundled(lcms2) = 2.12.0
+Provides: bundled(lcms2) = 2.15.0
# Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
Provides: bundled(libjpeg) = 6b
# Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h
-Provides: bundled(libpng) = 1.6.37
+Provides: bundled(libpng) = 1.6.39
# We link statically against libstdc++ to increase portability
BuildRequires: libstdc++-static
%endif
@@ -875,7 +878,7 @@ Group: Development/Tools
%{java_devel_rpo -- %{fastdebug_suffix_unquoted}}
%description devel-fastdebug
-The %{origin_nice} %{featurever} development tools - portable edition.
+The %{origin_nice} %{featurever} runtime environment and development tools - portable edition
%{fastdebug_warning}
%endif
@@ -883,7 +886,7 @@ The %{origin_nice} %{featurever} development tools - portable edition.
%if %{include_normal_build}
%package static-libs
-Summary: %{origin_nice} %{featurever} libraries for static linking - portable edition.
+Summary: %{origin_nice} %{featurever} libraries for static linking - portable edition
%{java_static_libs_rpo %{nil}}
@@ -898,7 +901,7 @@ Summary: %{origin_nice} %{featurever} libraries for static linking - portable ed
%{java_static_libs_rpo -- %{debug_suffix_unquoted}}
%description static-libs-slowdebug
-The %{origin_nice} %{featurever} libraries for static linking - portable edition.
+The %{origin_nice} %{featurever} libraries for static linking - portable edition
%{debug_warning}
%endif
@@ -909,13 +912,42 @@ Summary: %{origin_nice} %{featurever} libraries for static linking - portable ed
%{java_static_libs_rpo -- %{fastdebug_suffix_unquoted}}
%description static-libs-fastdebug
-The %{origin_nice} %{featurever} libraries for static linking - portable edition.
+The %{origin_nice} %{featurever} libraries for static linking - portable edition
%{fastdebug_warning}
%endif
# staticlibs
%endif
+%if %{include_normal_build}
+%package unstripped
+Summary: The %{origin_nice} %{featurever} runtime environment.
+
+%{java_unstripped_rpo %{nil}}
+
+%description unstripped
+The %{origin_nice} %{featurever} runtime environment.
+
+%endif
+
+%if %{include_normal_build}
+%package docs
+Summary: %{origin_nice} %{featurever} API documentation
+
+%{java_docs_rpo %{nil}}
+
+%description docs
+The %{origin_nice} %{featurever} API documentation.
+
+%package misc
+Summary: %{origin_nice} %{featurever} miscellany
+
+%{java_misc_rpo %{nil}}
+
+%description misc
+The %{origin_nice} %{featurever} miscellany.
+%endif
+
%package sources
Summary: %{origin_nice} %{featurever} full patched sources of portable JDK
@@ -951,7 +983,6 @@ else
echo "include_fastdebug_build is %{include_fastdebug_build}, that is invalid. Use 1 for yes or 0 for no"
exit 13
fi
-
if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 -a %{include_fastdebug_build} -eq 0 ] ; then
echo "You have disabled all builds (normal,fastdebug,slowdebug). That is a no go."
exit 14
@@ -980,17 +1011,18 @@ sh %{SOURCE12} %{top_level_dir_name}
# Patch the JDK
pushd %{top_level_dir_name}
%patch1 -p1
-%patch2 -p1
%patch3 -p1
%patch6 -p1
# Add crypto policy and FIPS support
%patch1001 -p1
# nss.cfg PKCS11 support; must come last as it also alters java.security
%patch1000 -p1
-%patch2003 -p1
+# JDK-8312489 backport, coming in 17.0.10
+%patch2000 -p1
+# alt-java support
+%patch600 -p1
popd # openjdk
-%patch600
# The OpenJDK version file includes the current
# upstream version information. For some reason,
@@ -1009,37 +1041,12 @@ if [ "x${UPSTREAM_EA_DESIGNATOR}" != "x%{ea_designator}" ] ; then
echo "WARNING: Designator mismatch";
echo "Spec file is configured for a %{build_type} build with designator '%{ea_designator}'"
echo "Upstream version-pre setting is '${UPSTREAM_EA_DESIGNATOR}'";
- exit 17
+ # Temporarily commented out as local copy of jdk-17.0.8+7 has the wrong setting
+ # This is fixed in the final upstream version
+ # exit 17
fi
-# Extract systemtap tapsets
-%if %{with_systemtap}
-tar --strip-components=1 -x -I xz -f %{SOURCE8}
-%if %{include_debug_build}
-cp -r tapset tapset%{debug_suffix}
-%endif
-%if %{include_fastdebug_build}
-cp -r tapset tapset%{fastdebug_suffix}
-%endif
-
-for suffix in %{build_loop} ; do
- for file in "tapset"$suffix/*.in; do
- OUTPUT_FILE=`echo $file | sed -e "s:\.stp\.in$:-%{version}-%{release}.%{_arch}.stp:g"`
- sed -e "s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/server/libjvm.so:g" $file > $file.1
- sed -e "s:@JAVA_SPEC_VER@:%{javaver}:g" $file.1 > $file.2
-# TODO find out which architectures other than i686 have a client vm
-%ifarch %{ix86}
- sed -e "s:@ABS_CLIENT_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/client/libjvm.so:g" $file.2 > $OUTPUT_FILE
-%else
- sed -e "/@ABS_CLIENT_LIBJVM_SO@/d" $file.2 > $OUTPUT_FILE
-%endif
- sed -i -e "s:@ABS_JAVA_HOME_DIR@:%{_jvmdir}/%{sdkdir -- $suffix}:g" $OUTPUT_FILE
- sed -i -e "s:@INSTALL_ARCH_DIR@:%{archinstall}:g" $OUTPUT_FILE
- sed -i -e "s:@prefix@:%{_jvmdir}/%{sdkdir -- $suffix}/:g" $OUTPUT_FILE
- done
-done
-# systemtap tapsets ends
-%endif
+# Systemtap is processed in rpms
# Prepare desktop files
# Portables do not have desktop integration
@@ -1047,30 +1054,7 @@ done
# Setup nss.cfg
sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE11} > nss.cfg
-# Setup nss.fips.cfg
-sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE17} > nss.fips.cfg
-
%build
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-mkdir bootjdk
-pushd bootjdk
-%ifarch %{aarch64}
-tar --strip-components=1 -xf %{SOURCE1001}
-%endif
-%ifarch %{ppc64le}
-tar --strip-components=1 -xf %{SOURCE1002}
-%endif
-%ifarch x86_64
-tar --strip-components=1 -xf %{SOURCE1003}
-%endif
-%ifarch s390x
-tar --strip-components=1 -xf %{SOURCE1004}
-%endif
-BOOT_JDK=$PWD
-popd
-%else
-BOOT_JDK=%{bootjdk}
-%endif
# How many CPU's do we have?
export NUM_PROC=%(/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :)
@@ -1104,12 +1088,15 @@ EXTRA_CPP_FLAGS="$(echo ${EXTRA_CPP_FLAGS} | sed -e 's|-mstackrealign|-mincoming
%endif
export EXTRA_CFLAGS EXTRA_CPP_FLAGS
+echo "Building %{newjavaver}-%{buildver}, pre=%{ea_designator}, opt=%{lts_designator}"
+
function buildjdk() {
local outputdir=${1}
local buildjdk=${2}
local maketargets="${3}"
local debuglevel=${4}
local link_opt=${5}
+ local debug_symbols=${6}
local top_dir_abs_src_path=$(pwd)/%{top_level_dir_name}
local top_dir_abs_build_path=$(pwd)/${outputdir}
@@ -1128,6 +1115,7 @@ function buildjdk() {
echo "Using make targets: ${maketargets}"
echo "Using debuglevel: ${debuglevel}"
echo "Using link_opt: ${link_opt}"
+ echo "Using debug_symbols: ${debug_symbols}"
echo "Building %{newjavaver}-%{buildver}, pre=%{ea_designator}, opt=%{lts_designator}"
mkdir -p ${outputdir}
@@ -1138,7 +1126,7 @@ function buildjdk() {
# are always used in a system_libs build, even
# for the static library build
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
- scl enable devtoolset-8 -- bash ${top_dir_abs_src_path}/configure \
+ scl enable devtoolset-%{dtsversion} -- bash ${top_dir_abs_src_path}/configure \
%else
bash ${top_dir_abs_src_path}/configure \
%endif
@@ -1150,7 +1138,7 @@ function buildjdk() {
%endif
--with-version-build=%{buildver} \
--with-version-pre="%{ea_designator}" \
- --with-version-opt=%{lts_designator} \
+ --with-version-opt="%{lts_designator}" \
--with-vendor-version-string="%{oj_vendor_version}" \
--with-vendor-name="%{oj_vendor}" \
--with-vendor-url="%{oj_vendor_url}" \
@@ -1158,7 +1146,7 @@ function buildjdk() {
--with-vendor-vm-bug-url="%{oj_vendor_bug_url}" \
--with-boot-jdk=${buildjdk} \
--with-debug-level=${debuglevel} \
- --with-native-debug-symbols="%{debug_symbols}" \
+ --with-native-debug-symbols="${debug_symbols}" \
--disable-sysconf-nss \
--enable-unlimited-crypto \
--with-zlib=%{link_type} \
@@ -1182,7 +1170,7 @@ function buildjdk() {
cat spec.gmk
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
- scl enable devtoolset-8 -- make \
+ scl enable devtoolset-%{dtsversion} -- make \
%else
make \
%endif
@@ -1190,311 +1178,325 @@ function buildjdk() {
WARNINGS_ARE_ERRORS="-Wno-error" \
CFLAGS_WARNINGS_ARE_ERRORS="-Wno-error" \
$maketargets || ( pwd; find ${top_dir_abs_src_path} ${top_dir_abs_build_path} -name "hs_err_pid*.log" | xargs cat && false )
-
popd
}
-function installjdk() {
- local imagepath=${1}
-
- if [ -d ${imagepath} ] ; then
- # the build (erroneously) removes read permissions from some jars
- # this is a regression in OpenJDK 7 (our compiler):
- # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
- find ${imagepath} -iname '*.jar' -exec chmod ugo+r {} \;
-
- # Build screws up permissions on binaries
- # https://bugs.openjdk.java.net/browse/JDK-8173610
- find ${imagepath} -iname '*.so' -exec chmod +x {} \;
- find ${imagepath}/bin/ -exec chmod +x {} \;
+function stripjdk() {
+ local outputdir=${1}
+ local jdkimagepath=${outputdir}/images/%{jdkimage}
+ local jreimagepath=${outputdir}/images/%{jreimage}
+ local jmodimagepath=${outputdir}/images/jmods
+ local supportdir=${outputdir}/support
+
+ if [ "x$suffix" = "x" ] ; then
+ # Keep the unstripped version for consumption by RHEL RPMs
+ cp -a ${jdkimagepath}{,.unstripped}
+
+ # Strip the files
+ for file in $(find ${jdkimagepath} ${jreimagepath} ${supportdir} -type f) ; do
+ if file ${file} | grep -q 'ELF'; then
+ noextfile=${file/.so/};
+ objcopy --only-keep-debug ${file} ${noextfile}.debuginfo;
+ objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file};
+ strip -g ${file};
+ fi
+ done
- # Install nss.cfg right away as we will be using the JRE above
- install -m 644 nss.cfg ${imagepath}/conf/security/
+ # Rebuild jmod files against the stripped binaries
+ if [ ! -d ${supportdir} ] ; then
+ echo "Support directory missing.";
+ exit 15
+ fi
+ for cmd in $(find ${supportdir} -name '*.jmod_exec.cmdline') ; do
+ pre=${cmd/_exec/_pre};
+ post=${cmd/_exec/_post};
+ jmod=$(echo ${cmd}|sed 's#.*_create_##'|sed 's#_exec.cmdline##')
+ echo "Rebuilding ${jmod} against stripped binaries...";
+ if [ -e ${pre} ] ; then
+ echo "Executing ${pre}...";
+ cat ${pre} | sh -s ;
+ fi
+ echo "Executing ${cmd}...";
+ cat ${cmd} | sh -s ;
+ if [ -e ${post} ] ; then
+ echo "Executing ${post}...";
+ cat ${post} | sh -s ;
+ fi
+ done
+ rm -rf ${jdkimagepath}/jmods
+ cp -a ${jmodimagepath} ${jdkimagepath}
+ fi
+}
- # Install nss.fips.cfg: NSS configuration for global FIPS mode (crypto-policies)
- install -m 644 nss.fips.cfg ${imagepath}/conf/security/
+function installjdk() {
+ local outputdir=${1}
+ local installdir=${2}
+ local jdkimagepath=${installdir}/images/%{jdkimage}
+ local jreimagepath=${installdir}/images/%{jreimage}
+ local unstripped=${jdkimagepath}.unstripped
+
+ echo "Installing build from ${outputdir} to ${installdir}..."
+ mkdir -p ${installdir}
+ echo "Installing images..."
+ mv ${outputdir}/images ${installdir}
+ if [ -d ${outputdir}/bundles ] ; then
+ echo "Installing bundles...";
+ mv ${outputdir}/bundles ${installdir} ;
+ fi
- # Create fake alt-java as a placeholder for future alt-java
- if [ -d man/man1 ] ; then
- pushd ${imagepath}
+%if !%{with artifacts}
+ echo "Removing output directory...";
+ rm -rf ${outputdir}
+%endif
+
+ # legacy-jre-image target does not install any man pages for the JRE
+ # We copy the jdk man directory and then remove pages for binaries that
+ # don't exist in the JRE
+ cp -a ${jdkimagepath}/man ${jreimagepath}
+ for manpage in $(find ${jreimagepath}/man -name '*.1'); do
+ filename=$(basename ${manpage});
+ binary=${filename/.1/};
+ if [ ! -f ${jreimagepath}/bin/${binary} ] ; then
+ echo "Removing ${manpage} from JRE for which no binary ${binary} exists";
+ rm -f ${manpage};
+ fi;
+ done
+
+ for imagepath in ${jdkimagepath} ${jreimagepath} ${unstripped}; do
+
+ if [ -d ${imagepath} ] ; then
+ # the build (erroneously) removes read permissions from some jars
+ # this is a regression in OpenJDK 7 (our compiler):
+ # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
+ find ${imagepath} -iname '*.jar' -exec chmod ugo+r {} \;
+
+ # Build screws up permissions on binaries
+ # https://bugs.openjdk.java.net/browse/JDK-8173610
+ find ${imagepath} -iname '*.so' -exec chmod +x {} \;
+ find ${imagepath}/bin/ -exec chmod +x {} \;
+
+ # Install local files which are distributed with the JDK
+ install -m 644 %{SOURCE10} ${imagepath}
+ install -m 644 nss.cfg ${imagepath}/conf/security/
+
+ # Create fake alt-java as a placeholder for future alt-java
+ pushd ${imagepath}
# add alt-java man page
echo "Hardened java binary recommended for launching untrusted code from the Web e.g. javaws" > man/man1/%{alt_java_name}.1
cat man/man1/java.1 >> man/man1/%{alt_java_name}.1
- popd
- fi
- fi
+ popd
+
+ # Print release information
+ cat ${imagepath}/release
+ fi
+ done
}
-# Checks on debuginfo must be performed before the files are stripped
-# by the RPM installation stage
-function debugcheckjdk() {
- local imagepath=${1}
-
- if [ -d ${imagepath} ] ; then
-
- so_suffix="so"
- # Check debug symbols are present and can identify code
- find "${imagepath}" -iname "*.$so_suffix" -print0 | while read -d $'\0' lib
- do
- if [ -f "$lib" ] ; then
- echo "Testing $lib for debug symbols"
- # All these tests rely on RPM failing the build if the exit code of any set
- # of piped commands is non-zero.
-
- # Test for .debug_* sections in the shared object. This is the main test
- # Stripped objects will not contain these
- eu-readelf -S "$lib" | grep "] .debug_"
- test $(eu-readelf -S "$lib" | grep -E "\]\ .debug_(info|abbrev)" | wc --lines) == 2
-
- # Test FILE symbols. These will most likely be removed by anything that
- # manipulates symbol tables because it's generally useless. So a nice test
- # that nothing has messed with symbols
- old_IFS="$IFS"
- IFS=$'\n'
- for line in $(eu-readelf -s "$lib" | grep "00000000 0 FILE LOCAL DEFAULT")
- do
- # We expect to see .cpp and .S files, except for architectures like aarch64 and
- # s390 where we expect .o and .oS files
- echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|S|oS))?$"
- done
- IFS="$old_IFS"
-
- # If this is the JVM, look for javaCalls.(cpp|o) in FILEs, for extra sanity checking
- if [ "`basename $lib`" = "libjvm.so" ]; then
- eu-readelf -s "$lib" | \
- grep -E "00000000 0 FILE LOCAL DEFAULT ABS javaCalls.(cpp|o)$"
- fi
-
- # Test that there are no .gnu_debuglink sections pointing to another
- # debuginfo file. There shouldn't be any debuginfo files, so the link makes
- # no sense either
- eu-readelf -S "$lib" | grep 'gnu'
- if eu-readelf -S "$lib" | grep "\] .gnu_debuglink" | grep PROGBITS; then
- echo "bad .gnu_debuglink section."
- eu-readelf -x .gnu_debuglink "$lib"
- false
- fi
- fi
+function genchecksum() {
+ local checkedfile=${1}
+
+ checkdir=$(dirname ${1})
+ checkfile=$(basename ${1})
+
+ echo "Generating checksum for ${checkfile} in ${checkdir}..."
+ pushd ${checkdir}
+ sha256sum ${checkfile} > ${checkfile}.sha256sum
+ sha256sum --check ${checkfile}.sha256sum
+ popd
+}
+
+function packFullPatchedSources() {
+ srcpackagesdir=`pwd`
+ tar -cJf ${srcpackagesdir}/%{jdkportablesourcesarchive -- ""} --transform "s|^|%{jdkportablesourcesname -- ""}/|" %{top_level_dir_name} nss*
+ genchecksum ${srcpackagesdir}/%{jdkportablesourcesarchive -- ""}
+}
+
+function packagejdk() {
+ local imagesdir=$(pwd)/${1}/images
+ local docdir=$(pwd)/${1}/images/docs
+ local bundledir=$(pwd)/${1}/bundles
+ local packagesdir=$(pwd)/${2}
+ local srcdir=$(pwd)/%{top_level_dir_name}
+ local tapsetdir=$(pwd)/tapset
+
+ echo "Packaging build from ${imagesdir} to ${packagesdir}..."
+ mkdir -p ${packagesdir}
+ pushd ${imagesdir}
+
+ if [ "x$suffix" = "x" ] ; then
+ nameSuffix=""
+ else
+ nameSuffix=`echo "$suffix"| sed s/-/./`
+ fi
+
+ jdkname=%{jdkportablename -- "$nameSuffix"}
+ jdkarchive=${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
+ jrename=%{jreportablename -- "$nameSuffix"}
+ jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
+ staticname=%{staticlibsportablename -- "$nameSuffix"}
+ staticarchive=${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
+ debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
+ unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
+ if [ "x$suffix" = "x" ] ; then
+ docname=%{docportablename}
+ docarchive=${packagesdir}/%{docportablearchive}
+ built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
+ fi
+ # These are from the source tree so no debug variants
+ miscname=%{miscportablename}
+ miscarchive=${packagesdir}/%{miscportablearchive}
+
+ if [ "x$suffix" = "x" ] ; then
+ # Keep the unstripped version for consumption by RHEL RPMs
+ mv %{jdkimage}.unstripped ${jdkname}
+ tar -cJf ${unstrippedarchive} ${jdkname}
+ genchecksum ${unstrippedarchive}
+ mv ${jdkname} %{jdkimage}.unstripped
+ fi
+
+ # Rename directories for packaging
+ mv %{jdkimage} ${jdkname}
+ mv %{jreimage} ${jrename}
+
+ # Release images have external debug symbols
+ if [ "x$suffix" = "x" ] ; then
+ tar -cJf ${debugarchive} $(find ${jdkname} -name \*.debuginfo)
+ genchecksum ${debugarchive}
+
+ mkdir ${docname}
+ mv ${docdir} ${docname}
+ mv ${bundledir}/${built_doc_archive} ${docname}
+ tar -cJf ${docarchive} ${docname}
+ genchecksum ${docarchive}
+
+ mkdir ${miscname}
+ for s in 16 24 32 48 ; do
+ cp -av ${srcdir}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png ${miscname}
done
+ cp -a ${srcdir}/src/sample ${miscname}
+%if %{with_systemtap}
+ cp -a ${tapsetdir}* ${miscname}
+%endif
+ tar -cJf ${miscarchive} ${miscname}
+ genchecksum ${miscarchive}
+ fi
- # Make sure gdb can do a backtrace based on line numbers on libjvm.so
- # javaCalls.cpp:58 should map to:
- # http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/…
- # Using line number 1 might cause build problems. See:
- # https://bugzilla.redhat.com/show_bug.cgi?id=1539664
- # https://bugzilla.redhat.com/show_bug.cgi?id=1538767
- gdb -q "${imagepath}/bin/java" <<EOF | tee gdb.out
-handle SIGSEGV pass nostop noprint
-handle SIGILL pass nostop noprint
-set breakpoint pending on
-break javaCalls.cpp:58
-commands 1
-backtrace
-quit
-end
-run -version
-EOF
-%ifarch %{gdb_arches}
- grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
+ tar -cJf ${jdkarchive} --exclude='**.debuginfo' ${jdkname}
+ genchecksum ${jdkarchive}
+
+ tar -cJf ${jrearchive} --exclude='**.debuginfo' ${jrename}
+ genchecksum ${jrearchive}
+
+%if %{include_staticlibs}
+ # Static libraries (needed for building graal vm with native image)
+ # Tar as overlay. Transform to the JDK name, since we just want to "add"
+ # static libraries to that folder
+ tar -cJf ${staticarchive} \
+ --transform "s|^%{static_libs_image}/lib/*|${staticname}/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib"
+ genchecksum ${staticarchive}
%endif
- fi
+ # Revert directory renaming so testing will run
+ # TODO: testing should run on the packaged JDK
+ mv ${jdkname} %{jdkimage}
+ mv ${jrename} %{jreimage}
+
+ popd #images
+
}
-pwd
-ls -l
-tar -cJf ../%{jdkportablesourcesarchive -- ""} --transform "s|^|%{jdkportablesourcesname -- ""}/|" openjdk nss*
-sha256sum ../%{jdkportablesourcesarchive -- ""} > ../%{jdkportablesourcesarchive -- ""}.sha256sum
+packFullPatchedSources
%if %{build_hotspot_first}
# Build a fresh libjvm.so first and use it to bootstrap
cp -LR --preserve=mode,timestamps %{bootjdk} newboot
systemjdk=$(pwd)/newboot
- buildjdk build/newboot ${systemjdk} %{hotspot_target} "release" "bundled"
- mv build/newboot/jdk/lib/server/libjvm.so newboot/lib/server
+ buildjdk build/newboot ${systemjdk} %{hotspot_target} "release" "bundled" "internal"
+ mv build/newboot/jdk/lib/%{vm_variant}/libjvm.so newboot/lib/%{vm_variant}
%else
systemjdk=%{bootjdk}
%endif
for suffix in %{build_loop} ; do
+
if [ "x$suffix" = "x" ] ; then
debugbuild=release
else
# change --something to something
debugbuild=`echo $suffix | sed "s/-//g"`
fi
- for loop in %{main_suffix} %{staticlibs_loop} ; do
- builddir=%{buildoutputdir -- ${suffix}${loop}}
- bootbuilddir=boot${builddir}
- if test "x${loop}" = "x%{main_suffix}" ; then
- link_opt="%{link_type}"
-%if %{system_libs}
- # Copy the source tree so we can remove all in-tree libraries
- cp -a %{top_level_dir_name} %{top_level_dir_name_backup}
- # Remove all libraries that are linked
- sh %{SOURCE12} %{top_level_dir_name} full
-%endif
- # Debug builds don't need same targets as release for
- # build speed-up. We also avoid bootstrapping these
- # slower builds.
- if echo $debugbuild | grep -q "debug" ; then
- maketargets="%{debug_targets}"
- run_bootstrap=false
- else
- maketargets="%{release_targets}"
- run_bootstrap=%{bootstrap_build}
- fi
- if ${run_bootstrap} ; then
- buildjdk ${bootbuilddir} ${systemjdk} "%{bootstrap_targets}" ${debugbuild} ${link_opt}
- buildjdk ${builddir} $(pwd)/${bootbuilddir}/images/%{jdkimage} "${maketargets}" ${debugbuild} ${link_opt}
- rm -rf ${bootbuilddir}
- else
- buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt}
- fi
+ # We build with internal debug symbols and do
+ # our own stripping for one version of the
+ # release build
+ debug_symbols=internal
+
+ builddir=%{buildoutputdir -- ${suffix}}
+ bootbuilddir=boot${builddir}
+ installdir=%{installoutputdir -- ${suffix}}
+ bootinstalldir=boot${installdir}
+ packagesdir=%{packageoutputdir -- ${suffix}}
+
+ link_opt="%{link_type}"
%if %{system_libs}
- # Restore original source tree we modified by removing full in-tree sources
- rm -rf %{top_level_dir_name}
- mv %{top_level_dir_name_backup} %{top_level_dir_name}
-%endif
- else
- # Use bundled libraries for building statically
- link_opt="bundled"
- # Static library cycle only builds the static libraries
- maketargets="%{static_libs_target}"
- # Always just do the one build for the static libraries
- buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt}
- fi
-
- done # end of main / staticlibs loop
-
- # Final setup on the main image
- top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
- for image in %{jdkimage} %{jreimage} ; do
- imagePath=${top_dir_abs_main_build_path}/images/${image}
- installjdk ${imagePath}
- done
- # Check debug symbols were built into the dynamic libraries; todo, why it passes in JDK only?
- debugcheckjdk ${top_dir_abs_main_build_path}/images/%{jdkimage}
-
- # Print release information
- cat ${top_dir_abs_main_build_path}/images/%{jdkimage}/release
+ # Copy the source tree so we can remove all in-tree libraries
+ cp -a %{top_level_dir_name} %{top_level_dir_name_backup}
+ # Remove all libraries that are linked
+ sh %{SOURCE12} %{top_level_dir_name} full
+%endif
+ # Debug builds don't need same targets as release for
+ # build speed-up. We also avoid bootstrapping these
+ # slower builds.
+ if echo $debugbuild | grep -q "debug" ; then
+ maketargets="%{debug_targets}"
+ run_bootstrap=false
+ else
+ maketargets="%{release_targets}"
+ run_bootstrap=%{bootstrap_build}
+ fi
+ if ${run_bootstrap} ; then
+ buildjdk ${bootbuilddir} ${systemjdk} "%{bootstrap_targets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ installjdk ${bootbuilddir} ${bootinstalldir}
+ buildjdk ${builddir} $(pwd)/${bootinstalldir}/images/%{jdkimage} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ stripjdk ${builddir}
+ installjdk ${builddir} ${installdir}
+ %{!?with_artifacts:rm -rf ${bootinstalldir}}
+ else
+ buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ stripjdk ${builddir}
+ installjdk ${builddir} ${installdir}
+ fi
+ packagejdk ${installdir} ${packagesdir}
-################################################################################
- pushd ${top_dir_abs_main_build_path}/images
- if [ "x$suffix" == "x" ] ; then
- nameSuffix=""
- else
- nameSuffix=`echo "$suffix"| sed s/-/./`
- fi
- # additional steps needed for fluent repack; most of them done twice, as images are already populated
- # maybe most of them should be done in upstream build?
- for imagedir in %{jdkimage} %{jreimage} ; do
- pushd $imagedir
- # Convert man pages to UTF8 encoding
- if [ -d man/man1 ] ; then # jre do not have man pages...
- for manpage in man/man1/* ; do
- iconv -f ISO_8859-1 -t UTF8 $manpage -o $manpage.tmp
- mv -f $manpage.tmp $manpage
- done
- fi
- # Install release notes
- cp -a %{SOURCE10} `pwd`
- cp -a %{SOURCE10} `pwd`/legal
- # stabilize permissions; aprtially duplicated in instalojdk
- find `pwd` -name "*.so" -exec chmod 755 {} \; -exec echo "set 755 to so {}" \; ;
- find `pwd` -type d -exec chmod 755 {} \; -exec echo "set 755 to dir {}" \; ;
- find `pwd`/legal -type f -exec chmod 644 {} \; -exec echo "set 644 to licences {}" \; ;
- popd # jdkimage/jreimage
- done # jre/sdk work in loop
- # javadoc is done only for release sdkimage
- if ! echo $suffix | grep -q "debug" ; then
- # Install Javadoc documentation
- #cp -a docs %{jdkimage} # not sure if the plaintext javadoc is for some use
- built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
- cp -a `pwd`/../bundles/${built_doc_archive} `pwd`/%{jdkimage}/javadocs.zip || ls -l `pwd`/../bundles
- fi
- # end of additional steps
-
- mv %{jdkimage} %{jdkportablename -- "$nameSuffix"}
- mv %{jreimage} %{jreportablename -- "$nameSuffix"}
- tar -cJf ../../../../%{jdkportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jdkportablename -- "$nameSuffix"}
- sha256sum ../../../../%{jdkportablearchive -- "$nameSuffix"} > ../../../../%{jdkportablearchive -- "$nameSuffix"}.sha256sum
- tar -cJf ../../../../%{jreportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jreportablename -- "$nameSuffix"}
- sha256sum ../../../../%{jreportablearchive -- "$nameSuffix"} > ../../../../%{jreportablearchive -- "$nameSuffix"}.sha256sum
- # copy licenses so they are avialable out of tarball
- cp -rf %{jdkportablename -- "$nameSuffix"}/legal ../../../../%{jdkportablearchive -- "%{normal_suffix}"}-legal
- mv %{jdkportablename -- "$nameSuffix"} %{jdkimage}
- mv %{jreportablename -- "$nameSuffix"} %{jreimage}
- popd #images
-%if %{include_staticlibs}
- top_dir_abs_staticlibs_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{staticlibs_suffix}}
- pushd ${top_dir_abs_staticlibs_build_path}/images
- # Static libraries (needed for building graal vm with native image)
- # Tar as overlay. Transform to the JDK name, since we just want to "add"
- # static libraries to that folder
- portableJDKname=%{staticlibsportablename -- "$nameSuffix"}
- tar -cJf ../../../../%{staticlibsportablearchive -- "$nameSuffix"} --transform "s|^%{static_libs_image}/lib/*|$portableJDKname/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib"
- sha256sum ../../../../%{staticlibsportablearchive -- "$nameSuffix"} > ../../../../%{staticlibsportablearchive -- "$nameSuffix"}.sha256sum
- popd #staticlibs-images
+%if %{system_libs}
+ # Restore original source tree we modified by removing full in-tree sources
+ rm -rf %{top_level_dir_name}
+ mv %{top_level_dir_name_backup} %{top_level_dir_name}
%endif
-################################################################################
-# note, currently no debuginfo, consult portbale spec for external (zipped) debuginfo, being tarred alone
-################################################################################
# build cycles
done # end of release / debug cycle loop
-%install
-mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
-mv ../%{jdkportablesourcesarchive -- ""} $RPM_BUILD_ROOT%{_jvmdir}/
-mv ../%{jdkportablesourcesarchive -- ""}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+%check
+# We test debug first as it will give better diagnostics on a crash
for suffix in %{build_loop} ; do
-top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
-################################################################################
- if [ "x$suffix" == "x" ] ; then
- nameSuffix=""
- else
- nameSuffix=`echo "$suffix"| sed s/-/./`
- fi
- mv ../%{jdkportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{jdkportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{jreportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{jreportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+# portable builds have static_libs embedded, thus top_dir_abs_main_build_path is same as top_dir_abs_staticlibs_build_path
+top_dir_abs_main_build_path=$(pwd)/%{installoutputdir -- ${suffix}}
%if %{include_staticlibs}
- mv ../%{staticlibsportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{staticlibsportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
-%endif
- if [ "x$suffix" == "x" ] ; then
- dnameSuffix="$nameSuffix".debuginfo
-# todo handle debuginfo, see note at build (we will need to pack one stripped and one unstripped release build)
-# mv ../%{jdkportablearchive -- "$dnameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
-# mv ../%{jdkportablearchive -- "$dnameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
- fi
-################################################################################
-# end, dual install
-done
-################################################################################
-# the licenses are packed onloy once and shared
-mkdir -p $RPM_BUILD_ROOT%{unpacked_licenses}
-mv ../%{jdkportablearchive -- "%{normal_suffix}"}-legal $RPM_BUILD_ROOT%{unpacked_licenses}/%{jdkportablesourcesarchive -- "%{normal_suffix}"}
-# To show sha in the build log
-for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do ls -l $file ; cat $file ; done
-################################################################################
+top_dir_abs_staticlibs_build_path=${top_dir_abs_main_build_path}
+%endif
-%check
+export JAVA_HOME=${top_dir_abs_main_build_path}/images/%{jdkimage}
-# We test debug first as it will give better diagnostics on a crash
-for suffix in %{build_loop} ; do
+# Pre-test setup
-# Tests in the check stage are performed on the installed image
-# rpmbuild operates as follows: build -> install -> test
-# however in portbales, we test built image instead of installed one
-top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
-export JAVA_HOME=${top_dir_abs_main_build_path}/images/%{jdkimage}
+# System security properties are disabled by default on portable.
+# Turn on system security properties
+#sed -i -e "s:^security.useSystemPropertiesFile=.*:security.useSystemPropertiesFile=true:" \
+#${JAVA_HOME}/conf/security/java.security
-#check Shenandoah is enabled
+# Check Shenandoah is enabled
%if %{use_shenandoah_hotspot}
$JAVA_HOME/bin/java -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -version
%endif
@@ -1507,14 +1509,19 @@ $JAVA_HOME/bin/java --add-opens java.base/javax.crypto=ALL-UNNAMED TestCryptoLev
$JAVA_HOME/bin/javac -d . %{SOURCE14}
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||")
-# Check system crypto (policy) is deactive and can not be enabled
+# Check system crypto (policy) is active and can be disabled
# Test takes a single argument - true or false - to state whether system
# security properties are enabled or not.
$JAVA_HOME/bin/javac -d . %{SOURCE15}
export PROG=$(echo $(basename %{SOURCE15})|sed "s|\.java||")
export SEC_DEBUG="-Djava.security.debug=properties"
+# Specific to portable:System security properties to be off by default
$JAVA_HOME/bin/java ${SEC_DEBUG} ${PROG} false
-$JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=false ${PROG} false
+$JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=true ${PROG} false
+
+# Check correct vendor values have been set
+$JAVA_HOME/bin/javac -d . %{SOURCE16}
+$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
# Check java launcher has no SSB mitigation
if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
@@ -1526,14 +1533,10 @@ nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation
if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi
%endif
-# Check correct vendor values have been set
-$JAVA_HOME/bin/javac -d . %{SOURCE16}
-$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
-
%if ! 0%{?flatpak}
# Check translations are available for new timezones (during flatpak builds, the
# tzdb.dat used by this test is not where the test expects it, so this is
-# disabled for flatpak builds)
+# disabled for flatpak builds)
$JAVA_HOME/bin/javac -d . %{SOURCE18}
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE
$JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR
@@ -1541,9 +1544,83 @@ $JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|
%if %{include_staticlibs}
# Check debug symbols in static libraries (smoke test)
-export STATIC_LIBS_HOME=${top_dir_abs_main_build_path}/../../%{buildoutputdir -- ${suffix}%{staticlibs_suffix}}/images/static-libs/lib/
-readelf --debug-dump $STATIC_LIBS_HOME/libfdlibm.a | grep w_remainder.c
-readelf --debug-dump $STATIC_LIBS_HOME/libfdlibm.a | grep e_remainder.c
+export STATIC_LIBS_HOME=${top_dir_abs_staticlibs_build_path}/images/%{static_libs_image}
+ls -l $STATIC_LIBS_HOME
+ls -l $STATIC_LIBS_HOME/lib
+# they are here, but grep do not find the remainders
+#readelf --debug-dump $STATIC_LIBS_HOME/lib/libfdlibm.a | grep w_remainder.c
+#readelf --debug-dump $STATIC_LIBS_HOME/lib/libfdlibm.a | grep e_remainder.c
+%endif
+
+# Release builds strip the debug symbols into external .debuginfo files
+if [ "x$suffix" = "x" ] ; then
+ so_suffix="debuginfo"
+else
+ so_suffix="so"
+fi
+# Check debug symbols are present and can identify code
+find "$JAVA_HOME" -iname "*.$so_suffix" -print0 | while read -d $'\0' lib
+do
+ if [ -f "$lib" ] ; then
+ echo "Testing $lib for debug symbols"
+ # All these tests rely on RPM failing the build if the exit code of any set
+ # of piped commands is non-zero.
+
+ # Test for .debug_* sections in the shared object. This is the main test
+ # Stripped objects will not contain these
+ eu-readelf -S "$lib" | grep "] .debug_"
+ test $(eu-readelf -S "$lib" | grep -E "\]\ .debug_(info|abbrev)" | wc --lines) == 2
+
+ # Test FILE symbols. These will most likely be removed by anything that
+ # manipulates symbol tables because it's generally useless. So a nice test
+ # that nothing has messed with symbols
+ old_IFS="$IFS"
+ IFS=$'\n'
+ for line in $(eu-readelf -s "$lib" | grep "00000000 0 FILE LOCAL DEFAULT")
+ do
+ # We expect to see .cpp and .S files, except for architectures like aarch64 and
+ # s390 where we expect .o and .oS files
+ echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|S|oS))?$"
+ done
+ IFS="$old_IFS"
+
+ # If this is the JVM, look for javaCalls.(cpp|o) in FILEs, for extra sanity checking
+ if [ "`basename $lib`" = "libjvm.so" ]; then
+ eu-readelf -s "$lib" | \
+ grep -E "00000000 0 FILE LOCAL DEFAULT ABS javaCalls.(cpp|o)$"
+ fi
+
+ # Test that there are no .gnu_debuglink sections pointing to another
+ # debuginfo file. There shouldn't be any debuginfo files, so the link makes
+ # no sense either
+ eu-readelf -S "$lib" | grep 'gnu'
+ if eu-readelf -S "$lib" | grep '] .gnu_debuglink' | grep PROGBITS; then
+ echo "bad .gnu_debuglink section."
+ eu-readelf -x .gnu_debuglink "$lib"
+ false
+ fi
+ fi
+done
+
+# Make sure gdb can do a backtrace based on line numbers on libjvm.so
+# javaCalls.cpp:58 should map to:
+# http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/…
+# Using line number 1 might cause build problems. See:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1539664
+# https://bugzilla.redhat.com/show_bug.cgi?id=1538767
+gdb -q "$JAVA_HOME/bin/java" <<EOF | tee gdb.out
+handle SIGSEGV pass nostop noprint
+handle SIGILL pass nostop noprint
+set breakpoint pending on
+break javaCalls.cpp:58
+commands 1
+backtrace
+quit
+end
+run -version
+EOF
+%ifarch %{gdb_arches}
+grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
%endif
# Check src.zip has all sources. See RHBZ#1130490
@@ -1562,12 +1639,70 @@ $JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LocalVariableTable
# build cycles check
done
+%install
+
+ mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
+ mv %{jdkportablesourcesarchive -- ""} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv %{jdkportablesourcesarchive -- ""}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+
+for suffix in %{build_loop} ; do
+
+ packagesdir=%{packageoutputdir -- ${suffix}}
+
+ if [ "x$suffix" == "x" ] ; then
+ nameSuffix=""
+ else
+ nameSuffix=`echo "$suffix"| sed s/-/./`
+ fi
+
+ # These definitions should match those in installjdk
+ jdkarchive=${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
+ jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
+ staticarchive=${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
+ debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
+ unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
+
+ mv ${jdkarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jdkarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jrearchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jrearchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+
+%if %{include_staticlibs}
+ mv ${staticarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${staticarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+%endif
+
+ if [ "x$suffix" = "x" ] ; then
+ mv ${debugarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${debugarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${unstrippedarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${unstrippedarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ fi
+done
+
+ if [ "x$suffix" = "x" ] ; then
+ # These definitions should match those in installjdk
+ # Install outside the loop as there are no debug variants
+ docarchive=${packagesdir}/%{docportablearchive}
+ miscarchive=${packagesdir}/%{miscportablearchive}
+ mv ${docarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${docarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${miscarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${miscarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ fi
+
+# To show sha in the build log
+for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do
+ ls -l $file ;
+ cat $file ;
+done
+
%if %{include_normal_build}
+
%files
# main package builds always
%{_jvmdir}/%{jreportablearchiveForFiles}
%{_jvmdir}/%{jreportablearchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%else
%files
# placeholder
@@ -1576,10 +1711,9 @@ done
%if %{include_normal_build}
%files devel
%{_jvmdir}/%{jdkportablearchiveForFiles}
-#%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
+%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
%{_jvmdir}/%{jdkportablearchiveForFiles}.sha256sum
-#%{_jvmdir}/%{jdkportablearchive -- .debuginfo}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
+%{_jvmdir}/%{jdkportablearchive -- .debuginfo}.sha256sum
%endif
%if %{include_normal_build}
@@ -1587,26 +1721,26 @@ done
%files static-libs
%{_jvmdir}/%{staticlibsportablearchiveForFiles}
%{_jvmdir}/%{staticlibsportablearchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
+
+%files unstripped
+%{_jvmdir}/%{jdkportablearchive -- .unstripped}
+%{_jvmdir}/%{jdkportablearchive -- .unstripped}.sha256sum
%endif
%if %{include_debug_build}
%files slowdebug
%{_jvmdir}/%{jreportablearchive -- .slowdebug}
%{_jvmdir}/%{jreportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%files devel-slowdebug
%{_jvmdir}/%{jdkportablearchive -- .slowdebug}
%{_jvmdir}/%{jdkportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%if %{include_staticlibs}
%files static-libs-slowdebug
%{_jvmdir}/%{staticlibsportablearchive -- .slowdebug}
%{_jvmdir}/%{staticlibsportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
%endif
@@ -1614,27 +1748,47 @@ done
%files fastdebug
%{_jvmdir}/%{jreportablearchive -- .fastdebug}
%{_jvmdir}/%{jreportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%files devel-fastdebug
%{_jvmdir}/%{jdkportablearchive -- .fastdebug}
%{_jvmdir}/%{jdkportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%if %{include_staticlibs}
%files static-libs-fastdebug
%{_jvmdir}/%{staticlibsportablearchive -- .fastdebug}
%{_jvmdir}/%{staticlibsportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
%endif
%files sources
%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}
%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
+
+%if %{include_normal_build}
+%files docs
+%{_jvmdir}/%{docportablearchive}
+%{_jvmdir}/%{docportablearchive}.sha256sum
+
+%files misc
+%{_jvmdir}/%{miscportablearchive}
+%{_jvmdir}/%{miscportablearchive}.sha256sum
+%endif
%changelog
+* Wed Nov 22 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:17.0.9.0.9-2
+- updated to OpenJDK 17.0.9 (2023-10-17)
+- adjsuted generate_source_tarball
+- removed icedtea_sync
+- dropped standalone licenses
+- added usntripped subpkg
+- added docs subpkg
+- adjsuted versions of bundled libraries
+- build refactored to several solid methods following gnu_andrew
+- removed no longer needed jdk8305995-footprint_regression_from_jdk_8224957, nss.fips.cfg.in, rh1648644-java_access_bridge_privileged_security.patch
+- added jdk8312489-max_sig_default_increase.patch
+- aligned fips-17u-51e1d00be4e.patch (gnu_andrew)
+- fixed '--without release' build-ability by moving docs and misc to if-release only
+
* Thu Aug 03 2023 Jiri Vanek <jvanekw(a)redhat.com> - 1:17.0.8.0.7-1
- Update to jdk-17.0.8.0+7
- Update release notes to 17.0.8.0+7
diff --git a/jconsole.desktop.in b/jconsole.desktop.in
index 8a3b04d..c1b8f6a 100644
--- a/jconsole.desktop.in
+++ b/jconsole.desktop.in
@@ -1,10 +1 @@
-[Desktop Entry]
-Name=OpenJDK @JAVA_VER@ for @target_cpu@ Monitoring & Management Console (@OPENJDK_VER@)
-Comment=Monitor and manage OpenJDK applications
-Exec=_SDKBINDIR_/jconsole
-Icon=java-@JAVA_VER@-@JAVA_VENDOR@
-Terminal=false
-Type=Application
-StartupWMClass=sun-tools-jconsole-JConsole
-Categories=Development;Profiling;Java;
-Version=1.0
+# this file is intentionally not here, as portable builds do not have desktop integration
diff --git a/jdk8305995-footprint_regression_from_jdk_8224957 b/jdk8305995-footprint_regression_from_jdk_8224957
deleted file mode 100644
index a5119a0..0000000
--- a/jdk8305995-footprint_regression_from_jdk_8224957
+++ /dev/null
@@ -1,1255 +0,0 @@
-diff --git a/src/hotspot/share/opto/node.cpp b/src/hotspot/share/opto/node.cpp
-index 9a9d3f0149a..7c85e73989e 100644
---- a/src/hotspot/share/opto/node.cpp
-+++ b/src/hotspot/share/opto/node.cpp
-@@ -1301,7 +1301,7 @@ bool Node::dominates(Node* sub, Node_List &nlist) {
- } else if (sub == up && sub->is_Region() && sub->req() == 2) {
- // Take in(1) path on the way up to 'dom' for regions with only one input
- up = sub->in(1);
-- } else if (sub == up && sub->is_Region() && sub->req() == 3) {
-+ } else if (sub == up && sub->is_Region()) {
- // Try both paths for Regions with 2 input paths (it may be a loop head).
- // It could give conservative 'false' answer without information
- // which region's input is the entry path.
-diff --git a/test/micro/org/openjdk/bench/vm/compiler/RBTreeSearch.java b/test/micro/org/openjdk/bench/vm/compiler/RBTreeSearch.java
-new file mode 100644
-index 00000000000..9b7430ccc13
---- /dev/null
-+++ b/test/micro/org/openjdk/bench/vm/compiler/RBTreeSearch.java
-@@ -0,0 +1,1236 @@
-+/*
-+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package org.openjdk.bench.vm.compiler;
-+
-+import org.openjdk.jmh.annotations.Benchmark;
-+import org.openjdk.jmh.annotations.Fork;
-+import org.openjdk.jmh.annotations.Measurement;
-+import org.openjdk.jmh.annotations.OutputTimeUnit;
-+import org.openjdk.jmh.annotations.Scope;
-+import org.openjdk.jmh.annotations.State;
-+import org.openjdk.jmh.annotations.Warmup;
-+
-+import java.util.concurrent.TimeUnit;
-+
-+/*
-+ * This benchmark is used as easy reproducer of JDK-8305995
-+ *
-+ * This benchmark contains simplified and minimized RB-tree
-+ * which is based on fasutils with iterators that jumps.
-+ *
-+ * At the end it contains a tree serialized as lines, and
-+ * maxPattern which is used to search in this tree.
-+ */
-+(a)State(Scope.Thread)
-+(a)OutputTimeUnit(TimeUnit.MICROSECONDS)
-+@Warmup(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
-+@Measurement(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
-+@Fork(value = 3)
-+public class RBTreeSearch {
-+
-+ private final Tree pattern;
-+
-+ private final Tree[] nodes;
-+
-+ private final Tree root;
-+
-+ private final int[] idxStack;
-+ private final Tree[] objStack;
-+
-+ public RBTreeSearch() {
-+ idxStack = new int[maxPattern];
-+
-+ objStack = new Tree[maxPattern];
-+
-+ pattern = new Tree();
-+ for (int i = 0; i <= maxPattern; i++) {
-+ pattern.put(i, i);
-+ }
-+
-+ nodes = new Tree[directions.length];
-+ for (int i = 0; i < directions.length; i++) {
-+ if (directions[i] == null) {
-+ continue;
-+ }
-+ Tree kids = new Tree();
-+ nodes[i] = kids;
-+ for (String pair : directions[i].split(", ")) {
-+ String[] kv = pair.split("=>");
-+ kids.put(Integer.parseInt(kv[0]), Integer.parseInt(kv[1]));
-+ }
-+ }
-+
-+ root = nodes[0];
-+ }
-+
-+ @Benchmark
-+ public void search() {
-+ Tree.Iterator sliceIt = pattern.keyIterator();
-+
-+ int stackSize = 0;
-+ idxStack[stackSize] = pattern.firstIntKey();
-+ objStack[stackSize++] = root;
-+
-+ while (stackSize > 0) {
-+ stackSize--;
-+ Tree node = objStack[stackSize];
-+
-+ final int startPoint = Math.max(idxStack[stackSize], node.firstIntKey()) - 1;
-+ final Tree.Iterator rootIt = node.keyIterator(startPoint);
-+
-+ sliceIt.jump(startPoint);
-+ while (sliceIt.hasNext() && rootIt.hasNext()) {
-+ final int sliceElem = sliceIt.nextInt();
-+ final int rootElem = rootIt.nextInt();
-+ if (sliceElem < rootElem) {
-+ rootIt.previousInt();
-+ if (sliceIt.nextInt() >= rootElem) {
-+ sliceIt.previousInt();
-+ } else {
-+ sliceIt.jump(rootElem - 1);
-+ }
-+ } else if (sliceElem == rootElem) {
-+ final int childrenIdx = node.get(sliceElem);
-+ final Tree children = nodes[childrenIdx];
-+
-+ if (children != null) {
-+ idxStack[stackSize] = sliceElem;
-+ objStack[stackSize++] = children;
-+ }
-+ }
-+ }
-+ }
-+ }
-+
-+ public static class Tree {
-+
-+ protected transient Entry root;
-+
-+ protected transient Entry firstEntry;
-+
-+ protected transient Entry lastEntry;
-+
-+ private final transient boolean[] dirPath = new boolean[64];
-+
-+ private final transient Entry[] nodePath = new Entry[64];
-+
-+ public int put(final int k, final int v) {
-+ Entry e = add(k);
-+ final int oldValue = e.value;
-+ e.value = v;
-+ return oldValue;
-+ }
-+
-+ private Entry add(final int k) {
-+ int maxDepth = 0;
-+ Entry e;
-+ if (root == null) {
-+ e = root = lastEntry = firstEntry = new Entry(k, 0);
-+ }
-+ else {
-+ Entry p = root;
-+ int cmp, i = 0;
-+ while(true) {
-+ if ((cmp = Integer.compare(k, p.key)) == 0) {
-+ while(i-- != 0) nodePath[i] = null;
-+ return p;
-+ }
-+ nodePath[i] = p;
-+ if (dirPath[i++] = cmp > 0) {
-+ if (p.succ()) {
-+ e = new Entry(k, 0);
-+ if (p.right == null) lastEntry = e;
-+ e.left = p;
-+ e.right = p.right;
-+ p.right(e);
-+ break;
-+ }
-+ p = p.right;
-+ }
-+ else {
-+ if (p.pred()) {
-+ e = new Entry(k, 0);
-+ if (p.left == null) firstEntry = e;
-+ e.right = p;
-+ e.left = p.left;
-+ p.left(e);
-+ break;
-+ }
-+ p = p.left;
-+ }
-+ }
-+ maxDepth = i--;
-+ while(i > 0 && ! nodePath[i].black()) {
-+ if (! dirPath[i - 1]) {
-+ Entry y = nodePath[i - 1].right;
-+ if (! nodePath[i - 1].succ() && ! y.black()) {
-+ nodePath[i].black(true);
-+ y.black(true);
-+ nodePath[i - 1].black(false);
-+ i -= 2;
-+ }
-+ else {
-+ Entry x;
-+ if (! dirPath[i]) y = nodePath[i];
-+ else {
-+ x = nodePath[i];
-+ y = x.right;
-+ x.right = y.left;
-+ y.left = x;
-+ nodePath[i - 1].left = y;
-+ if (y.pred()) {
-+ y.pred(false);
-+ x.succ(y);
-+ }
-+ }
-+ x = nodePath[i - 1];
-+ x.black(false);
-+ y.black(true);
-+ x.left = y.right;
-+ y.right = x;
-+ if (i < 2) root = y;
-+ else {
-+ if (dirPath[i - 2]) nodePath[i - 2].right = y;
-+ else nodePath[i - 2].left = y;
-+ }
-+ if (y.succ()) {
-+ y.succ(false);
-+ x.pred(y);
-+ }
-+ break;
-+ }
-+ }
-+ else {
-+ Entry y = nodePath[i - 1].left;
-+ if (! nodePath[i - 1].pred() && ! y.black()) {
-+ nodePath[i].black(true);
-+ y.black(true);
-+ nodePath[i - 1].black(false);
-+ i -= 2;
-+ }
-+ else {
-+ Entry x;
-+ if (dirPath[i]) y = nodePath[i];
-+ else {
-+ x = nodePath[i];
-+ y = x.left;
-+ x.left = y.right;
-+ y.right = x;
-+ nodePath[i - 1].right = y;
-+ if (y.succ()) {
-+ y.succ(false);
-+ x.pred(y);
-+ }
-+ }
-+ x = nodePath[i - 1];
-+ x.black(false);
-+ y.black(true);
-+ x.right = y.left;
-+ y.left = x;
-+ if (i < 2) root = y;
-+ else {
-+ if (dirPath[i - 2]) nodePath[i - 2].right = y;
-+ else nodePath[i - 2].left = y;
-+ }
-+ if (y.pred()){
-+ y.pred(false);
-+ x.succ(y);
-+ }
-+ break;
-+ }
-+ }
-+ }
-+ }
-+ root.black(true);
-+ while(maxDepth-- != 0) nodePath[maxDepth] = null;
-+ return e;
-+ }
-+
-+ private static final class Entry {
-+ int key;
-+ int value;
-+
-+ private static final int BLACK_MASK = 1;
-+
-+ private static final int SUCC_MASK = 1 << 31;
-+
-+ private static final int PRED_MASK = 1 << 30;
-+
-+ Entry left, right;
-+
-+ int info;
-+
-+ Entry(final int k, final int v) {
-+ key = k;
-+ value = v;
-+ info = SUCC_MASK | PRED_MASK;
-+ }
-+
-+ Entry left() {
-+ return (info & PRED_MASK) != 0 ? null : left;
-+ }
-+
-+ Entry right() {
-+ return (info & SUCC_MASK) != 0 ? null : right;
-+ }
-+
-+ boolean pred() {
-+ return (info & PRED_MASK) != 0;
-+ }
-+
-+ boolean succ() {
-+ return (info & SUCC_MASK) != 0;
-+ }
-+
-+ void pred(final boolean pred) {
-+ if (pred) info |= PRED_MASK;
-+ else info &= ~PRED_MASK;
-+ }
-+
-+ void succ(final boolean succ) {
-+ if (succ) info |= SUCC_MASK;
-+ else info &= ~SUCC_MASK;
-+ }
-+
-+ void pred(final Entry pred) {
-+ info |= PRED_MASK;
-+ left = pred;
-+ }
-+
-+ void succ(final Entry succ) {
-+ info |= SUCC_MASK;
-+ right = succ;
-+ }
-+
-+ void left(final Entry left) {
-+ info &= ~PRED_MASK;
-+ this.left = left;
-+ }
-+
-+ void right(final Entry right) {
-+ info &= ~SUCC_MASK;
-+ this.right = right;
-+ }
-+
-+ boolean black() {
-+ return (info & BLACK_MASK) != 0;
-+ }
-+
-+ void black(final boolean black) {
-+ if (black) info |= BLACK_MASK;
-+ else info &= ~BLACK_MASK;
-+ }
-+
-+ Entry next() {
-+ Entry next = this.right;
-+ if ((info & SUCC_MASK) == 0) while ((next.info & PRED_MASK) == 0) next = next.left;
-+ return next;
-+ }
-+
-+ Entry prev() {
-+ Entry prev = this.left;
-+ if ((info & PRED_MASK) == 0) while ((prev.info & SUCC_MASK) == 0) prev = prev.right;
-+ return prev;
-+ }
-+ }
-+
-+ public int get(final int k) {
-+ Entry e = root;
-+ int cmp;
-+ while (e != null && (cmp = Integer.compare(k, e.key)) != 0) {
-+ e = cmp < 0 ? e.left() : e.right();
-+ }
-+ return e == null ? 0 : e.value;
-+ }
-+
-+ public int firstIntKey() {
-+ return firstEntry.key;
-+ }
-+
-+ interface Iterator {
-+ boolean hasNext();
-+ int nextInt();
-+ int previousInt();
-+ void jump(final int fromElement);
-+ }
-+
-+ private class KeyIteratorImpl implements Iterator {
-+ Entry prev;
-+
-+ Entry next;
-+
-+ Entry curr;
-+
-+ int index = 0;
-+
-+ KeyIteratorImpl() {
-+ next = firstEntry;
-+ }
-+
-+ KeyIteratorImpl(final int k) {
-+ if ((next = locateKey(k)) != null) {
-+ if (next.key <= k) {
-+ prev = next;
-+ next = next.next();
-+ }
-+ else prev = next.prev();
-+ }
-+ }
-+
-+ private Entry locateKey(final int k) {
-+ Entry e = root, last = root;
-+ int cmp = 0;
-+ while (e != null && (cmp = Integer.compare(k, e.key)) != 0) {
-+ last = e;
-+ e = cmp < 0 ? e.left() : e.right();
-+ }
-+ return cmp == 0 ? e : last;
-+ }
-+
-+ public boolean hasNext() { return next != null; }
-+
-+ Entry nextEntry() {
-+ curr = prev = next;
-+ index++;
-+ next = next.next();
-+ return curr;
-+ }
-+
-+ Entry previousEntry() {
-+ curr = next = prev;
-+ index--;
-+ prev = prev.prev();
-+ return curr;
-+ }
-+ public void jump(final int fromElement) {
-+ if ((next = locateKey(fromElement)) != null) {
-+ if (next.key <= fromElement) {
-+ prev = next;
-+ next = next.next();
-+ }
-+ else prev = next.prev();
-+ }
-+ }
-+
-+ public int nextInt() { return nextEntry().key; }
-+
-+ public int previousInt() { return previousEntry().key; }
-+
-+ }
-+
-+ public Iterator keyIterator() {
-+ return new KeyIteratorImpl();
-+ }
-+
-+ public Iterator keyIterator(final int from) {
-+ return new KeyIteratorImpl(from);
-+ }
-+ }
-+
-+ private static final int maxPattern = 39;
-+
-+ private static final String[] directions = {
-+ "0=>1, 1=>4, 2=>2, 4=>3, 7=>5",
-+ "13=>628, 14=>627, 15=>626, 17=>629, 18=>630",
-+ "13=>473, 14=>472, 15=>471, 17=>474, 18=>475",
-+ "13=>318, 14=>317, 15=>316, 17=>319, 18=>320",
-+ "13=>163, 14=>162, 15=>161, 17=>164, 18=>165",
-+ "13=>8, 14=>7, 15=>6, 17=>9, 18=>10",
-+ "22=>135, 23=>134, 24=>132, 26=>133, 27=>131",
-+ "22=>105, 23=>104, 24=>102, 26=>103, 27=>101",
-+ "22=>75, 23=>74, 24=>72, 26=>73, 27=>71",
-+ "22=>45, 23=>44, 24=>42, 26=>43, 27=>41",
-+ "22=>15, 23=>14, 24=>12, 26=>13, 27=>11",
-+ "31=>38, 32=>39, 33=>36, 34=>40, 35=>37",
-+ "31=>33, 32=>34, 33=>31, 34=>35, 35=>32",
-+ "31=>28, 32=>29, 33=>26, 34=>30, 35=>27",
-+ "31=>23, 32=>24, 33=>21, 34=>25, 35=>22",
-+ "31=>18, 32=>19, 33=>16, 34=>20, 35=>17",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>68, 32=>69, 33=>66, 34=>70, 35=>67",
-+ "31=>63, 32=>64, 33=>61, 34=>65, 35=>62",
-+ "31=>58, 32=>59, 33=>56, 34=>60, 35=>57",
-+ "31=>53, 32=>54, 33=>51, 34=>55, 35=>52",
-+ "31=>48, 32=>49, 33=>46, 34=>50, 35=>47",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>98, 32=>99, 33=>96, 34=>100, 35=>97",
-+ "31=>93, 32=>94, 33=>91, 34=>95, 35=>92",
-+ "31=>88, 32=>89, 33=>86, 34=>90, 35=>87",
-+ "31=>83, 32=>84, 33=>81, 34=>85, 35=>82",
-+ "31=>78, 32=>79, 33=>76, 34=>80, 35=>77",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>128, 32=>129, 33=>126, 34=>130, 35=>127",
-+ "31=>123, 32=>124, 33=>121, 34=>125, 35=>122",
-+ "31=>118, 32=>119, 33=>116, 34=>120, 35=>117",
-+ "31=>113, 32=>114, 33=>111, 34=>115, 35=>112",
-+ "31=>108, 32=>109, 33=>106, 34=>110, 35=>107",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>158, 32=>159, 33=>156, 34=>160, 35=>157",
-+ "31=>153, 32=>154, 33=>151, 34=>155, 35=>152",
-+ "31=>148, 32=>149, 33=>146, 34=>150, 35=>147",
-+ "31=>143, 32=>144, 33=>141, 34=>145, 35=>142",
-+ "31=>138, 32=>139, 33=>136, 34=>140, 35=>137",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "22=>290, 23=>289, 24=>287, 26=>288, 27=>286",
-+ "22=>260, 23=>259, 24=>257, 26=>258, 27=>256",
-+ "22=>230, 23=>229, 24=>227, 26=>228, 27=>226",
-+ "22=>200, 23=>199, 24=>197, 26=>198, 27=>196",
-+ "22=>170, 23=>169, 24=>167, 26=>168, 27=>166",
-+ "31=>193, 32=>194, 33=>191, 34=>195, 35=>192",
-+ "31=>188, 32=>189, 33=>186, 34=>190, 35=>187",
-+ "31=>183, 32=>184, 33=>181, 34=>185, 35=>182",
-+ "31=>178, 32=>179, 33=>176, 34=>180, 35=>177",
-+ "31=>173, 32=>174, 33=>171, 34=>175, 35=>172",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>223, 32=>224, 33=>221, 34=>225, 35=>222",
-+ "31=>218, 32=>219, 33=>216, 34=>220, 35=>217",
-+ "31=>213, 32=>214, 33=>211, 34=>215, 35=>212",
-+ "31=>208, 32=>209, 33=>206, 34=>210, 35=>207",
-+ "31=>203, 32=>204, 33=>201, 34=>205, 35=>202",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>253, 32=>254, 33=>251, 34=>255, 35=>252",
-+ "31=>248, 32=>249, 33=>246, 34=>250, 35=>247",
-+ "31=>243, 32=>244, 33=>241, 34=>245, 35=>242",
-+ "31=>238, 32=>239, 33=>236, 34=>240, 35=>237",
-+ "31=>233, 32=>234, 33=>231, 34=>235, 35=>232",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>283, 32=>284, 33=>281, 34=>285, 35=>282",
-+ "31=>278, 32=>279, 33=>276, 34=>280, 35=>277",
-+ "31=>273, 32=>274, 33=>271, 34=>275, 35=>272",
-+ "31=>268, 32=>269, 33=>266, 34=>270, 35=>267",
-+ "31=>263, 32=>264, 33=>261, 34=>265, 35=>262",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>313, 32=>314, 33=>311, 34=>315, 35=>312",
-+ "31=>308, 32=>309, 33=>306, 34=>310, 35=>307",
-+ "31=>303, 32=>304, 33=>301, 34=>305, 35=>302",
-+ "31=>298, 32=>299, 33=>296, 34=>300, 35=>297",
-+ "31=>293, 32=>294, 33=>291, 34=>295, 35=>292",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "22=>445, 23=>444, 24=>442, 26=>443, 27=>441",
-+ "22=>415, 23=>414, 24=>412, 26=>413, 27=>411",
-+ "22=>385, 23=>384, 24=>382, 26=>383, 27=>381",
-+ "22=>355, 23=>354, 24=>352, 26=>353, 27=>351",
-+ "22=>325, 23=>324, 24=>322, 26=>323, 27=>321",
-+ "31=>348, 32=>349, 33=>346, 34=>350, 35=>347",
-+ "31=>343, 32=>344, 33=>341, 34=>345, 35=>342",
-+ "31=>338, 32=>339, 33=>336, 34=>340, 35=>337",
-+ "31=>333, 32=>334, 33=>331, 34=>335, 35=>332",
-+ "31=>328, 32=>329, 33=>326, 34=>330, 35=>327",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>378, 32=>379, 33=>376, 34=>380, 35=>377",
-+ "31=>373, 32=>374, 33=>371, 34=>375, 35=>372",
-+ "31=>368, 32=>369, 33=>366, 34=>370, 35=>367",
-+ "31=>363, 32=>364, 33=>361, 34=>365, 35=>362",
-+ "31=>358, 32=>359, 33=>356, 34=>360, 35=>357",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>408, 32=>409, 33=>406, 34=>410, 35=>407",
-+ "31=>403, 32=>404, 33=>401, 34=>405, 35=>402",
-+ "31=>398, 32=>399, 33=>396, 34=>400, 35=>397",
-+ "31=>393, 32=>394, 33=>391, 34=>395, 35=>392",
-+ "31=>388, 32=>389, 33=>386, 34=>390, 35=>387",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>438, 32=>439, 33=>436, 34=>440, 35=>437",
-+ "31=>433, 32=>434, 33=>431, 34=>435, 35=>432",
-+ "31=>428, 32=>429, 33=>426, 34=>430, 35=>427",
-+ "31=>423, 32=>424, 33=>421, 34=>425, 35=>422",
-+ "31=>418, 32=>419, 33=>416, 34=>420, 35=>417",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>468, 32=>469, 33=>466, 34=>470, 35=>467",
-+ "31=>463, 32=>464, 33=>461, 34=>465, 35=>462",
-+ "31=>458, 32=>459, 33=>456, 34=>460, 35=>457",
-+ "31=>453, 32=>454, 33=>451, 34=>455, 35=>452",
-+ "31=>448, 32=>449, 33=>446, 34=>450, 35=>447",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "22=>600, 23=>599, 24=>597, 26=>598, 27=>596",
-+ "22=>570, 23=>569, 24=>567, 26=>568, 27=>566",
-+ "22=>540, 23=>539, 24=>537, 26=>538, 27=>536",
-+ "22=>510, 23=>509, 24=>507, 26=>508, 27=>506",
-+ "22=>480, 23=>479, 24=>477, 26=>478, 27=>476",
-+ "31=>503, 32=>504, 33=>501, 34=>505, 35=>502",
-+ "31=>498, 32=>499, 33=>496, 34=>500, 35=>497",
-+ "31=>493, 32=>494, 33=>491, 34=>495, 35=>492",
-+ "31=>488, 32=>489, 33=>486, 34=>490, 35=>487",
-+ "31=>483, 32=>484, 33=>481, 34=>485, 35=>482",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>533, 32=>534, 33=>531, 34=>535, 35=>532",
-+ "31=>528, 32=>529, 33=>526, 34=>530, 35=>527",
-+ "31=>523, 32=>524, 33=>521, 34=>525, 35=>522",
-+ "31=>518, 32=>519, 33=>516, 34=>520, 35=>517",
-+ "31=>513, 32=>514, 33=>511, 34=>515, 35=>512",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>563, 32=>564, 33=>561, 34=>565, 35=>562",
-+ "31=>558, 32=>559, 33=>556, 34=>560, 35=>557",
-+ "31=>553, 32=>554, 33=>551, 34=>555, 35=>552",
-+ "31=>548, 32=>549, 33=>546, 34=>550, 35=>547",
-+ "31=>543, 32=>544, 33=>541, 34=>545, 35=>542",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>593, 32=>594, 33=>591, 34=>595, 35=>592",
-+ "31=>588, 32=>589, 33=>586, 34=>590, 35=>587",
-+ "31=>583, 32=>584, 33=>581, 34=>585, 35=>582",
-+ "31=>578, 32=>579, 33=>576, 34=>580, 35=>577",
-+ "31=>573, 32=>574, 33=>571, 34=>575, 35=>572",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>623, 32=>624, 33=>621, 34=>625, 35=>622",
-+ "31=>618, 32=>619, 33=>616, 34=>620, 35=>617",
-+ "31=>613, 32=>614, 33=>611, 34=>615, 35=>612",
-+ "31=>608, 32=>609, 33=>606, 34=>610, 35=>607",
-+ "31=>603, 32=>604, 33=>601, 34=>605, 35=>602",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "22=>755, 23=>754, 24=>752, 26=>753, 27=>751",
-+ "22=>725, 23=>724, 24=>722, 26=>723, 27=>721",
-+ "22=>695, 23=>694, 24=>692, 26=>693, 27=>691",
-+ "22=>665, 23=>664, 24=>662, 26=>663, 27=>661",
-+ "22=>635, 23=>634, 24=>632, 26=>633, 27=>631",
-+ "31=>658, 32=>659, 33=>656, 34=>660, 35=>657",
-+ "31=>653, 32=>654, 33=>651, 34=>655, 35=>652",
-+ "31=>648, 32=>649, 33=>646, 34=>650, 35=>647",
-+ "31=>643, 32=>644, 33=>641, 34=>645, 35=>642",
-+ "31=>638, 32=>639, 33=>636, 34=>640, 35=>637",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>688, 32=>689, 33=>686, 34=>690, 35=>687",
-+ "31=>683, 32=>684, 33=>681, 34=>685, 35=>682",
-+ "31=>678, 32=>679, 33=>676, 34=>680, 35=>677",
-+ "31=>673, 32=>674, 33=>671, 34=>675, 35=>672",
-+ "31=>668, 32=>669, 33=>666, 34=>670, 35=>667",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>718, 32=>719, 33=>716, 34=>720, 35=>717",
-+ "31=>713, 32=>714, 33=>711, 34=>715, 35=>712",
-+ "31=>708, 32=>709, 33=>706, 34=>710, 35=>707",
-+ "31=>703, 32=>704, 33=>701, 34=>705, 35=>702",
-+ "31=>698, 32=>699, 33=>696, 34=>700, 35=>697",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>748, 32=>749, 33=>746, 34=>750, 35=>747",
-+ "31=>743, 32=>744, 33=>741, 34=>745, 35=>742",
-+ "31=>738, 32=>739, 33=>736, 34=>740, 35=>737",
-+ "31=>733, 32=>734, 33=>731, 34=>735, 35=>732",
-+ "31=>728, 32=>729, 33=>726, 34=>730, 35=>727",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "31=>778, 32=>779, 33=>776, 34=>780, 35=>777",
-+ "31=>773, 32=>774, 33=>771, 34=>775, 35=>772",
-+ "31=>768, 32=>769, 33=>766, 34=>770, 35=>767",
-+ "31=>763, 32=>764, 33=>761, 34=>765, 35=>762",
-+ "31=>758, 32=>759, 33=>756, 34=>760, 35=>757",
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null
-+ };
-+}
diff --git a/jdk8312489-max_sig_default_increase.patch b/jdk8312489-max_sig_default_increase.patch
new file mode 100644
index 0000000..8aeb261
--- /dev/null
+++ b/jdk8312489-max_sig_default_increase.patch
@@ -0,0 +1,50 @@
+commit 5b613e3ebed6c141146e743e64c894fe4f39421e
+Author: Andrew John Hughes <andrew(a)openjdk.org>
+Date: Fri Sep 1 15:53:41 2023 +0000
+
+ 8312489: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar
+
+ Backport-of: e47a84f23dd2608c6f5748093eefe301fb5bf750
+
+diff --git a/src/java.base/share/classes/java/util/jar/JarFile.java b/src/java.base/share/classes/java/util/jar/JarFile.java
+index bd538649a4f..70cf99504e4 100644
+--- a/src/java.base/share/classes/java/util/jar/JarFile.java
++++ b/src/java.base/share/classes/java/util/jar/JarFile.java
+@@ -803,7 +803,9 @@ private byte[] getBytes(ZipEntry ze) throws IOException {
+ throw new IOException("Unsupported size: " + uncompressedSize +
+ " for JarEntry " + ze.getName() +
+ ". Allowed max size: " +
+- SignatureFileVerifier.MAX_SIG_FILE_SIZE + " bytes");
++ SignatureFileVerifier.MAX_SIG_FILE_SIZE + " bytes. " +
++ "You can use the jdk.jar.maxSignatureFileSize " +
++ "system property to increase the default value.");
+ }
+ int len = (int)uncompressedSize;
+ int bytesRead;
+diff --git a/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
+index 4ea9255ba0a..05acdcb9474 100644
+--- a/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
++++ b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
+@@ -856,16 +856,16 @@ private static int initializeMaxSigFileSize() {
+ * the maximum allowed number of bytes for the signature-related files
+ * in a JAR file.
+ */
+- Integer tmp = GetIntegerAction.privilegedGetProperty(
+- "jdk.jar.maxSignatureFileSize", 8000000);
++ int tmp = GetIntegerAction.privilegedGetProperty(
++ "jdk.jar.maxSignatureFileSize", 16000000);
+ if (tmp < 0 || tmp > MAX_ARRAY_SIZE) {
+ if (debug != null) {
+- debug.println("Default signature file size 8000000 bytes " +
+- "is used as the specified size for the " +
+- "jdk.jar.maxSignatureFileSize system property " +
++ debug.println("The default signature file size of 16000000 bytes " +
++ "will be used for the jdk.jar.maxSignatureFileSize " +
++ "system property since the specified value " +
+ "is out of range: " + tmp);
+ }
+- tmp = 8000000;
++ tmp = 16000000;
+ }
+ return tmp;
+ }
diff --git a/nss.fips.cfg.in b/nss.fips.cfg.in
deleted file mode 100644
index 2d9ec35..0000000
--- a/nss.fips.cfg.in
+++ /dev/null
@@ -1,8 +0,0 @@
-name = NSS-FIPS
-nssLibraryDirectory = @NSS_LIBDIR@
-nssSecmodDirectory = sql:/etc/pki/nssdb
-nssDbMode = readOnly
-nssModule = fips
-
-attributes(*,CKO_SECRET_KEY,CKK_GENERIC_SECRET)={ CKA_SIGN=true }
-
diff --git a/openjdk_news.sh b/openjdk_news.sh
index 560b356..386aa53 100755
--- a/openjdk_news.sh
+++ b/openjdk_news.sh
@@ -18,8 +18,8 @@
OLD_RELEASE=$1
NEW_RELEASE=$2
-SUBDIR=$3
-REPO=$4
+REPO=$3
+SUBDIR=$4
SCRIPT_DIR=$(dirname ${0})
if test "x${SUBDIR}" = "x"; then
diff --git a/rh1648644-java_access_bridge_privileged_security.patch b/rh1648644-java_access_bridge_privileged_security.patch
deleted file mode 100644
index 53026ad..0000000
--- a/rh1648644-java_access_bridge_privileged_security.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- openjdk/src/java.base/share/conf/security/java.security
-+++ openjdk/src/java.base/share/conf/security/java.security
-@@ -304,6 +304,8 @@
- #
- package.access=sun.misc.,\
- sun.reflect.,\
-+ org.GNOME.Accessibility.,\
-+ org.GNOME.Bonobo.,\
-
- #
- # List of comma-separated packages that start with or equal this string
-@@ -316,6 +318,8 @@
- #
- package.definition=sun.misc.,\
- sun.reflect.,\
-+ org.GNOME.Accessibility.,\
-+ org.GNOME.Bonobo.,\
-
- #
- # Determines whether this properties file can be appended to
diff --git a/sources b/sources
index 47996d1..0c780d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openjdk-jdk17u-jdk-17.0.8+7.tar.xz) = 52bd1002cffafc6fc613b3ee1c62bfc3f27f31d5e1810ebb8f556a725ebb310508885762079589f15be5da63388214525128b77d2a665bae9fccfc419ab5d6a1
+SHA512 (openjdk-17.0.9+9.tar.xz) = 33225a1070077c9504b4857734305f301e51b93a929274d460ddc3dc042ce15943030f8af928c11962743a928619ea39daa453d8fb1c8ea5a334a4b6490a00ee
1
0
Architecture specific change in rpms/rust-fs-set-times.git
by githook-noreply＠fedoraproject.org 23 Nov '23
by githook-noreply＠fedoraproject.org 23 Nov '23
23 Nov '23
The package rpms/rust-fs-set-times.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-fs-set-times.git/commit/?id=cd…
https://src.fedoraproject.org/cgit/rpms/rust-fs-set-times.git/commit/?id=e4…
https://src.fedoraproject.org/cgit/rpms/rust-fs-set-times.git/commit/?id=51…
https://src.fedoraproject.org/cgit/rpms/rust-fs-set-times.git/commit/?id=36….
Change:
-ExclusiveArch: %{rust_arches}
+ExclusiveArch: %{rust_arches}
-ExclusiveArch: %{rust_arches}
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit cdfea05af58f8fcf76d96658abd920ca32dd4345
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Thu Nov 23 14:43:52 2023 +0100
Update to version 0.20.0
diff --git a/.gitignore b/.gitignore
index 0d68e52..de2ef8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/fs-set-times-0.14.0.crate
/fs-set-times-0.14.1.crate
/fs-set-times-0.15.0.crate
+/fs-set-times-0.20.0.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index f464679..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-fs-set-times
-
-The rust-fs-set-times package
diff --git a/changelog b/changelog
index 5247ecb..d3a48e6 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,15 @@
+* Thu Nov 23 2023 Fabio Valentini <decathorpe(a)gmail.com> 0.20.0-1
+- Update to version 0.20.0
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng(a)fedoraproject.org> 0.15.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Apr 13 2022 Fabio Valentini <decathorpe(a)gmail.com> 0.15.0-1
+- Update to version 0.15.0
+
+* Fri Feb 04 2022 Fabio Valentini <decathorpe(a)gmail.com> 0.14.1-1
+- Update to version 0.14.1
+
* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.14.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/fs-set-times-fix-metadata-auto.diff b/fs-set-times-fix-metadata-auto.diff
new file mode 100644
index 0000000..e5d706b
--- /dev/null
+++ b/fs-set-times-fix-metadata-auto.diff
@@ -0,0 +1,12 @@
+--- fs-set-times-0.20.0/Cargo.toml 1970-01-01T00:00:01+00:00
++++ fs-set-times-0.20.0/Cargo.toml 2023-11-05T00:03:34.202139+00:00
+@@ -37,9 +37,3 @@
+ "time",
+ ]
+
+-[target."cfg(windows)".dependencies.windows-sys]
+-version = "0.48.0"
+-features = [
+- "Win32_Foundation",
+- "Win32_Storage_FileSystem",
+-]
diff --git a/fs-set-times-fix-metadata.diff b/fs-set-times-fix-metadata.diff
deleted file mode 100644
index b22620b..0000000
--- a/fs-set-times-fix-metadata.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- fs-set-times-0.15.0/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ fs-set-times-0.15.0/Cargo.toml 2022-04-13T22:35:23.127723+00:00
-@@ -26,8 +26,5 @@
- default-features = false
- [target."cfg(not(windows))".dependencies.rustix]
- version = "0.33.0"
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3.9"
--features = ["winerror"]
- [badges.maintenance]
- status = "actively-developed"
diff --git a/rust-fs-set-times.spec b/rust-fs-set-times.spec
index 2dbda91..0c38b26 100644
--- a/rust-fs-set-times.spec
+++ b/rust-fs-set-times.spec
@@ -1,25 +1,21 @@
-# Generated by rust2rpm 21
+# Generated by rust2rpm 25
%bcond_without check
%global debug_package %{nil}
%global crate fs-set-times
-Name: rust-%{crate}
-Version: 0.15.0
+Name: rust-fs-set-times
+Version: 0.20.0
Release: %autorelease
Summary: Set filesystem timestamps
-# Upstream license specification: Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
-License: ASL 2.0 or MIT
+License: Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
URL: https://crates.io/crates/fs-set-times
Source: %{crates_source}
-# Initial patched metadata
-# * drop windows-specific dependencies
-Patch0: fs-set-times-fix-metadata.diff
+# Automatically generated patch to strip dependencies and normalize metadata
+Patch: fs-set-times-fix-metadata-auto.diff
-ExclusiveArch: %{rust_arches}
-
-BuildRequires: rust-packaging >= 21
+BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
Set filesystem timestamps.}
@@ -59,7 +55,7 @@ use the "default" feature of the "%{crate}" crate.
%ghost %{crate_instdir}/Cargo.toml
%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
%cargo_prep
%generate_buildrequires
diff --git a/sources b/sources
index bb6e9f3..522e7c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fs-set-times-0.15.0.crate) = 27018526e807f6e265e833465ea390295cbfa7083a0b49ff03668f503c3f249e9bfa4adf86d1722e83e898192f4aded65b5881be6d13ad20d84354c87a4d1f30
+SHA512 (fs-set-times-0.20.0.crate) = e51001c743ab03c02a95e14ff4c0dc9834ba97b41c491ca54d709e0d5aee119ffbad0755a6c2e810fad842eed0bcab2519d117745152176be78feedd047631c7
commit e468e0443d0c2ee08f094c3f80df5edf41af61ac
Author: Tomas Hrcka <thrcka(a)redhat.com>
Date: Thu Nov 23 08:32:24 2023 +0100
Unretirement request: https://pagure.io/releng/issue/11799
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0d68e52
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/fs-set-times-0.3.1.crate
+/fs-set-times-0.14.0.crate
+/fs-set-times-0.14.1.crate
+/fs-set-times-0.15.0.crate
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..f464679
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# rust-fs-set-times
+
+The rust-fs-set-times package
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..5247ecb
--- /dev/null
+++ b/changelog
@@ -0,0 +1,12 @@
+* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.14.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Sat Dec 4 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.14.0-1
+- Update to upstream 0.14.0 (fixes rhbz#1976478)
+
+* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.3.1-2
+- Second attempt - Rebuilt for
+ https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 31 20:37:18 CEST 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.3.1-1
+- Initial package
diff --git a/dead.package b/dead.package
deleted file mode 100644
index 0d143d3..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-unused as effort to package wasmtime is abandoned
diff --git a/fs-set-times-fix-metadata.diff b/fs-set-times-fix-metadata.diff
new file mode 100644
index 0000000..b22620b
--- /dev/null
+++ b/fs-set-times-fix-metadata.diff
@@ -0,0 +1,11 @@
+--- fs-set-times-0.15.0/Cargo.toml 1970-01-01T00:00:01+00:00
++++ fs-set-times-0.15.0/Cargo.toml 2022-04-13T22:35:23.127723+00:00
+@@ -26,8 +26,5 @@
+ default-features = false
+ [target."cfg(not(windows))".dependencies.rustix]
+ version = "0.33.0"
+-[target."cfg(windows)".dependencies.winapi]
+-version = "0.3.9"
+-features = ["winerror"]
+ [badges.maintenance]
+ status = "actively-developed"
diff --git a/rust-fs-set-times.spec b/rust-fs-set-times.spec
new file mode 100644
index 0000000..2dbda91
--- /dev/null
+++ b/rust-fs-set-times.spec
@@ -0,0 +1,80 @@
+# Generated by rust2rpm 21
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate fs-set-times
+
+Name: rust-%{crate}
+Version: 0.15.0
+Release: %autorelease
+Summary: Set filesystem timestamps
+
+# Upstream license specification: Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
+License: ASL 2.0 or MIT
+URL: https://crates.io/crates/fs-set-times
+Source: %{crates_source}
+# Initial patched metadata
+# * drop windows-specific dependencies
+Patch0: fs-set-times-fix-metadata.diff
+
+ExclusiveArch: %{rust_arches}
+
+BuildRequires: rust-packaging >= 21
+
+%global _description %{expand:
+Set filesystem timestamps.}
+
+%description %{_description}
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
+
+%files devel
+%license %{crate_instdir}/COPYRIGHT
+%license %{crate_instdir}/LICENSE-APACHE
+%license %{crate_instdir}/LICENSE-Apache-2.0_WITH_LLVM-exception
+%license %{crate_instdir}/LICENSE-MIT
+%doc %{crate_instdir}/CODE_OF_CONDUCT.md
+%doc %{crate_instdir}/ORG_CODE_OF_CONDUCT.md
+%doc %{crate_instdir}/README.md
+%doc %{crate_instdir}/SECURITY.md
+%{crate_instdir}/
+
+%package -n %{name}+default-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
+
+%files -n %{name}+default-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%prep
+%autosetup -n %{crate}-%{version_no_tilde} -p1
+%cargo_prep
+
+%generate_buildrequires
+%cargo_generate_buildrequires
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%changelog
+%autochangelog
diff --git a/sources b/sources
new file mode 100644
index 0000000..bb6e9f3
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (fs-set-times-0.15.0.crate) = 27018526e807f6e265e833465ea390295cbfa7083a0b49ff03668f503c3f249e9bfa4adf86d1722e83e898192f4aded65b5881be6d13ad20d84354c87a4d1f30
commit 5165a5a30e0e56d8f0272742d3417a55aec456f8
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Tue Aug 9 18:37:11 2022 +0200
unused as effort to package wasmtime is abandoned
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 0d68e52..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/fs-set-times-0.3.1.crate
-/fs-set-times-0.14.0.crate
-/fs-set-times-0.14.1.crate
-/fs-set-times-0.15.0.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index f464679..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-fs-set-times
-
-The rust-fs-set-times package
diff --git a/changelog b/changelog
deleted file mode 100644
index 5247ecb..0000000
--- a/changelog
+++ /dev/null
@@ -1,12 +0,0 @@
-* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.14.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Sat Dec 4 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.14.0-1
-- Update to upstream 0.14.0 (fixes rhbz#1976478)
-
-* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.3.1-2
-- Second attempt - Rebuilt for
- https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon May 31 20:37:18 CEST 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.3.1-1
-- Initial package
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..0d143d3
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+unused as effort to package wasmtime is abandoned
diff --git a/fs-set-times-fix-metadata.diff b/fs-set-times-fix-metadata.diff
deleted file mode 100644
index b22620b..0000000
--- a/fs-set-times-fix-metadata.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- fs-set-times-0.15.0/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ fs-set-times-0.15.0/Cargo.toml 2022-04-13T22:35:23.127723+00:00
-@@ -26,8 +26,5 @@
- default-features = false
- [target."cfg(not(windows))".dependencies.rustix]
- version = "0.33.0"
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3.9"
--features = ["winerror"]
- [badges.maintenance]
- status = "actively-developed"
diff --git a/rust-fs-set-times.spec b/rust-fs-set-times.spec
deleted file mode 100644
index 2dbda91..0000000
--- a/rust-fs-set-times.spec
+++ /dev/null
@@ -1,80 +0,0 @@
-# Generated by rust2rpm 21
-%bcond_without check
-%global debug_package %{nil}
-
-%global crate fs-set-times
-
-Name: rust-%{crate}
-Version: 0.15.0
-Release: %autorelease
-Summary: Set filesystem timestamps
-
-# Upstream license specification: Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
-License: ASL 2.0 or MIT
-URL: https://crates.io/crates/fs-set-times
-Source: %{crates_source}
-# Initial patched metadata
-# * drop windows-specific dependencies
-Patch0: fs-set-times-fix-metadata.diff
-
-ExclusiveArch: %{rust_arches}
-
-BuildRequires: rust-packaging >= 21
-
-%global _description %{expand:
-Set filesystem timestamps.}
-
-%description %{_description}
-
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "%{crate}" crate.
-
-%files devel
-%license %{crate_instdir}/COPYRIGHT
-%license %{crate_instdir}/LICENSE-APACHE
-%license %{crate_instdir}/LICENSE-Apache-2.0_WITH_LLVM-exception
-%license %{crate_instdir}/LICENSE-MIT
-%doc %{crate_instdir}/CODE_OF_CONDUCT.md
-%doc %{crate_instdir}/ORG_CODE_OF_CONDUCT.md
-%doc %{crate_instdir}/README.md
-%doc %{crate_instdir}/SECURITY.md
-%{crate_instdir}/
-
-%package -n %{name}+default-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+default-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "default" feature of the "%{crate}" crate.
-
-%files -n %{name}+default-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
-%cargo_prep
-
-%generate_buildrequires
-%cargo_generate_buildrequires
-
-%build
-%cargo_build
-
-%install
-%cargo_install
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%changelog
-%autochangelog
diff --git a/sources b/sources
deleted file mode 100644
index bb6e9f3..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (fs-set-times-0.15.0.crate) = 27018526e807f6e265e833465ea390295cbfa7083a0b49ff03668f503c3f249e9bfa4adf86d1722e83e898192f4aded65b5881be6d13ad20d84354c87a4d1f30
commit 0e28095ea459d39b3f0feaf7a4f94a5782a5da07
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jul 23 04:10:51 2022 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
commit 4e1b68409ec2208be973ea12e0bc6038a151ec93
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Thu Apr 14 00:37:16 2022 +0200
Update to version 0.15.0
diff --git a/.gitignore b/.gitignore
index 30af372..0d68e52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/fs-set-times-0.3.1.crate
/fs-set-times-0.14.0.crate
/fs-set-times-0.14.1.crate
+/fs-set-times-0.15.0.crate
diff --git a/fs-set-times-fix-metadata.diff b/fs-set-times-fix-metadata.diff
index 38af50c..b22620b 100644
--- a/fs-set-times-fix-metadata.diff
+++ b/fs-set-times-fix-metadata.diff
@@ -1,9 +1,9 @@
---- fs-set-times-0.14.1/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ fs-set-times-0.14.1/Cargo.toml 2022-02-03T18:39:27.910002+00:00
+--- fs-set-times-0.15.0/Cargo.toml 1970-01-01T00:00:01+00:00
++++ fs-set-times-0.15.0/Cargo.toml 2022-04-13T22:35:23.127723+00:00
@@ -26,8 +26,5 @@
default-features = false
[target."cfg(not(windows))".dependencies.rustix]
- version = "0.31.0"
+ version = "0.33.0"
-[target."cfg(windows)".dependencies.winapi]
-version = "0.3.9"
-features = ["winerror"]
diff --git a/rust-fs-set-times.spec b/rust-fs-set-times.spec
index 940d0d0..2dbda91 100644
--- a/rust-fs-set-times.spec
+++ b/rust-fs-set-times.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 20
+# Generated by rust2rpm 21
%bcond_without check
%global debug_package %{nil}
%global crate fs-set-times
Name: rust-%{crate}
-Version: 0.14.1
+Version: 0.15.0
Release: %autorelease
Summary: Set filesystem timestamps
@@ -19,7 +19,7 @@ Patch0: fs-set-times-fix-metadata.diff
ExclusiveArch: %{rust_arches}
-BuildRequires: rust-packaging
+BuildRequires: rust-packaging >= 21
%global _description %{expand:
Set filesystem timestamps.}
@@ -36,9 +36,15 @@ This package contains library source intended for building other packages which
use the "%{crate}" crate.
%files devel
-%license COPYRIGHT LICENSE-APACHE LICENSE-Apache-2.0_WITH_LLVM-exception LICENSE-MIT
-%doc CODE_OF_CONDUCT.md ORG_CODE_OF_CONDUCT.md README.md SECURITY.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/COPYRIGHT
+%license %{crate_instdir}/LICENSE-APACHE
+%license %{crate_instdir}/LICENSE-Apache-2.0_WITH_LLVM-exception
+%license %{crate_instdir}/LICENSE-MIT
+%doc %{crate_instdir}/CODE_OF_CONDUCT.md
+%doc %{crate_instdir}/ORG_CODE_OF_CONDUCT.md
+%doc %{crate_instdir}/README.md
+%doc %{crate_instdir}/SECURITY.md
+%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -50,7 +56,7 @@ This package contains library source intended for building other packages which
use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
diff --git a/sources b/sources
index 4569e30..bb6e9f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fs-set-times-0.14.1.crate) = b0ea07a1501a40392c36518f980eadd8560f2698b02a5da6b695aaba5dd4173abc6906b1925fa80a5b78b5147f1b4281e0a68ea1bd5642c15f8571914454f2d3
+SHA512 (fs-set-times-0.15.0.crate) = 27018526e807f6e265e833465ea390295cbfa7083a0b49ff03668f503c3f249e9bfa4adf86d1722e83e898192f4aded65b5881be6d13ad20d84354c87a4d1f30
commit 2c3e4dea3bcb3ce58bfad94c0bbb4253c505157c
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Fri Feb 4 17:02:14 2022 +0100
Update to version 0.14.1
diff --git a/.gitignore b/.gitignore
index 171ab11..30af372 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/fs-set-times-0.3.1.crate
/fs-set-times-0.14.0.crate
+/fs-set-times-0.14.1.crate
diff --git a/fs-set-times-fix-metadata.diff b/fs-set-times-fix-metadata.diff
index 677b32a..38af50c 100644
--- a/fs-set-times-fix-metadata.diff
+++ b/fs-set-times-fix-metadata.diff
@@ -1,13 +1,11 @@
---- fs-set-times-0.14.0/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ fs-set-times-0.14.0/Cargo.toml 2021-12-04T18:33:27.301436+00:00
-@@ -25,9 +25,6 @@
- version = "0.4.0"
+--- fs-set-times-0.14.1/Cargo.toml 1970-01-01T00:00:01+00:00
++++ fs-set-times-0.14.1/Cargo.toml 2022-02-03T18:39:27.910002+00:00
+@@ -26,8 +26,5 @@
default-features = false
[target."cfg(not(windows))".dependencies.rustix]
--version = "0.27.0"
+ version = "0.31.0"
-[target."cfg(windows)".dependencies.winapi]
-version = "0.3.9"
-features = ["winerror"]
-+version = "0.29"
[badges.maintenance]
status = "actively-developed"
diff --git a/rust-fs-set-times.spec b/rust-fs-set-times.spec
index 188c1eb..940d0d0 100644
--- a/rust-fs-set-times.spec
+++ b/rust-fs-set-times.spec
@@ -1,35 +1,28 @@
-# Generated by rust2rpm 18
+# Generated by rust2rpm 20
%bcond_without check
%global debug_package %{nil}
%global crate fs-set-times
Name: rust-%{crate}
-Version: 0.14.0
+Version: 0.14.1
Release: %autorelease
Summary: Set filesystem timestamps
# Upstream license specification: Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
-License: ASL 2.0 with exceptions or ASL 2.0 or MIT
+License: ASL 2.0 or MIT
URL: https://crates.io/crates/fs-set-times
Source: %{crates_source}
# Initial patched metadata
-# - Remove windows-only dependency winapi
-# - Bump rustix
+# * drop windows-specific dependencies
Patch0: fs-set-times-fix-metadata.diff
ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
BuildRequires: rust-packaging
%global _description %{expand:
-Set filesystem timestamps.
-
-Rust crate fs-set-times provides functions to set timestamps on files,
-directories, and other filesystem objects.}
+Set filesystem timestamps.}
%description %{_description}
@@ -39,14 +32,12 @@ BuildArch: noarch
%description devel %{_description}
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
%files devel
-%doc README.md SECURITY.md
-%doc CODE_OF_CONDUCT.md ORG_CODE_OF_CONDUCT.md
-%license LICENSE-APACHE LICENSE-MIT COPYRIGHT
-%license LICENSE-Apache-2.0_WITH_LLVM-exception
+%license COPYRIGHT LICENSE-APACHE LICENSE-Apache-2.0_WITH_LLVM-exception LICENSE-MIT
+%doc CODE_OF_CONDUCT.md ORG_CODE_OF_CONDUCT.md README.md SECURITY.md
%{cargo_registry}/%{crate}-%{version_no_tilde}/
%package -n %{name}+default-devel
@@ -55,8 +46,8 @@ BuildArch: noarch
%description -n %{name}+default-devel %{_description}
-This package contains library source intended for building other packages
-which use "default" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
diff --git a/sources b/sources
index 5ff0d07..4569e30 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fs-set-times-0.14.0.crate) = 8d83aa78939082439c514b768c31ec6ed7b64b8584904d9531bbadeecd0a8aeea526ec48e8769cddd7bac6c13cf9b5d7ec8c0211635e9c2abd3837562c8170d4
+SHA512 (fs-set-times-0.14.1.crate) = b0ea07a1501a40392c36518f980eadd8560f2698b02a5da6b695aaba5dd4173abc6906b1925fa80a5b78b5147f1b4281e0a68ea1bd5642c15f8571914454f2d3
commit 93b2659df3304b8fc13cac423947687bd86875b7
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Thu Feb 3 19:39:04 2022 +0100
convert to rpmautospec
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..5247ecb
--- /dev/null
+++ b/changelog
@@ -0,0 +1,12 @@
+* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.14.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Sat Dec 4 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.14.0-1
+- Update to upstream 0.14.0 (fixes rhbz#1976478)
+
+* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.3.1-2
+- Second attempt - Rebuilt for
+ https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 31 20:37:18 CEST 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.3.1-1
+- Initial package
diff --git a/rust-fs-set-times.spec b/rust-fs-set-times.spec
index b334377..188c1eb 100644
--- a/rust-fs-set-times.spec
+++ b/rust-fs-set-times.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.14.0
-Release: 2%{?dist}
+Release: %autorelease
Summary: Set filesystem timestamps
# Upstream license specification: Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
@@ -80,15 +80,4 @@ which use "default" feature of "%{crate}" crate.
%endif
%changelog
-* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.14.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Sat Dec 4 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.14.0-1
-- Update to upstream 0.14.0 (fixes rhbz#1976478)
-
-* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.3.1-2
-- Second attempt - Rebuilt for
- https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon May 31 20:37:18 CEST 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.3.1-1
-- Initial package
+%autochangelog
commit 38da6c49f430093324bcb79107c5b7f5de5eb497
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 21 20:59:29 2022 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-fs-set-times.spec b/rust-fs-set-times.spec
index 2b025ed..b334377 100644
--- a/rust-fs-set-times.spec
+++ b/rust-fs-set-times.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.14.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Set filesystem timestamps
# Upstream license specification: Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
@@ -80,6 +80,9 @@ which use "default" feature of "%{crate}" crate.
%endif
%changelog
+* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.14.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
* Sat Dec 4 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.14.0-1
- Update to upstream 0.14.0 (fixes rhbz#1976478)
commit 4a2402bbee77906839d927351a8447186c982223
Author: Olivier Lemasle <o.lemasle(a)gmail.com>
Date: Sat Dec 4 19:36:59 2021 +0100
Update to upstream 0.14.0 (fixes rhbz#1976478)
diff --git a/.gitignore b/.gitignore
index 03e74d3..171ab11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/fs-set-times-0.3.1.crate
+/fs-set-times-0.14.0.crate
diff --git a/fs-set-times-fix-metadata.diff b/fs-set-times-fix-metadata.diff
index 1298536..677b32a 100644
--- a/fs-set-times-fix-metadata.diff
+++ b/fs-set-times-fix-metadata.diff
@@ -1,11 +1,13 @@
---- fs-set-times-0.3.1/Cargo.toml 1970-01-01T00:00:00+00:00
-+++ fs-set-times-0.3.1/Cargo.toml 2021-05-29T19:36:17.987792+00:00
-@@ -26,8 +26,5 @@
- version = "0.6.0"
- [target."cfg(not(windows))".dependencies.posish]
- version = "0.6.1"
+--- fs-set-times-0.14.0/Cargo.toml 1970-01-01T00:00:01+00:00
++++ fs-set-times-0.14.0/Cargo.toml 2021-12-04T18:33:27.301436+00:00
+@@ -25,9 +25,6 @@
+ version = "0.4.0"
+ default-features = false
+ [target."cfg(not(windows))".dependencies.rustix]
+-version = "0.27.0"
-[target."cfg(windows)".dependencies.winapi]
-version = "0.3.9"
-features = ["winerror"]
++version = "0.29"
[badges.maintenance]
status = "actively-developed"
diff --git a/rust-fs-set-times.spec b/rust-fs-set-times.spec
index 30dac76..2b025ed 100644
--- a/rust-fs-set-times.spec
+++ b/rust-fs-set-times.spec
@@ -1,12 +1,12 @@
-# Generated by rust2rpm 17
+# Generated by rust2rpm 18
%bcond_without check
%global debug_package %{nil}
%global crate fs-set-times
Name: rust-%{crate}
-Version: 0.3.1
-Release: 2%{?dist}
+Version: 0.14.0
+Release: 1%{?dist}
Summary: Set filesystem timestamps
# Upstream license specification: Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
@@ -14,7 +14,8 @@ License: ASL 2.0 with exceptions or ASL 2.0 or MIT
URL: https://crates.io/crates/fs-set-times
Source: %{crates_source}
# Initial patched metadata
-# Remove windows-only dependency winapi
+# - Remove windows-only dependency winapi
+# - Bump rustix
Patch0: fs-set-times-fix-metadata.diff
ExclusiveArch: %{rust_arches}
@@ -79,6 +80,9 @@ which use "default" feature of "%{crate}" crate.
%endif
%changelog
+* Sat Dec 4 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.14.0-1
+- Update to upstream 0.14.0 (fixes rhbz#1976478)
+
* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.3.1-2
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
diff --git a/sources b/sources
index d770559..5ff0d07 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fs-set-times-0.3.1.crate) = 2dc4c72e4d2caac9f3d6fc7399a903f80e797c7880e043c31f83ebbaed555c2a05eb9531944975b3a23880bfc90c2ca07763522f92ebbb3ae82204b24bc5dfa7
+SHA512 (fs-set-times-0.14.0.crate) = 8d83aa78939082439c514b768c31ec6ed7b64b8584904d9531bbadeecd0a8aeea526ec48e8769cddd7bac6c13cf9b5d7ec8c0211635e9c2abd3837562c8170d4
commit 7839ff790c95f74950df1b946fa641125503c40b
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jul 27 09:01:04 2021 +0000
- Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-fs-set-times.spec b/rust-fs-set-times.spec
index aeca1e2..30dac76 100644
--- a/rust-fs-set-times.spec
+++ b/rust-fs-set-times.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Set filesystem timestamps
# Upstream license specification: Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
@@ -79,5 +79,9 @@ which use "default" feature of "%{crate}" crate.
%endif
%changelog
+* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.3.1-2
+- Second attempt - Rebuilt for
+ https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
* Mon May 31 20:37:18 CEST 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.3.1-1
- Initial package
commit 369f2209295678fa52c51c302d5b4bae7346d688
Author: Olivier Lemasle <o.lemasle(a)gmail.com>
Date: Mon Jun 7 22:18:03 2021 +0200
Initial import (#1966284)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..03e74d3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/fs-set-times-0.3.1.crate
diff --git a/fs-set-times-fix-metadata.diff b/fs-set-times-fix-metadata.diff
new file mode 100644
index 0000000..1298536
--- /dev/null
+++ b/fs-set-times-fix-metadata.diff
@@ -0,0 +1,11 @@
+--- fs-set-times-0.3.1/Cargo.toml 1970-01-01T00:00:00+00:00
++++ fs-set-times-0.3.1/Cargo.toml 2021-05-29T19:36:17.987792+00:00
+@@ -26,8 +26,5 @@
+ version = "0.6.0"
+ [target."cfg(not(windows))".dependencies.posish]
+ version = "0.6.1"
+-[target."cfg(windows)".dependencies.winapi]
+-version = "0.3.9"
+-features = ["winerror"]
+ [badges.maintenance]
+ status = "actively-developed"
diff --git a/rust-fs-set-times.spec b/rust-fs-set-times.spec
new file mode 100644
index 0000000..aeca1e2
--- /dev/null
+++ b/rust-fs-set-times.spec
@@ -0,0 +1,83 @@
+# Generated by rust2rpm 17
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate fs-set-times
+
+Name: rust-%{crate}
+Version: 0.3.1
+Release: 1%{?dist}
+Summary: Set filesystem timestamps
+
+# Upstream license specification: Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
+License: ASL 2.0 with exceptions or ASL 2.0 or MIT
+URL: https://crates.io/crates/fs-set-times
+Source: %{crates_source}
+# Initial patched metadata
+# Remove windows-only dependency winapi
+Patch0: fs-set-times-fix-metadata.diff
+
+ExclusiveArch: %{rust_arches}
+%if %{__cargo_skip_build}
+BuildArch: noarch
+%endif
+
+BuildRequires: rust-packaging
+
+%global _description %{expand:
+Set filesystem timestamps.
+
+Rust crate fs-set-times provides functions to set timestamps on files,
+directories, and other filesystem objects.}
+
+%description %{_description}
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel %{_description}
+
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
+
+%files devel
+%doc README.md SECURITY.md
+%doc CODE_OF_CONDUCT.md ORG_CODE_OF_CONDUCT.md
+%license LICENSE-APACHE LICENSE-MIT COPYRIGHT
+%license LICENSE-Apache-2.0_WITH_LLVM-exception
+%{cargo_registry}/%{crate}-%{version_no_tilde}/
+
+%package -n %{name}+default-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "default" feature of "%{crate}" crate.
+
+%files -n %{name}+default-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%prep
+%autosetup -n %{crate}-%{version_no_tilde} -p1
+%cargo_prep
+
+%generate_buildrequires
+%cargo_generate_buildrequires
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%changelog
+* Mon May 31 20:37:18 CEST 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.3.1-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..d770559
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (fs-set-times-0.3.1.crate) = 2dc4c72e4d2caac9f3d6fc7399a903f80e797c7880e043c31f83ebbaed555c2a05eb9531944975b3a23880bfc90c2ca07763522f92ebbb3ae82204b24bc5dfa7
1
0
Architecture specific change in rpms/rust-fs-set-times.git
by githook-noreply＠fedoraproject.org 23 Nov '23
by githook-noreply＠fedoraproject.org 23 Nov '23
23 Nov '23
The package rpms/rust-fs-set-times.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-fs-set-times.git/commit/?id=cd…
https://src.fedoraproject.org/cgit/rpms/rust-fs-set-times.git/commit/?id=e4…
https://src.fedoraproject.org/cgit/rpms/rust-fs-set-times.git/commit/?id=51…
https://src.fedoraproject.org/cgit/rpms/rust-fs-set-times.git/commit/?id=36….
Change:
-ExclusiveArch: %{rust_arches}
+ExclusiveArch: %{rust_arches}
-ExclusiveArch: %{rust_arches}
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit cdfea05af58f8fcf76d96658abd920ca32dd4345
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Thu Nov 23 14:43:52 2023 +0100
Update to version 0.20.0
diff --git a/.gitignore b/.gitignore
index 0d68e52..de2ef8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/fs-set-times-0.14.0.crate
/fs-set-times-0.14.1.crate
/fs-set-times-0.15.0.crate
+/fs-set-times-0.20.0.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index f464679..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-fs-set-times
-
-The rust-fs-set-times package
diff --git a/changelog b/changelog
index 5247ecb..d3a48e6 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,15 @@
+* Thu Nov 23 2023 Fabio Valentini <decathorpe(a)gmail.com> 0.20.0-1
+- Update to version 0.20.0
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng(a)fedoraproject.org> 0.15.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Apr 13 2022 Fabio Valentini <decathorpe(a)gmail.com> 0.15.0-1
+- Update to version 0.15.0
+
+* Fri Feb 04 2022 Fabio Valentini <decathorpe(a)gmail.com> 0.14.1-1
+- Update to version 0.14.1
+
* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.14.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/fs-set-times-fix-metadata-auto.diff b/fs-set-times-fix-metadata-auto.diff
new file mode 100644
index 0000000..e5d706b
--- /dev/null
+++ b/fs-set-times-fix-metadata-auto.diff
@@ -0,0 +1,12 @@
+--- fs-set-times-0.20.0/Cargo.toml 1970-01-01T00:00:01+00:00
++++ fs-set-times-0.20.0/Cargo.toml 2023-11-05T00:03:34.202139+00:00
+@@ -37,9 +37,3 @@
+ "time",
+ ]
+
+-[target."cfg(windows)".dependencies.windows-sys]
+-version = "0.48.0"
+-features = [
+- "Win32_Foundation",
+- "Win32_Storage_FileSystem",
+-]
diff --git a/fs-set-times-fix-metadata.diff b/fs-set-times-fix-metadata.diff
deleted file mode 100644
index b22620b..0000000
--- a/fs-set-times-fix-metadata.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- fs-set-times-0.15.0/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ fs-set-times-0.15.0/Cargo.toml 2022-04-13T22:35:23.127723+00:00
-@@ -26,8 +26,5 @@
- default-features = false
- [target."cfg(not(windows))".dependencies.rustix]
- version = "0.33.0"
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3.9"
--features = ["winerror"]
- [badges.maintenance]
- status = "actively-developed"
diff --git a/rust-fs-set-times.spec b/rust-fs-set-times.spec
index 2dbda91..0c38b26 100644
--- a/rust-fs-set-times.spec
+++ b/rust-fs-set-times.spec
@@ -1,25 +1,21 @@
-# Generated by rust2rpm 21
+# Generated by rust2rpm 25
%bcond_without check
%global debug_package %{nil}
%global crate fs-set-times
-Name: rust-%{crate}
-Version: 0.15.0
+Name: rust-fs-set-times
+Version: 0.20.0
Release: %autorelease
Summary: Set filesystem timestamps
-# Upstream license specification: Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
-License: ASL 2.0 or MIT
+License: Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
URL: https://crates.io/crates/fs-set-times
Source: %{crates_source}
-# Initial patched metadata
-# * drop windows-specific dependencies
-Patch0: fs-set-times-fix-metadata.diff
+# Automatically generated patch to strip dependencies and normalize metadata
+Patch: fs-set-times-fix-metadata-auto.diff
-ExclusiveArch: %{rust_arches}
-
-BuildRequires: rust-packaging >= 21
+BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
Set filesystem timestamps.}
@@ -59,7 +55,7 @@ use the "default" feature of the "%{crate}" crate.
%ghost %{crate_instdir}/Cargo.toml
%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
%cargo_prep
%generate_buildrequires
diff --git a/sources b/sources
index bb6e9f3..522e7c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fs-set-times-0.15.0.crate) = 27018526e807f6e265e833465ea390295cbfa7083a0b49ff03668f503c3f249e9bfa4adf86d1722e83e898192f4aded65b5881be6d13ad20d84354c87a4d1f30
+SHA512 (fs-set-times-0.20.0.crate) = e51001c743ab03c02a95e14ff4c0dc9834ba97b41c491ca54d709e0d5aee119ffbad0755a6c2e810fad842eed0bcab2519d117745152176be78feedd047631c7
commit e468e0443d0c2ee08f094c3f80df5edf41af61ac
Author: Tomas Hrcka <thrcka(a)redhat.com>
Date: Thu Nov 23 08:32:24 2023 +0100
Unretirement request: https://pagure.io/releng/issue/11799
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0d68e52
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/fs-set-times-0.3.1.crate
+/fs-set-times-0.14.0.crate
+/fs-set-times-0.14.1.crate
+/fs-set-times-0.15.0.crate
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..f464679
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# rust-fs-set-times
+
+The rust-fs-set-times package
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..5247ecb
--- /dev/null
+++ b/changelog
@@ -0,0 +1,12 @@
+* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.14.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Sat Dec 4 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.14.0-1
+- Update to upstream 0.14.0 (fixes rhbz#1976478)
+
+* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.3.1-2
+- Second attempt - Rebuilt for
+ https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 31 20:37:18 CEST 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.3.1-1
+- Initial package
diff --git a/dead.package b/dead.package
deleted file mode 100644
index 0d143d3..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-unused as effort to package wasmtime is abandoned
diff --git a/fs-set-times-fix-metadata.diff b/fs-set-times-fix-metadata.diff
new file mode 100644
index 0000000..b22620b
--- /dev/null
+++ b/fs-set-times-fix-metadata.diff
@@ -0,0 +1,11 @@
+--- fs-set-times-0.15.0/Cargo.toml 1970-01-01T00:00:01+00:00
++++ fs-set-times-0.15.0/Cargo.toml 2022-04-13T22:35:23.127723+00:00
+@@ -26,8 +26,5 @@
+ default-features = false
+ [target."cfg(not(windows))".dependencies.rustix]
+ version = "0.33.0"
+-[target."cfg(windows)".dependencies.winapi]
+-version = "0.3.9"
+-features = ["winerror"]
+ [badges.maintenance]
+ status = "actively-developed"
diff --git a/rust-fs-set-times.spec b/rust-fs-set-times.spec
new file mode 100644
index 0000000..2dbda91
--- /dev/null
+++ b/rust-fs-set-times.spec
@@ -0,0 +1,80 @@
+# Generated by rust2rpm 21
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate fs-set-times
+
+Name: rust-%{crate}
+Version: 0.15.0
+Release: %autorelease
+Summary: Set filesystem timestamps
+
+# Upstream license specification: Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
+License: ASL 2.0 or MIT
+URL: https://crates.io/crates/fs-set-times
+Source: %{crates_source}
+# Initial patched metadata
+# * drop windows-specific dependencies
+Patch0: fs-set-times-fix-metadata.diff
+
+ExclusiveArch: %{rust_arches}
+
+BuildRequires: rust-packaging >= 21
+
+%global _description %{expand:
+Set filesystem timestamps.}
+
+%description %{_description}
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
+
+%files devel
+%license %{crate_instdir}/COPYRIGHT
+%license %{crate_instdir}/LICENSE-APACHE
+%license %{crate_instdir}/LICENSE-Apache-2.0_WITH_LLVM-exception
+%license %{crate_instdir}/LICENSE-MIT
+%doc %{crate_instdir}/CODE_OF_CONDUCT.md
+%doc %{crate_instdir}/ORG_CODE_OF_CONDUCT.md
+%doc %{crate_instdir}/README.md
+%doc %{crate_instdir}/SECURITY.md
+%{crate_instdir}/
+
+%package -n %{name}+default-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
+
+%files -n %{name}+default-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%prep
+%autosetup -n %{crate}-%{version_no_tilde} -p1
+%cargo_prep
+
+%generate_buildrequires
+%cargo_generate_buildrequires
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%changelog
+%autochangelog
diff --git a/sources b/sources
new file mode 100644
index 0000000..bb6e9f3
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (fs-set-times-0.15.0.crate) = 27018526e807f6e265e833465ea390295cbfa7083a0b49ff03668f503c3f249e9bfa4adf86d1722e83e898192f4aded65b5881be6d13ad20d84354c87a4d1f30
commit 5165a5a30e0e56d8f0272742d3417a55aec456f8
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Tue Aug 9 18:37:11 2022 +0200
unused as effort to package wasmtime is abandoned
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 0d68e52..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/fs-set-times-0.3.1.crate
-/fs-set-times-0.14.0.crate
-/fs-set-times-0.14.1.crate
-/fs-set-times-0.15.0.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index f464679..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-fs-set-times
-
-The rust-fs-set-times package
diff --git a/changelog b/changelog
deleted file mode 100644
index 5247ecb..0000000
--- a/changelog
+++ /dev/null
@@ -1,12 +0,0 @@
-* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.14.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Sat Dec 4 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.14.0-1
-- Update to upstream 0.14.0 (fixes rhbz#1976478)
-
-* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.3.1-2
-- Second attempt - Rebuilt for
- https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon May 31 20:37:18 CEST 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.3.1-1
-- Initial package
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..0d143d3
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+unused as effort to package wasmtime is abandoned
diff --git a/fs-set-times-fix-metadata.diff b/fs-set-times-fix-metadata.diff
deleted file mode 100644
index b22620b..0000000
--- a/fs-set-times-fix-metadata.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- fs-set-times-0.15.0/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ fs-set-times-0.15.0/Cargo.toml 2022-04-13T22:35:23.127723+00:00
-@@ -26,8 +26,5 @@
- default-features = false
- [target."cfg(not(windows))".dependencies.rustix]
- version = "0.33.0"
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3.9"
--features = ["winerror"]
- [badges.maintenance]
- status = "actively-developed"
diff --git a/rust-fs-set-times.spec b/rust-fs-set-times.spec
deleted file mode 100644
index 2dbda91..0000000
--- a/rust-fs-set-times.spec
+++ /dev/null
@@ -1,80 +0,0 @@
-# Generated by rust2rpm 21
-%bcond_without check
-%global debug_package %{nil}
-
-%global crate fs-set-times
-
-Name: rust-%{crate}
-Version: 0.15.0
-Release: %autorelease
-Summary: Set filesystem timestamps
-
-# Upstream license specification: Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
-License: ASL 2.0 or MIT
-URL: https://crates.io/crates/fs-set-times
-Source: %{crates_source}
-# Initial patched metadata
-# * drop windows-specific dependencies
-Patch0: fs-set-times-fix-metadata.diff
-
-ExclusiveArch: %{rust_arches}
-
-BuildRequires: rust-packaging >= 21
-
-%global _description %{expand:
-Set filesystem timestamps.}
-
-%description %{_description}
-
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "%{crate}" crate.
-
-%files devel
-%license %{crate_instdir}/COPYRIGHT
-%license %{crate_instdir}/LICENSE-APACHE
-%license %{crate_instdir}/LICENSE-Apache-2.0_WITH_LLVM-exception
-%license %{crate_instdir}/LICENSE-MIT
-%doc %{crate_instdir}/CODE_OF_CONDUCT.md
-%doc %{crate_instdir}/ORG_CODE_OF_CONDUCT.md
-%doc %{crate_instdir}/README.md
-%doc %{crate_instdir}/SECURITY.md
-%{crate_instdir}/
-
-%package -n %{name}+default-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+default-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "default" feature of the "%{crate}" crate.
-
-%files -n %{name}+default-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
-%cargo_prep
-
-%generate_buildrequires
-%cargo_generate_buildrequires
-
-%build
-%cargo_build
-
-%install
-%cargo_install
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%changelog
-%autochangelog
diff --git a/sources b/sources
deleted file mode 100644
index bb6e9f3..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (fs-set-times-0.15.0.crate) = 27018526e807f6e265e833465ea390295cbfa7083a0b49ff03668f503c3f249e9bfa4adf86d1722e83e898192f4aded65b5881be6d13ad20d84354c87a4d1f30
commit 0e28095ea459d39b3f0feaf7a4f94a5782a5da07
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jul 23 04:10:51 2022 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
commit 4e1b68409ec2208be973ea12e0bc6038a151ec93
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Thu Apr 14 00:37:16 2022 +0200
Update to version 0.15.0
diff --git a/.gitignore b/.gitignore
index 30af372..0d68e52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/fs-set-times-0.3.1.crate
/fs-set-times-0.14.0.crate
/fs-set-times-0.14.1.crate
+/fs-set-times-0.15.0.crate
diff --git a/fs-set-times-fix-metadata.diff b/fs-set-times-fix-metadata.diff
index 38af50c..b22620b 100644
--- a/fs-set-times-fix-metadata.diff
+++ b/fs-set-times-fix-metadata.diff
@@ -1,9 +1,9 @@
---- fs-set-times-0.14.1/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ fs-set-times-0.14.1/Cargo.toml 2022-02-03T18:39:27.910002+00:00
+--- fs-set-times-0.15.0/Cargo.toml 1970-01-01T00:00:01+00:00
++++ fs-set-times-0.15.0/Cargo.toml 2022-04-13T22:35:23.127723+00:00
@@ -26,8 +26,5 @@
default-features = false
[target."cfg(not(windows))".dependencies.rustix]
- version = "0.31.0"
+ version = "0.33.0"
-[target."cfg(windows)".dependencies.winapi]
-version = "0.3.9"
-features = ["winerror"]
diff --git a/rust-fs-set-times.spec b/rust-fs-set-times.spec
index 940d0d0..2dbda91 100644
--- a/rust-fs-set-times.spec
+++ b/rust-fs-set-times.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 20
+# Generated by rust2rpm 21
%bcond_without check
%global debug_package %{nil}
%global crate fs-set-times
Name: rust-%{crate}
-Version: 0.14.1
+Version: 0.15.0
Release: %autorelease
Summary: Set filesystem timestamps
@@ -19,7 +19,7 @@ Patch0: fs-set-times-fix-metadata.diff
ExclusiveArch: %{rust_arches}
-BuildRequires: rust-packaging
+BuildRequires: rust-packaging >= 21
%global _description %{expand:
Set filesystem timestamps.}
@@ -36,9 +36,15 @@ This package contains library source intended for building other packages which
use the "%{crate}" crate.
%files devel
-%license COPYRIGHT LICENSE-APACHE LICENSE-Apache-2.0_WITH_LLVM-exception LICENSE-MIT
-%doc CODE_OF_CONDUCT.md ORG_CODE_OF_CONDUCT.md README.md SECURITY.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/COPYRIGHT
+%license %{crate_instdir}/LICENSE-APACHE
+%license %{crate_instdir}/LICENSE-Apache-2.0_WITH_LLVM-exception
+%license %{crate_instdir}/LICENSE-MIT
+%doc %{crate_instdir}/CODE_OF_CONDUCT.md
+%doc %{crate_instdir}/ORG_CODE_OF_CONDUCT.md
+%doc %{crate_instdir}/README.md
+%doc %{crate_instdir}/SECURITY.md
+%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -50,7 +56,7 @@ This package contains library source intended for building other packages which
use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
diff --git a/sources b/sources
index 4569e30..bb6e9f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fs-set-times-0.14.1.crate) = b0ea07a1501a40392c36518f980eadd8560f2698b02a5da6b695aaba5dd4173abc6906b1925fa80a5b78b5147f1b4281e0a68ea1bd5642c15f8571914454f2d3
+SHA512 (fs-set-times-0.15.0.crate) = 27018526e807f6e265e833465ea390295cbfa7083a0b49ff03668f503c3f249e9bfa4adf86d1722e83e898192f4aded65b5881be6d13ad20d84354c87a4d1f30
commit 2c3e4dea3bcb3ce58bfad94c0bbb4253c505157c
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Fri Feb 4 17:02:14 2022 +0100
Update to version 0.14.1
diff --git a/.gitignore b/.gitignore
index 171ab11..30af372 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/fs-set-times-0.3.1.crate
/fs-set-times-0.14.0.crate
+/fs-set-times-0.14.1.crate
diff --git a/fs-set-times-fix-metadata.diff b/fs-set-times-fix-metadata.diff
index 677b32a..38af50c 100644
--- a/fs-set-times-fix-metadata.diff
+++ b/fs-set-times-fix-metadata.diff
@@ -1,13 +1,11 @@
---- fs-set-times-0.14.0/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ fs-set-times-0.14.0/Cargo.toml 2021-12-04T18:33:27.301436+00:00
-@@ -25,9 +25,6 @@
- version = "0.4.0"
+--- fs-set-times-0.14.1/Cargo.toml 1970-01-01T00:00:01+00:00
++++ fs-set-times-0.14.1/Cargo.toml 2022-02-03T18:39:27.910002+00:00
+@@ -26,8 +26,5 @@
default-features = false
[target."cfg(not(windows))".dependencies.rustix]
--version = "0.27.0"
+ version = "0.31.0"
-[target."cfg(windows)".dependencies.winapi]
-version = "0.3.9"
-features = ["winerror"]
-+version = "0.29"
[badges.maintenance]
status = "actively-developed"
diff --git a/rust-fs-set-times.spec b/rust-fs-set-times.spec
index 188c1eb..940d0d0 100644
--- a/rust-fs-set-times.spec
+++ b/rust-fs-set-times.spec
@@ -1,35 +1,28 @@
-# Generated by rust2rpm 18
+# Generated by rust2rpm 20
%bcond_without check
%global debug_package %{nil}
%global crate fs-set-times
Name: rust-%{crate}
-Version: 0.14.0
+Version: 0.14.1
Release: %autorelease
Summary: Set filesystem timestamps
# Upstream license specification: Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
-License: ASL 2.0 with exceptions or ASL 2.0 or MIT
+License: ASL 2.0 or MIT
URL: https://crates.io/crates/fs-set-times
Source: %{crates_source}
# Initial patched metadata
-# - Remove windows-only dependency winapi
-# - Bump rustix
+# * drop windows-specific dependencies
Patch0: fs-set-times-fix-metadata.diff
ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
BuildRequires: rust-packaging
%global _description %{expand:
-Set filesystem timestamps.
-
-Rust crate fs-set-times provides functions to set timestamps on files,
-directories, and other filesystem objects.}
+Set filesystem timestamps.}
%description %{_description}
@@ -39,14 +32,12 @@ BuildArch: noarch
%description devel %{_description}
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
%files devel
-%doc README.md SECURITY.md
-%doc CODE_OF_CONDUCT.md ORG_CODE_OF_CONDUCT.md
-%license LICENSE-APACHE LICENSE-MIT COPYRIGHT
-%license LICENSE-Apache-2.0_WITH_LLVM-exception
+%license COPYRIGHT LICENSE-APACHE LICENSE-Apache-2.0_WITH_LLVM-exception LICENSE-MIT
+%doc CODE_OF_CONDUCT.md ORG_CODE_OF_CONDUCT.md README.md SECURITY.md
%{cargo_registry}/%{crate}-%{version_no_tilde}/
%package -n %{name}+default-devel
@@ -55,8 +46,8 @@ BuildArch: noarch
%description -n %{name}+default-devel %{_description}
-This package contains library source intended for building other packages
-which use "default" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
diff --git a/sources b/sources
index 5ff0d07..4569e30 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fs-set-times-0.14.0.crate) = 8d83aa78939082439c514b768c31ec6ed7b64b8584904d9531bbadeecd0a8aeea526ec48e8769cddd7bac6c13cf9b5d7ec8c0211635e9c2abd3837562c8170d4
+SHA512 (fs-set-times-0.14.1.crate) = b0ea07a1501a40392c36518f980eadd8560f2698b02a5da6b695aaba5dd4173abc6906b1925fa80a5b78b5147f1b4281e0a68ea1bd5642c15f8571914454f2d3
commit 93b2659df3304b8fc13cac423947687bd86875b7
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Thu Feb 3 19:39:04 2022 +0100
convert to rpmautospec
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..5247ecb
--- /dev/null
+++ b/changelog
@@ -0,0 +1,12 @@
+* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.14.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Sat Dec 4 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.14.0-1
+- Update to upstream 0.14.0 (fixes rhbz#1976478)
+
+* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.3.1-2
+- Second attempt - Rebuilt for
+ https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 31 20:37:18 CEST 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.3.1-1
+- Initial package
diff --git a/rust-fs-set-times.spec b/rust-fs-set-times.spec
index b334377..188c1eb 100644
--- a/rust-fs-set-times.spec
+++ b/rust-fs-set-times.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.14.0
-Release: 2%{?dist}
+Release: %autorelease
Summary: Set filesystem timestamps
# Upstream license specification: Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
@@ -80,15 +80,4 @@ which use "default" feature of "%{crate}" crate.
%endif
%changelog
-* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.14.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Sat Dec 4 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.14.0-1
-- Update to upstream 0.14.0 (fixes rhbz#1976478)
-
-* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.3.1-2
-- Second attempt - Rebuilt for
- https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon May 31 20:37:18 CEST 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.3.1-1
-- Initial package
+%autochangelog
commit 38da6c49f430093324bcb79107c5b7f5de5eb497
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 21 20:59:29 2022 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-fs-set-times.spec b/rust-fs-set-times.spec
index 2b025ed..b334377 100644
--- a/rust-fs-set-times.spec
+++ b/rust-fs-set-times.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.14.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Set filesystem timestamps
# Upstream license specification: Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
@@ -80,6 +80,9 @@ which use "default" feature of "%{crate}" crate.
%endif
%changelog
+* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.14.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
* Sat Dec 4 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.14.0-1
- Update to upstream 0.14.0 (fixes rhbz#1976478)
commit 4a2402bbee77906839d927351a8447186c982223
Author: Olivier Lemasle <o.lemasle(a)gmail.com>
Date: Sat Dec 4 19:36:59 2021 +0100
Update to upstream 0.14.0 (fixes rhbz#1976478)
diff --git a/.gitignore b/.gitignore
index 03e74d3..171ab11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/fs-set-times-0.3.1.crate
+/fs-set-times-0.14.0.crate
diff --git a/fs-set-times-fix-metadata.diff b/fs-set-times-fix-metadata.diff
index 1298536..677b32a 100644
--- a/fs-set-times-fix-metadata.diff
+++ b/fs-set-times-fix-metadata.diff
@@ -1,11 +1,13 @@
---- fs-set-times-0.3.1/Cargo.toml 1970-01-01T00:00:00+00:00
-+++ fs-set-times-0.3.1/Cargo.toml 2021-05-29T19:36:17.987792+00:00
-@@ -26,8 +26,5 @@
- version = "0.6.0"
- [target."cfg(not(windows))".dependencies.posish]
- version = "0.6.1"
+--- fs-set-times-0.14.0/Cargo.toml 1970-01-01T00:00:01+00:00
++++ fs-set-times-0.14.0/Cargo.toml 2021-12-04T18:33:27.301436+00:00
+@@ -25,9 +25,6 @@
+ version = "0.4.0"
+ default-features = false
+ [target."cfg(not(windows))".dependencies.rustix]
+-version = "0.27.0"
-[target."cfg(windows)".dependencies.winapi]
-version = "0.3.9"
-features = ["winerror"]
++version = "0.29"
[badges.maintenance]
status = "actively-developed"
diff --git a/rust-fs-set-times.spec b/rust-fs-set-times.spec
index 30dac76..2b025ed 100644
--- a/rust-fs-set-times.spec
+++ b/rust-fs-set-times.spec
@@ -1,12 +1,12 @@
-# Generated by rust2rpm 17
+# Generated by rust2rpm 18
%bcond_without check
%global debug_package %{nil}
%global crate fs-set-times
Name: rust-%{crate}
-Version: 0.3.1
-Release: 2%{?dist}
+Version: 0.14.0
+Release: 1%{?dist}
Summary: Set filesystem timestamps
# Upstream license specification: Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
@@ -14,7 +14,8 @@ License: ASL 2.0 with exceptions or ASL 2.0 or MIT
URL: https://crates.io/crates/fs-set-times
Source: %{crates_source}
# Initial patched metadata
-# Remove windows-only dependency winapi
+# - Remove windows-only dependency winapi
+# - Bump rustix
Patch0: fs-set-times-fix-metadata.diff
ExclusiveArch: %{rust_arches}
@@ -79,6 +80,9 @@ which use "default" feature of "%{crate}" crate.
%endif
%changelog
+* Sat Dec 4 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.14.0-1
+- Update to upstream 0.14.0 (fixes rhbz#1976478)
+
* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.3.1-2
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
diff --git a/sources b/sources
index d770559..5ff0d07 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fs-set-times-0.3.1.crate) = 2dc4c72e4d2caac9f3d6fc7399a903f80e797c7880e043c31f83ebbaed555c2a05eb9531944975b3a23880bfc90c2ca07763522f92ebbb3ae82204b24bc5dfa7
+SHA512 (fs-set-times-0.14.0.crate) = 8d83aa78939082439c514b768c31ec6ed7b64b8584904d9531bbadeecd0a8aeea526ec48e8769cddd7bac6c13cf9b5d7ec8c0211635e9c2abd3837562c8170d4
commit 7839ff790c95f74950df1b946fa641125503c40b
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jul 27 09:01:04 2021 +0000
- Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-fs-set-times.spec b/rust-fs-set-times.spec
index aeca1e2..30dac76 100644
--- a/rust-fs-set-times.spec
+++ b/rust-fs-set-times.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Set filesystem timestamps
# Upstream license specification: Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
@@ -79,5 +79,9 @@ which use "default" feature of "%{crate}" crate.
%endif
%changelog
+* Tue Jul 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.3.1-2
+- Second attempt - Rebuilt for
+ https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
* Mon May 31 20:37:18 CEST 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.3.1-1
- Initial package
commit 369f2209295678fa52c51c302d5b4bae7346d688
Author: Olivier Lemasle <o.lemasle(a)gmail.com>
Date: Mon Jun 7 22:18:03 2021 +0200
Initial import (#1966284)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..03e74d3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/fs-set-times-0.3.1.crate
diff --git a/fs-set-times-fix-metadata.diff b/fs-set-times-fix-metadata.diff
new file mode 100644
index 0000000..1298536
--- /dev/null
+++ b/fs-set-times-fix-metadata.diff
@@ -0,0 +1,11 @@
+--- fs-set-times-0.3.1/Cargo.toml 1970-01-01T00:00:00+00:00
++++ fs-set-times-0.3.1/Cargo.toml 2021-05-29T19:36:17.987792+00:00
+@@ -26,8 +26,5 @@
+ version = "0.6.0"
+ [target."cfg(not(windows))".dependencies.posish]
+ version = "0.6.1"
+-[target."cfg(windows)".dependencies.winapi]
+-version = "0.3.9"
+-features = ["winerror"]
+ [badges.maintenance]
+ status = "actively-developed"
diff --git a/rust-fs-set-times.spec b/rust-fs-set-times.spec
new file mode 100644
index 0000000..aeca1e2
--- /dev/null
+++ b/rust-fs-set-times.spec
@@ -0,0 +1,83 @@
+# Generated by rust2rpm 17
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate fs-set-times
+
+Name: rust-%{crate}
+Version: 0.3.1
+Release: 1%{?dist}
+Summary: Set filesystem timestamps
+
+# Upstream license specification: Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
+License: ASL 2.0 with exceptions or ASL 2.0 or MIT
+URL: https://crates.io/crates/fs-set-times
+Source: %{crates_source}
+# Initial patched metadata
+# Remove windows-only dependency winapi
+Patch0: fs-set-times-fix-metadata.diff
+
+ExclusiveArch: %{rust_arches}
+%if %{__cargo_skip_build}
+BuildArch: noarch
+%endif
+
+BuildRequires: rust-packaging
+
+%global _description %{expand:
+Set filesystem timestamps.
+
+Rust crate fs-set-times provides functions to set timestamps on files,
+directories, and other filesystem objects.}
+
+%description %{_description}
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel %{_description}
+
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
+
+%files devel
+%doc README.md SECURITY.md
+%doc CODE_OF_CONDUCT.md ORG_CODE_OF_CONDUCT.md
+%license LICENSE-APACHE LICENSE-MIT COPYRIGHT
+%license LICENSE-Apache-2.0_WITH_LLVM-exception
+%{cargo_registry}/%{crate}-%{version_no_tilde}/
+
+%package -n %{name}+default-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "default" feature of "%{crate}" crate.
+
+%files -n %{name}+default-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%prep
+%autosetup -n %{crate}-%{version_no_tilde} -p1
+%cargo_prep
+
+%generate_buildrequires
+%cargo_generate_buildrequires
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%changelog
+* Mon May 31 20:37:18 CEST 2021 Olivier Lemasle <o.lemasle(a)gmail.com> - 0.3.1-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..d770559
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (fs-set-times-0.3.1.crate) = 2dc4c72e4d2caac9f3d6fc7399a903f80e797c7880e043c31f83ebbaed555c2a05eb9531944975b3a23880bfc90c2ca07763522f92ebbb3ae82204b24bc5dfa7
1
0
Architecture specific change in rpms/java-latest-openjdk-portable.git
by githook-noreply＠fedoraproject.org 23 Nov '23
by githook-noreply＠fedoraproject.org 23 Nov '23
23 Nov '23
The package rpms/java-latest-openjdk-portable.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-latest-openjdk-portable.git/co…
https://src.fedoraproject.org/cgit/rpms/java-latest-openjdk-portable.git/co….
Change:
+ExcludeArch: %{ix86}
+%ifarch %{gdb_arches}
Thanks.
Full change:
============
commit e4459f4dcc7ba596c3d140a04dd284ccaa1ead0a
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Wed Nov 22 11:07:30 2023 +0100
moved docs and miscs to release-only condition
diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec
index 7bac98c..3fa3abd 100644
--- a/java-latest-openjdk-portable.spec
+++ b/java-latest-openjdk-portable.spec
@@ -915,6 +915,7 @@ The %{origin_nice} %{featurever} runtime environment.
%endif
+%if %{include_normal_build}
%package docs
Summary: %{origin_nice} %{featurever} API documentation
@@ -930,6 +931,7 @@ Summary: %{origin_nice} %{featurever} miscellany
%description misc
The %{origin_nice} %{featurever} miscellany.
+%endif
%package sources
Summary: %{origin_nice} %{featurever} full patched sources of portable JDK
@@ -1302,7 +1304,6 @@ function packagejdk() {
echo "Packaging build from ${imagesdir} to ${packagesdir}..."
mkdir -p ${packagesdir}
- pushd ${imagesdir}
if [ "x$suffix" = "x" ] ; then
nameSuffix=""
@@ -1318,10 +1319,11 @@ function packagejdk() {
staticarchive=${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
- # We only use docs for the release build
- docname=%{docportablename}
- docarchive=${packagesdir}/%{docportablearchive}
- built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
+ if [ "x$suffix" = "x" ] ; then
+ docname=%{docportablename}
+ docarchive=${packagesdir}/%{docportablearchive}
+ built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
+ fi
# These are from the source tree so no debug variants
miscname=%{miscportablename}
miscarchive=${packagesdir}/%{miscportablearchive}
@@ -1661,15 +1663,16 @@ for suffix in %{build_loop} ; do
fi
done
-# These definitions should match those in installjdk
-# Install outside the loop as there are no debug variants
-docarchive=${packagesdir}/%{docportablearchive}
-miscarchive=${packagesdir}/%{miscportablearchive}
-
-mv ${docarchive} $RPM_BUILD_ROOT%{_jvmdir}/
-mv ${docarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
-mv ${miscarchive} $RPM_BUILD_ROOT%{_jvmdir}/
-mv ${miscarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ if [ "x$suffix" = "x" ] ; then
+ # These definitions should match those in installjdk
+ # Install outside the loop as there are no debug variants
+ docarchive=${packagesdir}/%{docportablearchive}
+ miscarchive=${packagesdir}/%{miscportablearchive}
+ mv ${docarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${docarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${miscarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${miscarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ fi
# To show sha in the build log
for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do
@@ -1744,6 +1747,7 @@ done
%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}
%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}.sha256sum
+%if %{include_normal_build}
%files docs
%{_jvmdir}/%{docportablearchive}
%{_jvmdir}/%{docportablearchive}.sha256sum
@@ -1751,6 +1755,7 @@ done
%files misc
%{_jvmdir}/%{miscportablearchive}
%{_jvmdir}/%{miscportablearchive}.sha256sum
+%endif
%changelog
* Wed Nov 22 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.1.0.12-2.rolling
@@ -1765,6 +1770,7 @@ done
- removed no longer needed jdk8296108-tzdata2022f.patch, jdk8296715-cldr2022f.patch, rh1648644-java_access_bridge_privileged_security.patch
- added jdk8311630-s390_ffmapi.patch to support virtual threads on s390x
- aligned fips-21u-75ffdc48eda.patch (gnu_andrew)
+- fixed '--without release' build-ability by moving docs and misc to if-release only
* Wed Sep 20 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.0.0.35-4.rolling
- removed %{1} from miscportablename
commit 26504dac4c5d1ddf0ec7e85199b12e54be85e259
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Tue Nov 21 16:02:43 2023 +0100
restricted to java-arches
diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec
index f487843..7bac98c 100644
--- a/java-latest-openjdk-portable.spec
+++ b/java-latest-openjdk-portable.spec
@@ -518,6 +518,13 @@
%global alternatives_requires %{_sbindir}/alternatives
%endif
+# x86 is no longer supported
+%if 0%{?java_arches:1}
+ExclusiveArch: %{java_arches}
+%else
+ExcludeArch: %{ix86}
+%endif
+
# Portables have no repo (requires/provides), but these are awesome for orientation in spec
# Also scriptlets are happily missing and files are handled old fashion
# not-duplicated requires/provides/obsoletes for normal/debug packages
commit 1eb10e704bfd129924882085b3519c94f50b9454
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Tue Nov 21 15:48:20 2023 +0100
updated to OpenJDK 21.0.1 (2023-10-17)
- adjsuted generate_source_tarball
- removed icedtea_sync
- dropped standalone licenses
- added usntripped subpkg
- added docs subpkg
- adjsuted versions of bundled libraries
- build refactored to several solid methods following gnu_andrew
- removed no longer needed jdk8296108-tzdata2022f.patch, jdk8296715-cldr2022f.patch, rh1648644-java_access_bridge_privileged_security.patch
- added jdk8311630-s390_ffmapi.patch to support virtual threads on s390x
- aligned fips-21u-75ffdc48eda.patch (gnu_andrew)
diff --git a/.gitignore b/.gitignore
index 79f3174..3f711a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@
/openjdk-jdk21u-jdk-21+34.tar.xz
/openjdk-jdk21u-jdk-21+35.tar.xz
/openjdk-21+35.tar.xz
+/openjdk-21.0.1+12.tar.xz
diff --git a/NEWS b/NEWS
index 73322e7..09d1dfe 100644
--- a/NEWS
+++ b/NEWS
@@ -3,13 +3,210 @@ Key:
JDK-X - https://bugs.openjdk.java.net/browse/JDK-X
CVE-XXXX-YYYY: https://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
+New in release OpenJDK 21.0.1 (2023-10-17):
+===========================================
+
+* CVEs
+ - CVE-2023-22081
+ - CVE-2023-22025
+* Security fixes
+ - JDK-8286503, JDK-8312367: Enhance security classes
+ - JDK-8296581: Better system proxy support
+ - JDK-8297856: Improve handling of Bidi characters
+ - JDK-8309966: Enhanced TLS connections
+ - JDK-8312248: Enhanced archival support redux
+ - JDK-8314649: Enhanced archival support redux
+ - JDK-8317121: vector_masked_load instruction is moved too early after JDK-8286941
+* Other changes
+ - JDK-8240567: MethodTooLargeException thrown while creating a jlink image
+ - JDK-8284772: GHA: Use GCC Major Version Dependencies Only
+ - JDK-8293114: JVM should trim the native heap
+ - JDK-8299658: C1 compilation crashes in LinearScan::resolve_exception_edge
+ - JDK-8302017: Allocate BadPaddingException only if it will be thrown
+ - JDK-8303815: Improve Metaspace test speed
+ - JDK-8304954: SegmentedCodeCache fails when using large pages
+ - JDK-8307766: Linux: Provide the option to override the timer slack
+ - JDK-8308042: [macos] Developer ID Application Certificate not picked up by jpackage if it contains UNICODE characters
+ - JDK-8308047: java/util/concurrent/ScheduledThreadPoolExecutor/BasicCancelTest.java timed out and also had jcmd pipe errors
+ - JDK-8308184: Launching java with large number of jars in classpath with java.protocol.handler.pkgs system property set can lead to StackOverflowError
+ - JDK-8308474: DSA does not reset SecureRandom when initSign is called again
+ - JDK-8308609: java/lang/ScopedValue/StressStackOverflow.java fails with "-XX:-VMContinuations"
+ - JDK-8309032: jpackage does not work for module projects unless --module-path is specified
+ - JDK-8309088: security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java fails
+ - JDK-8309214: sun/security/pkcs11/KeyStore/CertChainRemoval.java fails after 8301154
+ - JDK-8309475: Test java/foreign/TestByteBuffer.java fails: a problem with msync (aix)
+ - JDK-8309502: RISC-V: String.indexOf intrinsic may produce misaligned memory loads
+ - JDK-8309591: Socket.setOption(TCP_QUICKACK) uses wrong level
+ - JDK-8309746: Reconfigure check should include make/conf/version-numbers.conf
+ - JDK-8309889: [s390] Missing return statement after calling jump_to_native_invoker method in generate_method_handle_dispatch.
+ - JDK-8310106: sun.security.ssl.SSLHandshake.getHandshakeProducer() incorrectly checks handshakeConsumers
+ - JDK-8310171: Bump version numbers for 21.0.1
+ - JDK-8310211: serviceability/jvmti/thread/GetStackTrace/getstacktr03/getstacktr03.java failing
+ - JDK-8310233: Fix THP detection on Linux
+ - JDK-8310268: RISC-V: misaligned memory access in String.Compare intrinsic
+ - JDK-8310321: make JDKOPT_CHECK_CODESIGN_PARAMS more verbose
+ - JDK-8310586: ProblemList java/lang/ScopedValue/StressStackOverflow.java#default with virtual threads on linux-all
+ - JDK-8310687: JDK-8303215 is incomplete
+ - JDK-8310873: Re-enable locked_create_entry symbol check in runtime/NMT/CheckForProperDetailStackTrace.java for RISC-V
+ - JDK-8311026: Some G1 specific tests do not set -XX:+UseG1GC
+ - JDK-8311033: [macos] PrinterJob does not take into account Sides attribute
+ - JDK-8311160: [macOS, Accessibility] VoiceOver: No announcements on JRadioButtonMenuItem and JCheckBoxMenuItem
+ - JDK-8311249: Remove unused MemAllocator::obj_memory_range
+ - JDK-8311285: report some fontconfig related environment variables in hs_err file
+ - JDK-8311511: Improve description of NativeLibrary JFR event
+ - JDK-8311592: ECKeySizeParameterSpec causes too many exceptions on third party providers
+ - JDK-8311682: Change milestone to fcs for all releases
+ - JDK-8311862: RISC-V: small improvements to shift immediate instructions
+ - JDK-8311917: MAP_FAILED definition seems to be obsolete in src/java.desktop/unix/native/common/awt/fontpath.c
+ - JDK-8311921: Inform about MaxExpectedDataSegmentSize in case of pthread_create failures on AIX
+ - JDK-8311923: TestIRMatching.java fails on RISC-V
+ - JDK-8311926: java/lang/ScopedValue/StressStackOverflow.java takes 9mins in tier1
+ - JDK-8311955: c++filt is now ibm-llvm-cxxfilt when using xlc17 / clang on AIX
+ - JDK-8311981: Test gc/stringdedup/TestStringDeduplicationAgeThreshold.java#ZGenerational timed out
+ - JDK-8312127: FileDescriptor.sync should temporarily increase parallelism
+ - JDK-8312180: (bf) MappedMemoryUtils passes incorrect arguments to msync (aix)
+ - JDK-8312182: THPs cause huge RSS due to thread start timing issue
+ - JDK-8312394: [linux] SIGSEGV if kernel was built without hugepage support
+ - JDK-8312395: Improve assertions in growableArray
+ - JDK-8312401: SymbolTable::do_add_if_needed hangs when called in InstanceKlass::add_initialization_error path with requesting length exceeds max_symbol_length
+ - JDK-8312489: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar
+ - JDK-8312525: New test runtime/os/TestTrimNative.java#trimNative is failing: did not see the expected RSS reduction
+ - JDK-8312535: MidiSystem.getSoundbank() throws unexpected SecurityException
+ - JDK-8312555: Ideographic characters aren't stretched by AffineTransform.scale(2, 1)
+ - JDK-8312573: Failure during CompileOnly parsing leads to ShouldNotReachHere
+ - JDK-8312585: Rename DisableTHPStackMitigation flag to THPStackMitigation
+ - JDK-8312591: GCC 6 build failure after JDK-8280982
+ - JDK-8312619: Strange error message when switching over long
+ - JDK-8312620: WSL Linux build crashes after JDK-8310233
+ - JDK-8312625: Test serviceability/dcmd/vm/TrimLibcHeapTest.java failed: RSS use increased
+ - JDK-8312909: C1 should not inline through interface calls with non-subtype receiver
+ - JDK-8312976: MatchResult produces StringIndexOutOfBoundsException for groups outside match
+ - JDK-8312984: javac may crash on a record pattern with too few components
+ - JDK-8313081: MonitoringSupport_lock should be unconditionally initialized after 8304074
+ - JDK-8313248: C2: setScopedValueCache intrinsic exposes nullptr pre-values to store barriers
+ - JDK-8313262: C2: Sinking node may cause required cast to be dropped
+ - JDK-8313307: java/util/Formatter/Padding.java fails on some Locales
+ - JDK-8313312: Add missing classpath exception copyright header
+ - JDK-8313323: javac -g on a java file which uses unnamed variable leads to ClassFormatError when launching that class
+ - JDK-8313402: C1: Incorrect LoadIndexed value numbering
+ - JDK-8313428: GHA: Bump GCC versions for July 2023 updates
+ - JDK-8313576: GCC 7 reports compiler warning in bundled freetype 2.13.0
+ - JDK-8313602: increase timeout for jdk/classfile/CorpusTest.java
+ - JDK-8313626: C2 crash due to unexpected exception control flow
+ - JDK-8313657: com.sun.jndi.ldap.Connection.cleanup does not close connections on SocketTimeoutErrors
+ - JDK-8313676: Amend TestLoadIndexedMismatch test to target intrinsic directly
+ - JDK-8313678: SymbolTable can leak Symbols during cleanup
+ - JDK-8313691: use close after failing os::fdopen in vmError and ciEnv
+ - JDK-8313701: GHA: RISC-V should use the official repository for bootstrap
+ - JDK-8313707: GHA: Bootstrap sysroots with --variant=minbase
+ - JDK-8313752: InstanceKlassFlags::print_on doesn't print the flag names
+ - JDK-8313765: Invalid CEN header (invalid zip64 extra data field size)
+ - JDK-8313796: AsyncGetCallTrace crash on unreadable interpreter method pointer
+ - JDK-8313874: JNI NewWeakGlobalRef throws exception for null arg
+ - JDK-8313901: [TESTBUG] test/hotspot/jtreg/compiler/codecache/CodeCacheFullCountTest.java fails with java.lang.VirtualMachineError
+ - JDK-8313904: [macos] All signing tests which verifies unsigned app images are failing
+ - JDK-8314020: Print instruction blocks in byte units
+ - JDK-8314024: SIGSEGV in PhaseIdealLoop::build_loop_late_post_work due to bad immediate dominator info
+ - JDK-8314063: The socket is not closed in Connection::createSocket when the handshake failed for LDAP connection
+ - JDK-8314117: RISC-V: Incorrect VMReg encoding in RISCV64Frame.java
+ - JDK-8314118: Update JMH devkit to 1.37
+ - JDK-8314139: TEST_BUG: runtime/os/THPsInThreadStackPreventionTest.java could fail on machine with large number of cores
+ - JDK-8314144: gc/g1/ihop/TestIHOPStatic.java fails due to extra concurrent mark with -Xcomp
+ - JDK-8314216: Case enumConstant, pattern compilation fails
+ - JDK-8314262: GHA: Cut down cross-compilation sysroots deeper
+ - JDK-8314423: Multiple patterns without unnamed variables
+ - JDK-8314426: runtime/os/TestTrimNative.java is failing on slow machines
+ - JDK-8314501: Shenandoah: sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java fails
+ - JDK-8314517: some tests fail in case ipv6 is disabled on the machine
+ - JDK-8314618: RISC-V: -XX:MaxVectorSize does not work as expected
+ - JDK-8314656: GHA: No need for Debian ports keyring installation after JDK-8313701
+ - JDK-8314679: SA fails to properly attach to JVM after having just detached from a different JVM
+ - JDK-8314730: GHA: Drop libfreetype6-dev transitional package in favor of libfreetype-dev
+ - JDK-8314850: SharedRuntime::handle_wrong_method() gets called too often when resolving Continuation.enter
+ - JDK-8314960: Add Certigna Root CA - 2
+ - JDK-8315020: The macro definition for LoongArch64 zero build is not accurate.
+ - JDK-8315051: jdk/jfr/jvm/TestGetEventWriter.java fails with non-JVMCI GCs
+ - JDK-8315534: Incorrect warnings about implicit annotation processing
+
+Notes on individual issues:
+===========================
+
+core-libs/java.util.jar:
+
+JDK-8313765: Invalid CEN header (invalid zip64 extra data field size)
+=====================================================================
+Additional validity checks in the handling of Zip64 files,
+JDK-8302483, introduced in 21.0.0, caused the use of some valid zip
+files to now fail with the error, `Invalid CEN header (invalid zip64
+extra data field size)`
+
+This release, 21.0.1, allows for zero length headers and additional
+padding produced by some Zip64 creation tools.
+
+The following third party tools have also released patches to better
+adhere to the ZIP File Format Specification:
+
+* Apache Commons Compress fix for Empty CEN Zip64 Extra Headers fixed in Commons Compress release 1.11
+* Apache Ant fix for Empty CEN Zip64 Extra Headers fixed in Ant 1.10.14
+* BND issue with writing invalid Extra Headers fixed in BND 5.3
+
+The maven-bundle-plugin 5.1.5 includes the BND 5.3 patch.
+
+If these improved validation checks cause issues for deployed zip or
+jar files, check how the file was created and whether patches are
+available from the generating software to resolve the issue. With
+both JDK releases, the checks can be disabled by setting the new
+system property, `jdk.util.zip.disableZip64ExtraFieldValidation` to
+`true`.
+
+hotspot/runtime:
+
+JDK-8311981: JVM May Hang When Using Generational ZGC if a VM Handshake Stalls on Memory
+========================================================================================
+The JVM can hang under an uncommon condition that involves the JVM
+running out of heap memory, the GC just starting a relocation phase to
+reclaim memory, and a JVM thread-local Handshake asking to relocate an
+object. This potential deadlock should now be avoided in this
+release.
+
+core-libs/java.util.regex:
+
+JDK-8312976: `java.util.regex.MatchResult` Might Throw `StringIndexOutOfBoundsException` on Regex Patterns Containing Lookaheads and Lookbehinds
+================================================================================================================================================
+JDK-8132995 introduced an unintended regression when using instances
+returned by `java.util.regex.Matcher.toMatchResult()`.
+
+This regression happens with a `java.util.regex.Pattern`s containing
+lookaheads and lookbehinds that, in turn, contain groups. If these are
+located outside the match, a `StringIndexOutOfBoundsException` is
+thrown when accessing these groups. See JDK-8312976 for an example.
+
+The issue is resolved in this release by calculating a minimum start
+location as part of the match result and using this in constructing
+String objects, rather than the location of the first match.
+
+JDK-8314960: Added Certigna Root CA Certificate
+===============================================
+The following root certificate has been added to the cacerts
+truststore:
+
+Name: Certigna (Dhimyotis)
+Alias Name: certignarootca
+Distinguished Name: CN=Certigna Root CA, OU=0002 48146308100036, O=Dhimyotis, C=FR
+
+JDK-8312489: Increase Default Value of the System Property `jdk.jar.maxSignatureFileSize`
+=========================================================================================
+A maximum signature file size property, jdk.jar.maxSignatureFileSize,
+was introduced in the 21.0.0 release of OpenJDK by JDK-8300596 to
+control the maximum size of signature files in a signed JAR. The
+default value of 8MB proved to be too small for some JAR files. This
+release, 21.0.1, increases it to 16MB.
+
New in release OpenJDK 21.0.0 (2023-09-XX):
===========================================
Major changes are listed below. Some changes may have been backported
-to earlier releases following their first appearance in OpenJDK 21.
-
-The full list of changes in 21u can be found at:
-- * https://builds.shipilev.net/backports-monitor/release-notes-21.txt
+to earlier releases following their first appearance in OpenJDK 18
+through to 21.
NEW FEATURES
============
@@ -76,8 +273,8 @@ an underscore character, _.
This is a preview feature (http://openjdk.java.net/jeps/12) introduced
in OpenJDK 21 (JEP 443).
-Unnamed Classes and Instance Main Methods
-=========================================
+Unnamed Classes and Instance Main Methods (Preview)
+===================================================
https://openjdk.org/jeps/445
Evolve the Java language so that students can write their first
@@ -93,6 +290,24 @@ in OpenJDK 21 (JEP 445).
Library Features
================
+UTF-8 by Default
+================
+https://openjdk.org/jeps/400
+
+Specify UTF-8 as the default charset of the standard Java APIs. With
+this change, APIs that depend upon the default charset will behave
+consistently across all implementations, operating systems, locales,
+and configurations.
+
+Reimplement Core Reflection with Method Handles
+===============================================
+https://openjdk.org/jeps/416
+
+Reimplement java.lang.reflect.Method, Constructor, and Field on top of
+java.lang.invoke method handles. Making method handles the underlying
+mechanism for reflection will reduce the maintenance and development
+cost of both the java.lang.reflect and java.lang.invoke APIs.
+
Vector API
==========
https://openjdk.org/jeps/338
@@ -113,6 +328,14 @@ place in OpenJDK 17 (JEP 414), OpenJDK 18 (JEP 417) saw a third,
OpenJDK 19 a fourth (JEP 426), OpenJDK 20 (JEP 438) a fifth and
OpenJDK 21 a sixth (JEP 448).
+Internet-Address Resolution SPI
+===============================
+https://openjdk.org/jeps/418
+
+Define a service-provider interface (SPI) for host name and address
+resolution, so that java.net.InetAddress can make use of resolvers
+other than the platform's built-in resolver.
+
Foreign Function & Memory API
=============================
https://openjdk.org/jeps/412
@@ -211,9 +434,55 @@ Improve application performance by extending the Z Garbage Collector
will allow ZGC to collect young objects — which tend to die young —
more frequently.
+Tools
+=====
+
+Simple Web Server
+=================
+https://openjdk.org/jeps/408
+
+Provide a command-line tool, `jwebserver`, to start a minimal web
+server that serves static files only. No CGI or servlet-like
+functionality is available. This tool will be useful for prototyping,
+ad-hoc coding, and testing purposes, particularly in educational
+contexts.
+
+Code Snippets in Java API Documentation
+=======================================
+https://openjdk.org/jeps/413
+
+Introduce an @snippet tag for JavaDoc's Standard Doclet, to simplify
+the inclusion of example source code in API documentation.
+
+Ports
+=====
+
+Linux/RISC-V Port
+=================
+https://openjdk.org/jeps/422
+
+RISC-V is a free and open-source RISC instruction set architecture
+(ISA) designed originally at the University of California, Berkeley,
+and now developed collaboratively under the sponsorship of RISC-V
+International. It is already supported by a wide range of language
+toolchains. With the increasing availability of RISC-V hardware, a
+port of the JDK would be valuable.
+
DEPRECATIONS
============
+Deprecate Finalization for Removal
+==================================
+https://openjdk.org/jeps/421
+
+Deprecate finalization for removal in a future release. Finalization
+remains enabled by default for now, but can be disabled to facilitate
+early testing. In a future release it will be disabled by default, and
+in a later release it will be removed. Maintainers of libraries and
+applications that rely upon finalization should consider migrating to
+other resource management techniques such as the try-with-resources
+statement and cleaners.
+
Deprecate the Windows 32-bit x86 Port for Removal
=================================================
https://openjdk.org/jeps/449
@@ -230,4 +499,3 @@ JVM. These warnings aim to prepare users for a future release which
disallows the dynamic loading of agents by default in order to improve
integrity by default. Serviceability tools that load agents at startup
will not cause warnings to be issued in any release.
-
diff --git a/discover_trees.sh b/discover_trees.sh
new file mode 100755
index 0000000..8c31278
--- /dev/null
+++ b/discover_trees.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# Copyright (C) 2020 Red Hat, Inc.
+# Written by Andrew John Hughes <gnu.andrew(a)redhat.com>.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+TREE=${1}
+
+if test "x${TREE}" = "x"; then
+ TREE=${PWD}
+fi
+
+if [ -e ${TREE}/nashorn/.hg -o -e ${TREE}/nashorn/merge.changeset ] ; then
+ NASHORN="nashorn" ;
+fi
+
+if [ -e ${TREE}/corba/.hg -o -e ${TREE}/corba/merge.changeset ] ; then
+ CORBA="corba";
+fi
+
+if [ -e ${TREE}/jaxp/.hg -o -e ${TREE}/jaxp/merge.changeset ] ; then
+ JAXP="jaxp";
+fi
+
+if [ -e ${TREE}/jaxws/.hg -o -e ${TREE}/jaxws/merge.changeset ] ; then
+ JAXWS="jaxws";
+fi
+
+if [ -e ${TREE}/langtools/.hg -o -e ${TREE}/langtools/merge.changeset ] ; then
+ LANGTOOLS="langtools";
+fi
+
+if [ -e ${TREE}/jdk/.hg -o -e ${TREE}/jdk/merge.changeset ] ; then
+ JDK="jdk";
+fi
+
+if [ -e ${TREE}/hotspot/.hg -o -e ${TREE}/hotspot/merge.changeset ] ; then
+ HOTSPOT="hotspot";
+fi
+
+SUBTREES="${CORBA} ${JAXP} ${JAXWS} ${LANGTOOLS} ${NASHORN} ${JDK} ${HOTSPOT}";
+echo ${SUBTREES}
diff --git a/fips-21u-75ffdc48eda.patch b/fips-21u-75ffdc48eda.patch
index 7ffbe3a..8413fe1 100644
--- a/fips-21u-75ffdc48eda.patch
+++ b/fips-21u-75ffdc48eda.patch
@@ -4231,4 +4231,3 @@ index 00000000000..87f1ad04505
+ }
+ }
+}
-
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index f27158d..5d6efd9 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -6,10 +6,9 @@
# If your local repo follows upstream forests conventions, it may be enough to set OPENJDK_URL
#
# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
-# BOOT_JDK=/usr/lib/jvm/java-20-openjdk
# PROJECT_NAME=openjdk
# REPO_NAME=jdk21u
-# VERSION=jdk-21+35
+# VERSION=jdk-21.0.1+12
# or to eg prepare systemtap:
# icedtea7's jstack and other tapsets
# VERSION=6327cf1cea9e
@@ -36,13 +35,13 @@ if [ "x$1" = "xhelp" ] ; then
VERSION="<unspecified>";
fi
echo -e "Behaviour may be specified by setting the following variables:\n"
- echo "VERSION - the version of the specified OpenJDK project (current value: ${VERSION})"
+ echo "VERSION - the version of the specified OpenJDK project"
echo "PROJECT_NAME -- the name of the OpenJDK project being archived (optional; only needed by defaults)"
echo "REPO_NAME - the name of the OpenJDK repository (optional; only needed by defaults)"
echo "OPENJDK_URL - the URL to retrieve code from (optional; defaults to ${OPENJDK_URL_DEFAULT})"
echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
- echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to open${VERSION})"
- echo "REPO_ROOT - the location of the Git repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
+ echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
+ echo "REPO_ROOT - the location of the Git repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME.git)"
echo "TO_COMPRESS - what part of clone to pack (default is ${VERSION})"
echo "BOOT_JDK - the bootstrap JDK to satisfy the configure run"
exit 1;
@@ -111,7 +110,7 @@ fi
echo "Creating a tar.${COMPRESSION} archive"
if [ "x$FILE_NAME_ROOT" = "x" ] ; then
- FILE_NAME_ROOT=open${VERSION}
+ FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
echo "No file name root specified; default to ${FILE_NAME_ROOT}"
fi
if [ "x$REPO_ROOT" = "x" ] ; then
@@ -121,7 +120,7 @@ fi;
if [ "x$TO_COMPRESS" = "x" ] ; then
TO_COMPRESS="${VERSION}"
- echo "No targets to be compressed specified, ; default to ${TO_COMPRESS}"
+ echo "No targets to be compressed specified ; default to ${TO_COMPRESS}"
fi;
echo -e "Settings:"
@@ -147,6 +146,7 @@ else
popd
fi
pushd "${FILE_NAME_ROOT}"
+
# Generate .src-rev so build has knowledge of the revision the tarball was created from
mkdir build
pushd build
@@ -161,17 +161,17 @@ pushd "${FILE_NAME_ROOT}"
# Remove history and GHA
echo "find ${VERSION} -name '.hgtags'"
- find ${VERSION} -name '.hgtags' -exec rm -v '{}' '+'
+ find ${VERSION} -name '.hgtags' -exec rm -fv '{}' '+'
echo "find ${VERSION} -name '.hgignore'"
- find ${VERSION} -name '.hgignore' -exec rm -v '{}' '+'
+ find ${VERSION} -name '.hgignore' -exec rm -fv '{}' '+'
echo "find ${VERSION} -name '.gitattributes'"
- find ${VERSION} -name '.gitattributes' -exec rm -v '{}' '+'
+ find ${VERSION} -name '.gitattributes' -exec rm -fv '{}' '+'
echo "find ${VERSION} -name '.gitignore'"
- find ${VERSION} -name '.gitignore' -exec rm -v '{}' '+'
+ find ${VERSION} -name '.gitignore' -exec rm -fv '{}' '+'
echo "find ${VERSION} -name '.git'"
- find ${VERSION} -name '.git' -exec rm -rv '{}' '+'
+ find ${VERSION} -name '.git' -exec rm -rfv '{}' '+'
echo "find ${VERSION} -name '.github'"
- find ${VERSION} -name '.github' -exec rm -rv '{}' '+'
+ find ${VERSION} -name '.github' -exec rm -rfv '{}' '+'
echo "Compressing remaining forest"
if [ "X$COMPRESSION" = "Xxz" ] ; then
diff --git a/icedtea_sync.sh b/icedtea_sync.sh
index e5c54f3..c1b8f6a 100755
--- a/icedtea_sync.sh
+++ b/icedtea_sync.sh
@@ -1,192 +1 @@
-#!/bin/bash
-
-# Copyright (C) 2019 Red Hat, Inc.
-# Written by Andrew John Hughes <gnu.andrew(a)redhat.com>.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-ICEDTEA_USE_VCS=true
-
-ICEDTEA_VERSION=3.15.0
-ICEDTEA_URL=https://icedtea.classpath.org/download/source
-ICEDTEA_SIGNING_KEY=CFDA0F9B35964222
-
-ICEDTEA_HG_URL=https://icedtea.classpath.org/hg/icedtea11
-
-set -e
-
-RPM_DIR=${PWD}
-if [ ! -f ${RPM_DIR}/jconsole.desktop.in ] ; then
- echo "Not in RPM source tree.";
- exit 1;
-fi
-
-if test "x${TMPDIR}" = "x"; then
- TMPDIR=/tmp;
-fi
-WORKDIR=${TMPDIR}/it.sync
-
-echo "Using working directory ${WORKDIR}"
-mkdir ${WORKDIR}
-pushd ${WORKDIR}
-
-if test "x${WGET}" = "x"; then
- WGET=$(which wget);
- if test "x${WGET}" = "x"; then
- echo "wget not found";
- exit 1;
- fi
-fi
-
-if test "x${TAR}" = "x"; then
- TAR=$(which tar)
- if test "x${TAR}" = "x"; then
- echo "tar not found";
- exit 2;
- fi
-fi
-
-echo "Dependencies:";
-echo -e "\tWGET: ${WGET}";
-echo -e "\tTAR: ${TAR}\n";
-
-if test "x${ICEDTEA_USE_VCS}" = "xtrue"; then
- echo "Mode: Using VCS";
-
- if test "x${GREP}" = "x"; then
- GREP=$(which grep);
- if test "x${GREP}" = "x"; then
- echo "grep not found";
- exit 3;
- fi
- fi
-
- if test "x${CUT}" = "x"; then
- CUT=$(which cut);
- if test "x${CUT}" = "x"; then
- echo "cut not found";
- exit 4;
- fi
- fi
-
- if test "x${TR}" = "x"; then
- TR=$(which tr);
- if test "x${TR}" = "x"; then
- echo "tr not found";
- exit 5;
- fi
- fi
-
- if test "x${HG}" = "x"; then
- HG=$(which hg);
- if test "x${HG}" = "x"; then
- echo "hg not found";
- exit 6;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tGREP: ${GREP}";
- echo -e "\tCUT: ${CUT}";
- echo -e "\tTR: ${TR}";
- echo -e "\tHG: ${HG}";
-
- echo "Checking out repository from VCS...";
- ${HG} clone ${ICEDTEA_HG_URL} icedtea
-
- echo "Obtaining version from configure.ac...";
- ROOT_VER=$(${GREP} '^AC_INIT' icedtea/configure.ac|${CUT} -d ',' -f 2|${TR} -d '[][:space:]')
- echo "Root version from configure: ${ROOT_VER}";
-
- VCS_REV=$(${HG} log -R icedtea --template '{node|short}' -r tip)
- echo "VCS revision: ${VCS_REV}";
-
- ICEDTEA_VERSION="${ROOT_VER}-${VCS_REV}"
- echo "Creating icedtea-${ICEDTEA_VERSION}";
- mkdir icedtea-${ICEDTEA_VERSION}
- echo "Copying required files from checkout to icedtea-${ICEDTEA_VERSION}";
- # Commented out for now as IcedTea 6's jconsole.desktop.in is outdated
- #cp -a icedtea/jconsole.desktop.in ../icedtea-${ICEDTEA_VERSION}
- cp -a ${RPM_DIR}/jconsole.desktop.in icedtea-${ICEDTEA_VERSION}
- cp -a icedtea/tapset icedtea-${ICEDTEA_VERSION}
-
- rm -rf icedtea
-else
- echo "Mode: Using tarball";
-
- if test "x${ICEDTEA_VERSION}" = "x"; then
- echo "No IcedTea version specified for tarball download.";
- exit 3;
- fi
-
- if test "x${CHECKSUM}" = "x"; then
- CHECKSUM=$(which sha256sum)
- if test "x${CHECKSUM}" = "x"; then
- echo "sha256sum not found";
- exit 4;
- fi
- fi
-
- if test "x${PGP}" = "x"; then
- PGP=$(which gpg)
- if test "x${PGP}" = "x"; then
- echo "gpg not found";
- exit 5;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tCHECKSUM: ${CHECKSUM}";
- echo -e "\tPGP: ${PGP}\n";
-
- echo "Checking for IcedTea signing key ${ICEDTEA_SIGNING_KEY}...";
- if ! gpg --list-keys ${ICEDTEA_SIGNING_KEY}; then
- echo "IcedTea signing key ${ICEDTEA_SIGNING_KEY} not installed.";
- exit 6;
- fi
-
- echo "Downloading IcedTea release tarball...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz
- echo "Downloading IcedTea tarball signature...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- echo "Downloading IcedTea tarball checksums...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Verifying checksums...";
- ${CHECKSUM} --check --ignore-missing icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Checking signature...";
- ${PGP} --verify icedtea-${ICEDTEA_VERSION}.tar.xz.sig
-
- echo "Extracting files...";
- ${TAR} xJf icedtea-${ICEDTEA_VERSION}.tar.xz \
- icedtea-${ICEDTEA_VERSION}/tapset \
- icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in
-
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- rm -vf icedtea-${ICEDTEA_VERSION}.sha256
-fi
-
-echo "Replacing desktop files...";
-mv -v icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in ${RPM_DIR}
-
-echo "Creating new tapset tarball...";
-mv -v icedtea-${ICEDTEA_VERSION} openjdk
-${TAR} cJf ${RPM_DIR}/tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz openjdk
-
-rm -rvf openjdk
-
-popd
-rm -rf ${WORKDIR}
+# this file is intentionally not here, as portable builds do not have desktop integration
diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec
index 8a3b968..f487843 100644
--- a/java-latest-openjdk-portable.spec
+++ b/java-latest-openjdk-portable.spec
@@ -1,8 +1,3 @@
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-# portable jdk 17 specific bug, _jvmdir being missing
-%define _jvmdir /usr/lib/jvm
-%endif
-
# debug_package %%{nil} is portable-jdks specific
%define debug_package %{nil}
@@ -41,8 +36,6 @@
%define __os_install_post %{nil}
%endif
-%global unpacked_licenses %{_datarootdir}/licenses
-
# Workaround for stripping of debug symbols from static libraries
%if %{with staticlibs}
%define __brp_strip_static_archive %{nil}
@@ -66,10 +59,6 @@
# See: https://bugzilla.redhat.com/show_bug.cgi?id=1520879
%global _find_debuginfo_opts -g
-# With LTO flags enabled, debuginfo checks fail for some reason. Disable
-# LTO for a passing build. This really needs to be looked at.
-%define _lto_cflags %{nil}
-
# note: parametrized macros are order-sensitive (unlike not-parametrized) even with normal macros
# also necessary when passing it as parameter to other macros. If not macro, then it is considered a switch
# see the difference between global and define:
@@ -147,9 +136,9 @@
# Set of architectures which support the serviceability agent
%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm}
# Set of architectures which support class data sharing
-# See https://bugzilla.redhat.com/show_bug.cgi?id=513605
-# MetaspaceShared::generate_vtable_methods is not implemented for the PPC JIT
-%global share_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{arm} s390x
+# As of JDK-8005165 in OpenJDK 10, class sharing is not arch-specific
+# However, it does segfault on the Zero assembler port, so currently JIT only
+%global share_arches %{jit_arches}
# Set of architectures for which we build the Shenandoah garbage collector
%global shenandoah_arches x86_64 %{aarch64}
# Set of architectures for which we build the Z garbage collector
@@ -166,7 +155,7 @@
%global gdb_arches %{jit_arches} %{zero_arches}
%endif
-# By default, we build a debug build during main build on JIT architectures
+# By default, we build a slowdebug build during main build on JIT architectures
%if %{with slowdebug}
%ifarch %{debug_arches}
%global include_debug_build 1
@@ -237,17 +226,24 @@
%global static_libs_target %{nil}
%endif
-# RPM JDK builds keep the debug symbols internal, to be later stripped by RPM
-%global debug_symbols internal
-
-# unlike portables,the rpms have to use static_libs_target very dynamically
-%global bootstrap_targets images legacy-jre-image
-%global release_targets images docs-zip legacy-jre-image
+# The static libraries are produced under the same configuration as the main
+# build for portables, as we expect in-tree libraries to be used throughout.
+# If system libraries are enabled, the static libraries will also use them
+# which may cause issues.
+%global bootstrap_targets images %{static_libs_target} legacy-jre-image
+%global release_targets images docs-zip %{static_libs_target} legacy-jre-image
# No docs nor bootcycle for debug builds
-%global debug_targets images legacy-jre-image
+%global debug_targets images %{static_libs_target} legacy-jre-image
# Target to use to just build HotSpot
%global hotspot_target hotspot
+# DTS toolset to use to provide gcc & binutils
+%global dtsversion 10
+
+# Disable LTO as this causes build failures at the moment.
+# See RHBZ#1861401
+%define _lto_cflags %{nil}
+
# Filter out flags from the optflags macro that cause problems with the OpenJDK build
# We filter out -O flags so that the optimization of HotSpot is not lowered from O3 to O2
# We filter out -Wall which will otherwise cause HotSpot to produce hundreds of thousands of warnings (100+mb logs)
@@ -327,20 +323,20 @@
# New Version-String scheme-style defines
%global featurever 21
%global interimver 0
-%global updatever 0
+%global updatever 1
%global patchver 0
# buildjdkver is usually same as %%{featurever},
# but in time of bootstrap of next jdk, it is featurever-1,
# and this it is better to change it here, on single place
-%global buildjdkver 21
+%global buildjdkver %{featurever}
# We don't add any LTS designator for STS packages (Fedora and EPEL).
# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
%if 0%{?rhel} && !0%{?epel}
%global lts_designator "LTS"
%global lts_designator_zip -%{lts_designator}
%else
- %global lts_designator ""
- %global lts_designator_zip ""
+ %global lts_designator ""
+ %global lts_designator_zip ""
%endif
# JDK to use for bootstrapping
%global bootjdk /usr/lib/jvm/java-%{buildjdkver}-openjdk
@@ -366,26 +362,34 @@
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{name}&…
%else
%if 0%{?rhel}
-%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20…
+%global oj_vendor_bug_url https://access.redhat.com/support/cases/
%else
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi
%endif
%endif
%endif
-%global oj_vendor_version (Red_Hat-%{version}-%{release})
+%global oj_vendor_version (Red_Hat-%{version}-%{rpmrelease})
# Define IcedTea version used for SystemTap tapsets and desktop file
%global icedteaver 6.0.0pre00-c848b93a8598
# Define current Git revision for the FIPS support patches
%global fipsver 75ffdc48eda
+# Define JDK versions
+%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
+%global javaver %{featurever}
+# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
+%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
+# The tag used to create the OpenJDK tarball
+%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Standard JPackage naming and versioning defines
%global origin openjdk
%global origin_nice OpenJDK
%global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
-%global buildver 35
-%global rpmrelease 4
+%global buildver 12
+%global rpmrelease 2
+#%%global tagsuffix %%{nil}
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -398,14 +402,6 @@
# for techpreview, using 1, so slowdebugs can have 0
%global priority %( printf '%08d' 1 )
%endif
-%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
-%global javaver %{featurever}
-
-# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
-%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
-
-# The tag used to create the OpenJDK tarball
-%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Define milestone (EA for pre-releases, GA for releases)
# Release will be (where N is usually a number starting at 1):
@@ -415,7 +411,7 @@
%if %{is_ga}
%global build_type GA
%global ea_designator ""
-%global ea_designator_zip ""
+%global ea_designator_zip %{nil}
%global extraver %{nil}
%global eaprefix %{nil}
%else
@@ -438,7 +434,9 @@
%global static_libs_install_dir %{static_libs_arch_dir}/glibc
# output dir stub
%define buildoutputdir() %{expand:build/jdk%{featurever}.build%{?1}}
+%define installoutputdir() %{expand:install/jdk%{featurever}.install%{?1}}
%global altjavaoutputdir install/altjava.install
+%define packageoutputdir() %{expand:packages/jdk%{featurever}.packages%{?1}}
# we can copy the javadoc to not arched dir, or make it not noarch
%define uniquejavadocdir() %{expand:%{fullversion}.%{_arch}%{?1}}
# main id and dir of this jdk
@@ -459,6 +457,8 @@
# Intentionally use jdkportablenameimpl here since we want to have static-libs files overlayed on
# top of the JDK archive
%define staticlibsportablename() %{expand:%{jdkportablenameimpl -- %%{1}}}
+%define docportablename() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable.docs;g" | sed "s;openjdkportable;el;g")
+%define docportablearchive() %{docportablename}.tar.xz
%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable.misc;g" | sed "s;openjdkportable;el;g")
%define miscportablearchive() %{miscportablename}.tar.xz
@@ -490,6 +490,12 @@
%global __requires_exclude ^(%{_privatelibs}|%{_publiclibs})$
%endif
+# VM variant being built
+%ifarch %{zero_arches}
+%global vm_variant zero
+%else
+%global vm_variant server
+%endif
%global etcjavasubdir %{_sysconfdir}/java/java-%{javaver}-%{origin}
%define etcjavadir() %{expand:%{etcjavasubdir}/%{uniquesuffix -- %{?1}}}
@@ -512,29 +518,8 @@
%global alternatives_requires %{_sbindir}/alternatives
%endif
-%if %{with_systemtap}
-# Where to install systemtap tapset (links)
-# We would like these to be in a package specific sub-dir,
-# but currently systemtap doesn't support that, so we have to
-# use the root tapset dir for now. To distinguish between 64
-# and 32 bit architectures we place the tapsets under the arch
-# specific dir (note that systemtap will only pickup the tapset
-# for the primary arch for now). Systemtap uses the machine name
-# aka target_cpu as architecture specific directory name.
-%global tapsetroot /usr/share/systemtap
-%global tapsetdirttapset %{tapsetroot}/tapset/
-%global tapsetdir %{tapsetdirttapset}/%{stapinstall}
-%endif
-
-# x86 is no longer supported
-%if 0%{?java_arches:1}
-ExclusiveArch: %{java_arches}
-%else
-ExcludeArch: %{ix86}
-%endif
-
-# Portables have no rpo (requires/provides), but thsoe are awesome for orientation in spec
-# also scriptlets are hapily missing and files are handled old fashion
+# Portables have no repo (requires/provides), but these are awesome for orientation in spec
+# Also scriptlets are happily missing and files are handled old fashion
# not-duplicated requires/provides/obsoletes for normal/debug packages
%define java_rpo() %{expand:
}
@@ -545,16 +530,18 @@ ExcludeArch: %{ix86}
%define java_static_libs_rpo() %{expand:
}
+%define java_unstripped_rpo() %{expand:
+}
+
+%define java_docs_rpo() %{expand:
+}
+
%define java_misc_rpo() %{expand:
}
# Prevent brp-java-repack-jars from being run
%global __jar_repack 0
-# portables have grown out of its component, moving back to java-x-vendor
-# this expression, when declared as global, filled component with java-x-vendor portable
-%define component %(echo %{name} | sed "s;-portable;;g")
-
Name: java-latest-%{origin}-portable
Version: %{newjavaver}.%{buildver}
# This package needs `.rolling` as part of Release so as to not conflict on install with
@@ -572,6 +559,11 @@ Release: %{?eaprefix}%{rpmrelease}%{?extraver}.rolling%{?dist}
# provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0".
Epoch: 1
+
+# portables have grown out of its component, moving back to java-x-vendor
+# this expression, when declared as global, filled component with java-x-vendor portable
+%define component %(echo %{name} | sed "s;-portable;;g")
+
Summary: %{origin_nice} %{featurever} Runtime Environment portable edition
# Groups are only used up to RHEL 8 and on Fedora versions prior to F30
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
@@ -595,9 +587,8 @@ Group: Development/Languages
License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib and ISC and FTL and RSA
URL: http://openjdk.java.net/
-
# The source tarball, generated using generate_source_tarball.sh
-Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}.tar.xz
+Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}%{ea_desi…
# Use 'icedtea_sync.sh' to update the following
# They are based on code contained in the IcedTea project (6.x).
@@ -616,8 +607,7 @@ Source10: NEWS
Source11: alt-java.c
# Removed libraries that we link instead
-# Disabled in portables
-#Source12: remove-intree-libraries.sh
+Source12: remove-intree-libraries.sh
# Ensure we aren't using the limited crypto policy
Source13: TestCryptoLevel.java
@@ -634,14 +624,6 @@ Source16: CheckVendor.java
# Ensure translations are available for new timezones
Source18: TestTranslations.java
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-# boot jdk for portable build root on
-Source1001: ojdk17-aarch64-17.35.tar.gz
-Source1002: ojdk17-ppc64le-17.35.tar.gz
-Source1003: ojdk17-x86_64-17.35.tar.gz
-Source1004: ojdk17-s390x-17.35.tar.gz
-%endif
-
############################################
#
# RPM/distribution specific patches
@@ -691,16 +673,29 @@ Patch1001: fips-%{featurever}u-%{fipsver}.patch
# OpenJDK patches in need of upstreaming
#
#############################################
+
# JDK-8009550, RH910107: Depend on pcsc-lite-libs instead of pcsc-lite-devel as this is only in optional repo
# PR: https://github.com/openjdk/jdk/pull/15409
Patch6: jdk8009550-rh910107-fail_to_load_pcsc_library.patch
+# Currently empty
+
#############################################
#
# OpenJDK patches which missed last update
#
#############################################
-#empty now
+
+# JDK-8311630: [s390] Implementation of Foreign Function & Memory API (Preview)
+Patch100: jdk8311630-s390_ffmapi.patch
+
+#############################################
+#
+# Portable build specific patches
+#
+#############################################
+
+# Currently empty
BuildRequires: autoconf
BuildRequires: automake
@@ -710,11 +705,11 @@ BuildRequires: cups-devel
BuildRequires: desktop-file-utils
# elfutils only are OK for build without AOT
BuildRequires: elfutils-devel
+BuildRequires: file
BuildRequires: fontconfig-devel
-BuildRequires: freetype-devel
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-BuildRequires: devtoolset-8-gcc
-BuildRequires: devtoolset-8-gcc-c++
+BuildRequires: devtoolset-%{dtsversion}-gcc
+BuildRequires: devtoolset-%{dtsversion}-gcc-c++
%else
BuildRequires: gcc
# gcc-c++ is already needed
@@ -737,9 +732,8 @@ BuildRequires: libXtst-devel
# Requirement for setting up nss.fips.cfg
BuildRequires: nss-devel
# Requirement for system security property test
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-BuildRequires: crypto-policies
-%endif
+#N/A
+#BuildRequires: crypto-policies
BuildRequires: pkgconfig
BuildRequires: xorg-x11-proto-devel
BuildRequires: zip
@@ -758,7 +752,6 @@ BuildRequires: libffi-devel
%endif
# 2023c required as of JDK-8305113
BuildRequires: tzdata-java >= 2023c
-
# cacerts build requirement in portable mode
BuildRequires: ca-certificates
# Earlier versions have a bug in tree vectorization on PPC
@@ -777,18 +770,18 @@ BuildRequires: lcms2-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
%else
-# Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h
-Provides: bundled(freetype) = 2.12.1
+# Version in src/java.desktop/share/legal/freetype.md
+Provides: bundled(freetype) = 2.13.0
# Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
Provides: bundled(giflib) = 5.2.1
# Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
-Provides: bundled(harfbuzz) = 4.4.1
+Provides: bundled(harfbuzz) = 7.2.0
# Version in src/java.desktop/share/native/liblcms/lcms2.h
-Provides: bundled(lcms2) = 2.12.0
+Provides: bundled(lcms2) = 2.15.0
# Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
Provides: bundled(libjpeg) = 6b
# Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h
-Provides: bundled(libpng) = 1.6.37
+Provides: bundled(libpng) = 1.6.39
# We link statically against libstdc++ to increase portability
BuildRequires: libstdc++-static
%endif
@@ -863,7 +856,7 @@ Group: Development/Tools
%{java_devel_rpo -- %{fastdebug_suffix_unquoted}}
%description devel-fastdebug
-The %{origin_nice} %{featurever} development tools - portable edition.
+The %{origin_nice} %{featurever} runtime environment and development tools - portable edition
%{fastdebug_warning}
%endif
@@ -871,7 +864,7 @@ The %{origin_nice} %{featurever} development tools - portable edition.
%if %{include_normal_build}
%package static-libs
-Summary: %{origin_nice} %{featurever} libraries for static linking - portable edition.
+Summary: %{origin_nice} %{featurever} libraries for static linking - portable edition
%{java_static_libs_rpo %{nil}}
@@ -886,7 +879,7 @@ Summary: %{origin_nice} %{featurever} libraries for static linking - portable ed
%{java_static_libs_rpo -- %{debug_suffix_unquoted}}
%description static-libs-slowdebug
-The %{origin_nice} %{featurever} libraries for static linking - portable edition.
+The %{origin_nice} %{featurever} libraries for static linking - portable edition
%{debug_warning}
%endif
@@ -897,13 +890,32 @@ Summary: %{origin_nice} %{featurever} libraries for static linking - portable ed
%{java_static_libs_rpo -- %{fastdebug_suffix_unquoted}}
%description static-libs-fastdebug
-The %{origin_nice} %{featurever} libraries for static linking - portable edition.
+The %{origin_nice} %{featurever} libraries for static linking - portable edition
%{fastdebug_warning}
%endif
# staticlibs
%endif
+%if %{include_normal_build}
+%package unstripped
+Summary: The %{origin_nice} %{featurever} runtime environment.
+
+%{java_unstripped_rpo %{nil}}
+
+%description unstripped
+The %{origin_nice} %{featurever} runtime environment.
+
+%endif
+
+%package docs
+Summary: %{origin_nice} %{featurever} API documentation
+
+%{java_docs_rpo %{nil}}
+
+%description docs
+The %{origin_nice} %{featurever} API documentation.
+
%package misc
Summary: %{origin_nice} %{featurever} miscellany
@@ -923,10 +935,10 @@ The %{origin_nice} %{featurever} full patched sources of portable JDK to build,
echo "Preparing %{oj_vendor_version}"
# Using the echo macro breaks rpmdev-bumpspec, as it parses the first line of stdout :-(
-%if 0%{?stapinstall:1}
- echo "CPU: %{_target_cpu}, arch install directory: %{archinstall}, SystemTap install directory: %{stapinstall}"
+%if 0%{?_build_cpu:1}
+ echo "CPU: %{_target_cpu}, arch install directory: %{archinstall}, SystemTap install directory: %{_build_cpu}"
%else
- %{error:Unrecognised architecture %{_target_cpu}}
+ %{error:Unrecognised architecture %{_build_cpu}}
%endif
if [ %{include_normal_build} -eq 0 -o %{include_normal_build} -eq 1 ] ; then
@@ -947,7 +959,6 @@ else
echo "include_fastdebug_build is %{include_fastdebug_build}, that is invalid. Use 1 for yes or 0 for no"
exit 13
fi
-
if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 -a %{include_fastdebug_build} -eq 0 ] ; then
echo "You have disabled all builds (normal,fastdebug,slowdebug). That is a no go."
exit 14
@@ -979,8 +990,11 @@ pushd %{top_level_dir_name}
%patch1001 -p1
# Patches in need of upstreaming
%patch6 -p1
+# Patches in next release
+%patch100 -p1
popd # openjdk
+
# The OpenJDK version file includes the current
# upstream version information. For some reason,
# configure does not automatically use the
@@ -1001,59 +1015,12 @@ if [ "x${UPSTREAM_EA_DESIGNATOR}" != "x%{ea_designator}" ] ; then
exit 17
fi
-# Extract systemtap tapsets
-%if %{with_systemtap}
-tar --strip-components=1 -x -I xz -f %{SOURCE8}
-%if %{include_debug_build}
-cp -r tapset tapset%{debug_suffix}
-%endif
-%if %{include_fastdebug_build}
-cp -r tapset tapset%{fastdebug_suffix}
-%endif
-
-for suffix in %{build_loop} ; do
- for file in "tapset"$suffix/*.in; do
- OUTPUT_FILE=`echo $file | sed -e "s:\.stp\.in$:-%{version}-%{release}.%{_arch}.stp:g"`
- sed -e "s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/server/libjvm.so:g" $file > $file.1
- sed -e "s:@JAVA_SPEC_VER@:%{javaver}:g" $file.1 > $file.2
-# TODO find out which architectures other than i686 have a client vm
-%ifarch %{ix86}
- sed -e "s:@ABS_CLIENT_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/client/libjvm.so:g" $file.2 > $OUTPUT_FILE
-%else
- sed -e "/@ABS_CLIENT_LIBJVM_SO@/d" $file.2 > $OUTPUT_FILE
-%endif
- sed -i -e "s:@ABS_JAVA_HOME_DIR@:%{_jvmdir}/%{sdkdir -- $suffix}:g" $OUTPUT_FILE
- sed -i -e "s:@INSTALL_ARCH_DIR@:%{archinstall}:g" $OUTPUT_FILE
- sed -i -e "s:@prefix@:%{_jvmdir}/%{sdkdir -- $suffix}/:g" $OUTPUT_FILE
- done
-done
-# systemtap tapsets ends
-%endif
+# Systemtap is processed in rpms
# Prepare desktop files
# Portables do not have desktop integration
%build
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-mkdir bootjdk
-pushd bootjdk
-%ifarch %{aarch64}
-tar --strip-components=1 -xf %{SOURCE1001}
-%endif
-%ifarch %{ppc64le}
-tar --strip-components=1 -xf %{SOURCE1002}
-%endif
-%ifarch x86_64
-tar --strip-components=1 -xf %{SOURCE1003}
-%endif
-%ifarch s390x
-tar --strip-components=1 -xf %{SOURCE1004}
-%endif
-BOOT_JDK=$PWD
-popd
-%else
-BOOT_JDK=%{bootjdk}
-%endif
# How many CPU's do we have?
export NUM_PROC=%(/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :)
@@ -1091,12 +1058,15 @@ echo "Building %{SOURCE11}"
mkdir -p %{altjavaoutputdir}
gcc ${EXTRA_CFLAGS} -o %{altjavaoutputdir}/%{alt_java_name} %{SOURCE11}
+echo "Building %{newjavaver}-%{buildver}, pre=%{ea_designator}, opt=%{lts_designator}"
+
function buildjdk() {
local outputdir=${1}
local buildjdk=${2}
local maketargets="${3}"
local debuglevel=${4}
local link_opt=${5}
+ local debug_symbols=${6}
local top_dir_abs_src_path=$(pwd)/%{top_level_dir_name}
local top_dir_abs_build_path=$(pwd)/${outputdir}
@@ -1115,6 +1085,7 @@ function buildjdk() {
echo "Using make targets: ${maketargets}"
echo "Using debuglevel: ${debuglevel}"
echo "Using link_opt: ${link_opt}"
+ echo "Using debug_symbols: ${debug_symbols}"
echo "Building %{newjavaver}-%{buildver}, pre=%{ea_designator}, opt=%{lts_designator}"
mkdir -p ${outputdir}
@@ -1125,7 +1096,7 @@ function buildjdk() {
# are always used in a system_libs build, even
# for the static library build
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
- scl enable devtoolset-8 -- bash ${top_dir_abs_src_path}/configure \
+ scl enable devtoolset-%{dtsversion} -- bash ${top_dir_abs_src_path}/configure \
%else
bash ${top_dir_abs_src_path}/configure \
%endif
@@ -1145,7 +1116,7 @@ function buildjdk() {
--with-vendor-vm-bug-url="%{oj_vendor_bug_url}" \
--with-boot-jdk=${buildjdk} \
--with-debug-level=${debuglevel} \
- --with-native-debug-symbols="%{debug_symbols}" \
+ --with-native-debug-symbols="${debug_symbols}" \
--disable-sysconf-nss \
--enable-unlimited-crypto \
--with-zlib=%{link_type} \
@@ -1169,7 +1140,7 @@ function buildjdk() {
cat spec.gmk
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
- scl enable devtoolset-8 -- make \
+ scl enable devtoolset-%{dtsversion} -- make \
%else
make \
%endif
@@ -1177,109 +1148,117 @@ function buildjdk() {
WARNINGS_ARE_ERRORS="-Wno-error" \
CFLAGS_WARNINGS_ARE_ERRORS="-Wno-error" \
$maketargets || ( pwd; find ${top_dir_abs_src_path} ${top_dir_abs_build_path} -name "hs_err_pid*.log" | xargs cat && false )
-
popd
}
-function installjdk() {
- local imagepath=${1}
-
- if [ -d ${imagepath} ] ; then
- # the build (erroneously) removes read permissions from some jars
- # this is a regression in OpenJDK 7 (our compiler):
- # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
- find ${imagepath} -iname '*.jar' -exec chmod ugo+r {} \;
-
- # Build screws up permissions on binaries
- # https://bugs.openjdk.java.net/browse/JDK-8173610
- find ${imagepath} -iname '*.so' -exec chmod +x {} \;
- find ${imagepath}/bin/ -exec chmod +x {} \;
-
- # Create fake alt-java as a placeholder for future alt-java
- if [ -d man/man1 ] ; then
- pushd ${imagepath}
- # add alt-java man page
- echo "Hardened java binary recommended for launching untrusted code from the Web e.g. javaws" > man/man1/%{alt_java_name}.1
- cat man/man1/java.1 >> man/man1/%{alt_java_name}.1
- popd
- fi
- fi
-}
-
-# Checks on debuginfo must be performed before the files are stripped
-# by the RPM installation stage
-function debugcheckjdk() {
- local imagepath=${1}
-
- if [ -d ${imagepath} ] ; then
-
- so_suffix="so"
- # Check debug symbols are present and can identify code
- find "${imagepath}" -iname "*.$so_suffix" -print0 | while read -d $'\0' lib
- do
- if [ -f "$lib" ] ; then
- echo "Testing $lib for debug symbols"
- # All these tests rely on RPM failing the build if the exit code of any set
- # of piped commands is non-zero.
-
- # Test for .debug_* sections in the shared object. This is the main test
- # Stripped objects will not contain these
- eu-readelf -S "$lib" | grep "] .debug_"
- test $(eu-readelf -S "$lib" | grep -E "\]\ .debug_(info|abbrev)" | wc --lines) == 2
-
- # Test FILE symbols. These will most likely be removed by anything that
- # manipulates symbol tables because it's generally useless. So a nice test
- # that nothing has messed with symbols
- old_IFS="$IFS"
- IFS=$'\n'
- for line in $(eu-readelf -s "$lib" | grep "00000000 0 FILE LOCAL DEFAULT")
- do
- # We expect to see .cpp and .S files, except for architectures like aarch64 and
- # s390 where we expect .o and .oS files
- echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|S|oS))?$"
- done
- IFS="$old_IFS"
-
- # If this is the JVM, look for javaCalls.(cpp|o) in FILEs, for extra sanity checking
- if [ "`basename $lib`" = "libjvm.so" ]; then
- eu-readelf -s "$lib" | \
- grep -E "00000000 0 FILE LOCAL DEFAULT ABS javaCalls.(cpp|o)$"
- fi
-
- # Test that there are no .gnu_debuglink sections pointing to another
- # debuginfo file. There shouldn't be any debuginfo files, so the link makes
- # no sense either
- eu-readelf -S "$lib" | grep 'gnu'
- if eu-readelf -S "$lib" | grep "\] .gnu_debuglink" | grep PROGBITS; then
- echo "bad .gnu_debuglink section."
- eu-readelf -x .gnu_debuglink "$lib"
- false
- fi
+function stripjdk() {
+ local outputdir=${1}
+ local jdkimagepath=${outputdir}/images/%{jdkimage}
+ local jreimagepath=${outputdir}/images/%{jreimage}
+ local jmodimagepath=${outputdir}/images/jmods
+ local supportdir=${outputdir}/support
+
+ if [ "x$suffix" = "x" ] ; then
+ # Keep the unstripped version for consumption by RHEL RPMs
+ cp -a ${jdkimagepath}{,.unstripped}
+
+ # Strip the files
+ for file in $(find ${jdkimagepath} ${jreimagepath} ${supportdir} -type f) ; do
+ if file ${file} | grep -q 'ELF'; then
+ noextfile=${file/.so/};
+ objcopy --only-keep-debug ${file} ${noextfile}.debuginfo;
+ objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file};
+ strip -g ${file};
fi
done
- # Make sure gdb can do a backtrace based on line numbers on libjvm.so
- # javaCalls.cpp:58 should map to:
- # http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/…
- # Using line number 1 might cause build problems. See:
- # https://bugzilla.redhat.com/show_bug.cgi?id=1539664
- # https://bugzilla.redhat.com/show_bug.cgi?id=1538767
- gdb -q "${imagepath}/bin/java" <<EOF | tee gdb.out
-handle SIGSEGV pass nostop noprint
-handle SIGILL pass nostop noprint
-set breakpoint pending on
-break javaCalls.cpp:58
-commands 1
-backtrace
-quit
-end
-run -version
-EOF
-%ifarch %{gdb_arches}
- grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
-%endif
+ # Rebuild jmod files against the stripped binaries
+ if [ ! -d ${supportdir} ] ; then
+ echo "Support directory missing.";
+ exit 15
+ fi
+ for cmd in $(find ${supportdir} -name '*.jmod_exec.cmdline') ; do
+ pre=${cmd/_exec/_pre};
+ post=${cmd/_exec/_post};
+ jmod=$(echo ${cmd}|sed 's#.*_create_##'|sed 's#_exec.cmdline##')
+ echo "Rebuilding ${jmod} against stripped binaries...";
+ if [ -e ${pre} ] ; then
+ echo "Executing ${pre}...";
+ cat ${pre} | sh -s ;
+ fi
+ echo "Executing ${cmd}...";
+ cat ${cmd} | sh -s ;
+ if [ -e ${post} ] ; then
+ echo "Executing ${post}...";
+ cat ${post} | sh -s ;
+ fi
+ done
+ rm -rf ${jdkimagepath}/jmods
+ cp -a ${jmodimagepath} ${jdkimagepath}
+ fi
+}
+function installjdk() {
+ local outputdir=${1}
+ local installdir=${2}
+ local jdkimagepath=${installdir}/images/%{jdkimage}
+ local jreimagepath=${installdir}/images/%{jreimage}
+ local unstripped=${jdkimagepath}.unstripped
+
+ echo "Installing build from ${outputdir} to ${installdir}..."
+ mkdir -p ${installdir}
+ echo "Installing images..."
+ mv ${outputdir}/images ${installdir}
+ if [ -d ${outputdir}/bundles ] ; then
+ echo "Installing bundles...";
+ mv ${outputdir}/bundles ${installdir} ;
fi
+
+%if !%{with artifacts}
+ echo "Removing output directory...";
+ rm -rf ${outputdir}
+%endif
+
+ # legacy-jre-image target does not install any man pages for the JRE
+ # We copy the jdk man directory and then remove pages for binaries that
+ # don't exist in the JRE
+ cp -a ${jdkimagepath}/man ${jreimagepath}
+ for manpage in $(find ${jreimagepath}/man -name '*.1'); do
+ filename=$(basename ${manpage});
+ binary=${filename/.1/};
+ if [ ! -f ${jreimagepath}/bin/${binary} ] ; then
+ echo "Removing ${manpage} from JRE for which no binary ${binary} exists";
+ rm -f ${manpage};
+ fi;
+ done
+
+ for imagepath in ${jdkimagepath} ${jreimagepath} ${unstripped}; do
+
+ if [ -d ${imagepath} ] ; then
+ # the build (erroneously) removes read permissions from some jars
+ # this is a regression in OpenJDK 7 (our compiler):
+ # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
+ find ${imagepath} -iname '*.jar' -exec chmod ugo+r {} \;
+
+ # Build screws up permissions on binaries
+ # https://bugs.openjdk.java.net/browse/JDK-8173610
+ find ${imagepath} -iname '*.so' -exec chmod +x {} \;
+ find ${imagepath}/bin/ -exec chmod +x {} \;
+
+ # Install local files which are distributed with the JDK
+ install -m 644 %{SOURCE10} ${imagepath}
+
+ # Create fake alt-java as a placeholder for future alt-java
+ pushd ${imagepath}
+ # add alt-java man page
+ echo "Hardened java binary recommended for launching untrusted code from the Web e.g. javaws" > man/man1/%{alt_java_name}.1
+ cat man/man1/java.1 >> man/man1/%{alt_java_name}.1
+ popd
+
+ # Print release information
+ cat ${imagepath}/release
+ fi
+ done
}
function genchecksum() {
@@ -1295,218 +1274,202 @@ function genchecksum() {
popd
}
-packagesdir=$(pwd)/..
-
-pwd
-ls -l
-tar -cJf ${packagesdir}/%{jdkportablesourcesarchive -- ""} --transform "s|^|%{jdkportablesourcesname -- ""}/|" %{top_level_dir_name}
-genchecksum ${packagesdir}/%{jdkportablesourcesarchive -- ""}
-
-%if %{build_hotspot_first}
- # Build a fresh libjvm.so first and use it to bootstrap
- cp -LR --preserve=mode,timestamps %{bootjdk} newboot
- systemjdk=$(pwd)/newboot
- buildjdk build/newboot ${systemjdk} %{hotspot_target} "release" "bundled"
- mv build/newboot/jdk/lib/server/libjvm.so newboot/lib/server
-%else
- systemjdk=%{bootjdk}
-%endif
+function packFullPatchedSources() {
+ srcpackagesdir=`pwd`
+ tar -cJf ${srcpackagesdir}/%{jdkportablesourcesarchive -- ""} --transform "s|^|%{jdkportablesourcesname -- ""}/|" %{top_level_dir_name}
+ genchecksum ${srcpackagesdir}/%{jdkportablesourcesarchive -- ""}
+}
-for suffix in %{build_loop} ; do
- if [ "x$suffix" = "x" ] ; then
- debugbuild=release
- else
- # change --something to something
- debugbuild=`echo $suffix | sed "s/-//g"`
- fi
- for loop in %{main_suffix} %{staticlibs_loop} ; do
- builddir=%{buildoutputdir -- ${suffix}${loop}}
- bootbuilddir=boot${builddir}
- if test "x${loop}" = "x%{main_suffix}" ; then
- link_opt="%{link_type}"
-%if %{system_libs}
- # Copy the source tree so we can remove all in-tree libraries
- cp -a %{top_level_dir_name} %{top_level_dir_name_backup}
- # Remove all libraries that are linked
- sh %{SOURCE12} %{top_level_dir_name} full
-%endif
- # Debug builds don't need same targets as release for
- # build speed-up. We also avoid bootstrapping these
- # slower builds.
- if echo $debugbuild | grep -q "debug" ; then
- maketargets="%{debug_targets}"
- run_bootstrap=false
- else
- maketargets="%{release_targets}"
- run_bootstrap=%{bootstrap_build}
- fi
- if ${run_bootstrap} ; then
- buildjdk ${bootbuilddir} ${systemjdk} "%{bootstrap_targets}" ${debugbuild} ${link_opt}
- buildjdk ${builddir} $(pwd)/${bootbuilddir}/images/%{jdkimage} "${maketargets}" ${debugbuild} ${link_opt}
- rm -rf ${bootbuilddir}
- else
- buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt}
- fi
-%if %{system_libs}
- # Restore original source tree we modified by removing full in-tree sources
- rm -rf %{top_level_dir_name}
- mv %{top_level_dir_name_backup} %{top_level_dir_name}
-%endif
+function packagejdk() {
+ local imagesdir=$(pwd)/${1}/images
+ local docdir=$(pwd)/${1}/images/docs
+ local bundledir=$(pwd)/${1}/bundles
+ local packagesdir=$(pwd)/${2}
+ local srcdir=$(pwd)/%{top_level_dir_name}
+ local tapsetdir=$(pwd)/tapset
+ local altjavadir=$(pwd)/${3}
+
+ echo "Packaging build from ${imagesdir} to ${packagesdir}..."
+ mkdir -p ${packagesdir}
+ pushd ${imagesdir}
+
+ echo "Packaging build from ${imagesdir} to ${packagesdir}..."
+ mkdir -p ${packagesdir}
+ pushd ${imagesdir}
+
+ if [ "x$suffix" = "x" ] ; then
+ nameSuffix=""
else
- # Use bundled libraries for building statically
- link_opt="bundled"
- # Static library cycle only builds the static libraries
- maketargets="%{static_libs_target}"
- # Always just do the one build for the static libraries
- buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt}
+ nameSuffix=`echo "$suffix"| sed s/-/./`
fi
- done # end of main / staticlibs loop
+ jdkname=%{jdkportablename -- "$nameSuffix"}
+ jdkarchive=${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
+ jrename=%{jreportablename -- "$nameSuffix"}
+ jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
+ staticname=%{staticlibsportablename -- "$nameSuffix"}
+ staticarchive=${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
+ debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
+ unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
+ # We only use docs for the release build
+ docname=%{docportablename}
+ docarchive=${packagesdir}/%{docportablearchive}
+ built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
+ # These are from the source tree so no debug variants
+ miscname=%{miscportablename}
+ miscarchive=${packagesdir}/%{miscportablearchive}
+
+ if [ "x$suffix" = "x" ] ; then
+ # Keep the unstripped version for consumption by RHEL RPMs
+ mv %{jdkimage}.unstripped ${jdkname}
+ tar -cJf ${unstrippedarchive} ${jdkname}
+ genchecksum ${unstrippedarchive}
+ mv ${jdkname} %{jdkimage}.unstripped
+ fi
- # Final setup on the main image
- top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
- for image in %{jdkimage} %{jreimage} ; do
- imagePath=${top_dir_abs_main_build_path}/images/${image}
- installjdk ${imagePath}
- done
- # Check debug symbols were built into the dynamic libraries; todo, why it passes in JDK only?
- debugcheckjdk ${top_dir_abs_main_build_path}/images/%{jdkimage}
+ # Rename directories for packaging
+ mv %{jdkimage} ${jdkname}
+ mv %{jreimage} ${jrename}
- # Print release information
- cat ${top_dir_abs_main_build_path}/images/%{jdkimage}/release
+ # Release images have external debug symbols
+ if [ "x$suffix" = "x" ] ; then
+ tar -cJf ${debugarchive} $(find ${jdkname} -name \*.debuginfo)
+ genchecksum ${debugarchive}
-################################################################################
- pushd ${top_dir_abs_main_build_path}/images
- if [ "x$suffix" == "x" ] ; then
- nameSuffix=""
- else
- nameSuffix=`echo "$suffix"| sed s/-/./`
- fi
- # additional steps needed for fluent repack; most of them done twice, as images are already populated
- # maybe most of them should be done in upstream build?
- for imagedir in %{jdkimage} %{jreimage} ; do
- pushd $imagedir
- # Convert man pages to UTF8 encoding
- if [ -d man/man1 ] ; then # jre do not have man pages...
- for manpage in man/man1/* ; do
- iconv -f ISO_8859-1 -t UTF8 $manpage -o $manpage.tmp
- mv -f $manpage.tmp $manpage
- done
- fi
- # Install release notes
- cp -a %{SOURCE10} `pwd`
- cp -a %{SOURCE10} `pwd`/legal
- # stabilize permissions; aprtially duplicated in instalojdk
- find `pwd` -name "*.so" -exec chmod 755 {} \; -exec echo "set 755 to so {}" \; ;
- find `pwd` -type d -exec chmod 755 {} \; -exec echo "set 755 to dir {}" \; ;
- find `pwd`/legal -type f -exec chmod 644 {} \; -exec echo "set 644 to licences {}" \; ;
- popd # jdkimage/jreimage
- done # jre/sdk work in loop
- # javadoc is done only for release sdkimage
- if ! echo $suffix | grep -q "debug" ; then
- # Install Javadoc documentation
- #cp -a docs %{jdkimage} # not sure if the plaintext javadoc is for some use
- built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
- cp -a `pwd`/../bundles/${built_doc_archive} `pwd`/%{jdkimage}/javadocs.zip || ls -l `pwd`/../bundles
+ mkdir ${docname}
+ mv ${docdir} ${docname}
+ mv ${bundledir}/${built_doc_archive} ${docname}
+ tar -cJf ${docarchive} ${docname}
+ genchecksum ${docarchive}
+
+ mkdir ${miscname}
+ for s in 16 24 32 48 ; do
+ cp -av ${srcdir}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png ${miscname}
+ done
+%if %{with_systemtap}
+ cp -a ${tapsetdir}* ${miscname}
+%endif
+ cp -av ${altjavadir}/%{alt_java_name} ${miscname}
+ tar -cJf ${miscarchive} ${miscname}
+ genchecksum ${miscarchive}
fi
- # end of additional steps
-
- mv %{jdkimage} %{jdkportablename -- "$nameSuffix"}
- mv %{jreimage} %{jreportablename -- "$nameSuffix"}
- tar -cJf ${packagesdir}/%{jdkportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jdkportablename -- "$nameSuffix"}
- genchecksum ${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
- tar -cJf ${packagesdir}/%{jreportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jreportablename -- "$nameSuffix"}
- genchecksum ${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
- # copy licenses so they are avialable out of tarball
- cp -rf %{jdkportablename -- "$nameSuffix"}/legal ${packagesdir}/%{jdkportablearchive -- "%{normal_suffix}"}-legal
- mv %{jdkportablename -- "$nameSuffix"} %{jdkimage}
- mv %{jreportablename -- "$nameSuffix"} %{jreimage}
- popd #images
+
+ tar -cJf ${jdkarchive} --exclude='**.debuginfo' ${jdkname}
+ genchecksum ${jdkarchive}
+
+ tar -cJf ${jrearchive} --exclude='**.debuginfo' ${jrename}
+ genchecksum ${jrearchive}
+
%if %{include_staticlibs}
- top_dir_abs_staticlibs_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{staticlibs_suffix}}
- pushd ${top_dir_abs_staticlibs_build_path}/images
# Static libraries (needed for building graal vm with native image)
# Tar as overlay. Transform to the JDK name, since we just want to "add"
# static libraries to that folder
- portableJDKname=%{staticlibsportablename -- "$nameSuffix"}
- tar -cJf ${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"} --transform "s|^%{static_libs_image}/lib/*|$portableJDKname/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib"
- genchecksum ${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
- popd #staticlibs-images
+ tar -cJf ${staticarchive} \
+ --transform "s|^%{static_libs_image}/lib/*|${staticname}/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib"
+ genchecksum ${staticarchive}
%endif
-################################################################################
-# note, currently no debuginfo, consult portbale spec for external (zipped) debuginfo, being tarred alone
-################################################################################
-# build cycles
-done # end of release / debug cycle loop
+ # Revert directory renaming so testing will run
+ # TODO: testing should run on the packaged JDK
+ mv ${jdkname} %{jdkimage}
+ mv ${jrename} %{jreimage}
-# These are from the source tree so no debug variants
-miscname=%{miscportablename}
-miscarchive=${packagesdir}/%{miscportablearchive}
+ popd #images
-mkdir ${miscname}
-cp -av %{altjavaoutputdir}/%{alt_java_name} ${miscname}
-tar -cJf ${miscarchive} ${miscname}
-genchecksum ${miscarchive}
-
-%install
+}
-packagesdir=$(pwd)/..
+packFullPatchedSources
-mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
-# Install outside the loop as there are no debug variants
-miscarchive=${packagesdir}/%{miscportablearchive}
-mv ${packagesdir}/%{jdkportablesourcesarchive -- ""} $RPM_BUILD_ROOT%{_jvmdir}/
-mv ${packagesdir}/%{jdkportablesourcesarchive -- ""}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
-mv ${miscarchive} $RPM_BUILD_ROOT%{_jvmdir}/
-mv ${miscarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+%if %{build_hotspot_first}
+ # Build a fresh libjvm.so first and use it to bootstrap
+ cp -LR --preserve=mode,timestamps %{bootjdk} newboot
+ systemjdk=$(pwd)/newboot
+ buildjdk build/newboot ${systemjdk} %{hotspot_target} "release" "bundled" "internal"
+ mv build/newboot/jdk/lib/%{vm_variant}/libjvm.so newboot/lib/%{vm_variant}
+%else
+ systemjdk=%{bootjdk}
+%endif
for suffix in %{build_loop} ; do
-top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
-################################################################################
- if [ "x$suffix" == "x" ] ; then
- nameSuffix=""
+ if [ "x$suffix" = "x" ] ; then
+ debugbuild=release
else
- nameSuffix=`echo "$suffix"| sed s/-/./`
+ # change --something to something
+ debugbuild=`echo $suffix | sed "s/-//g"`
fi
- mv ${packagesdir}/%{jdkportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
- mv ${packagesdir}/%{jreportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ${packagesdir}/%{jreportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
-%if %{include_staticlibs}
- mv ${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
-%endif
- if [ "x$suffix" == "x" ] ; then
- dnameSuffix="$nameSuffix".debuginfo
-# todo handle debuginfo, see note at build (we will need to pack one stripped and one unstripped release build)
-# mv ../%{jdkportablearchive -- "$dnameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
-# mv ../%{jdkportablearchive -- "$dnameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ # We build with internal debug symbols and do
+ # our own stripping for one version of the
+ # release build
+ debug_symbols=internal
+
+ builddir=%{buildoutputdir -- ${suffix}}
+ bootbuilddir=boot${builddir}
+ installdir=%{installoutputdir -- ${suffix}}
+ bootinstalldir=boot${installdir}
+ packagesdir=%{packageoutputdir -- ${suffix}}
+
+ link_opt="%{link_type}"
+%if %{system_libs}
+ # Copy the source tree so we can remove all in-tree libraries
+ cp -a %{top_level_dir_name} %{top_level_dir_name_backup}
+ # Remove all libraries that are linked
+ sh %{SOURCE12} %{top_level_dir_name} full
+%endif
+ # Debug builds don't need same targets as release for
+ # build speed-up. We also avoid bootstrapping these
+ # slower builds.
+ if echo $debugbuild | grep -q "debug" ; then
+ maketargets="%{debug_targets}"
+ run_bootstrap=false
+ else
+ maketargets="%{release_targets}"
+ run_bootstrap=%{bootstrap_build}
fi
-################################################################################
-# end, dual install
-done
-################################################################################
-# the licenses are packed onloy once and shared
-mkdir -p $RPM_BUILD_ROOT%{unpacked_licenses}
-mv ${packagesdir}/%{jdkportablearchive -- "%{normal_suffix}"}-legal $RPM_BUILD_ROOT%{unpacked_licenses}/%{jdkportablesourcesarchive -- "%{normal_suffix}"}
-# To show sha in the build log
-for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do ls -l $file ; cat $file ; done
-################################################################################
+ if ${run_bootstrap} ; then
+ buildjdk ${bootbuilddir} ${systemjdk} "%{bootstrap_targets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ installjdk ${bootbuilddir} ${bootinstalldir}
+ buildjdk ${builddir} $(pwd)/${bootinstalldir}/images/%{jdkimage} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ stripjdk ${builddir}
+ installjdk ${builddir} ${installdir}
+ %{!?with_artifacts:rm -rf ${bootinstalldir}}
+ else
+ buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ stripjdk ${builddir}
+ installjdk ${builddir} ${installdir}
+ fi
+ packagejdk ${installdir} ${packagesdir} %{altjavaoutputdir}
+
+%if %{system_libs}
+ # Restore original source tree we modified by removing full in-tree sources
+ rm -rf %{top_level_dir_name}
+ mv %{top_level_dir_name_backup} %{top_level_dir_name}
+%endif
+
+# build cycles
+done # end of release / debug cycle loop
%check
# We test debug first as it will give better diagnostics on a crash
for suffix in %{build_loop} ; do
-# Tests in the check stage are performed on the installed image
-# rpmbuild operates as follows: build -> install -> test
-# however in portbales, we test built image instead of installed one
-top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
+# portable builds have static_libs embedded, thus top_dir_abs_main_build_path is same as top_dir_abs_staticlibs_build_path
+top_dir_abs_main_build_path=$(pwd)/%{installoutputdir -- ${suffix}}
+%if %{include_staticlibs}
+top_dir_abs_staticlibs_build_path=${top_dir_abs_main_build_path}
+%endif
+
export JAVA_HOME=${top_dir_abs_main_build_path}/images/%{jdkimage}
-#check Shenandoah is enabled
+# Pre-test setup
+
+# System security properties are disabled by default on portable.
+# Turn on system security properties
+#sed -i -e "s:^security.useSystemPropertiesFile=.*:security.useSystemPropertiesFile=true:" \
+#${JAVA_HOME}/conf/security/java.security
+
+# Check Shenandoah is enabled
%if %{use_shenandoah_hotspot}
$JAVA_HOME/bin/java -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -version
%endif
@@ -1525,9 +1488,14 @@ $JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||")
$JAVA_HOME/bin/javac -d . %{SOURCE15}
export PROG=$(echo $(basename %{SOURCE15})|sed "s|\.java||")
export SEC_DEBUG="-Djava.security.debug=properties"
+# Specific to portable:System security properties to be off by default
$JAVA_HOME/bin/java ${SEC_DEBUG} ${PROG} false
$JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=false ${PROG} false
+# Check correct vendor values have been set
+$JAVA_HOME/bin/javac -d . %{SOURCE16}
+$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
+
# Check java launcher has no SSB mitigation
if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
@@ -1539,14 +1507,11 @@ nm %{altjavaoutputdir}/%{alt_java_name} | grep prctl
if ! nm %{altjavaoutputdir}/%{alt_java_name} | grep prctl ; then true ; else false; fi
%endif
-# Check correct vendor values have been set
-$JAVA_HOME/bin/javac -d . %{SOURCE16}
-$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
-
%if ! 0%{?flatpak}
# Check translations are available for new timezones (during flatpak builds, the
# tzdb.dat used by this test is not where the test expects it, so this is
-# disabled for flatpak builds)
+# disabled for flatpak builds)
+# Disable test until we are on the latest JDK
$JAVA_HOME/bin/javac -d . %{SOURCE18}
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE
$JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR
@@ -1554,9 +1519,82 @@ $JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|
%if %{include_staticlibs}
# Check debug symbols in static libraries (smoke test)
-export STATIC_LIBS_HOME=${top_dir_abs_main_build_path}/../../%{buildoutputdir -- ${suffix}%{staticlibs_suffix}}/images/static-libs/lib/
-readelf --debug-dump $STATIC_LIBS_HOME/libnet.a | grep Inet4AddressImpl.c
-readelf --debug-dump $STATIC_LIBS_HOME/libnet.a | grep Inet6AddressImpl.c
+export STATIC_LIBS_HOME=${top_dir_abs_staticlibs_build_path}/images/%{static_libs_image}
+ls -l $STATIC_LIBS_HOME
+ls -l $STATIC_LIBS_HOME/lib
+readelf --debug-dump $STATIC_LIBS_HOME/lib/libnet.a | grep Inet4AddressImpl.c
+readelf --debug-dump $STATIC_LIBS_HOME/lib/libnet.a | grep Inet6AddressImpl.c
+%endif
+
+# Release builds strip the debug symbols into external .debuginfo files
+if [ "x$suffix" = "x" ] ; then
+ so_suffix="debuginfo"
+else
+ so_suffix="so"
+fi
+# Check debug symbols are present and can identify code
+find "$JAVA_HOME" -iname "*.$so_suffix" -print0 | while read -d $'\0' lib
+do
+ if [ -f "$lib" ] ; then
+ echo "Testing $lib for debug symbols"
+ # All these tests rely on RPM failing the build if the exit code of any set
+ # of piped commands is non-zero.
+
+ # Test for .debug_* sections in the shared object. This is the main test
+ # Stripped objects will not contain these
+ eu-readelf -S "$lib" | grep "] .debug_"
+ test $(eu-readelf -S "$lib" | grep -E "\]\ .debug_(info|abbrev)" | wc --lines) == 2
+
+ # Test FILE symbols. These will most likely be removed by anything that
+ # manipulates symbol tables because it's generally useless. So a nice test
+ # that nothing has messed with symbols
+ old_IFS="$IFS"
+ IFS=$'\n'
+ for line in $(eu-readelf -s "$lib" | grep "00000000 0 FILE LOCAL DEFAULT")
+ do
+ # We expect to see .cpp and .S files, except for architectures like aarch64 and
+ # s390 where we expect .o and .oS files
+ echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|S|oS))?$"
+ done
+ IFS="$old_IFS"
+
+ # If this is the JVM, look for javaCalls.(cpp|o) in FILEs, for extra sanity checking
+ if [ "`basename $lib`" = "libjvm.so" ]; then
+ eu-readelf -s "$lib" | \
+ grep -E "00000000 0 FILE LOCAL DEFAULT ABS javaCalls.(cpp|o)$"
+ fi
+
+ # Test that there are no .gnu_debuglink sections pointing to another
+ # debuginfo file. There shouldn't be any debuginfo files, so the link makes
+ # no sense either
+ eu-readelf -S "$lib" | grep 'gnu'
+ if eu-readelf -S "$lib" | grep '] .gnu_debuglink' | grep PROGBITS; then
+ echo "bad .gnu_debuglink section."
+ eu-readelf -x .gnu_debuglink "$lib"
+ false
+ fi
+ fi
+done
+
+# Make sure gdb can do a backtrace based on line numbers on libjvm.so
+# javaCalls.cpp:58 should map to:
+# http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/…
+# Using line number 1 might cause build problems. See:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1539664
+# https://bugzilla.redhat.com/show_bug.cgi?id=1538767
+gdb -q "$JAVA_HOME/bin/java" <<EOF | tee gdb.out
+handle SIGSEGV pass nostop noprint
+handle SIGILL pass nostop noprint
+set breakpoint pending on
+break javaCalls.cpp:58
+commands 1
+backtrace
+quit
+end
+run -version
+EOF
+%ifarch %{gdb_arches}
+grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
%endif
# Check src.zip has all sources. See RHBZ#1130490
@@ -1575,12 +1613,69 @@ $JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LocalVariableTable
# build cycles check
done
+%install
+
+ mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
+ mv %{jdkportablesourcesarchive -- ""} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv %{jdkportablesourcesarchive -- ""}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+
+for suffix in %{build_loop} ; do
+
+ packagesdir=%{packageoutputdir -- ${suffix}}
+
+ if [ "x$suffix" == "x" ] ; then
+ nameSuffix=""
+ else
+ nameSuffix=`echo "$suffix"| sed s/-/./`
+ fi
+
+ # These definitions should match those in installjdk
+ jdkarchive=${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
+ jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
+ staticarchive=${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
+ debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
+ unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
+
+ mv ${jdkarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jdkarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jrearchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jrearchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+
+%if %{include_staticlibs}
+ mv ${staticarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${staticarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+%endif
+
+ if [ "x$suffix" = "x" ] ; then
+ mv ${debugarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${debugarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${unstrippedarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${unstrippedarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ fi
+done
+
+# These definitions should match those in installjdk
+# Install outside the loop as there are no debug variants
+docarchive=${packagesdir}/%{docportablearchive}
+miscarchive=${packagesdir}/%{miscportablearchive}
+
+mv ${docarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+mv ${docarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+mv ${miscarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+mv ${miscarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+
+# To show sha in the build log
+for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do
+ ls -l $file ;
+ cat $file ;
+done
+
%if %{include_normal_build}
+
%files
# main package builds always
%{_jvmdir}/%{jreportablearchiveForFiles}
%{_jvmdir}/%{jreportablearchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%else
%files
# placeholder
@@ -1589,10 +1684,9 @@ done
%if %{include_normal_build}
%files devel
%{_jvmdir}/%{jdkportablearchiveForFiles}
-#%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
+%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
%{_jvmdir}/%{jdkportablearchiveForFiles}.sha256sum
-#%{_jvmdir}/%{jdkportablearchive -- .debuginfo}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
+%{_jvmdir}/%{jdkportablearchive -- .debuginfo}.sha256sum
%endif
%if %{include_normal_build}
@@ -1600,26 +1694,26 @@ done
%files static-libs
%{_jvmdir}/%{staticlibsportablearchiveForFiles}
%{_jvmdir}/%{staticlibsportablearchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
+
+%files unstripped
+%{_jvmdir}/%{jdkportablearchive -- .unstripped}
+%{_jvmdir}/%{jdkportablearchive -- .unstripped}.sha256sum
%endif
%if %{include_debug_build}
%files slowdebug
%{_jvmdir}/%{jreportablearchive -- .slowdebug}
%{_jvmdir}/%{jreportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%files devel-slowdebug
%{_jvmdir}/%{jdkportablearchive -- .slowdebug}
%{_jvmdir}/%{jdkportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%if %{include_staticlibs}
%files static-libs-slowdebug
%{_jvmdir}/%{staticlibsportablearchive -- .slowdebug}
%{_jvmdir}/%{staticlibsportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
%endif
@@ -1627,31 +1721,44 @@ done
%files fastdebug
%{_jvmdir}/%{jreportablearchive -- .fastdebug}
%{_jvmdir}/%{jreportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%files devel-fastdebug
%{_jvmdir}/%{jdkportablearchive -- .fastdebug}
%{_jvmdir}/%{jdkportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%if %{include_staticlibs}
%files static-libs-fastdebug
%{_jvmdir}/%{staticlibsportablearchive -- .fastdebug}
%{_jvmdir}/%{staticlibsportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
%endif
%files sources
%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}
%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
+
+%files docs
+%{_jvmdir}/%{docportablearchive}
+%{_jvmdir}/%{docportablearchive}.sha256sum
%files misc
%{_jvmdir}/%{miscportablearchive}
%{_jvmdir}/%{miscportablearchive}.sha256sum
%changelog
+* Wed Nov 22 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.1.0.12-2.rolling
+- updated to OpenJDK 21.0.1 (2023-10-17)
+- adjsuted generate_source_tarball
+- removed icedtea_sync
+- dropped standalone licenses
+- added usntripped subpkg
+- added docs subpkg
+- adjsuted versions of bundled libraries
+- build refactored to several solid methods following gnu_andrew
+- removed no longer needed jdk8296108-tzdata2022f.patch, jdk8296715-cldr2022f.patch, rh1648644-java_access_bridge_privileged_security.patch
+- added jdk8311630-s390_ffmapi.patch to support virtual threads on s390x
+- aligned fips-21u-75ffdc48eda.patch (gnu_andrew)
+
* Wed Sep 20 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.0.0.35-4.rolling
- removed %{1} from miscportablename
diff --git a/jconsole.desktop.in b/jconsole.desktop.in
index 8a3b04d..c1b8f6a 100644
--- a/jconsole.desktop.in
+++ b/jconsole.desktop.in
@@ -1,10 +1 @@
-[Desktop Entry]
-Name=OpenJDK @JAVA_VER@ for @target_cpu@ Monitoring & Management Console (@OPENJDK_VER@)
-Comment=Monitor and manage OpenJDK applications
-Exec=_SDKBINDIR_/jconsole
-Icon=java-@JAVA_VER@-@JAVA_VENDOR@
-Terminal=false
-Type=Application
-StartupWMClass=sun-tools-jconsole-JConsole
-Categories=Development;Profiling;Java;
-Version=1.0
+# this file is intentionally not here, as portable builds do not have desktop integration
diff --git a/jdk8296108-tzdata2022f.patch b/jdk8296108-tzdata2022f.patch
deleted file mode 100644
index 8b13789..0000000
--- a/jdk8296108-tzdata2022f.patch
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jdk8296715-cldr2022f.patch b/jdk8296715-cldr2022f.patch
deleted file mode 100644
index 8b13789..0000000
--- a/jdk8296715-cldr2022f.patch
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jdk8311630-s390_ffmapi.patch b/jdk8311630-s390_ffmapi.patch
new file mode 100644
index 0000000..cd3bc08
--- /dev/null
+++ b/jdk8311630-s390_ffmapi.patch
@@ -0,0 +1,1906 @@
+commit 27f635fabe7c2933674ad40443906fc35eecf785
+Author: Sidraya Jayagond <sjayagond(a)openjdk.org>
+Date: Tue Sep 12 09:07:09 2023 +0000
+
+ 8311630: [s390] Implementation of Foreign Function & Memory API (Preview)
+
+ Backport-of: ec1f7a8480db025a6f405817a106af8e92b69c44
+
+diff --git a/src/hotspot/cpu/s390/downcallLinker_s390.cpp b/src/hotspot/cpu/s390/downcallLinker_s390.cpp
+index baee7d7a043..f831da90755 100644
+--- a/src/hotspot/cpu/s390/downcallLinker_s390.cpp
++++ b/src/hotspot/cpu/s390/downcallLinker_s390.cpp
+@@ -23,8 +23,76 @@
+ */
+
+ #include "precompiled.hpp"
++#include "asm/macroAssembler.inline.hpp"
++#include "code/codeBlob.hpp"
++#include "code/codeCache.hpp"
++#include "code/vmreg.inline.hpp"
++#include "compiler/oopMap.hpp"
++#include "logging/logStream.hpp"
++#include "memory/resourceArea.hpp"
+ #include "prims/downcallLinker.hpp"
+-#include "utilities/debug.hpp"
++#include "runtime/globals.hpp"
++#include "runtime/stubCodeGenerator.hpp"
++
++#define __ _masm->
++
++class DowncallStubGenerator : public StubCodeGenerator {
++ BasicType* _signature;
++ int _num_args;
++ BasicType _ret_bt;
++ const ABIDescriptor& _abi;
++
++ const GrowableArray<VMStorage>& _input_registers;
++ const GrowableArray<VMStorage>& _output_registers;
++
++ bool _needs_return_buffer;
++ int _captured_state_mask;
++ bool _needs_transition;
++
++ int _frame_complete;
++ int _frame_size_slots;
++ OopMapSet* _oop_maps;
++ public:
++ DowncallStubGenerator(CodeBuffer* buffer,
++ BasicType* signature,
++ int num_args,
++ BasicType ret_bt,
++ const ABIDescriptor& abi,
++ const GrowableArray<VMStorage>& input_registers,
++ const GrowableArray<VMStorage>& output_registers,
++ bool needs_return_buffer,
++ int captured_state_mask,
++ bool needs_transition)
++ :StubCodeGenerator(buffer, PrintMethodHandleStubs),
++ _signature(signature),
++ _num_args(num_args),
++ _ret_bt(ret_bt),
++ _abi(abi),
++ _input_registers(input_registers),
++ _output_registers(output_registers),
++ _needs_return_buffer(needs_return_buffer),
++ _captured_state_mask(captured_state_mask),
++ _needs_transition(needs_transition),
++ _frame_complete(0),
++ _frame_size_slots(0),
++ _oop_maps(nullptr) {
++ }
++ void generate();
++ int frame_complete() const {
++ return _frame_complete;
++ }
++
++ int framesize() const {
++ return (_frame_size_slots >> (LogBytesPerWord - LogBytesPerInt));
++ }
++
++ OopMapSet* oop_maps() const {
++ return _oop_maps;
++ }
++};
++
++static const int native_invoker_code_base_size = 512;
++static const int native_invoker_size_per_args = 8;
+
+ RuntimeStub* DowncallLinker::make_downcall_stub(BasicType* signature,
+ int num_args,
+@@ -35,6 +103,197 @@ RuntimeStub* DowncallLinker::make_downcall_stub(BasicType* signature,
+ bool needs_return_buffer,
+ int captured_state_mask,
+ bool needs_transition) {
+- Unimplemented();
+- return nullptr;
++
++ int code_size = native_invoker_code_base_size + (num_args * native_invoker_size_per_args);
++ int locs_size = 1; //must be non zero
++ CodeBuffer code("nep_invoker_blob", code_size, locs_size);
++
++ DowncallStubGenerator g(&code, signature, num_args, ret_bt, abi,
++ input_registers, output_registers,
++ needs_return_buffer, captured_state_mask,
++ needs_transition);
++ g.generate();
++ code.log_section_sizes("nep_invoker_blob");
++
++ RuntimeStub* stub =
++ RuntimeStub::new_runtime_stub("nep_invoker_blob",
++ &code,
++ g.frame_complete(),
++ g.framesize(),
++ g.oop_maps(), false);
++
++#ifndef PRODUCT
++ LogTarget(Trace, foreign, downcall) lt;
++ if (lt.is_enabled()) {
++ ResourceMark rm;
++ LogStream ls(lt);
++ stub->print_on(&ls);
++ }
++#endif
++
++ return stub;
++}
++
++void DowncallStubGenerator::generate() {
++ Register call_target_address = Z_R1_scratch,
++ tmp = Z_R0_scratch;
++
++ VMStorage shuffle_reg = _abi._scratch1;
++
++ JavaCallingConvention in_conv;
++ NativeCallingConvention out_conv(_input_registers);
++ ArgumentShuffle arg_shuffle(_signature, _num_args, _signature, _num_args, &in_conv, &out_conv, shuffle_reg);
++
++#ifndef PRODUCT
++ LogTarget(Trace, foreign, downcall) lt;
++ if (lt.is_enabled()) {
++ ResourceMark rm;
++ LogStream ls(lt);
++ arg_shuffle.print_on(&ls);
++ }
++#endif
++
++ assert(_abi._shadow_space_bytes == frame::z_abi_160_size, "expected space according to ABI");
++ int allocated_frame_size = _abi._shadow_space_bytes;
++ allocated_frame_size += arg_shuffle.out_arg_bytes();
++
++ assert(!_needs_return_buffer, "unexpected needs_return_buffer");
++ RegSpiller out_reg_spiller(_output_registers);
++ int spill_offset = allocated_frame_size;
++ allocated_frame_size += BytesPerWord;
++
++ StubLocations locs;
++ locs.set(StubLocations::TARGET_ADDRESS, _abi._scratch2);
++
++ if (_captured_state_mask != 0) {
++ __ block_comment("{ _captured_state_mask is set");
++ locs.set_frame_data(StubLocations::CAPTURED_STATE_BUFFER, allocated_frame_size);
++ allocated_frame_size += BytesPerWord;
++ __ block_comment("} _captured_state_mask is set");
++ }
++
++ allocated_frame_size = align_up(allocated_frame_size, StackAlignmentInBytes);
++ _frame_size_slots = allocated_frame_size >> LogBytesPerInt;
++
++ _oop_maps = _needs_transition ? new OopMapSet() : nullptr;
++ address start = __ pc();
++
++ __ save_return_pc();
++ __ push_frame(allocated_frame_size, Z_R11); // Create a new frame for the wrapper.
++
++ _frame_complete = __ pc() - start; // frame build complete.
++
++ if (_needs_transition) {
++ __ block_comment("{ thread java2native");
++ __ get_PC(Z_R1_scratch);
++ address the_pc = __ pc();
++ __ set_last_Java_frame(Z_SP, Z_R1_scratch);
++
++ OopMap* map = new OopMap(_frame_size_slots, 0);
++ _oop_maps->add_gc_map(the_pc - start, map);
++
++ // State transition
++ __ set_thread_state(_thread_in_native);
++ __ block_comment("} thread java2native");
++ }
++ __ block_comment("{ argument shuffle");
++ arg_shuffle.generate(_masm, shuffle_reg, frame::z_jit_out_preserve_size, _abi._shadow_space_bytes, locs);
++ __ block_comment("} argument shuffle");
++
++ __ call(as_Register(locs.get(StubLocations::TARGET_ADDRESS)));
++
++ //////////////////////////////////////////////////////////////////////////////
++
++ if (_captured_state_mask != 0) {
++ __ block_comment("{ save thread local");
++
++ out_reg_spiller.generate_spill(_masm, spill_offset);
++
++ __ load_const_optimized(call_target_address, CAST_FROM_FN_PTR(uint64_t, DowncallLinker::capture_state));
++ __ z_lg(Z_ARG1, Address(Z_SP, locs.data_offset(StubLocations::CAPTURED_STATE_BUFFER)));
++ __ load_const_optimized(Z_ARG2, _captured_state_mask);
++ __ call(call_target_address);
++
++ out_reg_spiller.generate_fill(_masm, spill_offset);
++
++ __ block_comment("} save thread local");
++ }
++
++ //////////////////////////////////////////////////////////////////////////////
++
++ Label L_after_safepoint_poll;
++ Label L_safepoint_poll_slow_path;
++ Label L_reguard;
++ Label L_after_reguard;
++
++ if (_needs_transition) {
++ __ block_comment("{ thread native2java");
++ __ set_thread_state(_thread_in_native_trans);
++
++ if (!UseSystemMemoryBarrier) {
++ __ z_fence(); // Order state change wrt. safepoint poll.
++ }
++
++ __ safepoint_poll(L_safepoint_poll_slow_path, tmp);
++
++ __ load_and_test_int(tmp, Address(Z_thread, JavaThread::suspend_flags_offset()));
++ __ z_brne(L_safepoint_poll_slow_path);
++
++ __ bind(L_after_safepoint_poll);
++
++ // change thread state
++ __ set_thread_state(_thread_in_Java);
++
++ __ block_comment("reguard stack check");
++ __ z_cli(Address(Z_thread, JavaThread::stack_guard_state_offset() + in_ByteSize(sizeof(StackOverflow::StackGuardState) - 1)),
++ StackOverflow::stack_guard_yellow_reserved_disabled);
++ __ z_bre(L_reguard);
++ __ bind(L_after_reguard);
++
++ __ reset_last_Java_frame();
++ __ block_comment("} thread native2java");
++ }
++
++ __ pop_frame();
++ __ restore_return_pc(); // This is the way back to the caller.
++ __ z_br(Z_R14);
++
++ //////////////////////////////////////////////////////////////////////////////
++
++ if (_needs_transition) {
++ __ block_comment("{ L_safepoint_poll_slow_path");
++ __ bind(L_safepoint_poll_slow_path);
++
++ // Need to save the native result registers around any runtime calls.
++ out_reg_spiller.generate_spill(_masm, spill_offset);
++
++ __ load_const_optimized(call_target_address, CAST_FROM_FN_PTR(uint64_t, JavaThread::check_special_condition_for_native_trans));
++ __ z_lgr(Z_ARG1, Z_thread);
++ __ call(call_target_address);
++
++ out_reg_spiller.generate_fill(_masm, spill_offset);
++
++ __ z_bru(L_after_safepoint_poll);
++ __ block_comment("} L_safepoint_poll_slow_path");
++
++ //////////////////////////////////////////////////////////////////////////////
++ __ block_comment("{ L_reguard");
++ __ bind(L_reguard);
++
++ // Need to save the native result registers around any runtime calls.
++ out_reg_spiller.generate_spill(_masm, spill_offset);
++
++ __ load_const_optimized(call_target_address, CAST_FROM_FN_PTR(uint64_t, SharedRuntime::reguard_yellow_pages));
++ __ call(call_target_address);
++
++ out_reg_spiller.generate_fill(_masm, spill_offset);
++
++ __ z_bru(L_after_reguard);
++
++ __ block_comment("} L_reguard");
++ }
++
++ //////////////////////////////////////////////////////////////////////////////
++
++ __ flush();
+ }
+diff --git a/src/hotspot/cpu/s390/foreignGlobals_s390.cpp b/src/hotspot/cpu/s390/foreignGlobals_s390.cpp
+index d3a318536bd..9796ab4ffe4 100644
+--- a/src/hotspot/cpu/s390/foreignGlobals_s390.cpp
++++ b/src/hotspot/cpu/s390/foreignGlobals_s390.cpp
+@@ -23,34 +23,209 @@
+ */
+
+ #include "precompiled.hpp"
+-#include "code/vmreg.hpp"
++#include "asm/macroAssembler.inline.hpp"
++#include "code/vmreg.inline.hpp"
++#include "runtime/jniHandles.hpp"
++#include "runtime/jniHandles.inline.hpp"
++#include "oops/typeArrayOop.inline.hpp"
++#include "oops/oopCast.inline.hpp"
+ #include "prims/foreignGlobals.hpp"
+-#include "utilities/debug.hpp"
++#include "prims/foreignGlobals.inline.hpp"
++#include "prims/vmstorage.hpp"
++#include "utilities/formatBuffer.hpp"
+
+-class MacroAssembler;
++#define __ masm->
++
++bool ABIDescriptor::is_volatile_reg(Register reg) const {
++ return _integer_volatile_registers.contains(reg);
++}
++
++bool ABIDescriptor::is_volatile_reg(FloatRegister reg) const {
++ return _float_argument_registers.contains(reg)
++ || _float_additional_volatile_registers.contains(reg);
++}
+
+ bool ForeignGlobals::is_foreign_linker_supported() {
+- return false;
++ return true;
+ }
+
+ const ABIDescriptor ForeignGlobals::parse_abi_descriptor(jobject jabi) {
+- Unimplemented();
+- return {};
++ oop abi_oop = JNIHandles::resolve_non_null(jabi);
++ ABIDescriptor abi;
++
++ objArrayOop inputStorage = jdk_internal_foreign_abi_ABIDescriptor::inputStorage(abi_oop);
++ parse_register_array(inputStorage, StorageType::INTEGER, abi._integer_argument_registers, as_Register);
++ parse_register_array(inputStorage, StorageType::FLOAT, abi._float_argument_registers, as_FloatRegister);
++
++ objArrayOop outputStorage = jdk_internal_foreign_abi_ABIDescriptor::outputStorage(abi_oop);
++ parse_register_array(outputStorage, StorageType::INTEGER, abi._integer_return_registers, as_Register);
++ parse_register_array(outputStorage, StorageType::FLOAT, abi._float_return_registers, as_FloatRegister);
++
++ objArrayOop volatileStorage = jdk_internal_foreign_abi_ABIDescriptor::volatileStorage(abi_oop);
++ parse_register_array(volatileStorage, StorageType::INTEGER, abi._integer_volatile_registers, as_Register);
++ parse_register_array(volatileStorage, StorageType::FLOAT, abi._float_additional_volatile_registers, as_FloatRegister);
++
++ abi._stack_alignment_bytes = jdk_internal_foreign_abi_ABIDescriptor::stackAlignment(abi_oop);
++ abi._shadow_space_bytes = jdk_internal_foreign_abi_ABIDescriptor::shadowSpace(abi_oop);
++
++ abi._scratch1 = parse_vmstorage(jdk_internal_foreign_abi_ABIDescriptor::scratch1(abi_oop));
++ abi._scratch2 = parse_vmstorage(jdk_internal_foreign_abi_ABIDescriptor::scratch2(abi_oop));
++
++ return abi;
+ }
+
+ int RegSpiller::pd_reg_size(VMStorage reg) {
+- Unimplemented();
+- return -1;
++ if (reg.type() == StorageType::INTEGER || reg.type() == StorageType::FLOAT) {
++ return 8;
++ }
++ return 0; // stack and BAD
+ }
+
+ void RegSpiller::pd_store_reg(MacroAssembler* masm, int offset, VMStorage reg) {
+- Unimplemented();
++ if (reg.type() == StorageType::INTEGER) {
++ __ reg2mem_opt(as_Register(reg), Address(Z_SP, offset), true);
++ } else if (reg.type() == StorageType::FLOAT) {
++ __ freg2mem_opt(as_FloatRegister(reg), Address(Z_SP, offset), true);
++ } else {
++ // stack and BAD
++ }
+ }
+
+ void RegSpiller::pd_load_reg(MacroAssembler* masm, int offset, VMStorage reg) {
+- Unimplemented();
++ if (reg.type() == StorageType::INTEGER) {
++ __ mem2reg_opt(as_Register(reg), Address(Z_SP, offset), true);
++ } else if (reg.type() == StorageType::FLOAT) {
++ __ mem2freg_opt(as_FloatRegister(reg), Address(Z_SP, offset), true);
++ } else {
++ // stack and BAD
++ }
++}
++
++static int reg2offset(VMStorage vms, int stk_bias) {
++ assert(!vms.is_reg(), "wrong usage");
++ return vms.index_or_offset() + stk_bias;
++}
++
++static void move_reg(MacroAssembler* masm, int out_stk_bias,
++ VMStorage from_reg, VMStorage to_reg) {
++ int out_bias = 0;
++ switch (to_reg.type()) {
++ case StorageType::INTEGER:
++ if (to_reg.segment_mask() == REG64_MASK && from_reg.segment_mask() == REG32_MASK ) {
++ // see CCallingConventionRequiresIntsAsLongs
++ __ z_lgfr(as_Register(to_reg), as_Register(from_reg));
++ } else {
++ __ lgr_if_needed(as_Register(to_reg), as_Register(from_reg));
++ }
++ break;
++ case StorageType::STACK:
++ out_bias = out_stk_bias; //fallthrough
++ case StorageType::FRAME_DATA: {
++ // Integer types always get a 64 bit slot in C.
++ if (from_reg.segment_mask() == REG32_MASK) {
++ // see CCallingConventionRequiresIntsAsLongs
++ __ z_lgfr(as_Register(from_reg), as_Register(from_reg));
++ }
++ switch (to_reg.stack_size()) {
++ case 8: __ reg2mem_opt(as_Register(from_reg), Address(Z_SP, reg2offset(to_reg, out_bias)), true); break;
++ case 4: __ reg2mem_opt(as_Register(from_reg), Address(Z_SP, reg2offset(to_reg, out_bias)), false); break;
++ default: ShouldNotReachHere();
++ }
++ } break;
++ default: ShouldNotReachHere();
++ }
++}
++
++static void move_float(MacroAssembler* masm, int out_stk_bias,
++ VMStorage from_reg, VMStorage to_reg) {
++ switch (to_reg.type()) {
++ case StorageType::FLOAT:
++ if (from_reg.segment_mask() == REG64_MASK)
++ __ move_freg_if_needed(as_FloatRegister(to_reg), T_DOUBLE, as_FloatRegister(from_reg), T_DOUBLE);
++ else
++ __ move_freg_if_needed(as_FloatRegister(to_reg), T_FLOAT, as_FloatRegister(from_reg), T_FLOAT);
++ break;
++ case StorageType::STACK:
++ if (from_reg.segment_mask() == REG64_MASK) {
++ assert(to_reg.stack_size() == 8, "size should match");
++ __ freg2mem_opt(as_FloatRegister(from_reg), Address(Z_SP, reg2offset(to_reg, out_stk_bias)), true);
++ } else {
++ assert(to_reg.stack_size() == 4, "size should match");
++ __ freg2mem_opt(as_FloatRegister(from_reg), Address(Z_SP, reg2offset(to_reg, out_stk_bias)), false);
++ }
++ break;
++ default: ShouldNotReachHere();
++ }
++}
++
++static void move_stack(MacroAssembler* masm, Register tmp_reg, int in_stk_bias, int out_stk_bias,
++ VMStorage from_reg, VMStorage to_reg) {
++ int out_bias = 0;
++ Address from_addr(Z_R11, reg2offset(from_reg, in_stk_bias));
++ switch (to_reg.type()) {
++ case StorageType::INTEGER:
++ switch (from_reg.stack_size()) {
++ case 8: __ mem2reg_opt(as_Register(to_reg), from_addr, true);break;
++ case 4: __ mem2reg_opt(as_Register(to_reg), from_addr, false);break;
++ default: ShouldNotReachHere();
++ }
++ break;
++ case StorageType::FLOAT:
++ switch (from_reg.stack_size()) {
++ case 8: __ mem2freg_opt(as_FloatRegister(to_reg), from_addr, true);break;
++ case 4: __ mem2freg_opt(as_FloatRegister(to_reg), from_addr, false);break;
++ default: ShouldNotReachHere();
++ }
++ break;
++ case StorageType::STACK:
++ out_bias = out_stk_bias; // fallthrough
++ case StorageType::FRAME_DATA: {
++ switch (from_reg.stack_size()) {
++ case 8: __ mem2reg_opt(tmp_reg, from_addr, true); break;
++ case 4: if (to_reg.stack_size() == 8) {
++ __ mem2reg_signed_opt(tmp_reg, from_addr);
++ } else {
++ __ mem2reg_opt(tmp_reg, from_addr, false);
++ }
++ break;
++ default: ShouldNotReachHere();
++ }
++ switch (to_reg.stack_size()) {
++ case 8: __ reg2mem_opt(tmp_reg, Address (Z_SP, reg2offset(to_reg, out_bias)), true); break;
++ case 4: __ reg2mem_opt(tmp_reg, Address (Z_SP, reg2offset(to_reg, out_bias)), false); break;
++ default: ShouldNotReachHere();
++ }
++ } break;
++ default: ShouldNotReachHere();
++ }
+ }
+
+ void ArgumentShuffle::pd_generate(MacroAssembler* masm, VMStorage tmp, int in_stk_bias, int out_stk_bias, const StubLocations& locs) const {
+- Unimplemented();
++ Register tmp_reg = as_Register(tmp);
++ for (int i = 0; i < _moves.length(); i++) {
++ Move move = _moves.at(i);
++ VMStorage from_reg = move.from;
++ VMStorage to_reg = move.to;
++
++ // replace any placeholders
++ if (from_reg.type() == StorageType::PLACEHOLDER) {
++ from_reg = locs.get(from_reg);
++ }
++ if (to_reg.type() == StorageType::PLACEHOLDER) {
++ to_reg = locs.get(to_reg);
++ }
++
++ switch (from_reg.type()) {
++ case StorageType::INTEGER:
++ move_reg(masm, out_stk_bias, from_reg, to_reg);
++ break;
++ case StorageType::FLOAT:
++ move_float(masm, out_stk_bias, from_reg, to_reg);
++ break;
++ case StorageType::STACK:
++ move_stack(masm, tmp_reg, in_stk_bias, out_stk_bias, from_reg, to_reg);
++ break;
++ default: ShouldNotReachHere();
++ }
++ }
+ }
+diff --git a/src/hotspot/cpu/s390/foreignGlobals_s390.hpp b/src/hotspot/cpu/s390/foreignGlobals_s390.hpp
+index 8b86a2b06a6..4ff3b3e40b4 100644
+--- a/src/hotspot/cpu/s390/foreignGlobals_s390.hpp
++++ b/src/hotspot/cpu/s390/foreignGlobals_s390.hpp
+@@ -24,6 +24,23 @@
+ #ifndef CPU_S390_VM_FOREIGN_GLOBALS_S390_HPP
+ #define CPU_S390_VM_FOREIGN_GLOBALS_S390_HPP
+
+-class ABIDescriptor {};
++struct ABIDescriptor {
++ GrowableArray<Register> _integer_argument_registers;
++ GrowableArray<Register> _integer_return_registers;
++ GrowableArray<FloatRegister> _float_argument_registers;
++ GrowableArray<FloatRegister> _float_return_registers;
++
++ GrowableArray<Register> _integer_volatile_registers;
++ GrowableArray<FloatRegister> _float_additional_volatile_registers;
++
++ int32_t _stack_alignment_bytes;
++ int32_t _shadow_space_bytes;
++
++ VMStorage _scratch1;
++ VMStorage _scratch2;
++
++ bool is_volatile_reg(Register reg) const;
++ bool is_volatile_reg(FloatRegister reg) const;
++};
+
+ #endif // CPU_S390_VM_FOREIGN_GLOBALS_S390_HPP
+diff --git a/src/hotspot/cpu/s390/frame_s390.cpp b/src/hotspot/cpu/s390/frame_s390.cpp
+index 23547fa6617..ac24e43f00c 100644
+--- a/src/hotspot/cpu/s390/frame_s390.cpp
++++ b/src/hotspot/cpu/s390/frame_s390.cpp
+@@ -218,13 +218,32 @@ frame frame::sender_for_entry_frame(RegisterMap *map) const {
+ }
+
+ UpcallStub::FrameData* UpcallStub::frame_data_for_frame(const frame& frame) const {
+- ShouldNotCallThis();
+- return nullptr;
++ assert(frame.is_upcall_stub_frame(), "wrong frame");
++ // need unextended_sp here, since normal sp is wrong for interpreter callees
++ return reinterpret_cast<UpcallStub::FrameData*>(
++ reinterpret_cast<address>(frame.unextended_sp()) + in_bytes(_frame_data_offset));
+ }
+
+ bool frame::upcall_stub_frame_is_first() const {
+- ShouldNotCallThis();
+- return false;
++ assert(is_upcall_stub_frame(), "must be optimized entry frame");
++ UpcallStub* blob = _cb->as_upcall_stub();
++ JavaFrameAnchor* jfa = blob->jfa_for_frame(*this);
++ return jfa->last_Java_sp() == nullptr;
++}
++
++frame frame::sender_for_upcall_stub_frame(RegisterMap* map) const {
++ assert(map != nullptr, "map must be set");
++ UpcallStub* blob = _cb->as_upcall_stub();
++ // Java frame called from C; skip all C frames and return top C
++ // frame of that chunk as the sender
++ JavaFrameAnchor* jfa = blob->jfa_for_frame(*this);
++ assert(!upcall_stub_frame_is_first(), "must have a frame anchor to go back to");
++ assert(jfa->last_Java_sp() > sp(), "must be above this frame on stack");
++ map->clear();
++ assert(map->include_argument_oops(), "should be set by clear");
++ frame fr(jfa->last_Java_sp(), jfa->last_Java_pc());
++
++ return fr;
+ }
+
+ frame frame::sender_for_interpreter_frame(RegisterMap *map) const {
+diff --git a/src/hotspot/cpu/s390/frame_s390.inline.hpp b/src/hotspot/cpu/s390/frame_s390.inline.hpp
+index dfa68940bac..c188618653d 100644
+--- a/src/hotspot/cpu/s390/frame_s390.inline.hpp
++++ b/src/hotspot/cpu/s390/frame_s390.inline.hpp
+@@ -352,12 +352,10 @@ inline frame frame::sender(RegisterMap* map) const {
+ // update it accordingly.
+ map->set_include_argument_oops(false);
+
+- if (is_entry_frame()) {
+- return sender_for_entry_frame(map);
+- }
+- if (is_interpreted_frame()) {
+- return sender_for_interpreter_frame(map);
+- }
++ if (is_entry_frame()) return sender_for_entry_frame(map);
++ if (is_upcall_stub_frame()) return sender_for_upcall_stub_frame(map);
++ if (is_interpreted_frame()) return sender_for_interpreter_frame(map);
++
+ assert(_cb == CodeCache::find_blob(pc()),"Must be the same");
+ if (_cb != nullptr) return sender_for_compiled_frame(map);
+
+diff --git a/src/hotspot/cpu/s390/globalDefinitions_s390.hpp b/src/hotspot/cpu/s390/globalDefinitions_s390.hpp
+index 99906bb369e..2232215a587 100644
+--- a/src/hotspot/cpu/s390/globalDefinitions_s390.hpp
++++ b/src/hotspot/cpu/s390/globalDefinitions_s390.hpp
+@@ -28,7 +28,7 @@
+
+ #define ShortenBranches true
+
+-const int StackAlignmentInBytes = 16;
++const int StackAlignmentInBytes = 8;
+
+ #define SUPPORTS_NATIVE_CX8
+
+diff --git a/src/hotspot/cpu/s390/methodHandles_s390.cpp b/src/hotspot/cpu/s390/methodHandles_s390.cpp
+index 6392ba45a6c..ef8722f2499 100644
+--- a/src/hotspot/cpu/s390/methodHandles_s390.cpp
++++ b/src/hotspot/cpu/s390/methodHandles_s390.cpp
+@@ -349,7 +349,16 @@ address MethodHandles::generate_method_handle_interpreter_entry(MacroAssembler*
+
+ void MethodHandles::jump_to_native_invoker(MacroAssembler* _masm, Register nep_reg, Register temp_target) {
+ BLOCK_COMMENT("jump_to_native_invoker {");
+- __ should_not_reach_here();
++ assert(nep_reg != noreg, "required register");
++
++ // Load the invoker, as NEP -> .invoker
++ __ verify_oop(nep_reg);
++
++ __ z_lg(temp_target, Address(nep_reg,
++ NONZERO(jdk_internal_foreign_abi_NativeEntryPoint::downcall_stub_address_offset_in_bytes())));
++
++ __ z_br(temp_target);
++
+ BLOCK_COMMENT("} jump_to_native_invoker");
+ }
+
+diff --git a/src/hotspot/cpu/s390/upcallLinker_s390.cpp b/src/hotspot/cpu/s390/upcallLinker_s390.cpp
+index 3e1fb04218b..b748ec547cc 100644
+--- a/src/hotspot/cpu/s390/upcallLinker_s390.cpp
++++ b/src/hotspot/cpu/s390/upcallLinker_s390.cpp
+@@ -22,15 +22,287 @@
+ */
+
+ #include "precompiled.hpp"
++#include "asm/macroAssembler.inline.hpp"
++#include "logging/logStream.hpp"
++#include "memory/resourceArea.hpp"
+ #include "prims/upcallLinker.hpp"
+-#include "utilities/debug.hpp"
++#include "runtime/sharedRuntime.hpp"
++#include "runtime/signature.hpp"
++#include "runtime/stubRoutines.hpp"
++#include "utilities/formatBuffer.hpp"
++#include "utilities/globalDefinitions.hpp"
+
++#define __ _masm->
++
++// for callee saved regs, according to the caller's ABI
++static int compute_reg_save_area_size(const ABIDescriptor& abi) {
++ int size = 0;
++ for (int i = 0; i < Register::number_of_registers; i++) {
++ Register reg = as_Register(i);
++ // Z_SP saved/restored by prologue/epilogue
++ if (reg == Z_SP) continue;
++ if (!abi.is_volatile_reg(reg)) {
++ size += 8; // bytes
++ }
++ }
++
++ for (int i = 0; i < FloatRegister::number_of_registers; i++) {
++ FloatRegister reg = as_FloatRegister(i);
++ if (!abi.is_volatile_reg(reg)) {
++ size += 8; // bytes
++ }
++ }
++
++ return size;
++}
++
++static void preserve_callee_saved_registers(MacroAssembler* _masm, const ABIDescriptor& abi, int reg_save_area_offset) {
++ // 1. iterate all registers in the architecture
++ // - check if they are volatile or not for the given abi
++ // - if NOT, we need to save it here
++
++ int offset = reg_save_area_offset;
++
++ __ block_comment("{ preserve_callee_saved_regs ");
++ for (int i = 0; i < Register::number_of_registers; i++) {
++ Register reg = as_Register(i);
++ // Z_SP saved/restored by prologue/epilogue
++ if (reg == Z_SP) continue;
++ if (!abi.is_volatile_reg(reg)) {
++ __ z_stg(reg, Address(Z_SP, offset));
++ offset += 8;
++ }
++ }
++
++ for (int i = 0; i < FloatRegister::number_of_registers; i++) {
++ FloatRegister reg = as_FloatRegister(i);
++ if (!abi.is_volatile_reg(reg)) {
++ __ z_std(reg, Address(Z_SP, offset));
++ offset += 8;
++ }
++ }
++
++ __ block_comment("} preserve_callee_saved_regs ");
++}
++
++static void restore_callee_saved_registers(MacroAssembler* _masm, const ABIDescriptor& abi, int reg_save_area_offset) {
++ // 1. iterate all registers in the architecture
++ // - check if they are volatile or not for the given abi
++ // - if NOT, we need to restore it here
++
++ int offset = reg_save_area_offset;
++
++ __ block_comment("{ restore_callee_saved_regs ");
++ for (int i = 0; i < Register::number_of_registers; i++) {
++ Register reg = as_Register(i);
++ // Z_SP saved/restored by prologue/epilogue
++ if (reg == Z_SP) continue;
++ if (!abi.is_volatile_reg(reg)) {
++ __ z_lg(reg, Address(Z_SP, offset));
++ offset += 8;
++ }
++ }
++
++ for (int i = 0; i < FloatRegister::number_of_registers; i++) {
++ FloatRegister reg = as_FloatRegister(i);
++ if (!abi.is_volatile_reg(reg)) {
++ __ z_ld(reg, Address(Z_SP, offset));
++ offset += 8;
++ }
++ }
++
++ __ block_comment("} restore_callee_saved_regs ");
++}
++
++static const int upcall_stub_code_base_size = 1024; // depends on GC (resolve_jobject)
++static const int upcall_stub_size_per_arg = 16; // arg save & restore + move
+ address UpcallLinker::make_upcall_stub(jobject receiver, Method* entry,
+ BasicType* in_sig_bt, int total_in_args,
+ BasicType* out_sig_bt, int total_out_args,
+ BasicType ret_type,
+ jobject jabi, jobject jconv,
+ bool needs_return_buffer, int ret_buf_size) {
+- ShouldNotCallThis();
+- return nullptr;
++ ResourceMark rm;
++ const ABIDescriptor abi = ForeignGlobals::parse_abi_descriptor(jabi);
++ const CallRegs call_regs = ForeignGlobals::parse_call_regs(jconv);
++ int code_size = upcall_stub_code_base_size + (total_in_args * upcall_stub_size_per_arg);
++ CodeBuffer buffer("upcall_stub", code_size, /* locs_size = */ 0);
++
++ Register call_target_address = Z_R1_scratch;
++
++ VMStorage shuffle_reg = abi._scratch1;
++ JavaCallingConvention out_conv;
++ NativeCallingConvention in_conv(call_regs._arg_regs);
++ ArgumentShuffle arg_shuffle(in_sig_bt, total_in_args, out_sig_bt, total_out_args, &in_conv, &out_conv, shuffle_reg);
++
++ // The Java call uses the JIT ABI, but we also call C.
++ int out_arg_area = MAX2(frame::z_jit_out_preserve_size + arg_shuffle.out_arg_bytes(), (int)frame::z_abi_160_size);
++
++#ifndef PRODUCT
++ LogTarget(Trace, foreign, upcall) lt;
++ if (lt.is_enabled()) {
++ ResourceMark rm;
++ LogStream ls(lt);
++ arg_shuffle.print_on(&ls);
++ }
++#endif
++
++
++ int reg_save_area_size = compute_reg_save_area_size(abi);
++ RegSpiller arg_spiller(call_regs._arg_regs);
++ RegSpiller result_spiller(call_regs._ret_regs);
++
++ int res_save_area_offset = out_arg_area;
++ int arg_save_area_offset = res_save_area_offset + result_spiller.spill_size_bytes();
++ int reg_save_area_offset = arg_save_area_offset + arg_spiller.spill_size_bytes();
++ int frame_data_offset = reg_save_area_offset + reg_save_area_size;
++ int frame_bottom_offset = frame_data_offset + sizeof(UpcallStub::FrameData);
++
++ int frame_size = align_up(frame_bottom_offset, StackAlignmentInBytes);
++ StubLocations locs;
++
++ // The space we have allocated will look like:
++ //
++ //
++ // FP-> | |
++ // |---------------------| = frame_bottom_offset = frame_size
++ // | |
++ // | FrameData |
++ // |---------------------| = frame_data_offset
++ // | |
++ // | reg_save_area |
++ // |---------------------| = reg_save_are_offset
++ // | |
++ // | arg_save_area |
++ // |---------------------| = arg_save_are_offset
++ // | |
++ // | res_save_area |
++ // |---------------------| = res_save_are_offset
++ // | |
++ // SP-> | out_arg_area | needs to be at end for shadow space
++ //
++ //
++
++ //////////////////////////////////////////////////////////////////////////////
++
++ MacroAssembler* _masm = new MacroAssembler(&buffer);
++ address start = __ pc();
++
++ __ save_return_pc();
++ assert((abi._stack_alignment_bytes % StackAlignmentInBytes) == 0, "must be 8 byte aligned");
++ // allocate frame (frame_size is also aligned, so stack is still aligned)
++ __ push_frame(frame_size);
++
++ // we have to always spill args since we need to do a call to get the thread
++ // (and maybe attach it).
++ arg_spiller.generate_spill(_masm, arg_save_area_offset);
++ // Java methods won't preserve them, so save them here:
++ preserve_callee_saved_registers(_masm, abi, reg_save_area_offset);
++
++ __ block_comment("{ on_entry");
++ __ load_const_optimized(call_target_address, CAST_FROM_FN_PTR(uint64_t, UpcallLinker::on_entry));
++ __ z_aghik(Z_ARG1, Z_SP, frame_data_offset);
++ __ call(call_target_address);
++ __ z_lgr(Z_thread, Z_RET);
++ __ block_comment("} on_entry");
++
++ arg_spiller.generate_fill(_masm, arg_save_area_offset);
++ __ block_comment("{ argument shuffle");
++ arg_shuffle.generate(_masm, shuffle_reg, abi._shadow_space_bytes, frame::z_jit_out_preserve_size, locs);
++ __ block_comment("} argument shuffle");
++
++ __ block_comment("{ receiver ");
++ __ load_const_optimized(Z_ARG1, (intptr_t)receiver);
++ __ resolve_jobject(Z_ARG1, Z_tmp_1, Z_tmp_2);
++ __ block_comment("} receiver ");
++
++ __ load_const_optimized(Z_method, (intptr_t)entry);
++ __ z_stg(Z_method, Address(Z_thread, in_bytes(JavaThread::callee_target_offset())));
++
++ __ z_lg(call_target_address, Address(Z_method, in_bytes(Method::from_compiled_offset())));
++ __ call(call_target_address);
++
++ // return value shuffle
++ assert(!needs_return_buffer, "unexpected needs_return_buffer");
++ // CallArranger can pick a return type that goes in the same reg for both CCs.
++ if (call_regs._ret_regs.length() > 0) { // 0 or 1
++ VMStorage ret_reg = call_regs._ret_regs.at(0);
++ // Check if the return reg is as expected.
++ switch (ret_type) {
++ case T_BOOLEAN:
++ case T_BYTE:
++ case T_SHORT:
++ case T_CHAR:
++ case T_INT:
++ __ z_lgfr(Z_RET, Z_RET); // Clear garbage in high half.
++ // fallthrough
++ case T_LONG:
++ assert(as_Register(ret_reg) == Z_RET, "unexpected result register");
++ break;
++ case T_FLOAT:
++ case T_DOUBLE:
++ assert(as_FloatRegister(ret_reg) == Z_FRET, "unexpected result register");
++ break;
++ default:
++ fatal("unexpected return type: %s", type2name(ret_type));
++ }
++ }
++
++ result_spiller.generate_spill(_masm, res_save_area_offset);
++
++ __ block_comment("{ on_exit");
++ __ load_const_optimized(call_target_address, CAST_FROM_FN_PTR(uint64_t, UpcallLinker::on_exit));
++ __ z_aghik(Z_ARG1, Z_SP, frame_data_offset);
++ __ call(call_target_address);
++ __ block_comment("} on_exit");
++
++ restore_callee_saved_registers(_masm, abi, reg_save_area_offset);
++
++ result_spiller.generate_fill(_masm, res_save_area_offset);
++
++ __ pop_frame();
++ __ restore_return_pc();
++ __ z_br(Z_R14);
++
++ //////////////////////////////////////////////////////////////////////////////
++
++ __ block_comment("{ exception handler");
++
++ intptr_t exception_handler_offset = __ pc() - start;
++
++ // Native caller has no idea how to handle exceptions,
++ // so we just crash here. Up to callee to catch exceptions.
++ __ verify_oop(Z_ARG1);
++ __ load_const_optimized(call_target_address, CAST_FROM_FN_PTR(uint64_t, UpcallLinker::handle_uncaught_exception));
++ __ call_c(call_target_address);
++ __ should_not_reach_here();
++
++ __ block_comment("} exception handler");
++
++ _masm->flush();
++
++#ifndef PRODUCT
++ stringStream ss;
++ ss.print("upcall_stub_%s", entry->signature()->as_C_string());
++ const char* name = _masm->code_string(ss.as_string());
++#else // PRODUCT
++ const char* name = "upcall_stub";
++#endif // PRODUCT
++
++ buffer.log_section_sizes(name);
++ UpcallStub* blob
++ = UpcallStub::create(name,
++ &buffer,
++ exception_handler_offset,
++ receiver,
++ in_ByteSize(frame_data_offset));
++#ifndef PRODUCT
++ if (lt.is_enabled()) {
++ ResourceMark rm;
++ LogStream ls(lt);
++ blob->print_on(&ls);
++ }
++#endif
++
++ return blob->code_begin();
+ }
+diff --git a/src/hotspot/cpu/s390/vmstorage_s390.hpp b/src/hotspot/cpu/s390/vmstorage_s390.hpp
+index 192159adc4c..6a595670920 100644
+--- a/src/hotspot/cpu/s390/vmstorage_s390.hpp
++++ b/src/hotspot/cpu/s390/vmstorage_s390.hpp
+@@ -29,24 +29,79 @@
+ #include "asm/register.hpp"
+
+ enum class StorageType : int8_t {
+- STACK = 0,
+- PLACEHOLDER = 1,
+-// special locations used only by native code
+- FRAME_DATA = PLACEHOLDER + 1,
++ INTEGER = 0,
++ FLOAT = 1,
++ STACK = 2,
++ PLACEHOLDER = 3,
++ // special locations used only by native code
++ FRAME_DATA = 4,
+ INVALID = -1
+ };
+
+ // need to define this before constructing VMStorage (below)
+ constexpr inline bool VMStorage::is_reg(StorageType type) {
+- return false;
++ return type == StorageType::INTEGER || type == StorageType::FLOAT;
+ }
+ constexpr inline StorageType VMStorage::stack_type() { return StorageType::STACK; }
+ constexpr inline StorageType VMStorage::placeholder_type() { return StorageType::PLACEHOLDER; }
+ constexpr inline StorageType VMStorage::frame_data_type() { return StorageType::FRAME_DATA; }
+
++// Needs to be consistent with S390Architecture.java.
++constexpr uint16_t REG32_MASK = 0b0000000000000001;
++constexpr uint16_t REG64_MASK = 0b0000000000000011;
++
++inline Register as_Register(VMStorage vms) {
++ assert(vms.type() == StorageType::INTEGER, "not the right type");
++ return ::as_Register(vms.index());
++}
++
++inline FloatRegister as_FloatRegister(VMStorage vms) {
++ assert(vms.type() == StorageType::FLOAT, "not the right type");
++ return ::as_FloatRegister(vms.index());
++}
++
++inline VMStorage as_VMStorage(Register reg, uint16_t segment_mask = REG64_MASK) {
++ return VMStorage::reg_storage(StorageType::INTEGER, segment_mask, reg->encoding());
++}
++
++inline VMStorage as_VMStorage(FloatRegister reg, uint16_t segment_mask = REG64_MASK) {
++ return VMStorage::reg_storage(StorageType::FLOAT, segment_mask, reg->encoding());
++}
++
+ inline VMStorage as_VMStorage(VMReg reg, BasicType bt) {
++ if (reg->is_Register()) {
++ uint16_t segment_mask = 0;
++ switch (bt) {
++ case T_BOOLEAN:
++ case T_CHAR :
++ case T_BYTE :
++ case T_SHORT :
++ case T_INT : segment_mask = REG32_MASK; break;
++ default : segment_mask = REG64_MASK; break;
++ }
++ return as_VMStorage(reg->as_Register(), segment_mask);
++ } else if (reg->is_FloatRegister()) {
++ // FP regs always use double format. However, we need the correct format for loads /stores.
++ return as_VMStorage(reg->as_FloatRegister(), (bt == T_FLOAT) ? REG32_MASK : REG64_MASK);
++ } else if (reg->is_stack()) {
++ uint16_t size = 0;
++ switch (bt) {
++ case T_BOOLEAN:
++ case T_CHAR :
++ case T_BYTE :
++ case T_SHORT :
++ case T_INT :
++ case T_FLOAT : size = 4; break;
++ default : size = 8; break;
++ }
++ return VMStorage(StorageType::STACK, size,
++ checked_cast<uint16_t>(reg->reg2stack() * VMRegImpl::stack_slot_size));
++ } else if (!reg->is_valid()) {
++ return VMStorage::invalid();
++ }
++
+ ShouldNotReachHere();
+ return VMStorage::invalid();
+ }
+
+-#endif // CPU_S390_VMSTORAGE_S390_INLINE_HPP
+\ No newline at end of file
++#endif // CPU_S390_VMSTORAGE_S390_INLINE_HPP
+diff --git a/src/java.base/share/classes/jdk/internal/foreign/CABI.java b/src/java.base/share/classes/jdk/internal/foreign/CABI.java
+index eee4ae67457..d376a196333 100644
+--- a/src/java.base/share/classes/jdk/internal/foreign/CABI.java
++++ b/src/java.base/share/classes/jdk/internal/foreign/CABI.java
+@@ -41,6 +41,7 @@ public enum CABI {
+ WIN_AARCH_64,
+ LINUX_PPC_64_LE,
+ LINUX_RISCV_64,
++ LINUX_S390,
+ FALLBACK,
+ UNSUPPORTED;
+
+@@ -81,7 +82,11 @@ public enum CABI {
+ if (OperatingSystem.isLinux()) {
+ return LINUX_RISCV_64;
+ }
+- }
++ } else if (arch.equals("s390x")) {
++ if (OperatingSystem.isLinux()) {
++ return LINUX_S390;
++ }
++ }
+ } else if (FallbackLinker.isSupported()) {
+ return FALLBACK; // fallback linker
+ }
+diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java b/src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java
+index b5eb1029ff5..8a322cdcf7a 100644
+--- a/src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java
++++ b/src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java
+@@ -32,6 +32,7 @@ import jdk.internal.foreign.abi.aarch64.windows.WindowsAArch64Linker;
+ import jdk.internal.foreign.abi.fallback.FallbackLinker;
+ import jdk.internal.foreign.abi.ppc64.linux.LinuxPPC64leLinker;
+ import jdk.internal.foreign.abi.riscv64.linux.LinuxRISCV64Linker;
++import jdk.internal.foreign.abi.s390.linux.LinuxS390Linker;
+ import jdk.internal.foreign.abi.x64.sysv.SysVx64Linker;
+ import jdk.internal.foreign.abi.x64.windows.Windowsx64Linker;
+ import jdk.internal.foreign.layout.AbstractLayout;
+@@ -60,7 +61,8 @@ import java.util.Set;
+ public abstract sealed class AbstractLinker implements Linker permits LinuxAArch64Linker, MacOsAArch64Linker,
+ SysVx64Linker, WindowsAArch64Linker,
+ Windowsx64Linker, LinuxPPC64leLinker,
+- LinuxRISCV64Linker, FallbackLinker {
++ LinuxRISCV64Linker, LinuxS390Linker,
++ FallbackLinker {
+
+ public interface UpcallStubFactory {
+ MemorySegment makeStub(MethodHandle target, Arena arena);
+diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java b/src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java
+index 1e417245543..92d10a1dbdf 100644
+--- a/src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java
++++ b/src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java
+@@ -35,6 +35,7 @@ import jdk.internal.foreign.abi.aarch64.windows.WindowsAArch64Linker;
+ import jdk.internal.foreign.abi.fallback.FallbackLinker;
+ import jdk.internal.foreign.abi.ppc64.linux.LinuxPPC64leLinker;
+ import jdk.internal.foreign.abi.riscv64.linux.LinuxRISCV64Linker;
++import jdk.internal.foreign.abi.s390.linux.LinuxS390Linker;
+ import jdk.internal.foreign.abi.x64.sysv.SysVx64Linker;
+ import jdk.internal.foreign.abi.x64.windows.Windowsx64Linker;
+ import jdk.internal.vm.annotation.ForceInline;
+@@ -242,6 +243,7 @@ public final class SharedUtils {
+ case WIN_AARCH_64 -> WindowsAArch64Linker.getInstance();
+ case LINUX_PPC_64_LE -> LinuxPPC64leLinker.getInstance();
+ case LINUX_RISCV_64 -> LinuxRISCV64Linker.getInstance();
++ case LINUX_S390 -> LinuxS390Linker.getInstance();
+ case FALLBACK -> FallbackLinker.getInstance();
+ case UNSUPPORTED -> throw new UnsupportedOperationException("Platform does not support native linker");
+ };
+diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/s390/S390Architecture.java b/src/java.base/share/classes/jdk/internal/foreign/abi/s390/S390Architecture.java
+new file mode 100644
+index 00000000000..bbafef2f3dc
+--- /dev/null
++++ b/src/java.base/share/classes/jdk/internal/foreign/abi/s390/S390Architecture.java
+@@ -0,0 +1,151 @@
++/*
++ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2023 IBM Corp. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++package jdk.internal.foreign.abi.s390;
++
++import jdk.internal.foreign.abi.ABIDescriptor;
++import jdk.internal.foreign.abi.Architecture;
++import jdk.internal.foreign.abi.StubLocations;
++import jdk.internal.foreign.abi.VMStorage;
++
++public final class S390Architecture implements Architecture {
++ public static final Architecture INSTANCE = new S390Architecture();
++
++ // Needs to be consistent with vmstorage_s390.hpp.
++ public static final short REG32_MASK = 0b0000_0000_0000_0001;
++ public static final short REG64_MASK = 0b0000_0000_0000_0011;
++
++ private static final int INTEGER_REG_SIZE = 8;
++ private static final int FLOAT_REG_SIZE = 8;
++ private static final int STACK_SLOT_SIZE = 8;
++
++ // Suppresses default constructor, ensuring non-instantiability.
++ private S390Architecture() {
++ }
++
++ @Override
++ public boolean isStackType(int cls) {
++ return cls == StorageType.STACK;
++ }
++
++ @Override
++ public int typeSize(int cls) {
++ switch (cls) {
++ case StorageType.INTEGER:
++ return INTEGER_REG_SIZE;
++ case StorageType.FLOAT:
++ return FLOAT_REG_SIZE;
++ // STACK is deliberately omitted
++ }
++
++ throw new IllegalArgumentException("Invalid Storage Class: " + cls);
++ }
++
++ public interface StorageType {
++ byte INTEGER = 0;
++ byte FLOAT = 1;
++ byte STACK = 2;
++ byte PLACEHOLDER = 3;
++ }
++
++ public static class Regs { // break circular dependency
++ public static final VMStorage r0 = integerRegister(0);
++ public static final VMStorage r1 = integerRegister(1);
++ public static final VMStorage r2 = integerRegister(2);
++ public static final VMStorage r3 = integerRegister(3);
++ public static final VMStorage r4 = integerRegister(4);
++ public static final VMStorage r5 = integerRegister(5);
++ public static final VMStorage r6 = integerRegister(6);
++ public static final VMStorage r7 = integerRegister(7);
++ public static final VMStorage r8 = integerRegister(8);
++ public static final VMStorage r9 = integerRegister(9);
++ public static final VMStorage r10 = integerRegister(10);
++ public static final VMStorage r11 = integerRegister(11);
++ public static final VMStorage r12 = integerRegister(12);
++ public static final VMStorage r13 = integerRegister(13);
++ public static final VMStorage r14 = integerRegister(14);
++ public static final VMStorage r15 = integerRegister(15);
++
++ public static final VMStorage f0 = floatRegister(0);
++ public static final VMStorage f1 = floatRegister(1);
++ public static final VMStorage f2 = floatRegister(2);
++ public static final VMStorage f3 = floatRegister(3);
++ public static final VMStorage f4 = floatRegister(4);
++ public static final VMStorage f5 = floatRegister(5);
++ public static final VMStorage f6 = floatRegister(6);
++ public static final VMStorage f7 = floatRegister(7);
++ public static final VMStorage f8 = floatRegister(8);
++ public static final VMStorage f9 = floatRegister(9);
++ public static final VMStorage f10 = floatRegister(10);
++ public static final VMStorage f11 = floatRegister(11);
++ public static final VMStorage f12 = floatRegister(12);
++ public static final VMStorage f13 = floatRegister(13);
++ public static final VMStorage f14 = floatRegister(14);
++ public static final VMStorage f15 = floatRegister(15);
++ }
++
++ private static VMStorage integerRegister(int index) {
++ return new VMStorage(StorageType.INTEGER, REG64_MASK, index, "r" + index);
++ }
++
++ private static VMStorage floatRegister(int index) {
++ return new VMStorage(StorageType.FLOAT, REG64_MASK, index, "f" + index);
++ }
++
++ public static VMStorage stackStorage(short size, int byteOffset) {
++ return new VMStorage(StorageType.STACK, size, byteOffset);
++ }
++
++ public static ABIDescriptor abiFor(VMStorage[] inputIntRegs,
++ VMStorage[] inputFloatRegs,
++ VMStorage[] outputIntRegs,
++ VMStorage[] outputFloatRegs,
++ VMStorage[] volatileIntRegs,
++ VMStorage[] volatileFloatRegs,
++ int stackAlignment,
++ int shadowSpace,
++ VMStorage scratch1, VMStorage scratch2) {
++ return new ABIDescriptor(
++ INSTANCE,
++ new VMStorage[][] {
++ inputIntRegs,
++ inputFloatRegs,
++ },
++ new VMStorage[][] {
++ outputIntRegs,
++ outputFloatRegs,
++ },
++ new VMStorage[][] {
++ volatileIntRegs,
++ volatileFloatRegs,
++ },
++ stackAlignment,
++ shadowSpace,
++ scratch1, scratch2,
++ StubLocations.TARGET_ADDRESS.storage(StorageType.PLACEHOLDER),
++ StubLocations.RETURN_BUFFER.storage(StorageType.PLACEHOLDER),
++ StubLocations.CAPTURED_STATE_BUFFER.storage(StorageType.PLACEHOLDER));
++ }
++}
+diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/LinuxS390CallArranger.java b/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/LinuxS390CallArranger.java
+new file mode 100644
+index 00000000000..84392e45089
+--- /dev/null
++++ b/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/LinuxS390CallArranger.java
+@@ -0,0 +1,311 @@
++/*
++ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2023 IBM Corp. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++package jdk.internal.foreign.abi.s390.linux;
++
++import java.lang.foreign.AddressLayout;
++import java.lang.foreign.FunctionDescriptor;
++import java.lang.foreign.GroupLayout;
++import java.lang.foreign.MemoryLayout;
++import java.lang.foreign.MemorySegment;
++import jdk.internal.foreign.abi.ABIDescriptor;
++import jdk.internal.foreign.abi.AbstractLinker.UpcallStubFactory;
++import jdk.internal.foreign.abi.Binding;
++import jdk.internal.foreign.abi.CallingSequence;
++import jdk.internal.foreign.abi.CallingSequenceBuilder;
++import jdk.internal.foreign.abi.DowncallLinker;
++import jdk.internal.foreign.abi.LinkerOptions;
++import jdk.internal.foreign.abi.UpcallLinker;
++import jdk.internal.foreign.abi.SharedUtils;
++import jdk.internal.foreign.abi.VMStorage;
++import jdk.internal.foreign.Utils;
++
++import java.lang.foreign.ValueLayout;
++import java.lang.invoke.MethodHandle;
++import java.lang.invoke.MethodType;
++import java.util.List;
++import java.util.Map;
++import java.util.Optional;
++
++import static jdk.internal.foreign.abi.s390.linux.TypeClass.*;
++import static jdk.internal.foreign.abi.s390.S390Architecture.*;
++import static jdk.internal.foreign.abi.s390.S390Architecture.Regs.*;
++
++/**
++ * For the S390 C ABI specifically, this class uses CallingSequenceBuilder
++ * to translate a C FunctionDescriptor into a CallingSequence, which can then be turned into a MethodHandle.
++ *
++ * This includes taking care of synthetic arguments like pointers to return buffers for 'in-memory' returns.
++ */
++public class LinuxS390CallArranger {
++
++ private static final int STACK_SLOT_SIZE = 8;
++ public static final int MAX_REGISTER_ARGUMENTS = 5;
++ public static final int MAX_FLOAT_REGISTER_ARGUMENTS = 4;
++
++ private static final ABIDescriptor CLinux = abiFor(
++ new VMStorage[] { r2, r3, r4, r5, r6, }, // GP input
++ new VMStorage[] { f0, f2, f4, f6 }, // FP input
++ new VMStorage[] { r2, }, // GP output
++ new VMStorage[] { f0, }, // FP output
++ new VMStorage[] { r0, r1, r2, r3, r4, r5, r14 }, // volatile GP
++ new VMStorage[] { f1, f3, f5, f7 }, // volatile FP (excluding argument registers)
++ 8, // Stack is always 8 byte aligned on S390
++ 160, // ABI header
++ r0, r1 // scratch reg r0 & r1
++ );
++
++ public record Bindings(CallingSequence callingSequence, boolean isInMemoryReturn) {}
++
++ public static Bindings getBindings(MethodType mt, FunctionDescriptor cDesc, boolean forUpcall) {
++ return getBindings(mt, cDesc, forUpcall, LinkerOptions.empty());
++ }
++
++ public static Bindings getBindings(MethodType mt, FunctionDescriptor cDesc, boolean forUpcall, LinkerOptions options) {
++ CallingSequenceBuilder csb = new CallingSequenceBuilder(CLinux, forUpcall, options);
++
++ BindingCalculator argCalc = forUpcall ? new BoxBindingCalculator(true) : new UnboxBindingCalculator(true);
++ BindingCalculator retCalc = forUpcall ? new UnboxBindingCalculator(false) : new BoxBindingCalculator(false);
++
++ boolean returnInMemory = isInMemoryReturn(cDesc.returnLayout());
++ if (returnInMemory) {
++ Class<?> carrier = MemorySegment.class;
++ MemoryLayout layout =SharedUtils.C_POINTER;
++ csb.addArgumentBindings(carrier, layout, argCalc.getBindings(carrier, layout));
++ } else if (cDesc.returnLayout().isPresent()) {
++ Class<?> carrier = mt.returnType();
++ MemoryLayout layout = cDesc.returnLayout().get();
++ csb.setReturnBindings(carrier, layout, retCalc.getBindings(carrier, layout));
++ }
++
++ for (int i = 0; i < mt.parameterCount(); i++) {
++ Class<?> carrier = mt.parameterType(i);
++ MemoryLayout layout = cDesc.argumentLayouts().get(i);
++ csb.addArgumentBindings(carrier, layout, argCalc.getBindings(carrier, layout));
++ }
++
++ return new Bindings(csb.build(), returnInMemory);
++ }
++
++ public static MethodHandle arrangeDowncall(MethodType mt, FunctionDescriptor cDesc, LinkerOptions options) {
++ Bindings bindings = getBindings(mt, cDesc, false, options);
++
++ MethodHandle handle = new DowncallLinker(CLinux, bindings.callingSequence).getBoundMethodHandle();
++
++ if (bindings.isInMemoryReturn) {
++ handle = SharedUtils.adaptDowncallForIMR(handle, cDesc, bindings.callingSequence);
++ }
++
++ return handle;
++ }
++
++ public static UpcallStubFactory arrangeUpcall(MethodType mt, FunctionDescriptor cDesc, LinkerOptions options) {
++ Bindings bindings = getBindings(mt, cDesc, true, options);
++
++ final boolean dropReturn = true; /* drop return, since we don't have bindings for it */
++ return SharedUtils.arrangeUpcallHelper(mt, bindings.isInMemoryReturn, dropReturn, CLinux,
++ bindings.callingSequence);
++ }
++
++ private static boolean isInMemoryReturn(Optional<MemoryLayout> returnLayout) {
++ return returnLayout
++ .filter(layout -> layout instanceof GroupLayout)
++ .isPresent();
++ }
++
++ static class StorageCalculator {
++ private final boolean forArguments;
++
++ private final int[] nRegs = new int[] { 0, 0 };
++ private long stackOffset = 0;
++
++ public StorageCalculator(boolean forArguments) {
++ this.forArguments = forArguments;
++ }
++
++ VMStorage stackAlloc(long size, long alignment) {
++ long alignedStackOffset = Utils.alignUp(stackOffset, alignment);
++
++ short encodedSize = (short) size;
++ assert (encodedSize & 0xFFFF) == size;
++
++ VMStorage storage = stackStorage(encodedSize, (int) alignedStackOffset);
++ stackOffset = alignedStackOffset + size;
++ return storage;
++ }
++
++ VMStorage regAlloc(int type) {
++ int gpRegCnt = (type == StorageType.INTEGER) ? 1 : 0;
++ int fpRegCnt = (type == StorageType.FLOAT) ? 1 : 0;
++
++ // Use stack if not enough registers available.
++ if ((type == StorageType.FLOAT && (nRegs[StorageType.FLOAT] + fpRegCnt) > MAX_FLOAT_REGISTER_ARGUMENTS)
++ || (type == StorageType.INTEGER && (nRegs[StorageType.INTEGER] + gpRegCnt) > MAX_REGISTER_ARGUMENTS)) return null;
++
++ VMStorage[] source = (forArguments ? CLinux.inputStorage : CLinux.outputStorage)[type];
++ VMStorage result = source[nRegs[type]];
++
++ nRegs[StorageType.INTEGER] += gpRegCnt;
++ nRegs[StorageType.FLOAT] += fpRegCnt;
++ return result;
++
++ }
++ VMStorage getStorage(int type, boolean is32Bit) {
++ VMStorage reg = regAlloc(type);
++ if (reg != null) {
++ if (is32Bit) {
++ reg = new VMStorage(reg.type(), REG32_MASK, reg.indexOrOffset());
++ }
++ return reg;
++ }
++ VMStorage stack;
++ if (is32Bit) {
++ stackAlloc(4, STACK_SLOT_SIZE); // Skip first half of stack slot.
++ stack = stackAlloc(4, 4);
++ } else
++ stack = stackAlloc(8, STACK_SLOT_SIZE);
++
++ return stack;
++ }
++ }
++
++ abstract static class BindingCalculator {
++ protected final StorageCalculator storageCalculator;
++
++ protected BindingCalculator(boolean forArguments) {
++ this.storageCalculator = new LinuxS390CallArranger.StorageCalculator(forArguments);
++ }
++
++ abstract List<Binding> getBindings(Class<?> carrier, MemoryLayout layout);
++ }
++
++ // Compute recipe for transferring arguments / return values to C from Java.
++ static class UnboxBindingCalculator extends BindingCalculator {
++ UnboxBindingCalculator(boolean forArguments) {
++ super(forArguments);
++ }
++
++ @Override
++ List<Binding> getBindings(Class<?> carrier, MemoryLayout layout) {
++ TypeClass argumentClass = TypeClass.classifyLayout(layout);
++ Binding.Builder bindings = Binding.builder();
++ switch (argumentClass) {
++ case STRUCT_REGISTER -> {
++ assert carrier == MemorySegment.class;
++ VMStorage storage = storageCalculator.getStorage(StorageType.INTEGER, false);
++ Class<?> type = SharedUtils.primitiveCarrierForSize(layout.byteSize(), false);
++ bindings.bufferLoad(0, type)
++ .vmStore(storage, type);
++ }
++ case STRUCT_SFA -> {
++ assert carrier == MemorySegment.class;
++ VMStorage storage = storageCalculator.getStorage(StorageType.FLOAT, layout.byteSize() == 4);
++ Class<?> type = SharedUtils.primitiveCarrierForSize(layout.byteSize(), true);
++ bindings.bufferLoad(0, type)
++ .vmStore(storage, type);
++ }
++ case STRUCT_REFERENCE -> {
++ assert carrier == MemorySegment.class;
++ bindings.copy(layout)
++ .unboxAddress();
++ VMStorage storage = storageCalculator.getStorage(StorageType.INTEGER, false);
++ bindings.vmStore(storage, long.class);
++ }
++ case POINTER -> {
++ VMStorage storage = storageCalculator.getStorage(StorageType.INTEGER, false);
++ bindings.unboxAddress()
++ .vmStore(storage, long.class);
++ }
++ case INTEGER -> {
++ // ABI requires all int types to get extended to 64 bit.
++ VMStorage storage = storageCalculator.getStorage(StorageType.INTEGER, false);
++ bindings.vmStore(storage, carrier);
++ }
++ case FLOAT -> {
++ VMStorage storage = storageCalculator.getStorage(StorageType.FLOAT, carrier == float.class);
++ bindings.vmStore(storage, carrier);
++ }
++ default -> throw new UnsupportedOperationException("Unhandled class " + argumentClass);
++ }
++ return bindings.build();
++ }
++ }
++
++ // Compute recipe for transferring arguments / return values from C to Java.
++ static class BoxBindingCalculator extends BindingCalculator {
++ BoxBindingCalculator(boolean forArguments) {
++ super(forArguments);
++ }
++
++ @Override
++ List<Binding> getBindings(Class<?> carrier, MemoryLayout layout) {
++ TypeClass argumentClass = TypeClass.classifyLayout(layout);
++ Binding.Builder bindings = Binding.builder();
++ switch (argumentClass) {
++ case STRUCT_REGISTER -> {
++ assert carrier == MemorySegment.class;
++ bindings.allocate(layout)
++ .dup();
++ VMStorage storage = storageCalculator.getStorage(StorageType.INTEGER, false);
++ Class<?> type = SharedUtils.primitiveCarrierForSize(layout.byteSize(), false);
++ bindings.vmLoad(storage, type)
++ .bufferStore(0, type);
++ }
++ case STRUCT_SFA -> {
++ assert carrier == MemorySegment.class;
++ bindings.allocate(layout)
++ .dup();
++ VMStorage storage = storageCalculator.getStorage(StorageType.FLOAT, layout.byteSize() == 4);
++ Class<?> type = SharedUtils.primitiveCarrierForSize(layout.byteSize(), true);
++ bindings.vmLoad(storage, type)
++ .bufferStore(0, type);
++ }
++ case STRUCT_REFERENCE -> {
++ assert carrier == MemorySegment.class;
++ VMStorage storage = storageCalculator.getStorage(StorageType.INTEGER, false);
++ bindings.vmLoad(storage, long.class)
++ .boxAddress(layout);
++ }
++ case POINTER -> {
++ AddressLayout addressLayout = (AddressLayout) layout;
++ VMStorage storage = storageCalculator.getStorage(StorageType.INTEGER, false);
++ bindings.vmLoad(storage, long.class)
++ .boxAddressRaw(Utils.pointeeByteSize(addressLayout), Utils.pointeeByteAlign(addressLayout));
++ }
++ case INTEGER -> {
++ // We could use carrier != long.class for BoxBindingCalculator, but C always uses 64 bit slots.
++ VMStorage storage = storageCalculator.getStorage(StorageType.INTEGER, false);
++ bindings.vmLoad(storage, carrier);
++ }
++ case FLOAT -> {
++ VMStorage storage = storageCalculator.getStorage(StorageType.FLOAT, carrier == float.class);
++ bindings.vmLoad(storage, carrier);
++ }
++ default -> throw new UnsupportedOperationException("Unhandled class " + argumentClass);
++ }
++ return bindings.build();
++ }
++ }
++}
+diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/LinuxS390Linker.java b/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/LinuxS390Linker.java
+new file mode 100644
+index 00000000000..ac004b9e1e0
+--- /dev/null
++++ b/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/LinuxS390Linker.java
+@@ -0,0 +1,64 @@
++/*
++ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2023 IBM Corp. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++package jdk.internal.foreign.abi.s390.linux;
++
++import jdk.internal.foreign.abi.AbstractLinker;
++import jdk.internal.foreign.abi.LinkerOptions;
++
++import java.lang.foreign.FunctionDescriptor;
++import java.lang.invoke.MethodHandle;
++import java.lang.invoke.MethodType;
++import java.nio.ByteOrder;
++
++public final class LinuxS390Linker extends AbstractLinker {
++
++ public static LinuxS390Linker getInstance() {
++ final class Holder {
++ private static final LinuxS390Linker INSTANCE = new LinuxS390Linker();
++ }
++
++ return Holder.INSTANCE;
++ }
++
++ private LinuxS390Linker() {
++ // Ensure there is only one instance
++ }
++
++ @Override
++ protected MethodHandle arrangeDowncall(MethodType inferredMethodType, FunctionDescriptor function, LinkerOptions options) {
++ return LinuxS390CallArranger.arrangeDowncall(inferredMethodType, function, options);
++ }
++
++ @Override
++ protected UpcallStubFactory arrangeUpcall(MethodType targetType, FunctionDescriptor function, LinkerOptions options) {
++ return LinuxS390CallArranger.arrangeUpcall(targetType, function, options);
++ }
++
++ @Override
++ protected ByteOrder linkerByteOrder() {
++ return ByteOrder.BIG_ENDIAN;
++ }
++}
+diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/TypeClass.java b/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/TypeClass.java
+new file mode 100644
+index 00000000000..095cb2c08a8
+--- /dev/null
++++ b/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/TypeClass.java
+@@ -0,0 +1,126 @@
++/*
++ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2023 IBM Corp. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++package jdk.internal.foreign.abi.s390.linux;
++
++import java.lang.foreign.GroupLayout;
++import java.lang.foreign.MemoryLayout;
++import java.lang.foreign.MemorySegment;
++import java.lang.foreign.SequenceLayout;
++import java.lang.foreign.ValueLayout;
++import java.util.List;
++import java.util.ArrayList;
++
++public enum TypeClass {
++ STRUCT_REGISTER,
++ STRUCT_SFA, // Single Float Aggregate
++ STRUCT_REFERENCE,
++ POINTER,
++ INTEGER,
++ FLOAT;
++
++ private static TypeClass classifyValueType(ValueLayout type) {
++ Class<?> carrier = type.carrier();
++ if (carrier == boolean.class || carrier == byte.class || carrier == char.class ||
++ carrier == short.class || carrier == int.class || carrier == long.class) {
++ return INTEGER;
++ } else if (carrier == float.class || carrier == double.class) {
++ return FLOAT;
++ } else if (carrier == MemorySegment.class) {
++ return POINTER;
++ } else {
++ throw new IllegalStateException("Cannot get here: " + carrier.getName());
++ }
++ }
++
++ private static boolean isRegisterAggregate(MemoryLayout type) {
++ long byteSize = type.byteSize();
++ if (byteSize > 8 || byteSize == 3 || byteSize == 5 || byteSize == 6 || byteSize == 7)
++ return false;
++ return true;
++ }
++
++ static List<MemoryLayout> scalarLayouts(GroupLayout gl) {
++ List<MemoryLayout> out = new ArrayList<>();
++ scalarLayoutsInternal(out, gl);
++ return out;
++ }
++
++ private static void scalarLayoutsInternal(List<MemoryLayout> out, GroupLayout gl) {
++ for (MemoryLayout member : gl.memberLayouts()) {
++ if (member instanceof GroupLayout memberGl) {
++ scalarLayoutsInternal(out, memberGl);
++ } else if (member instanceof SequenceLayout memberSl) {
++ for (long i = 0; i < memberSl.elementCount(); i++) {
++ out.add(memberSl.elementLayout());
++ }
++ } else {
++ // padding or value layouts
++ out.add(member);
++ }
++ }
++ }
++
++ static boolean isSingleFloatAggregate(MemoryLayout type) {
++ List<MemoryLayout> scalarLayouts = scalarLayouts((GroupLayout) type);
++
++ final int numElements = scalarLayouts.size();
++ if (numElements > 1 || numElements == 0)
++ return false;
++
++ MemoryLayout baseType = scalarLayouts.get(0);
++
++ if (!(baseType instanceof ValueLayout))
++ return false;
++
++ TypeClass baseArgClass = classifyValueType((ValueLayout) baseType);
++ if (baseArgClass != FLOAT)
++ return false;
++
++ return true;
++ }
++
++ private static TypeClass classifyStructType(MemoryLayout layout) {
++
++ if (!isRegisterAggregate(layout)) {
++ return TypeClass.STRUCT_REFERENCE;
++ }
++
++ if (isSingleFloatAggregate(layout)) {
++ return TypeClass.STRUCT_SFA;
++ }
++ return TypeClass.STRUCT_REGISTER;
++ }
++
++ public static TypeClass classifyLayout(MemoryLayout type) {
++ if (type instanceof ValueLayout) {
++ return classifyValueType((ValueLayout) type);
++ } else if (type instanceof GroupLayout) {
++ return classifyStructType(type);
++ } else {
++ throw new IllegalArgumentException("Unsupported layout: " + type);
++ }
++ }
++}
+diff --git a/test/jdk/java/foreign/TestClassLoaderFindNative.java b/test/jdk/java/foreign/TestClassLoaderFindNative.java
+index 3f5fec0c195..44ec8732ed4 100644
+--- a/test/jdk/java/foreign/TestClassLoaderFindNative.java
++++ b/test/jdk/java/foreign/TestClassLoaderFindNative.java
+@@ -31,9 +31,10 @@
+ import java.lang.foreign.Arena;
+ import java.lang.foreign.MemorySegment;
+ import java.lang.foreign.SymbolLookup;
++import java.nio.ByteOrder;
+ import org.testng.annotations.Test;
+
+-import static java.lang.foreign.ValueLayout.JAVA_BYTE;
++import static java.lang.foreign.ValueLayout.JAVA_INT;
+ import static org.testng.Assert.*;
+
+ // FYI this test is run on 64-bit platforms only for now,
+@@ -58,8 +59,8 @@ public class TestClassLoaderFindNative {
+
+ @Test
+ public void testVariableSymbolLookup() {
+- MemorySegment segment = SymbolLookup.loaderLookup().find("c").get().reinterpret(1);
+- assertEquals(segment.get(JAVA_BYTE, 0), 42);
++ MemorySegment segment = SymbolLookup.loaderLookup().find("c").get().reinterpret(4);
++ assertEquals(segment.get(JAVA_INT, 0), 42);
+ }
+
+ @Test
+diff --git a/test/jdk/java/foreign/TestIllegalLink.java b/test/jdk/java/foreign/TestIllegalLink.java
+index 677f0bce62f..5d8277a5d4c 100644
+--- a/test/jdk/java/foreign/TestIllegalLink.java
++++ b/test/jdk/java/foreign/TestIllegalLink.java
+@@ -54,6 +54,7 @@ import static org.testng.Assert.fail;
+ public class TestIllegalLink extends NativeTestHelper {
+
+ private static final boolean IS_SYSV = CABI.current() == CABI.SYS_V;
++ private static final boolean IS_LE = ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN;
+
+ private static final MemorySegment DUMMY_TARGET = MemorySegment.ofAddress(1);
+ private static final MethodHandle DUMMY_TARGET_MH = MethodHandles.empty(MethodType.methodType(void.class));
+@@ -113,27 +114,27 @@ public class TestIllegalLink extends NativeTestHelper {
+ {
+ FunctionDescriptor.of(MemoryLayout.sequenceLayout(2, C_INT)),
+ NO_OPTIONS,
+- "Unsupported layout: [2:i4]"
++ IS_LE ? "Unsupported layout: [2:i4]" : "Unsupported layout: [2:I4]"
+ },
+ {
+ FunctionDescriptor.ofVoid(MemoryLayout.sequenceLayout(2, C_INT)),
+ NO_OPTIONS,
+- "Unsupported layout: [2:i4]"
++ IS_LE ? "Unsupported layout: [2:i4]" : "Unsupported layout: [2:I4]"
+ },
+ {
+ FunctionDescriptor.ofVoid(C_INT.withByteAlignment(2)),
+ NO_OPTIONS,
+- "Unsupported layout: 2%i4"
++ IS_LE ? "Unsupported layout: 2%i4" : "Unsupported layout: 2%I4"
+ },
+ {
+ FunctionDescriptor.ofVoid(C_POINTER.withByteAlignment(2)),
+ NO_OPTIONS,
+- "Unsupported layout: 2%a8"
++ IS_LE ? "Unsupported layout: 2%a8" : "Unsupported layout: 2%A8"
+ },
+ {
+ FunctionDescriptor.ofVoid(ValueLayout.JAVA_CHAR.withByteAlignment(4)),
+ NO_OPTIONS,
+- "Unsupported layout: 4%c2"
++ IS_LE ? "Unsupported layout: 4%c2" : "Unsupported layout: 4%C2"
+ },
+ {
+ FunctionDescriptor.ofVoid(MemoryLayout.structLayout(
+@@ -142,7 +143,7 @@ public class TestIllegalLink extends NativeTestHelper {
+ C_INT.withName("z").withByteAlignment(1)
+ ).withByteAlignment(1)),
+ NO_OPTIONS,
+- "Unsupported layout: 1%s2"
++ IS_LE ? "Unsupported layout: 1%s2" : "Unsupported layout: 1%S2"
+ },
+ {
+ FunctionDescriptor.ofVoid(MemoryLayout.structLayout(
+@@ -152,7 +153,7 @@ public class TestIllegalLink extends NativeTestHelper {
+ C_INT.withName("z").withByteAlignment(1)
+ ))),
+ NO_OPTIONS,
+- "Unsupported layout: 1%s2"
++ IS_LE ? "Unsupported layout: 1%s2" : "Unsupported layout: 1%S2"
+ },
+ {
+ FunctionDescriptor.ofVoid(MemoryLayout.structLayout(
+@@ -160,7 +161,7 @@ public class TestIllegalLink extends NativeTestHelper {
+ C_INT.withByteAlignment(1)
+ ))),
+ NO_OPTIONS,
+- "Unsupported layout: 1%i4"
++ IS_LE ? "Unsupported layout: 1%i4" : "Unsupported layout: 1%I4"
+ },
+ {
+ FunctionDescriptor.ofVoid(MemoryLayout.structLayout(
+@@ -173,17 +174,17 @@ public class TestIllegalLink extends NativeTestHelper {
+ {
+ FunctionDescriptor.of(C_INT.withOrder(nonNativeOrder())),
+ NO_OPTIONS,
+- "Unsupported layout: I4"
++ IS_LE ? "Unsupported layout: I4" : "Unsupported layout: i4"
+ },
+ {
+ FunctionDescriptor.of(MemoryLayout.structLayout(C_INT.withOrder(nonNativeOrder()))),
+ NO_OPTIONS,
+- "Unsupported layout: I4"
++ IS_LE ? "Unsupported layout: I4" : "Unsupported layout: i4"
+ },
+ {
+ FunctionDescriptor.of(MemoryLayout.structLayout(MemoryLayout.sequenceLayout(C_INT.withOrder(nonNativeOrder())))),
+ NO_OPTIONS,
+- "Unsupported layout: I4"
++ IS_LE ? "Unsupported layout: I4" : "Unsupported layout: i4"
+ },
+ {
+ FunctionDescriptor.ofVoid(MemoryLayout.structLayout(
+@@ -227,5 +228,4 @@ public class TestIllegalLink extends NativeTestHelper {
+ ? ByteOrder.BIG_ENDIAN
+ : ByteOrder.LITTLE_ENDIAN;
+ }
+-
+ }
+diff --git a/test/jdk/java/foreign/callarranger/platform/PlatformLayouts.java b/test/jdk/java/foreign/callarranger/platform/PlatformLayouts.java
+index 1646063fb08..97856075bef 100644
+--- a/test/jdk/java/foreign/callarranger/platform/PlatformLayouts.java
++++ b/test/jdk/java/foreign/callarranger/platform/PlatformLayouts.java
+@@ -305,5 +305,4 @@ public final class PlatformLayouts {
+ public static final AddressLayout C_POINTER = SharedUtils.C_POINTER;
+
+ }
+-
+ }
diff --git a/openjdk_news.sh b/openjdk_news.sh
index 560b356..386aa53 100755
--- a/openjdk_news.sh
+++ b/openjdk_news.sh
@@ -18,8 +18,8 @@
OLD_RELEASE=$1
NEW_RELEASE=$2
-SUBDIR=$3
-REPO=$4
+REPO=$3
+SUBDIR=$4
SCRIPT_DIR=$(dirname ${0})
if test "x${SUBDIR}" = "x"; then
diff --git a/rh1648644-java_access_bridge_privileged_security.patch b/rh1648644-java_access_bridge_privileged_security.patch
deleted file mode 100644
index 53026ad..0000000
--- a/rh1648644-java_access_bridge_privileged_security.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- openjdk/src/java.base/share/conf/security/java.security
-+++ openjdk/src/java.base/share/conf/security/java.security
-@@ -304,6 +304,8 @@
- #
- package.access=sun.misc.,\
- sun.reflect.,\
-+ org.GNOME.Accessibility.,\
-+ org.GNOME.Bonobo.,\
-
- #
- # List of comma-separated packages that start with or equal this string
-@@ -316,6 +318,8 @@
- #
- package.definition=sun.misc.,\
- sun.reflect.,\
-+ org.GNOME.Accessibility.,\
-+ org.GNOME.Bonobo.,\
-
- #
- # Determines whether this properties file can be appended to
diff --git a/sources b/sources
index a5817fd..b2b5901 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openjdk-21+35.tar.xz) = 311e954cc8d28a336b85efc05baade8945fe5292ae2d91cc7ff71c6b3a1830b1a4b9fc641f87e68a4b3db175eb5c21a18664457715da9b37720c5d4b3eb67195
+SHA512 (openjdk-21.0.1+12.tar.xz) = 96513e1346dea623183ae68f88690aa7ea41d65f6a2499b7f9c08954643dd2a6f10d3f4f529fc34e00ff14e8c1bd3764ac78a5c669937a200c910ebcc74e782b
commit 898c425bb61bb936be3117e39564691ac56b901f
Author: Jiri <jvanek(a)redhat.com>
Date: Wed Sep 20 21:39:53 2023 +0200
Returned misteriously disapeared line
diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec
index ffb74a8..8a3b968 100644
--- a/java-latest-openjdk-portable.spec
+++ b/java-latest-openjdk-portable.spec
@@ -1,3 +1,4 @@
+%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
# portable jdk 17 specific bug, _jvmdir being missing
%define _jvmdir /usr/lib/jvm
%endif
commit 9e5764b72d8f3ac8141370dea8e739ee676e914f
Author: Jiri <jvanek(a)redhat.com>
Date: Wed Sep 20 21:36:50 2023 +0200
removed %{1} from misc
diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec
index 4710c10..ffb74a8 100644
--- a/java-latest-openjdk-portable.spec
+++ b/java-latest-openjdk-portable.spec
@@ -1,4 +1,3 @@
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
# portable jdk 17 specific bug, _jvmdir being missing
%define _jvmdir /usr/lib/jvm
%endif
@@ -385,7 +384,7 @@
%global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 35
-%global rpmrelease 3
+%global rpmrelease 4
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -459,7 +458,7 @@
# Intentionally use jdkportablenameimpl here since we want to have static-libs files overlayed on
# top of the JDK archive
%define staticlibsportablename() %{expand:%{jdkportablenameimpl -- %%{1}}}
-%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable%{1}.misc;g" | sed "s;openjdkportable;el;g")
+%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable.misc;g" | sed "s;openjdkportable;el;g")
%define miscportablearchive() %{miscportablename}.tar.xz
# RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1}
@@ -1652,6 +1651,9 @@ done
%{_jvmdir}/%{miscportablearchive}.sha256sum
%changelog
+* Wed Sep 20 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.0.0.35-4.rolling
+- removed %{1} from miscportablename
+
* Fri Sep 15 2023 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:21.0.0.0.35-3.rolling
- Update documentation (README.md, add missing JEP to release notes)
- Replace alt-java patch with a binary separate from the JDK
commit 4ec83bb3a6d6f8530433036f7f73567b34326f0e
Author: Andrew John Hughes <gnu_andrew(a)member.fsf.org>
Date: Fri Sep 15 18:23:53 2023 +0100
Sync with upcoming java-21-openjdk package in RHEL
- Update documentation (README.md, add missing JEP to release notes)
- Replace alt-java patch with a binary separate from the JDK
- Drop stale patches that are of little use any more:
- * nss.cfg has been disabled since early PKCS11 work and long superseded by FIPS work
- * No accessibility subpackage to warrant RH1648242 patch any more
- * No use of system libjpeg turbo to warrant RH649512 patch any more
- Replace RH1684077 pcsc-lite-libs patch with better JDK-8009550 fix being upstreamed
- Update generate_tarball.sh to sync with upstream vanilla script
- Change top_level_dir_name to use the VCS tag, matching new upstream release style tarball
- Use upstream release URL for OpenJDK source
- Port misc tarball from RHEL to house alt-java outside the JDK tree
- Port improved tarball creation and checking from RHEL so tarballs are verified
diff --git a/.gitignore b/.gitignore
index cf8d957..79f3174 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@
/openjdk-jdk20u-jdk-20.0.2+9.tar.xz
/openjdk-jdk21u-jdk-21+34.tar.xz
/openjdk-jdk21u-jdk-21+35.tar.xz
+/openjdk-21+35.tar.xz
diff --git a/NEWS b/NEWS
index 066d951..73322e7 100644
--- a/NEWS
+++ b/NEWS
@@ -76,6 +76,20 @@ an underscore character, _.
This is a preview feature (http://openjdk.java.net/jeps/12) introduced
in OpenJDK 21 (JEP 443).
+Unnamed Classes and Instance Main Methods
+=========================================
+https://openjdk.org/jeps/445
+
+Evolve the Java language so that students can write their first
+programs without needing to understand language features designed for
+large programs. Far from using a separate dialect of Java, students
+can write streamlined declarations for single-class programs and then
+seamlessly expand their programs to use more advanced features as
+their skills grow.
+
+This is a preview feature (http://openjdk.java.net/jeps/12) introduced
+in OpenJDK 21 (JEP 445).
+
Library Features
================
@@ -128,14 +142,15 @@ Virtual Threads
===============
https://openjdk.org/jeps/425
https://openjdk.org/jeps/436
+https://openjdk.org/jeps/444
Introduce virtual threads to the Java Platform. Virtual threads are
lightweight threads that dramatically reduce the effort of writing,
maintaining, and observing high-throughput concurrent applications.
-This is a preview feature (http://openjdk.java.net/jeps/12) introduced
-in OpenJDK 19 (JEP 425) and reaching its second preview in OpenJDK 20
-(JEP 436).
+This was a preview feature (http://openjdk.java.net/jeps/12)
+introduced in OpenJDK 19 (JEP 425) and reaching its second preview in
+OpenJDK 20 (JEP 436). It became final with OpenJDK 21 (JEP 444).
Structured Concurrency
======================
diff --git a/README.md b/README.md
index d139d7d..55536ce 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,14 @@
-# java-latest-openjdk-portable
+This package contains the latest rolling release of OpenJDK. OpenJDK
+has a release cadence of six months, with a new release in March and
+September each year.
-The java-latest-openjdk-portable package
-=======
-Rolling release of (usually) STSs OpenJDK
-OpenJDK has release cadence of 6 months, but 3/4 of them are Short Term Supported for 6 months only. This package is designed to harbor them. Currently it is build of OpenJDK 12. LTSs will go also as separate packages.
+The current release is OpenJDK 21. For a list of major changes from
+OpenJDK 20, see the NEWS file included in this package and the
+upstream release page:
-JDK21 is current release of Java platform. It is bringing many cool improvements - https://openjdk.org/projects/jdk/21/ and is landing to your Fedora. Where it will be maintained for f28 and newer. Unluckily, this package is STS (short term support) version. Between individual LTS there will be always several STS. Again, please see announcement: http://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html and See java SIG plans: https://jvanek.fedorapeople.org/devconf/2018/changesInjavaReleaseProcess.pdf . So this is rolling release of all STSs to come. Its fate during the release of fresh LTS is yet to be decided. You will always be allowed to install LTS in fedora build root, alongside with latest STS via alternatives.
+https://openjdk.java.net/projects/jdk/21/
-
-See announcement: http://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html
-See java SIG plans: https://jvanek.fedorapeople.org/devconf/2018/changesInjavaReleaseProcess.pdf
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1557371#c0
-https://fedoraproject.org/wiki/Changes/java-openjdk-10
-https://fedoraproject.org/wiki/Changes/java-11-openjdk-TechPreview
+This package is intended for those who want to follow the latest
+OpenJDK releases. Long term support versions of OpenJDK are available
+in the java-1.8.0-openjdk, java-11-openjdk and java-17-openjdk
+packages.
diff --git a/alt-java.c b/alt-java.c
new file mode 100644
index 0000000..644d002
--- /dev/null
+++ b/alt-java.c
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2023 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Red Hat designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Red Hat in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+#include <errno.h>
+#include <libgen.h>
+#include <linux/limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/prctl.h>
+#include <unistd.h>
+
+/* Per task speculation control */
+#ifndef PR_GET_SPECULATION_CTRL
+# define PR_GET_SPECULATION_CTRL 52
+#endif
+#ifndef PR_SET_SPECULATION_CTRL
+# define PR_SET_SPECULATION_CTRL 53
+#endif
+/* Speculation control variants */
+#ifndef PR_SPEC_STORE_BYPASS
+# define PR_SPEC_STORE_BYPASS 0
+#endif
+/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
+
+#ifndef PR_SPEC_NOT_AFFECTED
+# define PR_SPEC_NOT_AFFECTED 0
+#endif
+#ifndef PR_SPEC_PRCTL
+# define PR_SPEC_PRCTL (1UL << 0)
+#endif
+#ifndef PR_SPEC_ENABLE
+# define PR_SPEC_ENABLE (1UL << 1)
+#endif
+#ifndef PR_SPEC_DISABLE
+# define PR_SPEC_DISABLE (1UL << 2)
+#endif
+#ifndef PR_SPEC_FORCE_DISABLE
+# define PR_SPEC_FORCE_DISABLE (1UL << 3)
+#endif
+#ifndef PR_SPEC_DISABLE_NOEXEC
+# define PR_SPEC_DISABLE_NOEXEC (1UL << 4)
+#endif
+
+static void set_speculation() {
+#if defined(__linux__) && defined(__x86_64__)
+ // PR_SPEC_DISABLE_NOEXEC doesn't survive execve, so we can't use it
+ // if ( prctl(PR_SET_SPECULATION_CTRL,
+ // PR_SPEC_STORE_BYPASS,
+ // PR_SPEC_DISABLE_NOEXEC, 0, 0) == 0 ) {
+ // return;
+ // }
+ prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
+#else
+#warning alt-java requested but SSB mitigation not available on this platform.
+#endif
+}
+
+int main(int argc, char **argv) {
+ set_speculation();
+
+ char our_name[PATH_MAX], java_name[PATH_MAX];
+ ssize_t len = readlink("/proc/self/exe", our_name, PATH_MAX - 1);
+ if (len < 0) {
+ perror("I can't find myself");
+ exit(2);
+ }
+
+ our_name[len] = '\0'; // readlink(2) doesn't append a null byte
+ char *path = dirname(our_name);
+ strncpy(java_name, path, PATH_MAX - 1);
+
+ size_t remaining_bytes = PATH_MAX - strlen(path) - 1;
+ strncat(java_name, "/java", remaining_bytes);
+
+ execv(java_name, argv);
+ fprintf(stderr, "%s failed to launch: %s\n", java_name, strerror(errno));
+
+ exit(1);
+}
+
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index b1e2009..f27158d 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -30,19 +30,20 @@ set -e
OPENJDK_URL_DEFAULT=https://github.com
COMPRESSION_DEFAULT=xz
-# Corresponding IcedTea version
-ICEDTEA_VERSION=15.0
if [ "x$1" = "xhelp" ] ; then
+ if [ "x$VERSION" = "x" ] ; then
+ VERSION="<unspecified>";
+ fi
echo -e "Behaviour may be specified by setting the following variables:\n"
- echo "VERSION - the version of the specified OpenJDK project"
+ echo "VERSION - the version of the specified OpenJDK project (current value: ${VERSION})"
echo "PROJECT_NAME -- the name of the OpenJDK project being archived (optional; only needed by defaults)"
echo "REPO_NAME - the name of the OpenJDK repository (optional; only needed by defaults)"
echo "OPENJDK_URL - the URL to retrieve code from (optional; defaults to ${OPENJDK_URL_DEFAULT})"
echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
- echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
+ echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to open${VERSION})"
echo "REPO_ROOT - the location of the Git repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
- echo "TO_COMPRESS - what part of clone to pack (default is openjdk)"
+ echo "TO_COMPRESS - what part of clone to pack (default is ${VERSION})"
echo "BOOT_JDK - the bootstrap JDK to satisfy the configure run"
exit 1;
fi
@@ -53,6 +54,7 @@ if [ "x$VERSION" = "x" ] ; then
exit 2
fi
echo "Version: ${VERSION}"
+
NUM_VER=${VERSION##jdk-}
RELEASE_VER=${NUM_VER%%+*}
BUILD_VER=${NUM_VER##*+}
@@ -109,7 +111,7 @@ fi
echo "Creating a tar.${COMPRESSION} archive"
if [ "x$FILE_NAME_ROOT" = "x" ] ; then
- FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
+ FILE_NAME_ROOT=open${VERSION}
echo "No file name root specified; default to ${FILE_NAME_ROOT}"
fi
if [ "x$REPO_ROOT" = "x" ] ; then
@@ -118,7 +120,7 @@ if [ "x$REPO_ROOT" = "x" ] ; then
fi;
if [ "x$TO_COMPRESS" = "x" ] ; then
- TO_COMPRESS="openjdk"
+ TO_COMPRESS="${VERSION}"
echo "No targets to be compressed specified, ; default to ${TO_COMPRESS}"
fi;
@@ -141,35 +143,35 @@ else
mkdir "${FILE_NAME_ROOT}"
pushd "${FILE_NAME_ROOT}"
echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
- git clone -b ${VERSION} ${REPO_ROOT} openjdk
+ git clone -b ${VERSION} ${REPO_ROOT} ${VERSION}
popd
fi
pushd "${FILE_NAME_ROOT}"
# Generate .src-rev so build has knowledge of the revision the tarball was created from
mkdir build
pushd build
- sh ${PWD}/../openjdk/configure --with-boot-jdk=${BOOT_JDK}
+ sh ${PWD}/../${VERSION}/configure --with-boot-jdk=${BOOT_JDK}
make store-source-revision
popd
rm -rf build
# Remove commit checks
- echo "Removing $(find openjdk -name '.jcheck' -print)"
- find openjdk -name '.jcheck' -print0 | xargs -0 rm -rf
+ echo "Removing $(find ${VERSION} -name '.jcheck' -print)"
+ find ${VERSION} -name '.jcheck' -print0 | xargs -0 rm -r
# Remove history and GHA
- echo "find openjdk -name '.hgtags'"
- find openjdk -name '.hgtags' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.hgignore'"
- find openjdk -name '.hgignore' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.gitattributes'"
- find openjdk -name '.gitattributes' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.gitignore'"
- find openjdk -name '.gitignore' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.git'"
- find openjdk -name '.git' -exec rm -rfv '{}' '+'
- echo "find openjdk -name '.github'"
- find openjdk -name '.github' -exec rm -rfv '{}' '+'
+ echo "find ${VERSION} -name '.hgtags'"
+ find ${VERSION} -name '.hgtags' -exec rm -v '{}' '+'
+ echo "find ${VERSION} -name '.hgignore'"
+ find ${VERSION} -name '.hgignore' -exec rm -v '{}' '+'
+ echo "find ${VERSION} -name '.gitattributes'"
+ find ${VERSION} -name '.gitattributes' -exec rm -v '{}' '+'
+ echo "find ${VERSION} -name '.gitignore'"
+ find ${VERSION} -name '.gitignore' -exec rm -v '{}' '+'
+ echo "find ${VERSION} -name '.git'"
+ find ${VERSION} -name '.git' -exec rm -rv '{}' '+'
+ echo "find ${VERSION} -name '.github'"
+ find ${VERSION} -name '.github' -exec rm -rv '{}' '+'
echo "Compressing remaining forest"
if [ "X$COMPRESSION" = "Xxz" ] ; then
diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec
index 65c2533..4710c10 100644
--- a/java-latest-openjdk-portable.spec
+++ b/java-latest-openjdk-portable.spec
@@ -257,12 +257,6 @@
%global ourcppflags %(echo %ourflags | sed -e 's|-fexceptions||')
%global ourldflags %{__global_ldflags}
-# With disabled nss is NSS deactivated, so NSS_LIBDIR can contain the wrong path
-# the initialization must be here. Later the pkg-config have buggy behavior
-# looks like openjdk RPM specific bug
-# Always set this so the nss.cfg file is not broken
-%global NSS_LIBDIR %(pkg-config --variable=libdir nss)
-
# In some cases, the arch used by the JDK does
# not match _arch.
# Also, in some cases, the machine name used by SystemTap
@@ -388,10 +382,10 @@
# Standard JPackage naming and versioning defines
%global origin openjdk
%global origin_nice OpenJDK
-%global top_level_dir_name %{origin}
+%global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 35
-%global rpmrelease 2
+%global rpmrelease 3
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -444,6 +438,7 @@
%global static_libs_install_dir %{static_libs_arch_dir}/glibc
# output dir stub
%define buildoutputdir() %{expand:build/jdk%{featurever}.build%{?1}}
+%global altjavaoutputdir install/altjava.install
# we can copy the javadoc to not arched dir, or make it not noarch
%define uniquejavadocdir() %{expand:%{fullversion}.%{_arch}%{?1}}
# main id and dir of this jdk
@@ -464,6 +459,8 @@
# Intentionally use jdkportablenameimpl here since we want to have static-libs files overlayed on
# top of the JDK archive
%define staticlibsportablename() %{expand:%{jdkportablenameimpl -- %%{1}}}
+%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable%{1}.misc;g" | sed "s;openjdkportable;el;g")
+%define miscportablearchive() %{miscportablename}.tar.xz
# RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1}
# so we have to pass in "" but evaluate it, otherwise files record will include it
@@ -548,6 +545,8 @@ ExcludeArch: %{ix86}
%define java_static_libs_rpo() %{expand:
}
+%define java_misc_rpo() %{expand:
+}
# Prevent brp-java-repack-jars from being run
%global __jar_repack 0
@@ -598,7 +597,7 @@ URL: http://openjdk.java.net/
# The source tarball, generated using generate_source_tarball.sh
-Source0: openjdk-jdk%{featurever}u-%{vcstag}.tar.xz
+Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}.tar.xz
# Use 'icedtea_sync.sh' to update the following
# They are based on code contained in the IcedTea project (6.x).
@@ -613,8 +612,8 @@ Source0: openjdk-jdk%{featurever}u-%{vcstag}.tar.xz
# Release notes
Source10: NEWS
-# nss configuration file
-Source11: nss.cfg.in
+# Source code for alt-java
+Source11: alt-java.c
# Removed libraries that we link instead
# Disabled in portables
@@ -649,20 +648,6 @@ Source1004: ojdk17-s390x-17.35.tar.gz
#
############################################
-# NSS via SunPKCS11 Provider (disabled comment
-# due to memory leak).
-Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
-# RH1750419: enable build of speculative store bypass hardened alt-java (CVE-2018-3639)
-Patch600: rh1750419-redhat_alt_java.patch
-
-# Ignore AWTError when assistive technologies are loaded
-Patch1: rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
-# Restrict access to java-atk-wrapper classes
-Patch2: rh1648644-java_access_bridge_privileged_security.patch
-Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch
-# Depend on pcsc-lite-libs instead of pcsc-lite-devel as this is only in optional repo
-Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
-
# Crypto policy and FIPS support patches
# Patch is generated from the fips-21u tree at https://github.com/rh-openjdk/jdk/tree/fips-21u
# as follows: git diff %%{vcstag} src make test > fips-21u-$(git show -s --format=%h HEAD).patch
@@ -688,7 +673,8 @@ Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-d
# RH2090378: Revert to disabling system security properties and FIPS mode support together
# RH2104724: Avoid import/export of DH private keys
# RH2092507: P11Key.getEncoded does not work for DH keys in FIPS mode
-# RH2048582: Support PKCS#12 keystores
+# Build the systemconf library on all platforms
+# RH2048582: Support PKCS#12 keystores [now part of JDK-8301553 upstream]
# RH2020290: Support TLS 1.3 in FIPS mode
# Add nss.fips.cfg support to OpenJDK tree
# RH2117972: Extend the support for NSS DBs (PKCS11) in FIPS mode
@@ -697,15 +683,17 @@ Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-d
# RH2134669: Add missing attributes when registering services in FIPS mode.
# test/jdk/sun/security/pkcs11/fips/VerifyMissingAttributes.java: fixed jtreg main class
# RH1940064: Enable XML Signature provider in FIPS mode
-# Build the systemconf library on all platforms
-# Remove GCC minor versioning (JDK-8284772) to unbreak testing
-Patch1001: fips-21u-%{fipsver}.patch
+# RH2173781: Avoid calling C_GetInfo() too early, before cryptoki is initialized [now part of JDK-8301553 upstream]
+Patch1001: fips-%{featurever}u-%{fipsver}.patch
#############################################
#
# OpenJDK patches in need of upstreaming
#
#############################################
+# JDK-8009550, RH910107: Depend on pcsc-lite-libs instead of pcsc-lite-devel as this is only in optional repo
+# PR: https://github.com/openjdk/jdk/pull/15409
+Patch6: jdk8009550-rh910107-fail_to_load_pcsc_library.patch
#############################################
#
@@ -746,7 +734,7 @@ BuildRequires: libXrandr-devel
BuildRequires: libXrender-devel
BuildRequires: libXt-devel
BuildRequires: libXtst-devel
-# Requirement for setting up nss.cfg and nss.fips.cfg
+# Requirement for setting up nss.fips.cfg
BuildRequires: nss-devel
# Requirement for system security property test
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
@@ -916,6 +904,14 @@ The %{origin_nice} %{featurever} libraries for static linking - portable edition
# staticlibs
%endif
+%package misc
+Summary: %{origin_nice} %{featurever} miscellany
+
+%{java_misc_rpo %{nil}}
+
+%description misc
+The %{origin_nice} %{featurever} miscellany.
+
%package sources
Summary: %{origin_nice} %{featurever} full patched sources of portable JDK
@@ -979,18 +975,12 @@ sh %{SOURCE12} %{top_level_dir_name}
# Patch the JDK
pushd %{top_level_dir_name}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch6 -p1
# Add crypto policy and FIPS support
%patch1001 -p1
-# nss.cfg PKCS11 support; must come last as it also alters java.security
-%patch1000 -p1
+# Patches in need of upstreaming
+%patch6 -p1
popd # openjdk
-%patch600
-
# The OpenJDK version file includes the current
# upstream version information. For some reason,
# configure does not automatically use the
@@ -1043,9 +1033,6 @@ done
# Prepare desktop files
# Portables do not have desktop integration
-# Setup nss.cfg
-sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE11} > nss.cfg
-
%build
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
mkdir bootjdk
@@ -1100,6 +1087,10 @@ EXTRA_CPP_FLAGS="$(echo ${EXTRA_CPP_FLAGS} | sed -e 's|-mstackrealign|-mincoming
%endif
export EXTRA_CFLAGS EXTRA_CPP_FLAGS
+echo "Building %{SOURCE11}"
+mkdir -p %{altjavaoutputdir}
+gcc ${EXTRA_CFLAGS} -o %{altjavaoutputdir}/%{alt_java_name} %{SOURCE11}
+
function buildjdk() {
local outputdir=${1}
local buildjdk=${2}
@@ -1204,9 +1195,6 @@ function installjdk() {
find ${imagepath} -iname '*.so' -exec chmod +x {} \;
find ${imagepath}/bin/ -exec chmod +x {} \;
- # Install nss.cfg right away as we will be using the JRE above
- install -m 644 nss.cfg ${imagepath}/conf/security/
-
# Create fake alt-java as a placeholder for future alt-java
if [ -d man/man1 ] ; then
pushd ${imagepath}
@@ -1294,10 +1282,25 @@ EOF
fi
}
+function genchecksum() {
+ local checkedfile=${1}
+
+ checkdir=$(dirname ${1})
+ checkfile=$(basename ${1})
+
+ echo "Generating checksum for ${checkfile} in ${checkdir}..."
+ pushd ${checkdir}
+ sha256sum ${checkfile} > ${checkfile}.sha256sum
+ sha256sum --check ${checkfile}.sha256sum
+ popd
+}
+
+packagesdir=$(pwd)/..
+
pwd
ls -l
-tar -cJf ../%{jdkportablesourcesarchive -- ""} --transform "s|^|%{jdkportablesourcesname -- ""}/|" openjdk nss*
-sha256sum ../%{jdkportablesourcesarchive -- ""} > ../%{jdkportablesourcesarchive -- ""}.sha256sum
+tar -cJf ${packagesdir}/%{jdkportablesourcesarchive -- ""} --transform "s|^|%{jdkportablesourcesname -- ""}/|" %{top_level_dir_name}
+genchecksum ${packagesdir}/%{jdkportablesourcesarchive -- ""}
%if %{build_hotspot_first}
# Build a fresh libjvm.so first and use it to bootstrap
@@ -1410,12 +1413,12 @@ for suffix in %{build_loop} ; do
mv %{jdkimage} %{jdkportablename -- "$nameSuffix"}
mv %{jreimage} %{jreportablename -- "$nameSuffix"}
- tar -cJf ../../../../%{jdkportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jdkportablename -- "$nameSuffix"}
- sha256sum ../../../../%{jdkportablearchive -- "$nameSuffix"} > ../../../../%{jdkportablearchive -- "$nameSuffix"}.sha256sum
- tar -cJf ../../../../%{jreportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jreportablename -- "$nameSuffix"}
- sha256sum ../../../../%{jreportablearchive -- "$nameSuffix"} > ../../../../%{jreportablearchive -- "$nameSuffix"}.sha256sum
+ tar -cJf ${packagesdir}/%{jdkportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jdkportablename -- "$nameSuffix"}
+ genchecksum ${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
+ tar -cJf ${packagesdir}/%{jreportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jreportablename -- "$nameSuffix"}
+ genchecksum ${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
# copy licenses so they are avialable out of tarball
- cp -rf %{jdkportablename -- "$nameSuffix"}/legal ../../../../%{jdkportablearchive -- "%{normal_suffix}"}-legal
+ cp -rf %{jdkportablename -- "$nameSuffix"}/legal ${packagesdir}/%{jdkportablearchive -- "%{normal_suffix}"}-legal
mv %{jdkportablename -- "$nameSuffix"} %{jdkimage}
mv %{jreportablename -- "$nameSuffix"} %{jreimage}
popd #images
@@ -1426,8 +1429,8 @@ for suffix in %{build_loop} ; do
# Tar as overlay. Transform to the JDK name, since we just want to "add"
# static libraries to that folder
portableJDKname=%{staticlibsportablename -- "$nameSuffix"}
- tar -cJf ../../../../%{staticlibsportablearchive -- "$nameSuffix"} --transform "s|^%{static_libs_image}/lib/*|$portableJDKname/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib"
- sha256sum ../../../../%{staticlibsportablearchive -- "$nameSuffix"} > ../../../../%{staticlibsportablearchive -- "$nameSuffix"}.sha256sum
+ tar -cJf ${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"} --transform "s|^%{static_libs_image}/lib/*|$portableJDKname/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib"
+ genchecksum ${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
popd #staticlibs-images
%endif
################################################################################
@@ -1437,10 +1440,26 @@ for suffix in %{build_loop} ; do
# build cycles
done # end of release / debug cycle loop
+# These are from the source tree so no debug variants
+miscname=%{miscportablename}
+miscarchive=${packagesdir}/%{miscportablearchive}
+
+mkdir ${miscname}
+cp -av %{altjavaoutputdir}/%{alt_java_name} ${miscname}
+tar -cJf ${miscarchive} ${miscname}
+genchecksum ${miscarchive}
+
%install
+
+packagesdir=$(pwd)/..
+
mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
-mv ../%{jdkportablesourcesarchive -- ""} $RPM_BUILD_ROOT%{_jvmdir}/
-mv ../%{jdkportablesourcesarchive -- ""}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+# Install outside the loop as there are no debug variants
+miscarchive=${packagesdir}/%{miscportablearchive}
+mv ${packagesdir}/%{jdkportablesourcesarchive -- ""} $RPM_BUILD_ROOT%{_jvmdir}/
+mv ${packagesdir}/%{jdkportablesourcesarchive -- ""}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+mv ${miscarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+mv ${miscarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
for suffix in %{build_loop} ; do
top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
@@ -1451,13 +1470,13 @@ top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
else
nameSuffix=`echo "$suffix"| sed s/-/./`
fi
- mv ../%{jdkportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{jdkportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{jreportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{jreportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${packagesdir}/%{jdkportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${packagesdir}/%{jreportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${packagesdir}/%{jreportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
%if %{include_staticlibs}
- mv ../%{staticlibsportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{staticlibsportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
%endif
if [ "x$suffix" == "x" ] ; then
dnameSuffix="$nameSuffix".debuginfo
@@ -1471,7 +1490,7 @@ done
################################################################################
# the licenses are packed onloy once and shared
mkdir -p $RPM_BUILD_ROOT%{unpacked_licenses}
-mv ../%{jdkportablearchive -- "%{normal_suffix}"}-legal $RPM_BUILD_ROOT%{unpacked_licenses}/%{jdkportablesourcesarchive -- "%{normal_suffix}"}
+mv ${packagesdir}/%{jdkportablearchive -- "%{normal_suffix}"}-legal $RPM_BUILD_ROOT%{unpacked_licenses}/%{jdkportablesourcesarchive -- "%{normal_suffix}"}
# To show sha in the build log
for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do ls -l $file ; cat $file ; done
################################################################################
@@ -1513,10 +1532,11 @@ $JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=fal
if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
# Check alt-java launcher has SSB mitigation on supported architectures
+# set_speculation function exists in both cases, so check for prctl call
%ifarch %{ssbd_arches}
-nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation
+nm %{altjavaoutputdir}/%{alt_java_name} | grep prctl
%else
-if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi
+if ! nm %{altjavaoutputdir}/%{alt_java_name} | grep prctl ; then true ; else false; fi
%endif
# Check correct vendor values have been set
@@ -1627,7 +1647,25 @@ done
%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}.sha256sum
%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
+%files misc
+%{_jvmdir}/%{miscportablearchive}
+%{_jvmdir}/%{miscportablearchive}.sha256sum
+
%changelog
+* Fri Sep 15 2023 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:21.0.0.0.35-3.rolling
+- Update documentation (README.md, add missing JEP to release notes)
+- Replace alt-java patch with a binary separate from the JDK
+- Drop stale patches that are of little use any more:
+- * nss.cfg has been disabled since early PKCS11 work and long superseded by FIPS work
+- * No accessibility subpackage to warrant RH1648242 patch any more
+- * No use of system libjpeg turbo to warrant RH649512 patch any more
+- Replace RH1684077 pcsc-lite-libs patch with better JDK-8009550 fix being upstreamed
+- Update generate_tarball.sh to sync with upstream vanilla script
+- Change top_level_dir_name to use the VCS tag, matching new upstream release style tarball
+- Use upstream release URL for OpenJDK source
+- Port misc tarball from RHEL to house alt-java outside the JDK tree
+- Port improved tarball creation and checking from RHEL so tarballs are verified
+
* Thu Sep 14 2023 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:21.0.0.0.35-2.rolling
- Bump buildjdkver now that java-21-openjdk is available in the buildroot
diff --git a/jdk8009550-rh910107-fail_to_load_pcsc_library.patch b/jdk8009550-rh910107-fail_to_load_pcsc_library.patch
new file mode 100644
index 0000000..9213937
--- /dev/null
+++ b/jdk8009550-rh910107-fail_to_load_pcsc_library.patch
@@ -0,0 +1,125 @@
+commit d0523302416bc6507696f20d1068f16427bcf6b8
+Author: Andrew Hughes <gnu.andrew(a)redhat.com>
+Date: Thu Aug 24 01:23:49 2023 +0100
+
+ 8009550: PlatformPCSC should load versioned so
+
+diff --git a/src/java.base/share/classes/sun/security/util/Debug.java b/src/java.base/share/classes/sun/security/util/Debug.java
+index bff273c6548..e5a6b288ff8 100644
+--- a/src/java.base/share/classes/sun/security/util/Debug.java
++++ b/src/java.base/share/classes/sun/security/util/Debug.java
+@@ -81,6 +81,7 @@ public static void Help()
+ System.err.println("logincontext login context results");
+ System.err.println("jca JCA engine class debugging");
+ System.err.println("keystore KeyStore debugging");
++ System.err.println("pcsc Smartcard library debugging");
+ System.err.println("policy loading and granting");
+ System.err.println("provider security provider debugging");
+ System.err.println("pkcs11 PKCS11 session manager debugging");
+diff --git a/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java b/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
+index bacff32efbc..d9f605ada1e 100644
+--- a/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
++++ b/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
+@@ -1,5 +1,6 @@
+ /*
+ * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2023, Red Hat Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -46,8 +47,13 @@ class PlatformPCSC {
+
+ private static final String PROP_NAME = "sun.security.smartcardio.library";
+
+- private static final String LIB1 = "/usr/$LIBISA/libpcsclite.so";
+- private static final String LIB2 = "/usr/local/$LIBISA/libpcsclite.so";
++ private static final String[] LIB_TEMPLATES = { "/usr/$LIBISA/libpcsclite.so",
++ "/usr/local/$LIBISA/libpcsclite.so",
++ "/usr/lib/$ARCH-linux-gnu/libpcsclite.so",
++ "/usr/lib/arm-linux-gnueabi/libpcsclite.so",
++ "/usr/lib/arm-linux-gnueabihf/libpcsclite.so",
++ "/usr/lib/$ARCH-kfreebsd-gnu/libpcsclite.so" };
++ private static final String[] LIB_SUFFIXES = { ".1", ".0", "" };
+ private static final String PCSC_FRAMEWORK = "/System/Library/Frameworks/PCSC.framework/Versions/Current/PCSC";
+
+ PlatformPCSC() {
+@@ -73,23 +79,38 @@ public Throwable run() {
+ });
+
+ // expand $LIBISA to the system specific directory name for libraries
++ // expand $ARCH to the Debian system architecture in use
+ private static String expand(String lib) {
+ int k = lib.indexOf("$LIBISA");
+- if (k == -1) {
+- return lib;
++ if (k != -1) {
++ String libDir;
++ if ("64".equals(System.getProperty("sun.arch.data.model"))) {
++ // assume Linux convention
++ libDir = "lib64";
++ } else {
++ // must be 32-bit
++ libDir = "lib";
++ }
++ lib = lib.replace("$LIBISA", libDir);
+ }
+- String s1 = lib.substring(0, k);
+- String s2 = lib.substring(k + 7);
+- String libDir;
+- if ("64".equals(System.getProperty("sun.arch.data.model"))) {
+- // assume Linux convention
+- libDir = "lib64";
+- } else {
+- // must be 32-bit
+- libDir = "lib";
++
++ k = lib.indexOf("$ARCH");
++ if (k != -1) {
++ String arch = System.getProperty("os.arch");
++ lib = lib.replace("$ARCH", getDebianArchitecture(arch));
+ }
+- String s = s1 + libDir + s2;
+- return s;
++
++ return lib;
++ }
++
++ private static String getDebianArchitecture(String jdkArch) {
++ return switch (jdkArch) {
++ case "amd64" -> "x86_64";
++ case "ppc" -> "powerpc";
++ case "ppc64" -> "powerpc64";
++ case "ppc64le" -> "powerpc64le";
++ default -> jdkArch;
++ };
+ }
+
+ private static String getLibraryName() throws IOException {
+@@ -98,15 +119,18 @@ private static String getLibraryName() throws IOException {
+ if (lib.length() != 0) {
+ return lib;
+ }
+- lib = expand(LIB1);
+- if (new File(lib).isFile()) {
+- // if LIB1 exists, use that
+- return lib;
+- }
+- lib = expand(LIB2);
+- if (new File(lib).isFile()) {
+- // if LIB2 exists, use that
+- return lib;
++
++ for (String template : LIB_TEMPLATES) {
++ for (String suffix : LIB_SUFFIXES) {
++ lib = expand(template) + suffix;
++ if (debug != null) {
++ debug.println("Looking for " + lib);
++ }
++ if (new File(lib).isFile()) {
++ // if library exists, use that
++ return lib;
++ }
++ }
+ }
+
+ // As of macos 11, framework libraries have been removed from the file
diff --git a/nss.cfg.in b/nss.cfg.in
deleted file mode 100644
index 377a39c..0000000
--- a/nss.cfg.in
+++ /dev/null
@@ -1,5 +0,0 @@
-name = NSS
-nssLibraryDirectory = @NSS_LIBDIR@
-nssDbMode = noDb
-attributes = compatibility
-handleStartupErrors = ignoreMultipleInitialisation
diff --git a/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch b/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
deleted file mode 100644
index 3042186..0000000
--- a/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -r 618ad1237e73 src/java.desktop/share/classes/java/awt/Toolkit.java
---- a/src/java.desktop/share/classes/java/awt/Toolkit.java Thu Jun 13 19:37:49 2019 +0200
-+++ b/src/java.desktop/share/classes/java/awt/Toolkit.java Thu Jul 04 10:35:42 2019 +0200
-@@ -595,7 +595,11 @@
- toolkit = new HeadlessToolkit(toolkit);
- }
- if (!GraphicsEnvironment.isHeadless()) {
-- loadAssistiveTechnologies();
-+ try {
-+ loadAssistiveTechnologies();
-+ } catch (AWTError error) {
-+ // ignore silently
-+ }
- }
- }
- return toolkit;
diff --git a/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch b/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
deleted file mode 100644
index b357edf..0000000
--- a/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git openjdk.orig/src/java.base/share/conf/security/java.security openjdk/src/java.base/share/conf/security/java.security
-index 68a9c1a2d08..7aa25eb2cb7 100644
---- openjdk.orig/src/java.base/share/conf/security/java.security
-+++ openjdk/src/java.base/share/conf/security/java.security
-@@ -78,6 +78,7 @@ security.provider.tbd=SunMSCAPI
- security.provider.tbd=Apple
- #endif
- security.provider.tbd=SunPKCS11
-+#security.provider.tbd=SunPKCS11 ${java.home}/lib/security/nss.cfg
-
- #
- # Security providers used when FIPS mode support is active
-
diff --git a/rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch b/rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
deleted file mode 100644
index 4c1476f..0000000
--- a/rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java b/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
-index bacff32efbc..ff7b3dcc81c 100644
---- openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
-+++ openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
-@@ -46,8 +46,8 @@ class PlatformPCSC {
-
- private static final String PROP_NAME = "sun.security.smartcardio.library";
-
-- private static final String LIB1 = "/usr/$LIBISA/libpcsclite.so";
-- private static final String LIB2 = "/usr/local/$LIBISA/libpcsclite.so";
-+ private static final String LIB1 = "/usr/$LIBISA/libpcsclite.so.1";
-+ private static final String LIB2 = "/usr/local/$LIBISA/libpcsclite.so.1";
- private static final String PCSC_FRAMEWORK = "/System/Library/Frameworks/PCSC.framework/Versions/Current/PCSC";
-
- PlatformPCSC() {
diff --git a/rh1750419-redhat_alt_java.patch b/rh1750419-redhat_alt_java.patch
deleted file mode 100644
index d877ca8..0000000
--- a/rh1750419-redhat_alt_java.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff --git openjdk.orig/make/modules/java.base/Launcher.gmk openjdk/make/modules/java.base/Launcher.gmk
-index 700ddefda49..2882de68eb2 100644
---- openjdk.orig/make/modules/java.base/Launcher.gmk
-+++ openjdk/make/modules/java.base/Launcher.gmk
-@@ -41,6 +41,14 @@ $(eval $(call SetupBuildLauncher, java, \
- OPTIMIZATION := HIGH, \
- ))
-
-+#Wno-error=cpp is present to allow commented warning in ifdef part of main.c
-+$(eval $(call SetupBuildLauncher, alt-java, \
-+ CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES -DREDHAT_ALT_JAVA -Wno-error=cpp, \
-+ EXTRA_RCFLAGS := $(JAVA_RCFLAGS), \
-+ VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \
-+ OPTIMIZATION := HIGH, \
-+))
-+
- ifeq ($(call isTargetOs, windows), true)
- $(eval $(call SetupBuildLauncher, javaw, \
- CFLAGS := -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \
-diff --git openjdk.orig/src/java.base/share/native/launcher/alt_main.h openjdk/src/java.base/share/native/launcher/alt_main.h
-new file mode 100644
-index 00000000000..697df2898ac
---- /dev/null
-+++ openjdk/src/java.base/share/native/launcher/alt_main.h
-@@ -0,0 +1,73 @@
-+/*
-+ * Copyright (c) 2019, Red Hat, Inc. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+#ifdef REDHAT_ALT_JAVA
-+
-+#include <sys/prctl.h>
-+
-+
-+/* Per task speculation control */
-+#ifndef PR_GET_SPECULATION_CTRL
-+# define PR_GET_SPECULATION_CTRL 52
-+#endif
-+#ifndef PR_SET_SPECULATION_CTRL
-+# define PR_SET_SPECULATION_CTRL 53
-+#endif
-+/* Speculation control variants */
-+#ifndef PR_SPEC_STORE_BYPASS
-+# define PR_SPEC_STORE_BYPASS 0
-+#endif
-+/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
-+
-+#ifndef PR_SPEC_NOT_AFFECTED
-+# define PR_SPEC_NOT_AFFECTED 0
-+#endif
-+#ifndef PR_SPEC_PRCTL
-+# define PR_SPEC_PRCTL (1UL << 0)
-+#endif
-+#ifndef PR_SPEC_ENABLE
-+# define PR_SPEC_ENABLE (1UL << 1)
-+#endif
-+#ifndef PR_SPEC_DISABLE
-+# define PR_SPEC_DISABLE (1UL << 2)
-+#endif
-+#ifndef PR_SPEC_FORCE_DISABLE
-+# define PR_SPEC_FORCE_DISABLE (1UL << 3)
-+#endif
-+#ifndef PR_SPEC_DISABLE_NOEXEC
-+# define PR_SPEC_DISABLE_NOEXEC (1UL << 4)
-+#endif
-+
-+static void set_speculation() __attribute__((constructor));
-+static void set_speculation() {
-+ if ( prctl(PR_SET_SPECULATION_CTRL,
-+ PR_SPEC_STORE_BYPASS,
-+ PR_SPEC_DISABLE_NOEXEC, 0, 0) == 0 ) {
-+ return;
-+ }
-+ prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
-+}
-+
-+#endif // REDHAT_ALT_JAVA
-diff --git openjdk.orig/src/java.base/share/native/launcher/main.c openjdk/src/java.base/share/native/launcher/main.c
-index b734fe2ba78..79dc8307650 100644
---- openjdk.orig/src/java.base/share/native/launcher/main.c
-+++ openjdk/src/java.base/share/native/launcher/main.c
-@@ -34,6 +34,14 @@
- #include "jli_util.h"
- #include "jni.h"
-
-+#ifdef REDHAT_ALT_JAVA
-+#if defined(__linux__) && defined(__x86_64__)
-+#include "alt_main.h"
-+#else
-+#warning alt-java requested but SSB mitigation not available on this platform.
-+#endif
-+#endif
-+
- /*
- * Entry point.
- */
diff --git a/rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch b/rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch
deleted file mode 100644
index 1b706a1..0000000
--- a/rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Remove uses of FAR in jpeg code
-
-Upstream libjpeg-trubo removed the (empty) FAR macro:
-http://sourceforge.net/p/libjpeg-turbo/code/1312/
-
-Adjust our code to not use the undefined FAR macro anymore.
-
-diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c b/jdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
---- openjdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
-+++ openjdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
-@@ -1385,7 +1385,7 @@
- /* and fill it in */
- dst_ptr = icc_data;
- for (seq_no = first; seq_no < last; seq_no++) {
-- JOCTET FAR *src_ptr = icc_markers[seq_no]->data + ICC_OVERHEAD_LEN;
-+ JOCTET *src_ptr = icc_markers[seq_no]->data + ICC_OVERHEAD_LEN;
- unsigned int length =
- icc_markers[seq_no]->data_length - ICC_OVERHEAD_LEN;
-
diff --git a/sources b/sources
index 443c08d..a5817fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openjdk-jdk21u-jdk-21+35.tar.xz) = 5961f12ff9828856e5ce7847a06177a6761088dbefbcac05512a7c3433d45154f6d59872cd00268fecd987128e623bb343d9879b26f6c6c811e6d6713d1b17a2
+SHA512 (openjdk-21+35.tar.xz) = 311e954cc8d28a336b85efc05baade8945fe5292ae2d91cc7ff71c6b3a1830b1a4b9fc641f87e68a4b3db175eb5c21a18664457715da9b37720c5d4b3eb67195
commit fff7874101a13073dc48d63657881324f7c9d39e
Author: Andrew John Hughes <gnu_andrew(a)member.fsf.org>
Date: Thu Sep 14 16:14:32 2023 +0100
Bump buildjdkver now that java-21-openjdk is available in the buildroot
diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec
index 80d4854..65c2533 100644
--- a/java-latest-openjdk-portable.spec
+++ b/java-latest-openjdk-portable.spec
@@ -338,7 +338,7 @@
# buildjdkver is usually same as %%{featurever},
# but in time of bootstrap of next jdk, it is featurever-1,
# and this it is better to change it here, on single place
-%global buildjdkver 20
+%global buildjdkver 21
# We don't add any LTS designator for STS packages (Fedora and EPEL).
# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
%if 0%{?rhel} && !0%{?epel}
@@ -391,7 +391,7 @@
%global top_level_dir_name %{origin}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 35
-%global rpmrelease 1
+%global rpmrelease 2
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -1628,7 +1628,10 @@ done
%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%changelog
-* Tue Aug 08 2023 Petra Alice Mikova <pmikova(a)redhat.com> 1:21.0.0.0.35-0.1.rolling
+* Thu Sep 14 2023 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:21.0.0.0.35-2.rolling
+- Bump buildjdkver now that java-21-openjdk is available in the buildroot
+
+* Tue Aug 08 2023 Petra Alice Mikova <pmikova(a)redhat.com> 1:21.0.0.0.35-1.rolling
- updated to jdk-21+35, which is no longer EA
* Tue Aug 08 2023 Petra Alice Mikova <pmikova(a)redhat.com> 1:21.0.0.0.34-0.1.ea.rolling
1
0
Architecture specific change in rpms/java-latest-openjdk-portable.git
by githook-noreply＠fedoraproject.org 23 Nov '23
by githook-noreply＠fedoraproject.org 23 Nov '23
23 Nov '23
The package rpms/java-latest-openjdk-portable.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-latest-openjdk-portable.git/co…
https://src.fedoraproject.org/cgit/rpms/java-latest-openjdk-portable.git/co….
Change:
+ExcludeArch: %{ix86}
+%ifarch %{gdb_arches}
Thanks.
Full change:
============
commit e4459f4dcc7ba596c3d140a04dd284ccaa1ead0a
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Wed Nov 22 11:07:30 2023 +0100
moved docs and miscs to release-only condition
diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec
index 7bac98c..3fa3abd 100644
--- a/java-latest-openjdk-portable.spec
+++ b/java-latest-openjdk-portable.spec
@@ -915,6 +915,7 @@ The %{origin_nice} %{featurever} runtime environment.
%endif
+%if %{include_normal_build}
%package docs
Summary: %{origin_nice} %{featurever} API documentation
@@ -930,6 +931,7 @@ Summary: %{origin_nice} %{featurever} miscellany
%description misc
The %{origin_nice} %{featurever} miscellany.
+%endif
%package sources
Summary: %{origin_nice} %{featurever} full patched sources of portable JDK
@@ -1302,7 +1304,6 @@ function packagejdk() {
echo "Packaging build from ${imagesdir} to ${packagesdir}..."
mkdir -p ${packagesdir}
- pushd ${imagesdir}
if [ "x$suffix" = "x" ] ; then
nameSuffix=""
@@ -1318,10 +1319,11 @@ function packagejdk() {
staticarchive=${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
- # We only use docs for the release build
- docname=%{docportablename}
- docarchive=${packagesdir}/%{docportablearchive}
- built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
+ if [ "x$suffix" = "x" ] ; then
+ docname=%{docportablename}
+ docarchive=${packagesdir}/%{docportablearchive}
+ built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
+ fi
# These are from the source tree so no debug variants
miscname=%{miscportablename}
miscarchive=${packagesdir}/%{miscportablearchive}
@@ -1661,15 +1663,16 @@ for suffix in %{build_loop} ; do
fi
done
-# These definitions should match those in installjdk
-# Install outside the loop as there are no debug variants
-docarchive=${packagesdir}/%{docportablearchive}
-miscarchive=${packagesdir}/%{miscportablearchive}
-
-mv ${docarchive} $RPM_BUILD_ROOT%{_jvmdir}/
-mv ${docarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
-mv ${miscarchive} $RPM_BUILD_ROOT%{_jvmdir}/
-mv ${miscarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ if [ "x$suffix" = "x" ] ; then
+ # These definitions should match those in installjdk
+ # Install outside the loop as there are no debug variants
+ docarchive=${packagesdir}/%{docportablearchive}
+ miscarchive=${packagesdir}/%{miscportablearchive}
+ mv ${docarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${docarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${miscarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${miscarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ fi
# To show sha in the build log
for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do
@@ -1744,6 +1747,7 @@ done
%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}
%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}.sha256sum
+%if %{include_normal_build}
%files docs
%{_jvmdir}/%{docportablearchive}
%{_jvmdir}/%{docportablearchive}.sha256sum
@@ -1751,6 +1755,7 @@ done
%files misc
%{_jvmdir}/%{miscportablearchive}
%{_jvmdir}/%{miscportablearchive}.sha256sum
+%endif
%changelog
* Wed Nov 22 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.1.0.12-2.rolling
@@ -1765,6 +1770,7 @@ done
- removed no longer needed jdk8296108-tzdata2022f.patch, jdk8296715-cldr2022f.patch, rh1648644-java_access_bridge_privileged_security.patch
- added jdk8311630-s390_ffmapi.patch to support virtual threads on s390x
- aligned fips-21u-75ffdc48eda.patch (gnu_andrew)
+- fixed '--without release' build-ability by moving docs and misc to if-release only
* Wed Sep 20 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.0.0.35-4.rolling
- removed %{1} from miscportablename
commit 26504dac4c5d1ddf0ec7e85199b12e54be85e259
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Tue Nov 21 16:02:43 2023 +0100
restricted to java-arches
diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec
index f487843..7bac98c 100644
--- a/java-latest-openjdk-portable.spec
+++ b/java-latest-openjdk-portable.spec
@@ -518,6 +518,13 @@
%global alternatives_requires %{_sbindir}/alternatives
%endif
+# x86 is no longer supported
+%if 0%{?java_arches:1}
+ExclusiveArch: %{java_arches}
+%else
+ExcludeArch: %{ix86}
+%endif
+
# Portables have no repo (requires/provides), but these are awesome for orientation in spec
# Also scriptlets are happily missing and files are handled old fashion
# not-duplicated requires/provides/obsoletes for normal/debug packages
commit 1eb10e704bfd129924882085b3519c94f50b9454
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Tue Nov 21 15:48:20 2023 +0100
updated to OpenJDK 21.0.1 (2023-10-17)
- adjsuted generate_source_tarball
- removed icedtea_sync
- dropped standalone licenses
- added usntripped subpkg
- added docs subpkg
- adjsuted versions of bundled libraries
- build refactored to several solid methods following gnu_andrew
- removed no longer needed jdk8296108-tzdata2022f.patch, jdk8296715-cldr2022f.patch, rh1648644-java_access_bridge_privileged_security.patch
- added jdk8311630-s390_ffmapi.patch to support virtual threads on s390x
- aligned fips-21u-75ffdc48eda.patch (gnu_andrew)
diff --git a/.gitignore b/.gitignore
index 79f3174..3f711a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@
/openjdk-jdk21u-jdk-21+34.tar.xz
/openjdk-jdk21u-jdk-21+35.tar.xz
/openjdk-21+35.tar.xz
+/openjdk-21.0.1+12.tar.xz
diff --git a/NEWS b/NEWS
index 73322e7..09d1dfe 100644
--- a/NEWS
+++ b/NEWS
@@ -3,13 +3,210 @@ Key:
JDK-X - https://bugs.openjdk.java.net/browse/JDK-X
CVE-XXXX-YYYY: https://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
+New in release OpenJDK 21.0.1 (2023-10-17):
+===========================================
+
+* CVEs
+ - CVE-2023-22081
+ - CVE-2023-22025
+* Security fixes
+ - JDK-8286503, JDK-8312367: Enhance security classes
+ - JDK-8296581: Better system proxy support
+ - JDK-8297856: Improve handling of Bidi characters
+ - JDK-8309966: Enhanced TLS connections
+ - JDK-8312248: Enhanced archival support redux
+ - JDK-8314649: Enhanced archival support redux
+ - JDK-8317121: vector_masked_load instruction is moved too early after JDK-8286941
+* Other changes
+ - JDK-8240567: MethodTooLargeException thrown while creating a jlink image
+ - JDK-8284772: GHA: Use GCC Major Version Dependencies Only
+ - JDK-8293114: JVM should trim the native heap
+ - JDK-8299658: C1 compilation crashes in LinearScan::resolve_exception_edge
+ - JDK-8302017: Allocate BadPaddingException only if it will be thrown
+ - JDK-8303815: Improve Metaspace test speed
+ - JDK-8304954: SegmentedCodeCache fails when using large pages
+ - JDK-8307766: Linux: Provide the option to override the timer slack
+ - JDK-8308042: [macos] Developer ID Application Certificate not picked up by jpackage if it contains UNICODE characters
+ - JDK-8308047: java/util/concurrent/ScheduledThreadPoolExecutor/BasicCancelTest.java timed out and also had jcmd pipe errors
+ - JDK-8308184: Launching java with large number of jars in classpath with java.protocol.handler.pkgs system property set can lead to StackOverflowError
+ - JDK-8308474: DSA does not reset SecureRandom when initSign is called again
+ - JDK-8308609: java/lang/ScopedValue/StressStackOverflow.java fails with "-XX:-VMContinuations"
+ - JDK-8309032: jpackage does not work for module projects unless --module-path is specified
+ - JDK-8309088: security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java fails
+ - JDK-8309214: sun/security/pkcs11/KeyStore/CertChainRemoval.java fails after 8301154
+ - JDK-8309475: Test java/foreign/TestByteBuffer.java fails: a problem with msync (aix)
+ - JDK-8309502: RISC-V: String.indexOf intrinsic may produce misaligned memory loads
+ - JDK-8309591: Socket.setOption(TCP_QUICKACK) uses wrong level
+ - JDK-8309746: Reconfigure check should include make/conf/version-numbers.conf
+ - JDK-8309889: [s390] Missing return statement after calling jump_to_native_invoker method in generate_method_handle_dispatch.
+ - JDK-8310106: sun.security.ssl.SSLHandshake.getHandshakeProducer() incorrectly checks handshakeConsumers
+ - JDK-8310171: Bump version numbers for 21.0.1
+ - JDK-8310211: serviceability/jvmti/thread/GetStackTrace/getstacktr03/getstacktr03.java failing
+ - JDK-8310233: Fix THP detection on Linux
+ - JDK-8310268: RISC-V: misaligned memory access in String.Compare intrinsic
+ - JDK-8310321: make JDKOPT_CHECK_CODESIGN_PARAMS more verbose
+ - JDK-8310586: ProblemList java/lang/ScopedValue/StressStackOverflow.java#default with virtual threads on linux-all
+ - JDK-8310687: JDK-8303215 is incomplete
+ - JDK-8310873: Re-enable locked_create_entry symbol check in runtime/NMT/CheckForProperDetailStackTrace.java for RISC-V
+ - JDK-8311026: Some G1 specific tests do not set -XX:+UseG1GC
+ - JDK-8311033: [macos] PrinterJob does not take into account Sides attribute
+ - JDK-8311160: [macOS, Accessibility] VoiceOver: No announcements on JRadioButtonMenuItem and JCheckBoxMenuItem
+ - JDK-8311249: Remove unused MemAllocator::obj_memory_range
+ - JDK-8311285: report some fontconfig related environment variables in hs_err file
+ - JDK-8311511: Improve description of NativeLibrary JFR event
+ - JDK-8311592: ECKeySizeParameterSpec causes too many exceptions on third party providers
+ - JDK-8311682: Change milestone to fcs for all releases
+ - JDK-8311862: RISC-V: small improvements to shift immediate instructions
+ - JDK-8311917: MAP_FAILED definition seems to be obsolete in src/java.desktop/unix/native/common/awt/fontpath.c
+ - JDK-8311921: Inform about MaxExpectedDataSegmentSize in case of pthread_create failures on AIX
+ - JDK-8311923: TestIRMatching.java fails on RISC-V
+ - JDK-8311926: java/lang/ScopedValue/StressStackOverflow.java takes 9mins in tier1
+ - JDK-8311955: c++filt is now ibm-llvm-cxxfilt when using xlc17 / clang on AIX
+ - JDK-8311981: Test gc/stringdedup/TestStringDeduplicationAgeThreshold.java#ZGenerational timed out
+ - JDK-8312127: FileDescriptor.sync should temporarily increase parallelism
+ - JDK-8312180: (bf) MappedMemoryUtils passes incorrect arguments to msync (aix)
+ - JDK-8312182: THPs cause huge RSS due to thread start timing issue
+ - JDK-8312394: [linux] SIGSEGV if kernel was built without hugepage support
+ - JDK-8312395: Improve assertions in growableArray
+ - JDK-8312401: SymbolTable::do_add_if_needed hangs when called in InstanceKlass::add_initialization_error path with requesting length exceeds max_symbol_length
+ - JDK-8312489: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar
+ - JDK-8312525: New test runtime/os/TestTrimNative.java#trimNative is failing: did not see the expected RSS reduction
+ - JDK-8312535: MidiSystem.getSoundbank() throws unexpected SecurityException
+ - JDK-8312555: Ideographic characters aren't stretched by AffineTransform.scale(2, 1)
+ - JDK-8312573: Failure during CompileOnly parsing leads to ShouldNotReachHere
+ - JDK-8312585: Rename DisableTHPStackMitigation flag to THPStackMitigation
+ - JDK-8312591: GCC 6 build failure after JDK-8280982
+ - JDK-8312619: Strange error message when switching over long
+ - JDK-8312620: WSL Linux build crashes after JDK-8310233
+ - JDK-8312625: Test serviceability/dcmd/vm/TrimLibcHeapTest.java failed: RSS use increased
+ - JDK-8312909: C1 should not inline through interface calls with non-subtype receiver
+ - JDK-8312976: MatchResult produces StringIndexOutOfBoundsException for groups outside match
+ - JDK-8312984: javac may crash on a record pattern with too few components
+ - JDK-8313081: MonitoringSupport_lock should be unconditionally initialized after 8304074
+ - JDK-8313248: C2: setScopedValueCache intrinsic exposes nullptr pre-values to store barriers
+ - JDK-8313262: C2: Sinking node may cause required cast to be dropped
+ - JDK-8313307: java/util/Formatter/Padding.java fails on some Locales
+ - JDK-8313312: Add missing classpath exception copyright header
+ - JDK-8313323: javac -g on a java file which uses unnamed variable leads to ClassFormatError when launching that class
+ - JDK-8313402: C1: Incorrect LoadIndexed value numbering
+ - JDK-8313428: GHA: Bump GCC versions for July 2023 updates
+ - JDK-8313576: GCC 7 reports compiler warning in bundled freetype 2.13.0
+ - JDK-8313602: increase timeout for jdk/classfile/CorpusTest.java
+ - JDK-8313626: C2 crash due to unexpected exception control flow
+ - JDK-8313657: com.sun.jndi.ldap.Connection.cleanup does not close connections on SocketTimeoutErrors
+ - JDK-8313676: Amend TestLoadIndexedMismatch test to target intrinsic directly
+ - JDK-8313678: SymbolTable can leak Symbols during cleanup
+ - JDK-8313691: use close after failing os::fdopen in vmError and ciEnv
+ - JDK-8313701: GHA: RISC-V should use the official repository for bootstrap
+ - JDK-8313707: GHA: Bootstrap sysroots with --variant=minbase
+ - JDK-8313752: InstanceKlassFlags::print_on doesn't print the flag names
+ - JDK-8313765: Invalid CEN header (invalid zip64 extra data field size)
+ - JDK-8313796: AsyncGetCallTrace crash on unreadable interpreter method pointer
+ - JDK-8313874: JNI NewWeakGlobalRef throws exception for null arg
+ - JDK-8313901: [TESTBUG] test/hotspot/jtreg/compiler/codecache/CodeCacheFullCountTest.java fails with java.lang.VirtualMachineError
+ - JDK-8313904: [macos] All signing tests which verifies unsigned app images are failing
+ - JDK-8314020: Print instruction blocks in byte units
+ - JDK-8314024: SIGSEGV in PhaseIdealLoop::build_loop_late_post_work due to bad immediate dominator info
+ - JDK-8314063: The socket is not closed in Connection::createSocket when the handshake failed for LDAP connection
+ - JDK-8314117: RISC-V: Incorrect VMReg encoding in RISCV64Frame.java
+ - JDK-8314118: Update JMH devkit to 1.37
+ - JDK-8314139: TEST_BUG: runtime/os/THPsInThreadStackPreventionTest.java could fail on machine with large number of cores
+ - JDK-8314144: gc/g1/ihop/TestIHOPStatic.java fails due to extra concurrent mark with -Xcomp
+ - JDK-8314216: Case enumConstant, pattern compilation fails
+ - JDK-8314262: GHA: Cut down cross-compilation sysroots deeper
+ - JDK-8314423: Multiple patterns without unnamed variables
+ - JDK-8314426: runtime/os/TestTrimNative.java is failing on slow machines
+ - JDK-8314501: Shenandoah: sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java fails
+ - JDK-8314517: some tests fail in case ipv6 is disabled on the machine
+ - JDK-8314618: RISC-V: -XX:MaxVectorSize does not work as expected
+ - JDK-8314656: GHA: No need for Debian ports keyring installation after JDK-8313701
+ - JDK-8314679: SA fails to properly attach to JVM after having just detached from a different JVM
+ - JDK-8314730: GHA: Drop libfreetype6-dev transitional package in favor of libfreetype-dev
+ - JDK-8314850: SharedRuntime::handle_wrong_method() gets called too often when resolving Continuation.enter
+ - JDK-8314960: Add Certigna Root CA - 2
+ - JDK-8315020: The macro definition for LoongArch64 zero build is not accurate.
+ - JDK-8315051: jdk/jfr/jvm/TestGetEventWriter.java fails with non-JVMCI GCs
+ - JDK-8315534: Incorrect warnings about implicit annotation processing
+
+Notes on individual issues:
+===========================
+
+core-libs/java.util.jar:
+
+JDK-8313765: Invalid CEN header (invalid zip64 extra data field size)
+=====================================================================
+Additional validity checks in the handling of Zip64 files,
+JDK-8302483, introduced in 21.0.0, caused the use of some valid zip
+files to now fail with the error, `Invalid CEN header (invalid zip64
+extra data field size)`
+
+This release, 21.0.1, allows for zero length headers and additional
+padding produced by some Zip64 creation tools.
+
+The following third party tools have also released patches to better
+adhere to the ZIP File Format Specification:
+
+* Apache Commons Compress fix for Empty CEN Zip64 Extra Headers fixed in Commons Compress release 1.11
+* Apache Ant fix for Empty CEN Zip64 Extra Headers fixed in Ant 1.10.14
+* BND issue with writing invalid Extra Headers fixed in BND 5.3
+
+The maven-bundle-plugin 5.1.5 includes the BND 5.3 patch.
+
+If these improved validation checks cause issues for deployed zip or
+jar files, check how the file was created and whether patches are
+available from the generating software to resolve the issue. With
+both JDK releases, the checks can be disabled by setting the new
+system property, `jdk.util.zip.disableZip64ExtraFieldValidation` to
+`true`.
+
+hotspot/runtime:
+
+JDK-8311981: JVM May Hang When Using Generational ZGC if a VM Handshake Stalls on Memory
+========================================================================================
+The JVM can hang under an uncommon condition that involves the JVM
+running out of heap memory, the GC just starting a relocation phase to
+reclaim memory, and a JVM thread-local Handshake asking to relocate an
+object. This potential deadlock should now be avoided in this
+release.
+
+core-libs/java.util.regex:
+
+JDK-8312976: `java.util.regex.MatchResult` Might Throw `StringIndexOutOfBoundsException` on Regex Patterns Containing Lookaheads and Lookbehinds
+================================================================================================================================================
+JDK-8132995 introduced an unintended regression when using instances
+returned by `java.util.regex.Matcher.toMatchResult()`.
+
+This regression happens with a `java.util.regex.Pattern`s containing
+lookaheads and lookbehinds that, in turn, contain groups. If these are
+located outside the match, a `StringIndexOutOfBoundsException` is
+thrown when accessing these groups. See JDK-8312976 for an example.
+
+The issue is resolved in this release by calculating a minimum start
+location as part of the match result and using this in constructing
+String objects, rather than the location of the first match.
+
+JDK-8314960: Added Certigna Root CA Certificate
+===============================================
+The following root certificate has been added to the cacerts
+truststore:
+
+Name: Certigna (Dhimyotis)
+Alias Name: certignarootca
+Distinguished Name: CN=Certigna Root CA, OU=0002 48146308100036, O=Dhimyotis, C=FR
+
+JDK-8312489: Increase Default Value of the System Property `jdk.jar.maxSignatureFileSize`
+=========================================================================================
+A maximum signature file size property, jdk.jar.maxSignatureFileSize,
+was introduced in the 21.0.0 release of OpenJDK by JDK-8300596 to
+control the maximum size of signature files in a signed JAR. The
+default value of 8MB proved to be too small for some JAR files. This
+release, 21.0.1, increases it to 16MB.
+
New in release OpenJDK 21.0.0 (2023-09-XX):
===========================================
Major changes are listed below. Some changes may have been backported
-to earlier releases following their first appearance in OpenJDK 21.
-
-The full list of changes in 21u can be found at:
-- * https://builds.shipilev.net/backports-monitor/release-notes-21.txt
+to earlier releases following their first appearance in OpenJDK 18
+through to 21.
NEW FEATURES
============
@@ -76,8 +273,8 @@ an underscore character, _.
This is a preview feature (http://openjdk.java.net/jeps/12) introduced
in OpenJDK 21 (JEP 443).
-Unnamed Classes and Instance Main Methods
-=========================================
+Unnamed Classes and Instance Main Methods (Preview)
+===================================================
https://openjdk.org/jeps/445
Evolve the Java language so that students can write their first
@@ -93,6 +290,24 @@ in OpenJDK 21 (JEP 445).
Library Features
================
+UTF-8 by Default
+================
+https://openjdk.org/jeps/400
+
+Specify UTF-8 as the default charset of the standard Java APIs. With
+this change, APIs that depend upon the default charset will behave
+consistently across all implementations, operating systems, locales,
+and configurations.
+
+Reimplement Core Reflection with Method Handles
+===============================================
+https://openjdk.org/jeps/416
+
+Reimplement java.lang.reflect.Method, Constructor, and Field on top of
+java.lang.invoke method handles. Making method handles the underlying
+mechanism for reflection will reduce the maintenance and development
+cost of both the java.lang.reflect and java.lang.invoke APIs.
+
Vector API
==========
https://openjdk.org/jeps/338
@@ -113,6 +328,14 @@ place in OpenJDK 17 (JEP 414), OpenJDK 18 (JEP 417) saw a third,
OpenJDK 19 a fourth (JEP 426), OpenJDK 20 (JEP 438) a fifth and
OpenJDK 21 a sixth (JEP 448).
+Internet-Address Resolution SPI
+===============================
+https://openjdk.org/jeps/418
+
+Define a service-provider interface (SPI) for host name and address
+resolution, so that java.net.InetAddress can make use of resolvers
+other than the platform's built-in resolver.
+
Foreign Function & Memory API
=============================
https://openjdk.org/jeps/412
@@ -211,9 +434,55 @@ Improve application performance by extending the Z Garbage Collector
will allow ZGC to collect young objects — which tend to die young —
more frequently.
+Tools
+=====
+
+Simple Web Server
+=================
+https://openjdk.org/jeps/408
+
+Provide a command-line tool, `jwebserver`, to start a minimal web
+server that serves static files only. No CGI or servlet-like
+functionality is available. This tool will be useful for prototyping,
+ad-hoc coding, and testing purposes, particularly in educational
+contexts.
+
+Code Snippets in Java API Documentation
+=======================================
+https://openjdk.org/jeps/413
+
+Introduce an @snippet tag for JavaDoc's Standard Doclet, to simplify
+the inclusion of example source code in API documentation.
+
+Ports
+=====
+
+Linux/RISC-V Port
+=================
+https://openjdk.org/jeps/422
+
+RISC-V is a free and open-source RISC instruction set architecture
+(ISA) designed originally at the University of California, Berkeley,
+and now developed collaboratively under the sponsorship of RISC-V
+International. It is already supported by a wide range of language
+toolchains. With the increasing availability of RISC-V hardware, a
+port of the JDK would be valuable.
+
DEPRECATIONS
============
+Deprecate Finalization for Removal
+==================================
+https://openjdk.org/jeps/421
+
+Deprecate finalization for removal in a future release. Finalization
+remains enabled by default for now, but can be disabled to facilitate
+early testing. In a future release it will be disabled by default, and
+in a later release it will be removed. Maintainers of libraries and
+applications that rely upon finalization should consider migrating to
+other resource management techniques such as the try-with-resources
+statement and cleaners.
+
Deprecate the Windows 32-bit x86 Port for Removal
=================================================
https://openjdk.org/jeps/449
@@ -230,4 +499,3 @@ JVM. These warnings aim to prepare users for a future release which
disallows the dynamic loading of agents by default in order to improve
integrity by default. Serviceability tools that load agents at startup
will not cause warnings to be issued in any release.
-
diff --git a/discover_trees.sh b/discover_trees.sh
new file mode 100755
index 0000000..8c31278
--- /dev/null
+++ b/discover_trees.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# Copyright (C) 2020 Red Hat, Inc.
+# Written by Andrew John Hughes <gnu.andrew(a)redhat.com>.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+TREE=${1}
+
+if test "x${TREE}" = "x"; then
+ TREE=${PWD}
+fi
+
+if [ -e ${TREE}/nashorn/.hg -o -e ${TREE}/nashorn/merge.changeset ] ; then
+ NASHORN="nashorn" ;
+fi
+
+if [ -e ${TREE}/corba/.hg -o -e ${TREE}/corba/merge.changeset ] ; then
+ CORBA="corba";
+fi
+
+if [ -e ${TREE}/jaxp/.hg -o -e ${TREE}/jaxp/merge.changeset ] ; then
+ JAXP="jaxp";
+fi
+
+if [ -e ${TREE}/jaxws/.hg -o -e ${TREE}/jaxws/merge.changeset ] ; then
+ JAXWS="jaxws";
+fi
+
+if [ -e ${TREE}/langtools/.hg -o -e ${TREE}/langtools/merge.changeset ] ; then
+ LANGTOOLS="langtools";
+fi
+
+if [ -e ${TREE}/jdk/.hg -o -e ${TREE}/jdk/merge.changeset ] ; then
+ JDK="jdk";
+fi
+
+if [ -e ${TREE}/hotspot/.hg -o -e ${TREE}/hotspot/merge.changeset ] ; then
+ HOTSPOT="hotspot";
+fi
+
+SUBTREES="${CORBA} ${JAXP} ${JAXWS} ${LANGTOOLS} ${NASHORN} ${JDK} ${HOTSPOT}";
+echo ${SUBTREES}
diff --git a/fips-21u-75ffdc48eda.patch b/fips-21u-75ffdc48eda.patch
index 7ffbe3a..8413fe1 100644
--- a/fips-21u-75ffdc48eda.patch
+++ b/fips-21u-75ffdc48eda.patch
@@ -4231,4 +4231,3 @@ index 00000000000..87f1ad04505
+ }
+ }
+}
-
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index f27158d..5d6efd9 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -6,10 +6,9 @@
# If your local repo follows upstream forests conventions, it may be enough to set OPENJDK_URL
#
# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
-# BOOT_JDK=/usr/lib/jvm/java-20-openjdk
# PROJECT_NAME=openjdk
# REPO_NAME=jdk21u
-# VERSION=jdk-21+35
+# VERSION=jdk-21.0.1+12
# or to eg prepare systemtap:
# icedtea7's jstack and other tapsets
# VERSION=6327cf1cea9e
@@ -36,13 +35,13 @@ if [ "x$1" = "xhelp" ] ; then
VERSION="<unspecified>";
fi
echo -e "Behaviour may be specified by setting the following variables:\n"
- echo "VERSION - the version of the specified OpenJDK project (current value: ${VERSION})"
+ echo "VERSION - the version of the specified OpenJDK project"
echo "PROJECT_NAME -- the name of the OpenJDK project being archived (optional; only needed by defaults)"
echo "REPO_NAME - the name of the OpenJDK repository (optional; only needed by defaults)"
echo "OPENJDK_URL - the URL to retrieve code from (optional; defaults to ${OPENJDK_URL_DEFAULT})"
echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
- echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to open${VERSION})"
- echo "REPO_ROOT - the location of the Git repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
+ echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
+ echo "REPO_ROOT - the location of the Git repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME.git)"
echo "TO_COMPRESS - what part of clone to pack (default is ${VERSION})"
echo "BOOT_JDK - the bootstrap JDK to satisfy the configure run"
exit 1;
@@ -111,7 +110,7 @@ fi
echo "Creating a tar.${COMPRESSION} archive"
if [ "x$FILE_NAME_ROOT" = "x" ] ; then
- FILE_NAME_ROOT=open${VERSION}
+ FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
echo "No file name root specified; default to ${FILE_NAME_ROOT}"
fi
if [ "x$REPO_ROOT" = "x" ] ; then
@@ -121,7 +120,7 @@ fi;
if [ "x$TO_COMPRESS" = "x" ] ; then
TO_COMPRESS="${VERSION}"
- echo "No targets to be compressed specified, ; default to ${TO_COMPRESS}"
+ echo "No targets to be compressed specified ; default to ${TO_COMPRESS}"
fi;
echo -e "Settings:"
@@ -147,6 +146,7 @@ else
popd
fi
pushd "${FILE_NAME_ROOT}"
+
# Generate .src-rev so build has knowledge of the revision the tarball was created from
mkdir build
pushd build
@@ -161,17 +161,17 @@ pushd "${FILE_NAME_ROOT}"
# Remove history and GHA
echo "find ${VERSION} -name '.hgtags'"
- find ${VERSION} -name '.hgtags' -exec rm -v '{}' '+'
+ find ${VERSION} -name '.hgtags' -exec rm -fv '{}' '+'
echo "find ${VERSION} -name '.hgignore'"
- find ${VERSION} -name '.hgignore' -exec rm -v '{}' '+'
+ find ${VERSION} -name '.hgignore' -exec rm -fv '{}' '+'
echo "find ${VERSION} -name '.gitattributes'"
- find ${VERSION} -name '.gitattributes' -exec rm -v '{}' '+'
+ find ${VERSION} -name '.gitattributes' -exec rm -fv '{}' '+'
echo "find ${VERSION} -name '.gitignore'"
- find ${VERSION} -name '.gitignore' -exec rm -v '{}' '+'
+ find ${VERSION} -name '.gitignore' -exec rm -fv '{}' '+'
echo "find ${VERSION} -name '.git'"
- find ${VERSION} -name '.git' -exec rm -rv '{}' '+'
+ find ${VERSION} -name '.git' -exec rm -rfv '{}' '+'
echo "find ${VERSION} -name '.github'"
- find ${VERSION} -name '.github' -exec rm -rv '{}' '+'
+ find ${VERSION} -name '.github' -exec rm -rfv '{}' '+'
echo "Compressing remaining forest"
if [ "X$COMPRESSION" = "Xxz" ] ; then
diff --git a/icedtea_sync.sh b/icedtea_sync.sh
index e5c54f3..c1b8f6a 100755
--- a/icedtea_sync.sh
+++ b/icedtea_sync.sh
@@ -1,192 +1 @@
-#!/bin/bash
-
-# Copyright (C) 2019 Red Hat, Inc.
-# Written by Andrew John Hughes <gnu.andrew(a)redhat.com>.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-ICEDTEA_USE_VCS=true
-
-ICEDTEA_VERSION=3.15.0
-ICEDTEA_URL=https://icedtea.classpath.org/download/source
-ICEDTEA_SIGNING_KEY=CFDA0F9B35964222
-
-ICEDTEA_HG_URL=https://icedtea.classpath.org/hg/icedtea11
-
-set -e
-
-RPM_DIR=${PWD}
-if [ ! -f ${RPM_DIR}/jconsole.desktop.in ] ; then
- echo "Not in RPM source tree.";
- exit 1;
-fi
-
-if test "x${TMPDIR}" = "x"; then
- TMPDIR=/tmp;
-fi
-WORKDIR=${TMPDIR}/it.sync
-
-echo "Using working directory ${WORKDIR}"
-mkdir ${WORKDIR}
-pushd ${WORKDIR}
-
-if test "x${WGET}" = "x"; then
- WGET=$(which wget);
- if test "x${WGET}" = "x"; then
- echo "wget not found";
- exit 1;
- fi
-fi
-
-if test "x${TAR}" = "x"; then
- TAR=$(which tar)
- if test "x${TAR}" = "x"; then
- echo "tar not found";
- exit 2;
- fi
-fi
-
-echo "Dependencies:";
-echo -e "\tWGET: ${WGET}";
-echo -e "\tTAR: ${TAR}\n";
-
-if test "x${ICEDTEA_USE_VCS}" = "xtrue"; then
- echo "Mode: Using VCS";
-
- if test "x${GREP}" = "x"; then
- GREP=$(which grep);
- if test "x${GREP}" = "x"; then
- echo "grep not found";
- exit 3;
- fi
- fi
-
- if test "x${CUT}" = "x"; then
- CUT=$(which cut);
- if test "x${CUT}" = "x"; then
- echo "cut not found";
- exit 4;
- fi
- fi
-
- if test "x${TR}" = "x"; then
- TR=$(which tr);
- if test "x${TR}" = "x"; then
- echo "tr not found";
- exit 5;
- fi
- fi
-
- if test "x${HG}" = "x"; then
- HG=$(which hg);
- if test "x${HG}" = "x"; then
- echo "hg not found";
- exit 6;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tGREP: ${GREP}";
- echo -e "\tCUT: ${CUT}";
- echo -e "\tTR: ${TR}";
- echo -e "\tHG: ${HG}";
-
- echo "Checking out repository from VCS...";
- ${HG} clone ${ICEDTEA_HG_URL} icedtea
-
- echo "Obtaining version from configure.ac...";
- ROOT_VER=$(${GREP} '^AC_INIT' icedtea/configure.ac|${CUT} -d ',' -f 2|${TR} -d '[][:space:]')
- echo "Root version from configure: ${ROOT_VER}";
-
- VCS_REV=$(${HG} log -R icedtea --template '{node|short}' -r tip)
- echo "VCS revision: ${VCS_REV}";
-
- ICEDTEA_VERSION="${ROOT_VER}-${VCS_REV}"
- echo "Creating icedtea-${ICEDTEA_VERSION}";
- mkdir icedtea-${ICEDTEA_VERSION}
- echo "Copying required files from checkout to icedtea-${ICEDTEA_VERSION}";
- # Commented out for now as IcedTea 6's jconsole.desktop.in is outdated
- #cp -a icedtea/jconsole.desktop.in ../icedtea-${ICEDTEA_VERSION}
- cp -a ${RPM_DIR}/jconsole.desktop.in icedtea-${ICEDTEA_VERSION}
- cp -a icedtea/tapset icedtea-${ICEDTEA_VERSION}
-
- rm -rf icedtea
-else
- echo "Mode: Using tarball";
-
- if test "x${ICEDTEA_VERSION}" = "x"; then
- echo "No IcedTea version specified for tarball download.";
- exit 3;
- fi
-
- if test "x${CHECKSUM}" = "x"; then
- CHECKSUM=$(which sha256sum)
- if test "x${CHECKSUM}" = "x"; then
- echo "sha256sum not found";
- exit 4;
- fi
- fi
-
- if test "x${PGP}" = "x"; then
- PGP=$(which gpg)
- if test "x${PGP}" = "x"; then
- echo "gpg not found";
- exit 5;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tCHECKSUM: ${CHECKSUM}";
- echo -e "\tPGP: ${PGP}\n";
-
- echo "Checking for IcedTea signing key ${ICEDTEA_SIGNING_KEY}...";
- if ! gpg --list-keys ${ICEDTEA_SIGNING_KEY}; then
- echo "IcedTea signing key ${ICEDTEA_SIGNING_KEY} not installed.";
- exit 6;
- fi
-
- echo "Downloading IcedTea release tarball...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz
- echo "Downloading IcedTea tarball signature...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- echo "Downloading IcedTea tarball checksums...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Verifying checksums...";
- ${CHECKSUM} --check --ignore-missing icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Checking signature...";
- ${PGP} --verify icedtea-${ICEDTEA_VERSION}.tar.xz.sig
-
- echo "Extracting files...";
- ${TAR} xJf icedtea-${ICEDTEA_VERSION}.tar.xz \
- icedtea-${ICEDTEA_VERSION}/tapset \
- icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in
-
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- rm -vf icedtea-${ICEDTEA_VERSION}.sha256
-fi
-
-echo "Replacing desktop files...";
-mv -v icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in ${RPM_DIR}
-
-echo "Creating new tapset tarball...";
-mv -v icedtea-${ICEDTEA_VERSION} openjdk
-${TAR} cJf ${RPM_DIR}/tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz openjdk
-
-rm -rvf openjdk
-
-popd
-rm -rf ${WORKDIR}
+# this file is intentionally not here, as portable builds do not have desktop integration
diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec
index 8a3b968..f487843 100644
--- a/java-latest-openjdk-portable.spec
+++ b/java-latest-openjdk-portable.spec
@@ -1,8 +1,3 @@
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-# portable jdk 17 specific bug, _jvmdir being missing
-%define _jvmdir /usr/lib/jvm
-%endif
-
# debug_package %%{nil} is portable-jdks specific
%define debug_package %{nil}
@@ -41,8 +36,6 @@
%define __os_install_post %{nil}
%endif
-%global unpacked_licenses %{_datarootdir}/licenses
-
# Workaround for stripping of debug symbols from static libraries
%if %{with staticlibs}
%define __brp_strip_static_archive %{nil}
@@ -66,10 +59,6 @@
# See: https://bugzilla.redhat.com/show_bug.cgi?id=1520879
%global _find_debuginfo_opts -g
-# With LTO flags enabled, debuginfo checks fail for some reason. Disable
-# LTO for a passing build. This really needs to be looked at.
-%define _lto_cflags %{nil}
-
# note: parametrized macros are order-sensitive (unlike not-parametrized) even with normal macros
# also necessary when passing it as parameter to other macros. If not macro, then it is considered a switch
# see the difference between global and define:
@@ -147,9 +136,9 @@
# Set of architectures which support the serviceability agent
%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm}
# Set of architectures which support class data sharing
-# See https://bugzilla.redhat.com/show_bug.cgi?id=513605
-# MetaspaceShared::generate_vtable_methods is not implemented for the PPC JIT
-%global share_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{arm} s390x
+# As of JDK-8005165 in OpenJDK 10, class sharing is not arch-specific
+# However, it does segfault on the Zero assembler port, so currently JIT only
+%global share_arches %{jit_arches}
# Set of architectures for which we build the Shenandoah garbage collector
%global shenandoah_arches x86_64 %{aarch64}
# Set of architectures for which we build the Z garbage collector
@@ -166,7 +155,7 @@
%global gdb_arches %{jit_arches} %{zero_arches}
%endif
-# By default, we build a debug build during main build on JIT architectures
+# By default, we build a slowdebug build during main build on JIT architectures
%if %{with slowdebug}
%ifarch %{debug_arches}
%global include_debug_build 1
@@ -237,17 +226,24 @@
%global static_libs_target %{nil}
%endif
-# RPM JDK builds keep the debug symbols internal, to be later stripped by RPM
-%global debug_symbols internal
-
-# unlike portables,the rpms have to use static_libs_target very dynamically
-%global bootstrap_targets images legacy-jre-image
-%global release_targets images docs-zip legacy-jre-image
+# The static libraries are produced under the same configuration as the main
+# build for portables, as we expect in-tree libraries to be used throughout.
+# If system libraries are enabled, the static libraries will also use them
+# which may cause issues.
+%global bootstrap_targets images %{static_libs_target} legacy-jre-image
+%global release_targets images docs-zip %{static_libs_target} legacy-jre-image
# No docs nor bootcycle for debug builds
-%global debug_targets images legacy-jre-image
+%global debug_targets images %{static_libs_target} legacy-jre-image
# Target to use to just build HotSpot
%global hotspot_target hotspot
+# DTS toolset to use to provide gcc & binutils
+%global dtsversion 10
+
+# Disable LTO as this causes build failures at the moment.
+# See RHBZ#1861401
+%define _lto_cflags %{nil}
+
# Filter out flags from the optflags macro that cause problems with the OpenJDK build
# We filter out -O flags so that the optimization of HotSpot is not lowered from O3 to O2
# We filter out -Wall which will otherwise cause HotSpot to produce hundreds of thousands of warnings (100+mb logs)
@@ -327,20 +323,20 @@
# New Version-String scheme-style defines
%global featurever 21
%global interimver 0
-%global updatever 0
+%global updatever 1
%global patchver 0
# buildjdkver is usually same as %%{featurever},
# but in time of bootstrap of next jdk, it is featurever-1,
# and this it is better to change it here, on single place
-%global buildjdkver 21
+%global buildjdkver %{featurever}
# We don't add any LTS designator for STS packages (Fedora and EPEL).
# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
%if 0%{?rhel} && !0%{?epel}
%global lts_designator "LTS"
%global lts_designator_zip -%{lts_designator}
%else
- %global lts_designator ""
- %global lts_designator_zip ""
+ %global lts_designator ""
+ %global lts_designator_zip ""
%endif
# JDK to use for bootstrapping
%global bootjdk /usr/lib/jvm/java-%{buildjdkver}-openjdk
@@ -366,26 +362,34 @@
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{name}&…
%else
%if 0%{?rhel}
-%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20…
+%global oj_vendor_bug_url https://access.redhat.com/support/cases/
%else
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi
%endif
%endif
%endif
-%global oj_vendor_version (Red_Hat-%{version}-%{release})
+%global oj_vendor_version (Red_Hat-%{version}-%{rpmrelease})
# Define IcedTea version used for SystemTap tapsets and desktop file
%global icedteaver 6.0.0pre00-c848b93a8598
# Define current Git revision for the FIPS support patches
%global fipsver 75ffdc48eda
+# Define JDK versions
+%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
+%global javaver %{featurever}
+# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
+%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
+# The tag used to create the OpenJDK tarball
+%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Standard JPackage naming and versioning defines
%global origin openjdk
%global origin_nice OpenJDK
%global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
-%global buildver 35
-%global rpmrelease 4
+%global buildver 12
+%global rpmrelease 2
+#%%global tagsuffix %%{nil}
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -398,14 +402,6 @@
# for techpreview, using 1, so slowdebugs can have 0
%global priority %( printf '%08d' 1 )
%endif
-%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
-%global javaver %{featurever}
-
-# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
-%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
-
-# The tag used to create the OpenJDK tarball
-%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Define milestone (EA for pre-releases, GA for releases)
# Release will be (where N is usually a number starting at 1):
@@ -415,7 +411,7 @@
%if %{is_ga}
%global build_type GA
%global ea_designator ""
-%global ea_designator_zip ""
+%global ea_designator_zip %{nil}
%global extraver %{nil}
%global eaprefix %{nil}
%else
@@ -438,7 +434,9 @@
%global static_libs_install_dir %{static_libs_arch_dir}/glibc
# output dir stub
%define buildoutputdir() %{expand:build/jdk%{featurever}.build%{?1}}
+%define installoutputdir() %{expand:install/jdk%{featurever}.install%{?1}}
%global altjavaoutputdir install/altjava.install
+%define packageoutputdir() %{expand:packages/jdk%{featurever}.packages%{?1}}
# we can copy the javadoc to not arched dir, or make it not noarch
%define uniquejavadocdir() %{expand:%{fullversion}.%{_arch}%{?1}}
# main id and dir of this jdk
@@ -459,6 +457,8 @@
# Intentionally use jdkportablenameimpl here since we want to have static-libs files overlayed on
# top of the JDK archive
%define staticlibsportablename() %{expand:%{jdkportablenameimpl -- %%{1}}}
+%define docportablename() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable.docs;g" | sed "s;openjdkportable;el;g")
+%define docportablearchive() %{docportablename}.tar.xz
%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable.misc;g" | sed "s;openjdkportable;el;g")
%define miscportablearchive() %{miscportablename}.tar.xz
@@ -490,6 +490,12 @@
%global __requires_exclude ^(%{_privatelibs}|%{_publiclibs})$
%endif
+# VM variant being built
+%ifarch %{zero_arches}
+%global vm_variant zero
+%else
+%global vm_variant server
+%endif
%global etcjavasubdir %{_sysconfdir}/java/java-%{javaver}-%{origin}
%define etcjavadir() %{expand:%{etcjavasubdir}/%{uniquesuffix -- %{?1}}}
@@ -512,29 +518,8 @@
%global alternatives_requires %{_sbindir}/alternatives
%endif
-%if %{with_systemtap}
-# Where to install systemtap tapset (links)
-# We would like these to be in a package specific sub-dir,
-# but currently systemtap doesn't support that, so we have to
-# use the root tapset dir for now. To distinguish between 64
-# and 32 bit architectures we place the tapsets under the arch
-# specific dir (note that systemtap will only pickup the tapset
-# for the primary arch for now). Systemtap uses the machine name
-# aka target_cpu as architecture specific directory name.
-%global tapsetroot /usr/share/systemtap
-%global tapsetdirttapset %{tapsetroot}/tapset/
-%global tapsetdir %{tapsetdirttapset}/%{stapinstall}
-%endif
-
-# x86 is no longer supported
-%if 0%{?java_arches:1}
-ExclusiveArch: %{java_arches}
-%else
-ExcludeArch: %{ix86}
-%endif
-
-# Portables have no rpo (requires/provides), but thsoe are awesome for orientation in spec
-# also scriptlets are hapily missing and files are handled old fashion
+# Portables have no repo (requires/provides), but these are awesome for orientation in spec
+# Also scriptlets are happily missing and files are handled old fashion
# not-duplicated requires/provides/obsoletes for normal/debug packages
%define java_rpo() %{expand:
}
@@ -545,16 +530,18 @@ ExcludeArch: %{ix86}
%define java_static_libs_rpo() %{expand:
}
+%define java_unstripped_rpo() %{expand:
+}
+
+%define java_docs_rpo() %{expand:
+}
+
%define java_misc_rpo() %{expand:
}
# Prevent brp-java-repack-jars from being run
%global __jar_repack 0
-# portables have grown out of its component, moving back to java-x-vendor
-# this expression, when declared as global, filled component with java-x-vendor portable
-%define component %(echo %{name} | sed "s;-portable;;g")
-
Name: java-latest-%{origin}-portable
Version: %{newjavaver}.%{buildver}
# This package needs `.rolling` as part of Release so as to not conflict on install with
@@ -572,6 +559,11 @@ Release: %{?eaprefix}%{rpmrelease}%{?extraver}.rolling%{?dist}
# provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0".
Epoch: 1
+
+# portables have grown out of its component, moving back to java-x-vendor
+# this expression, when declared as global, filled component with java-x-vendor portable
+%define component %(echo %{name} | sed "s;-portable;;g")
+
Summary: %{origin_nice} %{featurever} Runtime Environment portable edition
# Groups are only used up to RHEL 8 and on Fedora versions prior to F30
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
@@ -595,9 +587,8 @@ Group: Development/Languages
License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib and ISC and FTL and RSA
URL: http://openjdk.java.net/
-
# The source tarball, generated using generate_source_tarball.sh
-Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}.tar.xz
+Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}%{ea_desi…
# Use 'icedtea_sync.sh' to update the following
# They are based on code contained in the IcedTea project (6.x).
@@ -616,8 +607,7 @@ Source10: NEWS
Source11: alt-java.c
# Removed libraries that we link instead
-# Disabled in portables
-#Source12: remove-intree-libraries.sh
+Source12: remove-intree-libraries.sh
# Ensure we aren't using the limited crypto policy
Source13: TestCryptoLevel.java
@@ -634,14 +624,6 @@ Source16: CheckVendor.java
# Ensure translations are available for new timezones
Source18: TestTranslations.java
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-# boot jdk for portable build root on
-Source1001: ojdk17-aarch64-17.35.tar.gz
-Source1002: ojdk17-ppc64le-17.35.tar.gz
-Source1003: ojdk17-x86_64-17.35.tar.gz
-Source1004: ojdk17-s390x-17.35.tar.gz
-%endif
-
############################################
#
# RPM/distribution specific patches
@@ -691,16 +673,29 @@ Patch1001: fips-%{featurever}u-%{fipsver}.patch
# OpenJDK patches in need of upstreaming
#
#############################################
+
# JDK-8009550, RH910107: Depend on pcsc-lite-libs instead of pcsc-lite-devel as this is only in optional repo
# PR: https://github.com/openjdk/jdk/pull/15409
Patch6: jdk8009550-rh910107-fail_to_load_pcsc_library.patch
+# Currently empty
+
#############################################
#
# OpenJDK patches which missed last update
#
#############################################
-#empty now
+
+# JDK-8311630: [s390] Implementation of Foreign Function & Memory API (Preview)
+Patch100: jdk8311630-s390_ffmapi.patch
+
+#############################################
+#
+# Portable build specific patches
+#
+#############################################
+
+# Currently empty
BuildRequires: autoconf
BuildRequires: automake
@@ -710,11 +705,11 @@ BuildRequires: cups-devel
BuildRequires: desktop-file-utils
# elfutils only are OK for build without AOT
BuildRequires: elfutils-devel
+BuildRequires: file
BuildRequires: fontconfig-devel
-BuildRequires: freetype-devel
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-BuildRequires: devtoolset-8-gcc
-BuildRequires: devtoolset-8-gcc-c++
+BuildRequires: devtoolset-%{dtsversion}-gcc
+BuildRequires: devtoolset-%{dtsversion}-gcc-c++
%else
BuildRequires: gcc
# gcc-c++ is already needed
@@ -737,9 +732,8 @@ BuildRequires: libXtst-devel
# Requirement for setting up nss.fips.cfg
BuildRequires: nss-devel
# Requirement for system security property test
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-BuildRequires: crypto-policies
-%endif
+#N/A
+#BuildRequires: crypto-policies
BuildRequires: pkgconfig
BuildRequires: xorg-x11-proto-devel
BuildRequires: zip
@@ -758,7 +752,6 @@ BuildRequires: libffi-devel
%endif
# 2023c required as of JDK-8305113
BuildRequires: tzdata-java >= 2023c
-
# cacerts build requirement in portable mode
BuildRequires: ca-certificates
# Earlier versions have a bug in tree vectorization on PPC
@@ -777,18 +770,18 @@ BuildRequires: lcms2-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
%else
-# Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h
-Provides: bundled(freetype) = 2.12.1
+# Version in src/java.desktop/share/legal/freetype.md
+Provides: bundled(freetype) = 2.13.0
# Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
Provides: bundled(giflib) = 5.2.1
# Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
-Provides: bundled(harfbuzz) = 4.4.1
+Provides: bundled(harfbuzz) = 7.2.0
# Version in src/java.desktop/share/native/liblcms/lcms2.h
-Provides: bundled(lcms2) = 2.12.0
+Provides: bundled(lcms2) = 2.15.0
# Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
Provides: bundled(libjpeg) = 6b
# Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h
-Provides: bundled(libpng) = 1.6.37
+Provides: bundled(libpng) = 1.6.39
# We link statically against libstdc++ to increase portability
BuildRequires: libstdc++-static
%endif
@@ -863,7 +856,7 @@ Group: Development/Tools
%{java_devel_rpo -- %{fastdebug_suffix_unquoted}}
%description devel-fastdebug
-The %{origin_nice} %{featurever} development tools - portable edition.
+The %{origin_nice} %{featurever} runtime environment and development tools - portable edition
%{fastdebug_warning}
%endif
@@ -871,7 +864,7 @@ The %{origin_nice} %{featurever} development tools - portable edition.
%if %{include_normal_build}
%package static-libs
-Summary: %{origin_nice} %{featurever} libraries for static linking - portable edition.
+Summary: %{origin_nice} %{featurever} libraries for static linking - portable edition
%{java_static_libs_rpo %{nil}}
@@ -886,7 +879,7 @@ Summary: %{origin_nice} %{featurever} libraries for static linking - portable ed
%{java_static_libs_rpo -- %{debug_suffix_unquoted}}
%description static-libs-slowdebug
-The %{origin_nice} %{featurever} libraries for static linking - portable edition.
+The %{origin_nice} %{featurever} libraries for static linking - portable edition
%{debug_warning}
%endif
@@ -897,13 +890,32 @@ Summary: %{origin_nice} %{featurever} libraries for static linking - portable ed
%{java_static_libs_rpo -- %{fastdebug_suffix_unquoted}}
%description static-libs-fastdebug
-The %{origin_nice} %{featurever} libraries for static linking - portable edition.
+The %{origin_nice} %{featurever} libraries for static linking - portable edition
%{fastdebug_warning}
%endif
# staticlibs
%endif
+%if %{include_normal_build}
+%package unstripped
+Summary: The %{origin_nice} %{featurever} runtime environment.
+
+%{java_unstripped_rpo %{nil}}
+
+%description unstripped
+The %{origin_nice} %{featurever} runtime environment.
+
+%endif
+
+%package docs
+Summary: %{origin_nice} %{featurever} API documentation
+
+%{java_docs_rpo %{nil}}
+
+%description docs
+The %{origin_nice} %{featurever} API documentation.
+
%package misc
Summary: %{origin_nice} %{featurever} miscellany
@@ -923,10 +935,10 @@ The %{origin_nice} %{featurever} full patched sources of portable JDK to build,
echo "Preparing %{oj_vendor_version}"
# Using the echo macro breaks rpmdev-bumpspec, as it parses the first line of stdout :-(
-%if 0%{?stapinstall:1}
- echo "CPU: %{_target_cpu}, arch install directory: %{archinstall}, SystemTap install directory: %{stapinstall}"
+%if 0%{?_build_cpu:1}
+ echo "CPU: %{_target_cpu}, arch install directory: %{archinstall}, SystemTap install directory: %{_build_cpu}"
%else
- %{error:Unrecognised architecture %{_target_cpu}}
+ %{error:Unrecognised architecture %{_build_cpu}}
%endif
if [ %{include_normal_build} -eq 0 -o %{include_normal_build} -eq 1 ] ; then
@@ -947,7 +959,6 @@ else
echo "include_fastdebug_build is %{include_fastdebug_build}, that is invalid. Use 1 for yes or 0 for no"
exit 13
fi
-
if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 -a %{include_fastdebug_build} -eq 0 ] ; then
echo "You have disabled all builds (normal,fastdebug,slowdebug). That is a no go."
exit 14
@@ -979,8 +990,11 @@ pushd %{top_level_dir_name}
%patch1001 -p1
# Patches in need of upstreaming
%patch6 -p1
+# Patches in next release
+%patch100 -p1
popd # openjdk
+
# The OpenJDK version file includes the current
# upstream version information. For some reason,
# configure does not automatically use the
@@ -1001,59 +1015,12 @@ if [ "x${UPSTREAM_EA_DESIGNATOR}" != "x%{ea_designator}" ] ; then
exit 17
fi
-# Extract systemtap tapsets
-%if %{with_systemtap}
-tar --strip-components=1 -x -I xz -f %{SOURCE8}
-%if %{include_debug_build}
-cp -r tapset tapset%{debug_suffix}
-%endif
-%if %{include_fastdebug_build}
-cp -r tapset tapset%{fastdebug_suffix}
-%endif
-
-for suffix in %{build_loop} ; do
- for file in "tapset"$suffix/*.in; do
- OUTPUT_FILE=`echo $file | sed -e "s:\.stp\.in$:-%{version}-%{release}.%{_arch}.stp:g"`
- sed -e "s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/server/libjvm.so:g" $file > $file.1
- sed -e "s:@JAVA_SPEC_VER@:%{javaver}:g" $file.1 > $file.2
-# TODO find out which architectures other than i686 have a client vm
-%ifarch %{ix86}
- sed -e "s:@ABS_CLIENT_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/client/libjvm.so:g" $file.2 > $OUTPUT_FILE
-%else
- sed -e "/@ABS_CLIENT_LIBJVM_SO@/d" $file.2 > $OUTPUT_FILE
-%endif
- sed -i -e "s:@ABS_JAVA_HOME_DIR@:%{_jvmdir}/%{sdkdir -- $suffix}:g" $OUTPUT_FILE
- sed -i -e "s:@INSTALL_ARCH_DIR@:%{archinstall}:g" $OUTPUT_FILE
- sed -i -e "s:@prefix@:%{_jvmdir}/%{sdkdir -- $suffix}/:g" $OUTPUT_FILE
- done
-done
-# systemtap tapsets ends
-%endif
+# Systemtap is processed in rpms
# Prepare desktop files
# Portables do not have desktop integration
%build
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-mkdir bootjdk
-pushd bootjdk
-%ifarch %{aarch64}
-tar --strip-components=1 -xf %{SOURCE1001}
-%endif
-%ifarch %{ppc64le}
-tar --strip-components=1 -xf %{SOURCE1002}
-%endif
-%ifarch x86_64
-tar --strip-components=1 -xf %{SOURCE1003}
-%endif
-%ifarch s390x
-tar --strip-components=1 -xf %{SOURCE1004}
-%endif
-BOOT_JDK=$PWD
-popd
-%else
-BOOT_JDK=%{bootjdk}
-%endif
# How many CPU's do we have?
export NUM_PROC=%(/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :)
@@ -1091,12 +1058,15 @@ echo "Building %{SOURCE11}"
mkdir -p %{altjavaoutputdir}
gcc ${EXTRA_CFLAGS} -o %{altjavaoutputdir}/%{alt_java_name} %{SOURCE11}
+echo "Building %{newjavaver}-%{buildver}, pre=%{ea_designator}, opt=%{lts_designator}"
+
function buildjdk() {
local outputdir=${1}
local buildjdk=${2}
local maketargets="${3}"
local debuglevel=${4}
local link_opt=${5}
+ local debug_symbols=${6}
local top_dir_abs_src_path=$(pwd)/%{top_level_dir_name}
local top_dir_abs_build_path=$(pwd)/${outputdir}
@@ -1115,6 +1085,7 @@ function buildjdk() {
echo "Using make targets: ${maketargets}"
echo "Using debuglevel: ${debuglevel}"
echo "Using link_opt: ${link_opt}"
+ echo "Using debug_symbols: ${debug_symbols}"
echo "Building %{newjavaver}-%{buildver}, pre=%{ea_designator}, opt=%{lts_designator}"
mkdir -p ${outputdir}
@@ -1125,7 +1096,7 @@ function buildjdk() {
# are always used in a system_libs build, even
# for the static library build
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
- scl enable devtoolset-8 -- bash ${top_dir_abs_src_path}/configure \
+ scl enable devtoolset-%{dtsversion} -- bash ${top_dir_abs_src_path}/configure \
%else
bash ${top_dir_abs_src_path}/configure \
%endif
@@ -1145,7 +1116,7 @@ function buildjdk() {
--with-vendor-vm-bug-url="%{oj_vendor_bug_url}" \
--with-boot-jdk=${buildjdk} \
--with-debug-level=${debuglevel} \
- --with-native-debug-symbols="%{debug_symbols}" \
+ --with-native-debug-symbols="${debug_symbols}" \
--disable-sysconf-nss \
--enable-unlimited-crypto \
--with-zlib=%{link_type} \
@@ -1169,7 +1140,7 @@ function buildjdk() {
cat spec.gmk
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
- scl enable devtoolset-8 -- make \
+ scl enable devtoolset-%{dtsversion} -- make \
%else
make \
%endif
@@ -1177,109 +1148,117 @@ function buildjdk() {
WARNINGS_ARE_ERRORS="-Wno-error" \
CFLAGS_WARNINGS_ARE_ERRORS="-Wno-error" \
$maketargets || ( pwd; find ${top_dir_abs_src_path} ${top_dir_abs_build_path} -name "hs_err_pid*.log" | xargs cat && false )
-
popd
}
-function installjdk() {
- local imagepath=${1}
-
- if [ -d ${imagepath} ] ; then
- # the build (erroneously) removes read permissions from some jars
- # this is a regression in OpenJDK 7 (our compiler):
- # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
- find ${imagepath} -iname '*.jar' -exec chmod ugo+r {} \;
-
- # Build screws up permissions on binaries
- # https://bugs.openjdk.java.net/browse/JDK-8173610
- find ${imagepath} -iname '*.so' -exec chmod +x {} \;
- find ${imagepath}/bin/ -exec chmod +x {} \;
-
- # Create fake alt-java as a placeholder for future alt-java
- if [ -d man/man1 ] ; then
- pushd ${imagepath}
- # add alt-java man page
- echo "Hardened java binary recommended for launching untrusted code from the Web e.g. javaws" > man/man1/%{alt_java_name}.1
- cat man/man1/java.1 >> man/man1/%{alt_java_name}.1
- popd
- fi
- fi
-}
-
-# Checks on debuginfo must be performed before the files are stripped
-# by the RPM installation stage
-function debugcheckjdk() {
- local imagepath=${1}
-
- if [ -d ${imagepath} ] ; then
-
- so_suffix="so"
- # Check debug symbols are present and can identify code
- find "${imagepath}" -iname "*.$so_suffix" -print0 | while read -d $'\0' lib
- do
- if [ -f "$lib" ] ; then
- echo "Testing $lib for debug symbols"
- # All these tests rely on RPM failing the build if the exit code of any set
- # of piped commands is non-zero.
-
- # Test for .debug_* sections in the shared object. This is the main test
- # Stripped objects will not contain these
- eu-readelf -S "$lib" | grep "] .debug_"
- test $(eu-readelf -S "$lib" | grep -E "\]\ .debug_(info|abbrev)" | wc --lines) == 2
-
- # Test FILE symbols. These will most likely be removed by anything that
- # manipulates symbol tables because it's generally useless. So a nice test
- # that nothing has messed with symbols
- old_IFS="$IFS"
- IFS=$'\n'
- for line in $(eu-readelf -s "$lib" | grep "00000000 0 FILE LOCAL DEFAULT")
- do
- # We expect to see .cpp and .S files, except for architectures like aarch64 and
- # s390 where we expect .o and .oS files
- echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|S|oS))?$"
- done
- IFS="$old_IFS"
-
- # If this is the JVM, look for javaCalls.(cpp|o) in FILEs, for extra sanity checking
- if [ "`basename $lib`" = "libjvm.so" ]; then
- eu-readelf -s "$lib" | \
- grep -E "00000000 0 FILE LOCAL DEFAULT ABS javaCalls.(cpp|o)$"
- fi
-
- # Test that there are no .gnu_debuglink sections pointing to another
- # debuginfo file. There shouldn't be any debuginfo files, so the link makes
- # no sense either
- eu-readelf -S "$lib" | grep 'gnu'
- if eu-readelf -S "$lib" | grep "\] .gnu_debuglink" | grep PROGBITS; then
- echo "bad .gnu_debuglink section."
- eu-readelf -x .gnu_debuglink "$lib"
- false
- fi
+function stripjdk() {
+ local outputdir=${1}
+ local jdkimagepath=${outputdir}/images/%{jdkimage}
+ local jreimagepath=${outputdir}/images/%{jreimage}
+ local jmodimagepath=${outputdir}/images/jmods
+ local supportdir=${outputdir}/support
+
+ if [ "x$suffix" = "x" ] ; then
+ # Keep the unstripped version for consumption by RHEL RPMs
+ cp -a ${jdkimagepath}{,.unstripped}
+
+ # Strip the files
+ for file in $(find ${jdkimagepath} ${jreimagepath} ${supportdir} -type f) ; do
+ if file ${file} | grep -q 'ELF'; then
+ noextfile=${file/.so/};
+ objcopy --only-keep-debug ${file} ${noextfile}.debuginfo;
+ objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file};
+ strip -g ${file};
fi
done
- # Make sure gdb can do a backtrace based on line numbers on libjvm.so
- # javaCalls.cpp:58 should map to:
- # http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/…
- # Using line number 1 might cause build problems. See:
- # https://bugzilla.redhat.com/show_bug.cgi?id=1539664
- # https://bugzilla.redhat.com/show_bug.cgi?id=1538767
- gdb -q "${imagepath}/bin/java" <<EOF | tee gdb.out
-handle SIGSEGV pass nostop noprint
-handle SIGILL pass nostop noprint
-set breakpoint pending on
-break javaCalls.cpp:58
-commands 1
-backtrace
-quit
-end
-run -version
-EOF
-%ifarch %{gdb_arches}
- grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
-%endif
+ # Rebuild jmod files against the stripped binaries
+ if [ ! -d ${supportdir} ] ; then
+ echo "Support directory missing.";
+ exit 15
+ fi
+ for cmd in $(find ${supportdir} -name '*.jmod_exec.cmdline') ; do
+ pre=${cmd/_exec/_pre};
+ post=${cmd/_exec/_post};
+ jmod=$(echo ${cmd}|sed 's#.*_create_##'|sed 's#_exec.cmdline##')
+ echo "Rebuilding ${jmod} against stripped binaries...";
+ if [ -e ${pre} ] ; then
+ echo "Executing ${pre}...";
+ cat ${pre} | sh -s ;
+ fi
+ echo "Executing ${cmd}...";
+ cat ${cmd} | sh -s ;
+ if [ -e ${post} ] ; then
+ echo "Executing ${post}...";
+ cat ${post} | sh -s ;
+ fi
+ done
+ rm -rf ${jdkimagepath}/jmods
+ cp -a ${jmodimagepath} ${jdkimagepath}
+ fi
+}
+function installjdk() {
+ local outputdir=${1}
+ local installdir=${2}
+ local jdkimagepath=${installdir}/images/%{jdkimage}
+ local jreimagepath=${installdir}/images/%{jreimage}
+ local unstripped=${jdkimagepath}.unstripped
+
+ echo "Installing build from ${outputdir} to ${installdir}..."
+ mkdir -p ${installdir}
+ echo "Installing images..."
+ mv ${outputdir}/images ${installdir}
+ if [ -d ${outputdir}/bundles ] ; then
+ echo "Installing bundles...";
+ mv ${outputdir}/bundles ${installdir} ;
fi
+
+%if !%{with artifacts}
+ echo "Removing output directory...";
+ rm -rf ${outputdir}
+%endif
+
+ # legacy-jre-image target does not install any man pages for the JRE
+ # We copy the jdk man directory and then remove pages for binaries that
+ # don't exist in the JRE
+ cp -a ${jdkimagepath}/man ${jreimagepath}
+ for manpage in $(find ${jreimagepath}/man -name '*.1'); do
+ filename=$(basename ${manpage});
+ binary=${filename/.1/};
+ if [ ! -f ${jreimagepath}/bin/${binary} ] ; then
+ echo "Removing ${manpage} from JRE for which no binary ${binary} exists";
+ rm -f ${manpage};
+ fi;
+ done
+
+ for imagepath in ${jdkimagepath} ${jreimagepath} ${unstripped}; do
+
+ if [ -d ${imagepath} ] ; then
+ # the build (erroneously) removes read permissions from some jars
+ # this is a regression in OpenJDK 7 (our compiler):
+ # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
+ find ${imagepath} -iname '*.jar' -exec chmod ugo+r {} \;
+
+ # Build screws up permissions on binaries
+ # https://bugs.openjdk.java.net/browse/JDK-8173610
+ find ${imagepath} -iname '*.so' -exec chmod +x {} \;
+ find ${imagepath}/bin/ -exec chmod +x {} \;
+
+ # Install local files which are distributed with the JDK
+ install -m 644 %{SOURCE10} ${imagepath}
+
+ # Create fake alt-java as a placeholder for future alt-java
+ pushd ${imagepath}
+ # add alt-java man page
+ echo "Hardened java binary recommended for launching untrusted code from the Web e.g. javaws" > man/man1/%{alt_java_name}.1
+ cat man/man1/java.1 >> man/man1/%{alt_java_name}.1
+ popd
+
+ # Print release information
+ cat ${imagepath}/release
+ fi
+ done
}
function genchecksum() {
@@ -1295,218 +1274,202 @@ function genchecksum() {
popd
}
-packagesdir=$(pwd)/..
-
-pwd
-ls -l
-tar -cJf ${packagesdir}/%{jdkportablesourcesarchive -- ""} --transform "s|^|%{jdkportablesourcesname -- ""}/|" %{top_level_dir_name}
-genchecksum ${packagesdir}/%{jdkportablesourcesarchive -- ""}
-
-%if %{build_hotspot_first}
- # Build a fresh libjvm.so first and use it to bootstrap
- cp -LR --preserve=mode,timestamps %{bootjdk} newboot
- systemjdk=$(pwd)/newboot
- buildjdk build/newboot ${systemjdk} %{hotspot_target} "release" "bundled"
- mv build/newboot/jdk/lib/server/libjvm.so newboot/lib/server
-%else
- systemjdk=%{bootjdk}
-%endif
+function packFullPatchedSources() {
+ srcpackagesdir=`pwd`
+ tar -cJf ${srcpackagesdir}/%{jdkportablesourcesarchive -- ""} --transform "s|^|%{jdkportablesourcesname -- ""}/|" %{top_level_dir_name}
+ genchecksum ${srcpackagesdir}/%{jdkportablesourcesarchive -- ""}
+}
-for suffix in %{build_loop} ; do
- if [ "x$suffix" = "x" ] ; then
- debugbuild=release
- else
- # change --something to something
- debugbuild=`echo $suffix | sed "s/-//g"`
- fi
- for loop in %{main_suffix} %{staticlibs_loop} ; do
- builddir=%{buildoutputdir -- ${suffix}${loop}}
- bootbuilddir=boot${builddir}
- if test "x${loop}" = "x%{main_suffix}" ; then
- link_opt="%{link_type}"
-%if %{system_libs}
- # Copy the source tree so we can remove all in-tree libraries
- cp -a %{top_level_dir_name} %{top_level_dir_name_backup}
- # Remove all libraries that are linked
- sh %{SOURCE12} %{top_level_dir_name} full
-%endif
- # Debug builds don't need same targets as release for
- # build speed-up. We also avoid bootstrapping these
- # slower builds.
- if echo $debugbuild | grep -q "debug" ; then
- maketargets="%{debug_targets}"
- run_bootstrap=false
- else
- maketargets="%{release_targets}"
- run_bootstrap=%{bootstrap_build}
- fi
- if ${run_bootstrap} ; then
- buildjdk ${bootbuilddir} ${systemjdk} "%{bootstrap_targets}" ${debugbuild} ${link_opt}
- buildjdk ${builddir} $(pwd)/${bootbuilddir}/images/%{jdkimage} "${maketargets}" ${debugbuild} ${link_opt}
- rm -rf ${bootbuilddir}
- else
- buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt}
- fi
-%if %{system_libs}
- # Restore original source tree we modified by removing full in-tree sources
- rm -rf %{top_level_dir_name}
- mv %{top_level_dir_name_backup} %{top_level_dir_name}
-%endif
+function packagejdk() {
+ local imagesdir=$(pwd)/${1}/images
+ local docdir=$(pwd)/${1}/images/docs
+ local bundledir=$(pwd)/${1}/bundles
+ local packagesdir=$(pwd)/${2}
+ local srcdir=$(pwd)/%{top_level_dir_name}
+ local tapsetdir=$(pwd)/tapset
+ local altjavadir=$(pwd)/${3}
+
+ echo "Packaging build from ${imagesdir} to ${packagesdir}..."
+ mkdir -p ${packagesdir}
+ pushd ${imagesdir}
+
+ echo "Packaging build from ${imagesdir} to ${packagesdir}..."
+ mkdir -p ${packagesdir}
+ pushd ${imagesdir}
+
+ if [ "x$suffix" = "x" ] ; then
+ nameSuffix=""
else
- # Use bundled libraries for building statically
- link_opt="bundled"
- # Static library cycle only builds the static libraries
- maketargets="%{static_libs_target}"
- # Always just do the one build for the static libraries
- buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt}
+ nameSuffix=`echo "$suffix"| sed s/-/./`
fi
- done # end of main / staticlibs loop
+ jdkname=%{jdkportablename -- "$nameSuffix"}
+ jdkarchive=${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
+ jrename=%{jreportablename -- "$nameSuffix"}
+ jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
+ staticname=%{staticlibsportablename -- "$nameSuffix"}
+ staticarchive=${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
+ debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
+ unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
+ # We only use docs for the release build
+ docname=%{docportablename}
+ docarchive=${packagesdir}/%{docportablearchive}
+ built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
+ # These are from the source tree so no debug variants
+ miscname=%{miscportablename}
+ miscarchive=${packagesdir}/%{miscportablearchive}
+
+ if [ "x$suffix" = "x" ] ; then
+ # Keep the unstripped version for consumption by RHEL RPMs
+ mv %{jdkimage}.unstripped ${jdkname}
+ tar -cJf ${unstrippedarchive} ${jdkname}
+ genchecksum ${unstrippedarchive}
+ mv ${jdkname} %{jdkimage}.unstripped
+ fi
- # Final setup on the main image
- top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
- for image in %{jdkimage} %{jreimage} ; do
- imagePath=${top_dir_abs_main_build_path}/images/${image}
- installjdk ${imagePath}
- done
- # Check debug symbols were built into the dynamic libraries; todo, why it passes in JDK only?
- debugcheckjdk ${top_dir_abs_main_build_path}/images/%{jdkimage}
+ # Rename directories for packaging
+ mv %{jdkimage} ${jdkname}
+ mv %{jreimage} ${jrename}
- # Print release information
- cat ${top_dir_abs_main_build_path}/images/%{jdkimage}/release
+ # Release images have external debug symbols
+ if [ "x$suffix" = "x" ] ; then
+ tar -cJf ${debugarchive} $(find ${jdkname} -name \*.debuginfo)
+ genchecksum ${debugarchive}
-################################################################################
- pushd ${top_dir_abs_main_build_path}/images
- if [ "x$suffix" == "x" ] ; then
- nameSuffix=""
- else
- nameSuffix=`echo "$suffix"| sed s/-/./`
- fi
- # additional steps needed for fluent repack; most of them done twice, as images are already populated
- # maybe most of them should be done in upstream build?
- for imagedir in %{jdkimage} %{jreimage} ; do
- pushd $imagedir
- # Convert man pages to UTF8 encoding
- if [ -d man/man1 ] ; then # jre do not have man pages...
- for manpage in man/man1/* ; do
- iconv -f ISO_8859-1 -t UTF8 $manpage -o $manpage.tmp
- mv -f $manpage.tmp $manpage
- done
- fi
- # Install release notes
- cp -a %{SOURCE10} `pwd`
- cp -a %{SOURCE10} `pwd`/legal
- # stabilize permissions; aprtially duplicated in instalojdk
- find `pwd` -name "*.so" -exec chmod 755 {} \; -exec echo "set 755 to so {}" \; ;
- find `pwd` -type d -exec chmod 755 {} \; -exec echo "set 755 to dir {}" \; ;
- find `pwd`/legal -type f -exec chmod 644 {} \; -exec echo "set 644 to licences {}" \; ;
- popd # jdkimage/jreimage
- done # jre/sdk work in loop
- # javadoc is done only for release sdkimage
- if ! echo $suffix | grep -q "debug" ; then
- # Install Javadoc documentation
- #cp -a docs %{jdkimage} # not sure if the plaintext javadoc is for some use
- built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
- cp -a `pwd`/../bundles/${built_doc_archive} `pwd`/%{jdkimage}/javadocs.zip || ls -l `pwd`/../bundles
+ mkdir ${docname}
+ mv ${docdir} ${docname}
+ mv ${bundledir}/${built_doc_archive} ${docname}
+ tar -cJf ${docarchive} ${docname}
+ genchecksum ${docarchive}
+
+ mkdir ${miscname}
+ for s in 16 24 32 48 ; do
+ cp -av ${srcdir}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png ${miscname}
+ done
+%if %{with_systemtap}
+ cp -a ${tapsetdir}* ${miscname}
+%endif
+ cp -av ${altjavadir}/%{alt_java_name} ${miscname}
+ tar -cJf ${miscarchive} ${miscname}
+ genchecksum ${miscarchive}
fi
- # end of additional steps
-
- mv %{jdkimage} %{jdkportablename -- "$nameSuffix"}
- mv %{jreimage} %{jreportablename -- "$nameSuffix"}
- tar -cJf ${packagesdir}/%{jdkportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jdkportablename -- "$nameSuffix"}
- genchecksum ${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
- tar -cJf ${packagesdir}/%{jreportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jreportablename -- "$nameSuffix"}
- genchecksum ${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
- # copy licenses so they are avialable out of tarball
- cp -rf %{jdkportablename -- "$nameSuffix"}/legal ${packagesdir}/%{jdkportablearchive -- "%{normal_suffix}"}-legal
- mv %{jdkportablename -- "$nameSuffix"} %{jdkimage}
- mv %{jreportablename -- "$nameSuffix"} %{jreimage}
- popd #images
+
+ tar -cJf ${jdkarchive} --exclude='**.debuginfo' ${jdkname}
+ genchecksum ${jdkarchive}
+
+ tar -cJf ${jrearchive} --exclude='**.debuginfo' ${jrename}
+ genchecksum ${jrearchive}
+
%if %{include_staticlibs}
- top_dir_abs_staticlibs_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{staticlibs_suffix}}
- pushd ${top_dir_abs_staticlibs_build_path}/images
# Static libraries (needed for building graal vm with native image)
# Tar as overlay. Transform to the JDK name, since we just want to "add"
# static libraries to that folder
- portableJDKname=%{staticlibsportablename -- "$nameSuffix"}
- tar -cJf ${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"} --transform "s|^%{static_libs_image}/lib/*|$portableJDKname/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib"
- genchecksum ${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
- popd #staticlibs-images
+ tar -cJf ${staticarchive} \
+ --transform "s|^%{static_libs_image}/lib/*|${staticname}/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib"
+ genchecksum ${staticarchive}
%endif
-################################################################################
-# note, currently no debuginfo, consult portbale spec for external (zipped) debuginfo, being tarred alone
-################################################################################
-# build cycles
-done # end of release / debug cycle loop
+ # Revert directory renaming so testing will run
+ # TODO: testing should run on the packaged JDK
+ mv ${jdkname} %{jdkimage}
+ mv ${jrename} %{jreimage}
-# These are from the source tree so no debug variants
-miscname=%{miscportablename}
-miscarchive=${packagesdir}/%{miscportablearchive}
+ popd #images
-mkdir ${miscname}
-cp -av %{altjavaoutputdir}/%{alt_java_name} ${miscname}
-tar -cJf ${miscarchive} ${miscname}
-genchecksum ${miscarchive}
-
-%install
+}
-packagesdir=$(pwd)/..
+packFullPatchedSources
-mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
-# Install outside the loop as there are no debug variants
-miscarchive=${packagesdir}/%{miscportablearchive}
-mv ${packagesdir}/%{jdkportablesourcesarchive -- ""} $RPM_BUILD_ROOT%{_jvmdir}/
-mv ${packagesdir}/%{jdkportablesourcesarchive -- ""}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
-mv ${miscarchive} $RPM_BUILD_ROOT%{_jvmdir}/
-mv ${miscarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+%if %{build_hotspot_first}
+ # Build a fresh libjvm.so first and use it to bootstrap
+ cp -LR --preserve=mode,timestamps %{bootjdk} newboot
+ systemjdk=$(pwd)/newboot
+ buildjdk build/newboot ${systemjdk} %{hotspot_target} "release" "bundled" "internal"
+ mv build/newboot/jdk/lib/%{vm_variant}/libjvm.so newboot/lib/%{vm_variant}
+%else
+ systemjdk=%{bootjdk}
+%endif
for suffix in %{build_loop} ; do
-top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
-################################################################################
- if [ "x$suffix" == "x" ] ; then
- nameSuffix=""
+ if [ "x$suffix" = "x" ] ; then
+ debugbuild=release
else
- nameSuffix=`echo "$suffix"| sed s/-/./`
+ # change --something to something
+ debugbuild=`echo $suffix | sed "s/-//g"`
fi
- mv ${packagesdir}/%{jdkportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
- mv ${packagesdir}/%{jreportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ${packagesdir}/%{jreportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
-%if %{include_staticlibs}
- mv ${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
-%endif
- if [ "x$suffix" == "x" ] ; then
- dnameSuffix="$nameSuffix".debuginfo
-# todo handle debuginfo, see note at build (we will need to pack one stripped and one unstripped release build)
-# mv ../%{jdkportablearchive -- "$dnameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
-# mv ../%{jdkportablearchive -- "$dnameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ # We build with internal debug symbols and do
+ # our own stripping for one version of the
+ # release build
+ debug_symbols=internal
+
+ builddir=%{buildoutputdir -- ${suffix}}
+ bootbuilddir=boot${builddir}
+ installdir=%{installoutputdir -- ${suffix}}
+ bootinstalldir=boot${installdir}
+ packagesdir=%{packageoutputdir -- ${suffix}}
+
+ link_opt="%{link_type}"
+%if %{system_libs}
+ # Copy the source tree so we can remove all in-tree libraries
+ cp -a %{top_level_dir_name} %{top_level_dir_name_backup}
+ # Remove all libraries that are linked
+ sh %{SOURCE12} %{top_level_dir_name} full
+%endif
+ # Debug builds don't need same targets as release for
+ # build speed-up. We also avoid bootstrapping these
+ # slower builds.
+ if echo $debugbuild | grep -q "debug" ; then
+ maketargets="%{debug_targets}"
+ run_bootstrap=false
+ else
+ maketargets="%{release_targets}"
+ run_bootstrap=%{bootstrap_build}
fi
-################################################################################
-# end, dual install
-done
-################################################################################
-# the licenses are packed onloy once and shared
-mkdir -p $RPM_BUILD_ROOT%{unpacked_licenses}
-mv ${packagesdir}/%{jdkportablearchive -- "%{normal_suffix}"}-legal $RPM_BUILD_ROOT%{unpacked_licenses}/%{jdkportablesourcesarchive -- "%{normal_suffix}"}
-# To show sha in the build log
-for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do ls -l $file ; cat $file ; done
-################################################################################
+ if ${run_bootstrap} ; then
+ buildjdk ${bootbuilddir} ${systemjdk} "%{bootstrap_targets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ installjdk ${bootbuilddir} ${bootinstalldir}
+ buildjdk ${builddir} $(pwd)/${bootinstalldir}/images/%{jdkimage} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ stripjdk ${builddir}
+ installjdk ${builddir} ${installdir}
+ %{!?with_artifacts:rm -rf ${bootinstalldir}}
+ else
+ buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ stripjdk ${builddir}
+ installjdk ${builddir} ${installdir}
+ fi
+ packagejdk ${installdir} ${packagesdir} %{altjavaoutputdir}
+
+%if %{system_libs}
+ # Restore original source tree we modified by removing full in-tree sources
+ rm -rf %{top_level_dir_name}
+ mv %{top_level_dir_name_backup} %{top_level_dir_name}
+%endif
+
+# build cycles
+done # end of release / debug cycle loop
%check
# We test debug first as it will give better diagnostics on a crash
for suffix in %{build_loop} ; do
-# Tests in the check stage are performed on the installed image
-# rpmbuild operates as follows: build -> install -> test
-# however in portbales, we test built image instead of installed one
-top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
+# portable builds have static_libs embedded, thus top_dir_abs_main_build_path is same as top_dir_abs_staticlibs_build_path
+top_dir_abs_main_build_path=$(pwd)/%{installoutputdir -- ${suffix}}
+%if %{include_staticlibs}
+top_dir_abs_staticlibs_build_path=${top_dir_abs_main_build_path}
+%endif
+
export JAVA_HOME=${top_dir_abs_main_build_path}/images/%{jdkimage}
-#check Shenandoah is enabled
+# Pre-test setup
+
+# System security properties are disabled by default on portable.
+# Turn on system security properties
+#sed -i -e "s:^security.useSystemPropertiesFile=.*:security.useSystemPropertiesFile=true:" \
+#${JAVA_HOME}/conf/security/java.security
+
+# Check Shenandoah is enabled
%if %{use_shenandoah_hotspot}
$JAVA_HOME/bin/java -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -version
%endif
@@ -1525,9 +1488,14 @@ $JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||")
$JAVA_HOME/bin/javac -d . %{SOURCE15}
export PROG=$(echo $(basename %{SOURCE15})|sed "s|\.java||")
export SEC_DEBUG="-Djava.security.debug=properties"
+# Specific to portable:System security properties to be off by default
$JAVA_HOME/bin/java ${SEC_DEBUG} ${PROG} false
$JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=false ${PROG} false
+# Check correct vendor values have been set
+$JAVA_HOME/bin/javac -d . %{SOURCE16}
+$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
+
# Check java launcher has no SSB mitigation
if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
@@ -1539,14 +1507,11 @@ nm %{altjavaoutputdir}/%{alt_java_name} | grep prctl
if ! nm %{altjavaoutputdir}/%{alt_java_name} | grep prctl ; then true ; else false; fi
%endif
-# Check correct vendor values have been set
-$JAVA_HOME/bin/javac -d . %{SOURCE16}
-$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
-
%if ! 0%{?flatpak}
# Check translations are available for new timezones (during flatpak builds, the
# tzdb.dat used by this test is not where the test expects it, so this is
-# disabled for flatpak builds)
+# disabled for flatpak builds)
+# Disable test until we are on the latest JDK
$JAVA_HOME/bin/javac -d . %{SOURCE18}
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE
$JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR
@@ -1554,9 +1519,82 @@ $JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|
%if %{include_staticlibs}
# Check debug symbols in static libraries (smoke test)
-export STATIC_LIBS_HOME=${top_dir_abs_main_build_path}/../../%{buildoutputdir -- ${suffix}%{staticlibs_suffix}}/images/static-libs/lib/
-readelf --debug-dump $STATIC_LIBS_HOME/libnet.a | grep Inet4AddressImpl.c
-readelf --debug-dump $STATIC_LIBS_HOME/libnet.a | grep Inet6AddressImpl.c
+export STATIC_LIBS_HOME=${top_dir_abs_staticlibs_build_path}/images/%{static_libs_image}
+ls -l $STATIC_LIBS_HOME
+ls -l $STATIC_LIBS_HOME/lib
+readelf --debug-dump $STATIC_LIBS_HOME/lib/libnet.a | grep Inet4AddressImpl.c
+readelf --debug-dump $STATIC_LIBS_HOME/lib/libnet.a | grep Inet6AddressImpl.c
+%endif
+
+# Release builds strip the debug symbols into external .debuginfo files
+if [ "x$suffix" = "x" ] ; then
+ so_suffix="debuginfo"
+else
+ so_suffix="so"
+fi
+# Check debug symbols are present and can identify code
+find "$JAVA_HOME" -iname "*.$so_suffix" -print0 | while read -d $'\0' lib
+do
+ if [ -f "$lib" ] ; then
+ echo "Testing $lib for debug symbols"
+ # All these tests rely on RPM failing the build if the exit code of any set
+ # of piped commands is non-zero.
+
+ # Test for .debug_* sections in the shared object. This is the main test
+ # Stripped objects will not contain these
+ eu-readelf -S "$lib" | grep "] .debug_"
+ test $(eu-readelf -S "$lib" | grep -E "\]\ .debug_(info|abbrev)" | wc --lines) == 2
+
+ # Test FILE symbols. These will most likely be removed by anything that
+ # manipulates symbol tables because it's generally useless. So a nice test
+ # that nothing has messed with symbols
+ old_IFS="$IFS"
+ IFS=$'\n'
+ for line in $(eu-readelf -s "$lib" | grep "00000000 0 FILE LOCAL DEFAULT")
+ do
+ # We expect to see .cpp and .S files, except for architectures like aarch64 and
+ # s390 where we expect .o and .oS files
+ echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|S|oS))?$"
+ done
+ IFS="$old_IFS"
+
+ # If this is the JVM, look for javaCalls.(cpp|o) in FILEs, for extra sanity checking
+ if [ "`basename $lib`" = "libjvm.so" ]; then
+ eu-readelf -s "$lib" | \
+ grep -E "00000000 0 FILE LOCAL DEFAULT ABS javaCalls.(cpp|o)$"
+ fi
+
+ # Test that there are no .gnu_debuglink sections pointing to another
+ # debuginfo file. There shouldn't be any debuginfo files, so the link makes
+ # no sense either
+ eu-readelf -S "$lib" | grep 'gnu'
+ if eu-readelf -S "$lib" | grep '] .gnu_debuglink' | grep PROGBITS; then
+ echo "bad .gnu_debuglink section."
+ eu-readelf -x .gnu_debuglink "$lib"
+ false
+ fi
+ fi
+done
+
+# Make sure gdb can do a backtrace based on line numbers on libjvm.so
+# javaCalls.cpp:58 should map to:
+# http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/…
+# Using line number 1 might cause build problems. See:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1539664
+# https://bugzilla.redhat.com/show_bug.cgi?id=1538767
+gdb -q "$JAVA_HOME/bin/java" <<EOF | tee gdb.out
+handle SIGSEGV pass nostop noprint
+handle SIGILL pass nostop noprint
+set breakpoint pending on
+break javaCalls.cpp:58
+commands 1
+backtrace
+quit
+end
+run -version
+EOF
+%ifarch %{gdb_arches}
+grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
%endif
# Check src.zip has all sources. See RHBZ#1130490
@@ -1575,12 +1613,69 @@ $JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LocalVariableTable
# build cycles check
done
+%install
+
+ mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
+ mv %{jdkportablesourcesarchive -- ""} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv %{jdkportablesourcesarchive -- ""}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+
+for suffix in %{build_loop} ; do
+
+ packagesdir=%{packageoutputdir -- ${suffix}}
+
+ if [ "x$suffix" == "x" ] ; then
+ nameSuffix=""
+ else
+ nameSuffix=`echo "$suffix"| sed s/-/./`
+ fi
+
+ # These definitions should match those in installjdk
+ jdkarchive=${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
+ jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
+ staticarchive=${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
+ debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
+ unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
+
+ mv ${jdkarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jdkarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jrearchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jrearchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+
+%if %{include_staticlibs}
+ mv ${staticarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${staticarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+%endif
+
+ if [ "x$suffix" = "x" ] ; then
+ mv ${debugarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${debugarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${unstrippedarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${unstrippedarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ fi
+done
+
+# These definitions should match those in installjdk
+# Install outside the loop as there are no debug variants
+docarchive=${packagesdir}/%{docportablearchive}
+miscarchive=${packagesdir}/%{miscportablearchive}
+
+mv ${docarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+mv ${docarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+mv ${miscarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+mv ${miscarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+
+# To show sha in the build log
+for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do
+ ls -l $file ;
+ cat $file ;
+done
+
%if %{include_normal_build}
+
%files
# main package builds always
%{_jvmdir}/%{jreportablearchiveForFiles}
%{_jvmdir}/%{jreportablearchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%else
%files
# placeholder
@@ -1589,10 +1684,9 @@ done
%if %{include_normal_build}
%files devel
%{_jvmdir}/%{jdkportablearchiveForFiles}
-#%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
+%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
%{_jvmdir}/%{jdkportablearchiveForFiles}.sha256sum
-#%{_jvmdir}/%{jdkportablearchive -- .debuginfo}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
+%{_jvmdir}/%{jdkportablearchive -- .debuginfo}.sha256sum
%endif
%if %{include_normal_build}
@@ -1600,26 +1694,26 @@ done
%files static-libs
%{_jvmdir}/%{staticlibsportablearchiveForFiles}
%{_jvmdir}/%{staticlibsportablearchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
+
+%files unstripped
+%{_jvmdir}/%{jdkportablearchive -- .unstripped}
+%{_jvmdir}/%{jdkportablearchive -- .unstripped}.sha256sum
%endif
%if %{include_debug_build}
%files slowdebug
%{_jvmdir}/%{jreportablearchive -- .slowdebug}
%{_jvmdir}/%{jreportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%files devel-slowdebug
%{_jvmdir}/%{jdkportablearchive -- .slowdebug}
%{_jvmdir}/%{jdkportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%if %{include_staticlibs}
%files static-libs-slowdebug
%{_jvmdir}/%{staticlibsportablearchive -- .slowdebug}
%{_jvmdir}/%{staticlibsportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
%endif
@@ -1627,31 +1721,44 @@ done
%files fastdebug
%{_jvmdir}/%{jreportablearchive -- .fastdebug}
%{_jvmdir}/%{jreportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%files devel-fastdebug
%{_jvmdir}/%{jdkportablearchive -- .fastdebug}
%{_jvmdir}/%{jdkportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%if %{include_staticlibs}
%files static-libs-fastdebug
%{_jvmdir}/%{staticlibsportablearchive -- .fastdebug}
%{_jvmdir}/%{staticlibsportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
%endif
%files sources
%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}
%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
+
+%files docs
+%{_jvmdir}/%{docportablearchive}
+%{_jvmdir}/%{docportablearchive}.sha256sum
%files misc
%{_jvmdir}/%{miscportablearchive}
%{_jvmdir}/%{miscportablearchive}.sha256sum
%changelog
+* Wed Nov 22 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.1.0.12-2.rolling
+- updated to OpenJDK 21.0.1 (2023-10-17)
+- adjsuted generate_source_tarball
+- removed icedtea_sync
+- dropped standalone licenses
+- added usntripped subpkg
+- added docs subpkg
+- adjsuted versions of bundled libraries
+- build refactored to several solid methods following gnu_andrew
+- removed no longer needed jdk8296108-tzdata2022f.patch, jdk8296715-cldr2022f.patch, rh1648644-java_access_bridge_privileged_security.patch
+- added jdk8311630-s390_ffmapi.patch to support virtual threads on s390x
+- aligned fips-21u-75ffdc48eda.patch (gnu_andrew)
+
* Wed Sep 20 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.0.0.35-4.rolling
- removed %{1} from miscportablename
diff --git a/jconsole.desktop.in b/jconsole.desktop.in
index 8a3b04d..c1b8f6a 100644
--- a/jconsole.desktop.in
+++ b/jconsole.desktop.in
@@ -1,10 +1 @@
-[Desktop Entry]
-Name=OpenJDK @JAVA_VER@ for @target_cpu@ Monitoring & Management Console (@OPENJDK_VER@)
-Comment=Monitor and manage OpenJDK applications
-Exec=_SDKBINDIR_/jconsole
-Icon=java-@JAVA_VER@-@JAVA_VENDOR@
-Terminal=false
-Type=Application
-StartupWMClass=sun-tools-jconsole-JConsole
-Categories=Development;Profiling;Java;
-Version=1.0
+# this file is intentionally not here, as portable builds do not have desktop integration
diff --git a/jdk8296108-tzdata2022f.patch b/jdk8296108-tzdata2022f.patch
deleted file mode 100644
index 8b13789..0000000
--- a/jdk8296108-tzdata2022f.patch
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jdk8296715-cldr2022f.patch b/jdk8296715-cldr2022f.patch
deleted file mode 100644
index 8b13789..0000000
--- a/jdk8296715-cldr2022f.patch
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jdk8311630-s390_ffmapi.patch b/jdk8311630-s390_ffmapi.patch
new file mode 100644
index 0000000..cd3bc08
--- /dev/null
+++ b/jdk8311630-s390_ffmapi.patch
@@ -0,0 +1,1906 @@
+commit 27f635fabe7c2933674ad40443906fc35eecf785
+Author: Sidraya Jayagond <sjayagond(a)openjdk.org>
+Date: Tue Sep 12 09:07:09 2023 +0000
+
+ 8311630: [s390] Implementation of Foreign Function & Memory API (Preview)
+
+ Backport-of: ec1f7a8480db025a6f405817a106af8e92b69c44
+
+diff --git a/src/hotspot/cpu/s390/downcallLinker_s390.cpp b/src/hotspot/cpu/s390/downcallLinker_s390.cpp
+index baee7d7a043..f831da90755 100644
+--- a/src/hotspot/cpu/s390/downcallLinker_s390.cpp
++++ b/src/hotspot/cpu/s390/downcallLinker_s390.cpp
+@@ -23,8 +23,76 @@
+ */
+
+ #include "precompiled.hpp"
++#include "asm/macroAssembler.inline.hpp"
++#include "code/codeBlob.hpp"
++#include "code/codeCache.hpp"
++#include "code/vmreg.inline.hpp"
++#include "compiler/oopMap.hpp"
++#include "logging/logStream.hpp"
++#include "memory/resourceArea.hpp"
+ #include "prims/downcallLinker.hpp"
+-#include "utilities/debug.hpp"
++#include "runtime/globals.hpp"
++#include "runtime/stubCodeGenerator.hpp"
++
++#define __ _masm->
++
++class DowncallStubGenerator : public StubCodeGenerator {
++ BasicType* _signature;
++ int _num_args;
++ BasicType _ret_bt;
++ const ABIDescriptor& _abi;
++
++ const GrowableArray<VMStorage>& _input_registers;
++ const GrowableArray<VMStorage>& _output_registers;
++
++ bool _needs_return_buffer;
++ int _captured_state_mask;
++ bool _needs_transition;
++
++ int _frame_complete;
++ int _frame_size_slots;
++ OopMapSet* _oop_maps;
++ public:
++ DowncallStubGenerator(CodeBuffer* buffer,
++ BasicType* signature,
++ int num_args,
++ BasicType ret_bt,
++ const ABIDescriptor& abi,
++ const GrowableArray<VMStorage>& input_registers,
++ const GrowableArray<VMStorage>& output_registers,
++ bool needs_return_buffer,
++ int captured_state_mask,
++ bool needs_transition)
++ :StubCodeGenerator(buffer, PrintMethodHandleStubs),
++ _signature(signature),
++ _num_args(num_args),
++ _ret_bt(ret_bt),
++ _abi(abi),
++ _input_registers(input_registers),
++ _output_registers(output_registers),
++ _needs_return_buffer(needs_return_buffer),
++ _captured_state_mask(captured_state_mask),
++ _needs_transition(needs_transition),
++ _frame_complete(0),
++ _frame_size_slots(0),
++ _oop_maps(nullptr) {
++ }
++ void generate();
++ int frame_complete() const {
++ return _frame_complete;
++ }
++
++ int framesize() const {
++ return (_frame_size_slots >> (LogBytesPerWord - LogBytesPerInt));
++ }
++
++ OopMapSet* oop_maps() const {
++ return _oop_maps;
++ }
++};
++
++static const int native_invoker_code_base_size = 512;
++static const int native_invoker_size_per_args = 8;
+
+ RuntimeStub* DowncallLinker::make_downcall_stub(BasicType* signature,
+ int num_args,
+@@ -35,6 +103,197 @@ RuntimeStub* DowncallLinker::make_downcall_stub(BasicType* signature,
+ bool needs_return_buffer,
+ int captured_state_mask,
+ bool needs_transition) {
+- Unimplemented();
+- return nullptr;
++
++ int code_size = native_invoker_code_base_size + (num_args * native_invoker_size_per_args);
++ int locs_size = 1; //must be non zero
++ CodeBuffer code("nep_invoker_blob", code_size, locs_size);
++
++ DowncallStubGenerator g(&code, signature, num_args, ret_bt, abi,
++ input_registers, output_registers,
++ needs_return_buffer, captured_state_mask,
++ needs_transition);
++ g.generate();
++ code.log_section_sizes("nep_invoker_blob");
++
++ RuntimeStub* stub =
++ RuntimeStub::new_runtime_stub("nep_invoker_blob",
++ &code,
++ g.frame_complete(),
++ g.framesize(),
++ g.oop_maps(), false);
++
++#ifndef PRODUCT
++ LogTarget(Trace, foreign, downcall) lt;
++ if (lt.is_enabled()) {
++ ResourceMark rm;
++ LogStream ls(lt);
++ stub->print_on(&ls);
++ }
++#endif
++
++ return stub;
++}
++
++void DowncallStubGenerator::generate() {
++ Register call_target_address = Z_R1_scratch,
++ tmp = Z_R0_scratch;
++
++ VMStorage shuffle_reg = _abi._scratch1;
++
++ JavaCallingConvention in_conv;
++ NativeCallingConvention out_conv(_input_registers);
++ ArgumentShuffle arg_shuffle(_signature, _num_args, _signature, _num_args, &in_conv, &out_conv, shuffle_reg);
++
++#ifndef PRODUCT
++ LogTarget(Trace, foreign, downcall) lt;
++ if (lt.is_enabled()) {
++ ResourceMark rm;
++ LogStream ls(lt);
++ arg_shuffle.print_on(&ls);
++ }
++#endif
++
++ assert(_abi._shadow_space_bytes == frame::z_abi_160_size, "expected space according to ABI");
++ int allocated_frame_size = _abi._shadow_space_bytes;
++ allocated_frame_size += arg_shuffle.out_arg_bytes();
++
++ assert(!_needs_return_buffer, "unexpected needs_return_buffer");
++ RegSpiller out_reg_spiller(_output_registers);
++ int spill_offset = allocated_frame_size;
++ allocated_frame_size += BytesPerWord;
++
++ StubLocations locs;
++ locs.set(StubLocations::TARGET_ADDRESS, _abi._scratch2);
++
++ if (_captured_state_mask != 0) {
++ __ block_comment("{ _captured_state_mask is set");
++ locs.set_frame_data(StubLocations::CAPTURED_STATE_BUFFER, allocated_frame_size);
++ allocated_frame_size += BytesPerWord;
++ __ block_comment("} _captured_state_mask is set");
++ }
++
++ allocated_frame_size = align_up(allocated_frame_size, StackAlignmentInBytes);
++ _frame_size_slots = allocated_frame_size >> LogBytesPerInt;
++
++ _oop_maps = _needs_transition ? new OopMapSet() : nullptr;
++ address start = __ pc();
++
++ __ save_return_pc();
++ __ push_frame(allocated_frame_size, Z_R11); // Create a new frame for the wrapper.
++
++ _frame_complete = __ pc() - start; // frame build complete.
++
++ if (_needs_transition) {
++ __ block_comment("{ thread java2native");
++ __ get_PC(Z_R1_scratch);
++ address the_pc = __ pc();
++ __ set_last_Java_frame(Z_SP, Z_R1_scratch);
++
++ OopMap* map = new OopMap(_frame_size_slots, 0);
++ _oop_maps->add_gc_map(the_pc - start, map);
++
++ // State transition
++ __ set_thread_state(_thread_in_native);
++ __ block_comment("} thread java2native");
++ }
++ __ block_comment("{ argument shuffle");
++ arg_shuffle.generate(_masm, shuffle_reg, frame::z_jit_out_preserve_size, _abi._shadow_space_bytes, locs);
++ __ block_comment("} argument shuffle");
++
++ __ call(as_Register(locs.get(StubLocations::TARGET_ADDRESS)));
++
++ //////////////////////////////////////////////////////////////////////////////
++
++ if (_captured_state_mask != 0) {
++ __ block_comment("{ save thread local");
++
++ out_reg_spiller.generate_spill(_masm, spill_offset);
++
++ __ load_const_optimized(call_target_address, CAST_FROM_FN_PTR(uint64_t, DowncallLinker::capture_state));
++ __ z_lg(Z_ARG1, Address(Z_SP, locs.data_offset(StubLocations::CAPTURED_STATE_BUFFER)));
++ __ load_const_optimized(Z_ARG2, _captured_state_mask);
++ __ call(call_target_address);
++
++ out_reg_spiller.generate_fill(_masm, spill_offset);
++
++ __ block_comment("} save thread local");
++ }
++
++ //////////////////////////////////////////////////////////////////////////////
++
++ Label L_after_safepoint_poll;
++ Label L_safepoint_poll_slow_path;
++ Label L_reguard;
++ Label L_after_reguard;
++
++ if (_needs_transition) {
++ __ block_comment("{ thread native2java");
++ __ set_thread_state(_thread_in_native_trans);
++
++ if (!UseSystemMemoryBarrier) {
++ __ z_fence(); // Order state change wrt. safepoint poll.
++ }
++
++ __ safepoint_poll(L_safepoint_poll_slow_path, tmp);
++
++ __ load_and_test_int(tmp, Address(Z_thread, JavaThread::suspend_flags_offset()));
++ __ z_brne(L_safepoint_poll_slow_path);
++
++ __ bind(L_after_safepoint_poll);
++
++ // change thread state
++ __ set_thread_state(_thread_in_Java);
++
++ __ block_comment("reguard stack check");
++ __ z_cli(Address(Z_thread, JavaThread::stack_guard_state_offset() + in_ByteSize(sizeof(StackOverflow::StackGuardState) - 1)),
++ StackOverflow::stack_guard_yellow_reserved_disabled);
++ __ z_bre(L_reguard);
++ __ bind(L_after_reguard);
++
++ __ reset_last_Java_frame();
++ __ block_comment("} thread native2java");
++ }
++
++ __ pop_frame();
++ __ restore_return_pc(); // This is the way back to the caller.
++ __ z_br(Z_R14);
++
++ //////////////////////////////////////////////////////////////////////////////
++
++ if (_needs_transition) {
++ __ block_comment("{ L_safepoint_poll_slow_path");
++ __ bind(L_safepoint_poll_slow_path);
++
++ // Need to save the native result registers around any runtime calls.
++ out_reg_spiller.generate_spill(_masm, spill_offset);
++
++ __ load_const_optimized(call_target_address, CAST_FROM_FN_PTR(uint64_t, JavaThread::check_special_condition_for_native_trans));
++ __ z_lgr(Z_ARG1, Z_thread);
++ __ call(call_target_address);
++
++ out_reg_spiller.generate_fill(_masm, spill_offset);
++
++ __ z_bru(L_after_safepoint_poll);
++ __ block_comment("} L_safepoint_poll_slow_path");
++
++ //////////////////////////////////////////////////////////////////////////////
++ __ block_comment("{ L_reguard");
++ __ bind(L_reguard);
++
++ // Need to save the native result registers around any runtime calls.
++ out_reg_spiller.generate_spill(_masm, spill_offset);
++
++ __ load_const_optimized(call_target_address, CAST_FROM_FN_PTR(uint64_t, SharedRuntime::reguard_yellow_pages));
++ __ call(call_target_address);
++
++ out_reg_spiller.generate_fill(_masm, spill_offset);
++
++ __ z_bru(L_after_reguard);
++
++ __ block_comment("} L_reguard");
++ }
++
++ //////////////////////////////////////////////////////////////////////////////
++
++ __ flush();
+ }
+diff --git a/src/hotspot/cpu/s390/foreignGlobals_s390.cpp b/src/hotspot/cpu/s390/foreignGlobals_s390.cpp
+index d3a318536bd..9796ab4ffe4 100644
+--- a/src/hotspot/cpu/s390/foreignGlobals_s390.cpp
++++ b/src/hotspot/cpu/s390/foreignGlobals_s390.cpp
+@@ -23,34 +23,209 @@
+ */
+
+ #include "precompiled.hpp"
+-#include "code/vmreg.hpp"
++#include "asm/macroAssembler.inline.hpp"
++#include "code/vmreg.inline.hpp"
++#include "runtime/jniHandles.hpp"
++#include "runtime/jniHandles.inline.hpp"
++#include "oops/typeArrayOop.inline.hpp"
++#include "oops/oopCast.inline.hpp"
+ #include "prims/foreignGlobals.hpp"
+-#include "utilities/debug.hpp"
++#include "prims/foreignGlobals.inline.hpp"
++#include "prims/vmstorage.hpp"
++#include "utilities/formatBuffer.hpp"
+
+-class MacroAssembler;
++#define __ masm->
++
++bool ABIDescriptor::is_volatile_reg(Register reg) const {
++ return _integer_volatile_registers.contains(reg);
++}
++
++bool ABIDescriptor::is_volatile_reg(FloatRegister reg) const {
++ return _float_argument_registers.contains(reg)
++ || _float_additional_volatile_registers.contains(reg);
++}
+
+ bool ForeignGlobals::is_foreign_linker_supported() {
+- return false;
++ return true;
+ }
+
+ const ABIDescriptor ForeignGlobals::parse_abi_descriptor(jobject jabi) {
+- Unimplemented();
+- return {};
++ oop abi_oop = JNIHandles::resolve_non_null(jabi);
++ ABIDescriptor abi;
++
++ objArrayOop inputStorage = jdk_internal_foreign_abi_ABIDescriptor::inputStorage(abi_oop);
++ parse_register_array(inputStorage, StorageType::INTEGER, abi._integer_argument_registers, as_Register);
++ parse_register_array(inputStorage, StorageType::FLOAT, abi._float_argument_registers, as_FloatRegister);
++
++ objArrayOop outputStorage = jdk_internal_foreign_abi_ABIDescriptor::outputStorage(abi_oop);
++ parse_register_array(outputStorage, StorageType::INTEGER, abi._integer_return_registers, as_Register);
++ parse_register_array(outputStorage, StorageType::FLOAT, abi._float_return_registers, as_FloatRegister);
++
++ objArrayOop volatileStorage = jdk_internal_foreign_abi_ABIDescriptor::volatileStorage(abi_oop);
++ parse_register_array(volatileStorage, StorageType::INTEGER, abi._integer_volatile_registers, as_Register);
++ parse_register_array(volatileStorage, StorageType::FLOAT, abi._float_additional_volatile_registers, as_FloatRegister);
++
++ abi._stack_alignment_bytes = jdk_internal_foreign_abi_ABIDescriptor::stackAlignment(abi_oop);
++ abi._shadow_space_bytes = jdk_internal_foreign_abi_ABIDescriptor::shadowSpace(abi_oop);
++
++ abi._scratch1 = parse_vmstorage(jdk_internal_foreign_abi_ABIDescriptor::scratch1(abi_oop));
++ abi._scratch2 = parse_vmstorage(jdk_internal_foreign_abi_ABIDescriptor::scratch2(abi_oop));
++
++ return abi;
+ }
+
+ int RegSpiller::pd_reg_size(VMStorage reg) {
+- Unimplemented();
+- return -1;
++ if (reg.type() == StorageType::INTEGER || reg.type() == StorageType::FLOAT) {
++ return 8;
++ }
++ return 0; // stack and BAD
+ }
+
+ void RegSpiller::pd_store_reg(MacroAssembler* masm, int offset, VMStorage reg) {
+- Unimplemented();
++ if (reg.type() == StorageType::INTEGER) {
++ __ reg2mem_opt(as_Register(reg), Address(Z_SP, offset), true);
++ } else if (reg.type() == StorageType::FLOAT) {
++ __ freg2mem_opt(as_FloatRegister(reg), Address(Z_SP, offset), true);
++ } else {
++ // stack and BAD
++ }
+ }
+
+ void RegSpiller::pd_load_reg(MacroAssembler* masm, int offset, VMStorage reg) {
+- Unimplemented();
++ if (reg.type() == StorageType::INTEGER) {
++ __ mem2reg_opt(as_Register(reg), Address(Z_SP, offset), true);
++ } else if (reg.type() == StorageType::FLOAT) {
++ __ mem2freg_opt(as_FloatRegister(reg), Address(Z_SP, offset), true);
++ } else {
++ // stack and BAD
++ }
++}
++
++static int reg2offset(VMStorage vms, int stk_bias) {
++ assert(!vms.is_reg(), "wrong usage");
++ return vms.index_or_offset() + stk_bias;
++}
++
++static void move_reg(MacroAssembler* masm, int out_stk_bias,
++ VMStorage from_reg, VMStorage to_reg) {
++ int out_bias = 0;
++ switch (to_reg.type()) {
++ case StorageType::INTEGER:
++ if (to_reg.segment_mask() == REG64_MASK && from_reg.segment_mask() == REG32_MASK ) {
++ // see CCallingConventionRequiresIntsAsLongs
++ __ z_lgfr(as_Register(to_reg), as_Register(from_reg));
++ } else {
++ __ lgr_if_needed(as_Register(to_reg), as_Register(from_reg));
++ }
++ break;
++ case StorageType::STACK:
++ out_bias = out_stk_bias; //fallthrough
++ case StorageType::FRAME_DATA: {
++ // Integer types always get a 64 bit slot in C.
++ if (from_reg.segment_mask() == REG32_MASK) {
++ // see CCallingConventionRequiresIntsAsLongs
++ __ z_lgfr(as_Register(from_reg), as_Register(from_reg));
++ }
++ switch (to_reg.stack_size()) {
++ case 8: __ reg2mem_opt(as_Register(from_reg), Address(Z_SP, reg2offset(to_reg, out_bias)), true); break;
++ case 4: __ reg2mem_opt(as_Register(from_reg), Address(Z_SP, reg2offset(to_reg, out_bias)), false); break;
++ default: ShouldNotReachHere();
++ }
++ } break;
++ default: ShouldNotReachHere();
++ }
++}
++
++static void move_float(MacroAssembler* masm, int out_stk_bias,
++ VMStorage from_reg, VMStorage to_reg) {
++ switch (to_reg.type()) {
++ case StorageType::FLOAT:
++ if (from_reg.segment_mask() == REG64_MASK)
++ __ move_freg_if_needed(as_FloatRegister(to_reg), T_DOUBLE, as_FloatRegister(from_reg), T_DOUBLE);
++ else
++ __ move_freg_if_needed(as_FloatRegister(to_reg), T_FLOAT, as_FloatRegister(from_reg), T_FLOAT);
++ break;
++ case StorageType::STACK:
++ if (from_reg.segment_mask() == REG64_MASK) {
++ assert(to_reg.stack_size() == 8, "size should match");
++ __ freg2mem_opt(as_FloatRegister(from_reg), Address(Z_SP, reg2offset(to_reg, out_stk_bias)), true);
++ } else {
++ assert(to_reg.stack_size() == 4, "size should match");
++ __ freg2mem_opt(as_FloatRegister(from_reg), Address(Z_SP, reg2offset(to_reg, out_stk_bias)), false);
++ }
++ break;
++ default: ShouldNotReachHere();
++ }
++}
++
++static void move_stack(MacroAssembler* masm, Register tmp_reg, int in_stk_bias, int out_stk_bias,
++ VMStorage from_reg, VMStorage to_reg) {
++ int out_bias = 0;
++ Address from_addr(Z_R11, reg2offset(from_reg, in_stk_bias));
++ switch (to_reg.type()) {
++ case StorageType::INTEGER:
++ switch (from_reg.stack_size()) {
++ case 8: __ mem2reg_opt(as_Register(to_reg), from_addr, true);break;
++ case 4: __ mem2reg_opt(as_Register(to_reg), from_addr, false);break;
++ default: ShouldNotReachHere();
++ }
++ break;
++ case StorageType::FLOAT:
++ switch (from_reg.stack_size()) {
++ case 8: __ mem2freg_opt(as_FloatRegister(to_reg), from_addr, true);break;
++ case 4: __ mem2freg_opt(as_FloatRegister(to_reg), from_addr, false);break;
++ default: ShouldNotReachHere();
++ }
++ break;
++ case StorageType::STACK:
++ out_bias = out_stk_bias; // fallthrough
++ case StorageType::FRAME_DATA: {
++ switch (from_reg.stack_size()) {
++ case 8: __ mem2reg_opt(tmp_reg, from_addr, true); break;
++ case 4: if (to_reg.stack_size() == 8) {
++ __ mem2reg_signed_opt(tmp_reg, from_addr);
++ } else {
++ __ mem2reg_opt(tmp_reg, from_addr, false);
++ }
++ break;
++ default: ShouldNotReachHere();
++ }
++ switch (to_reg.stack_size()) {
++ case 8: __ reg2mem_opt(tmp_reg, Address (Z_SP, reg2offset(to_reg, out_bias)), true); break;
++ case 4: __ reg2mem_opt(tmp_reg, Address (Z_SP, reg2offset(to_reg, out_bias)), false); break;
++ default: ShouldNotReachHere();
++ }
++ } break;
++ default: ShouldNotReachHere();
++ }
+ }
+
+ void ArgumentShuffle::pd_generate(MacroAssembler* masm, VMStorage tmp, int in_stk_bias, int out_stk_bias, const StubLocations& locs) const {
+- Unimplemented();
++ Register tmp_reg = as_Register(tmp);
++ for (int i = 0; i < _moves.length(); i++) {
++ Move move = _moves.at(i);
++ VMStorage from_reg = move.from;
++ VMStorage to_reg = move.to;
++
++ // replace any placeholders
++ if (from_reg.type() == StorageType::PLACEHOLDER) {
++ from_reg = locs.get(from_reg);
++ }
++ if (to_reg.type() == StorageType::PLACEHOLDER) {
++ to_reg = locs.get(to_reg);
++ }
++
++ switch (from_reg.type()) {
++ case StorageType::INTEGER:
++ move_reg(masm, out_stk_bias, from_reg, to_reg);
++ break;
++ case StorageType::FLOAT:
++ move_float(masm, out_stk_bias, from_reg, to_reg);
++ break;
++ case StorageType::STACK:
++ move_stack(masm, tmp_reg, in_stk_bias, out_stk_bias, from_reg, to_reg);
++ break;
++ default: ShouldNotReachHere();
++ }
++ }
+ }
+diff --git a/src/hotspot/cpu/s390/foreignGlobals_s390.hpp b/src/hotspot/cpu/s390/foreignGlobals_s390.hpp
+index 8b86a2b06a6..4ff3b3e40b4 100644
+--- a/src/hotspot/cpu/s390/foreignGlobals_s390.hpp
++++ b/src/hotspot/cpu/s390/foreignGlobals_s390.hpp
+@@ -24,6 +24,23 @@
+ #ifndef CPU_S390_VM_FOREIGN_GLOBALS_S390_HPP
+ #define CPU_S390_VM_FOREIGN_GLOBALS_S390_HPP
+
+-class ABIDescriptor {};
++struct ABIDescriptor {
++ GrowableArray<Register> _integer_argument_registers;
++ GrowableArray<Register> _integer_return_registers;
++ GrowableArray<FloatRegister> _float_argument_registers;
++ GrowableArray<FloatRegister> _float_return_registers;
++
++ GrowableArray<Register> _integer_volatile_registers;
++ GrowableArray<FloatRegister> _float_additional_volatile_registers;
++
++ int32_t _stack_alignment_bytes;
++ int32_t _shadow_space_bytes;
++
++ VMStorage _scratch1;
++ VMStorage _scratch2;
++
++ bool is_volatile_reg(Register reg) const;
++ bool is_volatile_reg(FloatRegister reg) const;
++};
+
+ #endif // CPU_S390_VM_FOREIGN_GLOBALS_S390_HPP
+diff --git a/src/hotspot/cpu/s390/frame_s390.cpp b/src/hotspot/cpu/s390/frame_s390.cpp
+index 23547fa6617..ac24e43f00c 100644
+--- a/src/hotspot/cpu/s390/frame_s390.cpp
++++ b/src/hotspot/cpu/s390/frame_s390.cpp
+@@ -218,13 +218,32 @@ frame frame::sender_for_entry_frame(RegisterMap *map) const {
+ }
+
+ UpcallStub::FrameData* UpcallStub::frame_data_for_frame(const frame& frame) const {
+- ShouldNotCallThis();
+- return nullptr;
++ assert(frame.is_upcall_stub_frame(), "wrong frame");
++ // need unextended_sp here, since normal sp is wrong for interpreter callees
++ return reinterpret_cast<UpcallStub::FrameData*>(
++ reinterpret_cast<address>(frame.unextended_sp()) + in_bytes(_frame_data_offset));
+ }
+
+ bool frame::upcall_stub_frame_is_first() const {
+- ShouldNotCallThis();
+- return false;
++ assert(is_upcall_stub_frame(), "must be optimized entry frame");
++ UpcallStub* blob = _cb->as_upcall_stub();
++ JavaFrameAnchor* jfa = blob->jfa_for_frame(*this);
++ return jfa->last_Java_sp() == nullptr;
++}
++
++frame frame::sender_for_upcall_stub_frame(RegisterMap* map) const {
++ assert(map != nullptr, "map must be set");
++ UpcallStub* blob = _cb->as_upcall_stub();
++ // Java frame called from C; skip all C frames and return top C
++ // frame of that chunk as the sender
++ JavaFrameAnchor* jfa = blob->jfa_for_frame(*this);
++ assert(!upcall_stub_frame_is_first(), "must have a frame anchor to go back to");
++ assert(jfa->last_Java_sp() > sp(), "must be above this frame on stack");
++ map->clear();
++ assert(map->include_argument_oops(), "should be set by clear");
++ frame fr(jfa->last_Java_sp(), jfa->last_Java_pc());
++
++ return fr;
+ }
+
+ frame frame::sender_for_interpreter_frame(RegisterMap *map) const {
+diff --git a/src/hotspot/cpu/s390/frame_s390.inline.hpp b/src/hotspot/cpu/s390/frame_s390.inline.hpp
+index dfa68940bac..c188618653d 100644
+--- a/src/hotspot/cpu/s390/frame_s390.inline.hpp
++++ b/src/hotspot/cpu/s390/frame_s390.inline.hpp
+@@ -352,12 +352,10 @@ inline frame frame::sender(RegisterMap* map) const {
+ // update it accordingly.
+ map->set_include_argument_oops(false);
+
+- if (is_entry_frame()) {
+- return sender_for_entry_frame(map);
+- }
+- if (is_interpreted_frame()) {
+- return sender_for_interpreter_frame(map);
+- }
++ if (is_entry_frame()) return sender_for_entry_frame(map);
++ if (is_upcall_stub_frame()) return sender_for_upcall_stub_frame(map);
++ if (is_interpreted_frame()) return sender_for_interpreter_frame(map);
++
+ assert(_cb == CodeCache::find_blob(pc()),"Must be the same");
+ if (_cb != nullptr) return sender_for_compiled_frame(map);
+
+diff --git a/src/hotspot/cpu/s390/globalDefinitions_s390.hpp b/src/hotspot/cpu/s390/globalDefinitions_s390.hpp
+index 99906bb369e..2232215a587 100644
+--- a/src/hotspot/cpu/s390/globalDefinitions_s390.hpp
++++ b/src/hotspot/cpu/s390/globalDefinitions_s390.hpp
+@@ -28,7 +28,7 @@
+
+ #define ShortenBranches true
+
+-const int StackAlignmentInBytes = 16;
++const int StackAlignmentInBytes = 8;
+
+ #define SUPPORTS_NATIVE_CX8
+
+diff --git a/src/hotspot/cpu/s390/methodHandles_s390.cpp b/src/hotspot/cpu/s390/methodHandles_s390.cpp
+index 6392ba45a6c..ef8722f2499 100644
+--- a/src/hotspot/cpu/s390/methodHandles_s390.cpp
++++ b/src/hotspot/cpu/s390/methodHandles_s390.cpp
+@@ -349,7 +349,16 @@ address MethodHandles::generate_method_handle_interpreter_entry(MacroAssembler*
+
+ void MethodHandles::jump_to_native_invoker(MacroAssembler* _masm, Register nep_reg, Register temp_target) {
+ BLOCK_COMMENT("jump_to_native_invoker {");
+- __ should_not_reach_here();
++ assert(nep_reg != noreg, "required register");
++
++ // Load the invoker, as NEP -> .invoker
++ __ verify_oop(nep_reg);
++
++ __ z_lg(temp_target, Address(nep_reg,
++ NONZERO(jdk_internal_foreign_abi_NativeEntryPoint::downcall_stub_address_offset_in_bytes())));
++
++ __ z_br(temp_target);
++
+ BLOCK_COMMENT("} jump_to_native_invoker");
+ }
+
+diff --git a/src/hotspot/cpu/s390/upcallLinker_s390.cpp b/src/hotspot/cpu/s390/upcallLinker_s390.cpp
+index 3e1fb04218b..b748ec547cc 100644
+--- a/src/hotspot/cpu/s390/upcallLinker_s390.cpp
++++ b/src/hotspot/cpu/s390/upcallLinker_s390.cpp
+@@ -22,15 +22,287 @@
+ */
+
+ #include "precompiled.hpp"
++#include "asm/macroAssembler.inline.hpp"
++#include "logging/logStream.hpp"
++#include "memory/resourceArea.hpp"
+ #include "prims/upcallLinker.hpp"
+-#include "utilities/debug.hpp"
++#include "runtime/sharedRuntime.hpp"
++#include "runtime/signature.hpp"
++#include "runtime/stubRoutines.hpp"
++#include "utilities/formatBuffer.hpp"
++#include "utilities/globalDefinitions.hpp"
+
++#define __ _masm->
++
++// for callee saved regs, according to the caller's ABI
++static int compute_reg_save_area_size(const ABIDescriptor& abi) {
++ int size = 0;
++ for (int i = 0; i < Register::number_of_registers; i++) {
++ Register reg = as_Register(i);
++ // Z_SP saved/restored by prologue/epilogue
++ if (reg == Z_SP) continue;
++ if (!abi.is_volatile_reg(reg)) {
++ size += 8; // bytes
++ }
++ }
++
++ for (int i = 0; i < FloatRegister::number_of_registers; i++) {
++ FloatRegister reg = as_FloatRegister(i);
++ if (!abi.is_volatile_reg(reg)) {
++ size += 8; // bytes
++ }
++ }
++
++ return size;
++}
++
++static void preserve_callee_saved_registers(MacroAssembler* _masm, const ABIDescriptor& abi, int reg_save_area_offset) {
++ // 1. iterate all registers in the architecture
++ // - check if they are volatile or not for the given abi
++ // - if NOT, we need to save it here
++
++ int offset = reg_save_area_offset;
++
++ __ block_comment("{ preserve_callee_saved_regs ");
++ for (int i = 0; i < Register::number_of_registers; i++) {
++ Register reg = as_Register(i);
++ // Z_SP saved/restored by prologue/epilogue
++ if (reg == Z_SP) continue;
++ if (!abi.is_volatile_reg(reg)) {
++ __ z_stg(reg, Address(Z_SP, offset));
++ offset += 8;
++ }
++ }
++
++ for (int i = 0; i < FloatRegister::number_of_registers; i++) {
++ FloatRegister reg = as_FloatRegister(i);
++ if (!abi.is_volatile_reg(reg)) {
++ __ z_std(reg, Address(Z_SP, offset));
++ offset += 8;
++ }
++ }
++
++ __ block_comment("} preserve_callee_saved_regs ");
++}
++
++static void restore_callee_saved_registers(MacroAssembler* _masm, const ABIDescriptor& abi, int reg_save_area_offset) {
++ // 1. iterate all registers in the architecture
++ // - check if they are volatile or not for the given abi
++ // - if NOT, we need to restore it here
++
++ int offset = reg_save_area_offset;
++
++ __ block_comment("{ restore_callee_saved_regs ");
++ for (int i = 0; i < Register::number_of_registers; i++) {
++ Register reg = as_Register(i);
++ // Z_SP saved/restored by prologue/epilogue
++ if (reg == Z_SP) continue;
++ if (!abi.is_volatile_reg(reg)) {
++ __ z_lg(reg, Address(Z_SP, offset));
++ offset += 8;
++ }
++ }
++
++ for (int i = 0; i < FloatRegister::number_of_registers; i++) {
++ FloatRegister reg = as_FloatRegister(i);
++ if (!abi.is_volatile_reg(reg)) {
++ __ z_ld(reg, Address(Z_SP, offset));
++ offset += 8;
++ }
++ }
++
++ __ block_comment("} restore_callee_saved_regs ");
++}
++
++static const int upcall_stub_code_base_size = 1024; // depends on GC (resolve_jobject)
++static const int upcall_stub_size_per_arg = 16; // arg save & restore + move
+ address UpcallLinker::make_upcall_stub(jobject receiver, Method* entry,
+ BasicType* in_sig_bt, int total_in_args,
+ BasicType* out_sig_bt, int total_out_args,
+ BasicType ret_type,
+ jobject jabi, jobject jconv,
+ bool needs_return_buffer, int ret_buf_size) {
+- ShouldNotCallThis();
+- return nullptr;
++ ResourceMark rm;
++ const ABIDescriptor abi = ForeignGlobals::parse_abi_descriptor(jabi);
++ const CallRegs call_regs = ForeignGlobals::parse_call_regs(jconv);
++ int code_size = upcall_stub_code_base_size + (total_in_args * upcall_stub_size_per_arg);
++ CodeBuffer buffer("upcall_stub", code_size, /* locs_size = */ 0);
++
++ Register call_target_address = Z_R1_scratch;
++
++ VMStorage shuffle_reg = abi._scratch1;
++ JavaCallingConvention out_conv;
++ NativeCallingConvention in_conv(call_regs._arg_regs);
++ ArgumentShuffle arg_shuffle(in_sig_bt, total_in_args, out_sig_bt, total_out_args, &in_conv, &out_conv, shuffle_reg);
++
++ // The Java call uses the JIT ABI, but we also call C.
++ int out_arg_area = MAX2(frame::z_jit_out_preserve_size + arg_shuffle.out_arg_bytes(), (int)frame::z_abi_160_size);
++
++#ifndef PRODUCT
++ LogTarget(Trace, foreign, upcall) lt;
++ if (lt.is_enabled()) {
++ ResourceMark rm;
++ LogStream ls(lt);
++ arg_shuffle.print_on(&ls);
++ }
++#endif
++
++
++ int reg_save_area_size = compute_reg_save_area_size(abi);
++ RegSpiller arg_spiller(call_regs._arg_regs);
++ RegSpiller result_spiller(call_regs._ret_regs);
++
++ int res_save_area_offset = out_arg_area;
++ int arg_save_area_offset = res_save_area_offset + result_spiller.spill_size_bytes();
++ int reg_save_area_offset = arg_save_area_offset + arg_spiller.spill_size_bytes();
++ int frame_data_offset = reg_save_area_offset + reg_save_area_size;
++ int frame_bottom_offset = frame_data_offset + sizeof(UpcallStub::FrameData);
++
++ int frame_size = align_up(frame_bottom_offset, StackAlignmentInBytes);
++ StubLocations locs;
++
++ // The space we have allocated will look like:
++ //
++ //
++ // FP-> | |
++ // |---------------------| = frame_bottom_offset = frame_size
++ // | |
++ // | FrameData |
++ // |---------------------| = frame_data_offset
++ // | |
++ // | reg_save_area |
++ // |---------------------| = reg_save_are_offset
++ // | |
++ // | arg_save_area |
++ // |---------------------| = arg_save_are_offset
++ // | |
++ // | res_save_area |
++ // |---------------------| = res_save_are_offset
++ // | |
++ // SP-> | out_arg_area | needs to be at end for shadow space
++ //
++ //
++
++ //////////////////////////////////////////////////////////////////////////////
++
++ MacroAssembler* _masm = new MacroAssembler(&buffer);
++ address start = __ pc();
++
++ __ save_return_pc();
++ assert((abi._stack_alignment_bytes % StackAlignmentInBytes) == 0, "must be 8 byte aligned");
++ // allocate frame (frame_size is also aligned, so stack is still aligned)
++ __ push_frame(frame_size);
++
++ // we have to always spill args since we need to do a call to get the thread
++ // (and maybe attach it).
++ arg_spiller.generate_spill(_masm, arg_save_area_offset);
++ // Java methods won't preserve them, so save them here:
++ preserve_callee_saved_registers(_masm, abi, reg_save_area_offset);
++
++ __ block_comment("{ on_entry");
++ __ load_const_optimized(call_target_address, CAST_FROM_FN_PTR(uint64_t, UpcallLinker::on_entry));
++ __ z_aghik(Z_ARG1, Z_SP, frame_data_offset);
++ __ call(call_target_address);
++ __ z_lgr(Z_thread, Z_RET);
++ __ block_comment("} on_entry");
++
++ arg_spiller.generate_fill(_masm, arg_save_area_offset);
++ __ block_comment("{ argument shuffle");
++ arg_shuffle.generate(_masm, shuffle_reg, abi._shadow_space_bytes, frame::z_jit_out_preserve_size, locs);
++ __ block_comment("} argument shuffle");
++
++ __ block_comment("{ receiver ");
++ __ load_const_optimized(Z_ARG1, (intptr_t)receiver);
++ __ resolve_jobject(Z_ARG1, Z_tmp_1, Z_tmp_2);
++ __ block_comment("} receiver ");
++
++ __ load_const_optimized(Z_method, (intptr_t)entry);
++ __ z_stg(Z_method, Address(Z_thread, in_bytes(JavaThread::callee_target_offset())));
++
++ __ z_lg(call_target_address, Address(Z_method, in_bytes(Method::from_compiled_offset())));
++ __ call(call_target_address);
++
++ // return value shuffle
++ assert(!needs_return_buffer, "unexpected needs_return_buffer");
++ // CallArranger can pick a return type that goes in the same reg for both CCs.
++ if (call_regs._ret_regs.length() > 0) { // 0 or 1
++ VMStorage ret_reg = call_regs._ret_regs.at(0);
++ // Check if the return reg is as expected.
++ switch (ret_type) {
++ case T_BOOLEAN:
++ case T_BYTE:
++ case T_SHORT:
++ case T_CHAR:
++ case T_INT:
++ __ z_lgfr(Z_RET, Z_RET); // Clear garbage in high half.
++ // fallthrough
++ case T_LONG:
++ assert(as_Register(ret_reg) == Z_RET, "unexpected result register");
++ break;
++ case T_FLOAT:
++ case T_DOUBLE:
++ assert(as_FloatRegister(ret_reg) == Z_FRET, "unexpected result register");
++ break;
++ default:
++ fatal("unexpected return type: %s", type2name(ret_type));
++ }
++ }
++
++ result_spiller.generate_spill(_masm, res_save_area_offset);
++
++ __ block_comment("{ on_exit");
++ __ load_const_optimized(call_target_address, CAST_FROM_FN_PTR(uint64_t, UpcallLinker::on_exit));
++ __ z_aghik(Z_ARG1, Z_SP, frame_data_offset);
++ __ call(call_target_address);
++ __ block_comment("} on_exit");
++
++ restore_callee_saved_registers(_masm, abi, reg_save_area_offset);
++
++ result_spiller.generate_fill(_masm, res_save_area_offset);
++
++ __ pop_frame();
++ __ restore_return_pc();
++ __ z_br(Z_R14);
++
++ //////////////////////////////////////////////////////////////////////////////
++
++ __ block_comment("{ exception handler");
++
++ intptr_t exception_handler_offset = __ pc() - start;
++
++ // Native caller has no idea how to handle exceptions,
++ // so we just crash here. Up to callee to catch exceptions.
++ __ verify_oop(Z_ARG1);
++ __ load_const_optimized(call_target_address, CAST_FROM_FN_PTR(uint64_t, UpcallLinker::handle_uncaught_exception));
++ __ call_c(call_target_address);
++ __ should_not_reach_here();
++
++ __ block_comment("} exception handler");
++
++ _masm->flush();
++
++#ifndef PRODUCT
++ stringStream ss;
++ ss.print("upcall_stub_%s", entry->signature()->as_C_string());
++ const char* name = _masm->code_string(ss.as_string());
++#else // PRODUCT
++ const char* name = "upcall_stub";
++#endif // PRODUCT
++
++ buffer.log_section_sizes(name);
++ UpcallStub* blob
++ = UpcallStub::create(name,
++ &buffer,
++ exception_handler_offset,
++ receiver,
++ in_ByteSize(frame_data_offset));
++#ifndef PRODUCT
++ if (lt.is_enabled()) {
++ ResourceMark rm;
++ LogStream ls(lt);
++ blob->print_on(&ls);
++ }
++#endif
++
++ return blob->code_begin();
+ }
+diff --git a/src/hotspot/cpu/s390/vmstorage_s390.hpp b/src/hotspot/cpu/s390/vmstorage_s390.hpp
+index 192159adc4c..6a595670920 100644
+--- a/src/hotspot/cpu/s390/vmstorage_s390.hpp
++++ b/src/hotspot/cpu/s390/vmstorage_s390.hpp
+@@ -29,24 +29,79 @@
+ #include "asm/register.hpp"
+
+ enum class StorageType : int8_t {
+- STACK = 0,
+- PLACEHOLDER = 1,
+-// special locations used only by native code
+- FRAME_DATA = PLACEHOLDER + 1,
++ INTEGER = 0,
++ FLOAT = 1,
++ STACK = 2,
++ PLACEHOLDER = 3,
++ // special locations used only by native code
++ FRAME_DATA = 4,
+ INVALID = -1
+ };
+
+ // need to define this before constructing VMStorage (below)
+ constexpr inline bool VMStorage::is_reg(StorageType type) {
+- return false;
++ return type == StorageType::INTEGER || type == StorageType::FLOAT;
+ }
+ constexpr inline StorageType VMStorage::stack_type() { return StorageType::STACK; }
+ constexpr inline StorageType VMStorage::placeholder_type() { return StorageType::PLACEHOLDER; }
+ constexpr inline StorageType VMStorage::frame_data_type() { return StorageType::FRAME_DATA; }
+
++// Needs to be consistent with S390Architecture.java.
++constexpr uint16_t REG32_MASK = 0b0000000000000001;
++constexpr uint16_t REG64_MASK = 0b0000000000000011;
++
++inline Register as_Register(VMStorage vms) {
++ assert(vms.type() == StorageType::INTEGER, "not the right type");
++ return ::as_Register(vms.index());
++}
++
++inline FloatRegister as_FloatRegister(VMStorage vms) {
++ assert(vms.type() == StorageType::FLOAT, "not the right type");
++ return ::as_FloatRegister(vms.index());
++}
++
++inline VMStorage as_VMStorage(Register reg, uint16_t segment_mask = REG64_MASK) {
++ return VMStorage::reg_storage(StorageType::INTEGER, segment_mask, reg->encoding());
++}
++
++inline VMStorage as_VMStorage(FloatRegister reg, uint16_t segment_mask = REG64_MASK) {
++ return VMStorage::reg_storage(StorageType::FLOAT, segment_mask, reg->encoding());
++}
++
+ inline VMStorage as_VMStorage(VMReg reg, BasicType bt) {
++ if (reg->is_Register()) {
++ uint16_t segment_mask = 0;
++ switch (bt) {
++ case T_BOOLEAN:
++ case T_CHAR :
++ case T_BYTE :
++ case T_SHORT :
++ case T_INT : segment_mask = REG32_MASK; break;
++ default : segment_mask = REG64_MASK; break;
++ }
++ return as_VMStorage(reg->as_Register(), segment_mask);
++ } else if (reg->is_FloatRegister()) {
++ // FP regs always use double format. However, we need the correct format for loads /stores.
++ return as_VMStorage(reg->as_FloatRegister(), (bt == T_FLOAT) ? REG32_MASK : REG64_MASK);
++ } else if (reg->is_stack()) {
++ uint16_t size = 0;
++ switch (bt) {
++ case T_BOOLEAN:
++ case T_CHAR :
++ case T_BYTE :
++ case T_SHORT :
++ case T_INT :
++ case T_FLOAT : size = 4; break;
++ default : size = 8; break;
++ }
++ return VMStorage(StorageType::STACK, size,
++ checked_cast<uint16_t>(reg->reg2stack() * VMRegImpl::stack_slot_size));
++ } else if (!reg->is_valid()) {
++ return VMStorage::invalid();
++ }
++
+ ShouldNotReachHere();
+ return VMStorage::invalid();
+ }
+
+-#endif // CPU_S390_VMSTORAGE_S390_INLINE_HPP
+\ No newline at end of file
++#endif // CPU_S390_VMSTORAGE_S390_INLINE_HPP
+diff --git a/src/java.base/share/classes/jdk/internal/foreign/CABI.java b/src/java.base/share/classes/jdk/internal/foreign/CABI.java
+index eee4ae67457..d376a196333 100644
+--- a/src/java.base/share/classes/jdk/internal/foreign/CABI.java
++++ b/src/java.base/share/classes/jdk/internal/foreign/CABI.java
+@@ -41,6 +41,7 @@ public enum CABI {
+ WIN_AARCH_64,
+ LINUX_PPC_64_LE,
+ LINUX_RISCV_64,
++ LINUX_S390,
+ FALLBACK,
+ UNSUPPORTED;
+
+@@ -81,7 +82,11 @@ public enum CABI {
+ if (OperatingSystem.isLinux()) {
+ return LINUX_RISCV_64;
+ }
+- }
++ } else if (arch.equals("s390x")) {
++ if (OperatingSystem.isLinux()) {
++ return LINUX_S390;
++ }
++ }
+ } else if (FallbackLinker.isSupported()) {
+ return FALLBACK; // fallback linker
+ }
+diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java b/src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java
+index b5eb1029ff5..8a322cdcf7a 100644
+--- a/src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java
++++ b/src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java
+@@ -32,6 +32,7 @@ import jdk.internal.foreign.abi.aarch64.windows.WindowsAArch64Linker;
+ import jdk.internal.foreign.abi.fallback.FallbackLinker;
+ import jdk.internal.foreign.abi.ppc64.linux.LinuxPPC64leLinker;
+ import jdk.internal.foreign.abi.riscv64.linux.LinuxRISCV64Linker;
++import jdk.internal.foreign.abi.s390.linux.LinuxS390Linker;
+ import jdk.internal.foreign.abi.x64.sysv.SysVx64Linker;
+ import jdk.internal.foreign.abi.x64.windows.Windowsx64Linker;
+ import jdk.internal.foreign.layout.AbstractLayout;
+@@ -60,7 +61,8 @@ import java.util.Set;
+ public abstract sealed class AbstractLinker implements Linker permits LinuxAArch64Linker, MacOsAArch64Linker,
+ SysVx64Linker, WindowsAArch64Linker,
+ Windowsx64Linker, LinuxPPC64leLinker,
+- LinuxRISCV64Linker, FallbackLinker {
++ LinuxRISCV64Linker, LinuxS390Linker,
++ FallbackLinker {
+
+ public interface UpcallStubFactory {
+ MemorySegment makeStub(MethodHandle target, Arena arena);
+diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java b/src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java
+index 1e417245543..92d10a1dbdf 100644
+--- a/src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java
++++ b/src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java
+@@ -35,6 +35,7 @@ import jdk.internal.foreign.abi.aarch64.windows.WindowsAArch64Linker;
+ import jdk.internal.foreign.abi.fallback.FallbackLinker;
+ import jdk.internal.foreign.abi.ppc64.linux.LinuxPPC64leLinker;
+ import jdk.internal.foreign.abi.riscv64.linux.LinuxRISCV64Linker;
++import jdk.internal.foreign.abi.s390.linux.LinuxS390Linker;
+ import jdk.internal.foreign.abi.x64.sysv.SysVx64Linker;
+ import jdk.internal.foreign.abi.x64.windows.Windowsx64Linker;
+ import jdk.internal.vm.annotation.ForceInline;
+@@ -242,6 +243,7 @@ public final class SharedUtils {
+ case WIN_AARCH_64 -> WindowsAArch64Linker.getInstance();
+ case LINUX_PPC_64_LE -> LinuxPPC64leLinker.getInstance();
+ case LINUX_RISCV_64 -> LinuxRISCV64Linker.getInstance();
++ case LINUX_S390 -> LinuxS390Linker.getInstance();
+ case FALLBACK -> FallbackLinker.getInstance();
+ case UNSUPPORTED -> throw new UnsupportedOperationException("Platform does not support native linker");
+ };
+diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/s390/S390Architecture.java b/src/java.base/share/classes/jdk/internal/foreign/abi/s390/S390Architecture.java
+new file mode 100644
+index 00000000000..bbafef2f3dc
+--- /dev/null
++++ b/src/java.base/share/classes/jdk/internal/foreign/abi/s390/S390Architecture.java
+@@ -0,0 +1,151 @@
++/*
++ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2023 IBM Corp. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++package jdk.internal.foreign.abi.s390;
++
++import jdk.internal.foreign.abi.ABIDescriptor;
++import jdk.internal.foreign.abi.Architecture;
++import jdk.internal.foreign.abi.StubLocations;
++import jdk.internal.foreign.abi.VMStorage;
++
++public final class S390Architecture implements Architecture {
++ public static final Architecture INSTANCE = new S390Architecture();
++
++ // Needs to be consistent with vmstorage_s390.hpp.
++ public static final short REG32_MASK = 0b0000_0000_0000_0001;
++ public static final short REG64_MASK = 0b0000_0000_0000_0011;
++
++ private static final int INTEGER_REG_SIZE = 8;
++ private static final int FLOAT_REG_SIZE = 8;
++ private static final int STACK_SLOT_SIZE = 8;
++
++ // Suppresses default constructor, ensuring non-instantiability.
++ private S390Architecture() {
++ }
++
++ @Override
++ public boolean isStackType(int cls) {
++ return cls == StorageType.STACK;
++ }
++
++ @Override
++ public int typeSize(int cls) {
++ switch (cls) {
++ case StorageType.INTEGER:
++ return INTEGER_REG_SIZE;
++ case StorageType.FLOAT:
++ return FLOAT_REG_SIZE;
++ // STACK is deliberately omitted
++ }
++
++ throw new IllegalArgumentException("Invalid Storage Class: " + cls);
++ }
++
++ public interface StorageType {
++ byte INTEGER = 0;
++ byte FLOAT = 1;
++ byte STACK = 2;
++ byte PLACEHOLDER = 3;
++ }
++
++ public static class Regs { // break circular dependency
++ public static final VMStorage r0 = integerRegister(0);
++ public static final VMStorage r1 = integerRegister(1);
++ public static final VMStorage r2 = integerRegister(2);
++ public static final VMStorage r3 = integerRegister(3);
++ public static final VMStorage r4 = integerRegister(4);
++ public static final VMStorage r5 = integerRegister(5);
++ public static final VMStorage r6 = integerRegister(6);
++ public static final VMStorage r7 = integerRegister(7);
++ public static final VMStorage r8 = integerRegister(8);
++ public static final VMStorage r9 = integerRegister(9);
++ public static final VMStorage r10 = integerRegister(10);
++ public static final VMStorage r11 = integerRegister(11);
++ public static final VMStorage r12 = integerRegister(12);
++ public static final VMStorage r13 = integerRegister(13);
++ public static final VMStorage r14 = integerRegister(14);
++ public static final VMStorage r15 = integerRegister(15);
++
++ public static final VMStorage f0 = floatRegister(0);
++ public static final VMStorage f1 = floatRegister(1);
++ public static final VMStorage f2 = floatRegister(2);
++ public static final VMStorage f3 = floatRegister(3);
++ public static final VMStorage f4 = floatRegister(4);
++ public static final VMStorage f5 = floatRegister(5);
++ public static final VMStorage f6 = floatRegister(6);
++ public static final VMStorage f7 = floatRegister(7);
++ public static final VMStorage f8 = floatRegister(8);
++ public static final VMStorage f9 = floatRegister(9);
++ public static final VMStorage f10 = floatRegister(10);
++ public static final VMStorage f11 = floatRegister(11);
++ public static final VMStorage f12 = floatRegister(12);
++ public static final VMStorage f13 = floatRegister(13);
++ public static final VMStorage f14 = floatRegister(14);
++ public static final VMStorage f15 = floatRegister(15);
++ }
++
++ private static VMStorage integerRegister(int index) {
++ return new VMStorage(StorageType.INTEGER, REG64_MASK, index, "r" + index);
++ }
++
++ private static VMStorage floatRegister(int index) {
++ return new VMStorage(StorageType.FLOAT, REG64_MASK, index, "f" + index);
++ }
++
++ public static VMStorage stackStorage(short size, int byteOffset) {
++ return new VMStorage(StorageType.STACK, size, byteOffset);
++ }
++
++ public static ABIDescriptor abiFor(VMStorage[] inputIntRegs,
++ VMStorage[] inputFloatRegs,
++ VMStorage[] outputIntRegs,
++ VMStorage[] outputFloatRegs,
++ VMStorage[] volatileIntRegs,
++ VMStorage[] volatileFloatRegs,
++ int stackAlignment,
++ int shadowSpace,
++ VMStorage scratch1, VMStorage scratch2) {
++ return new ABIDescriptor(
++ INSTANCE,
++ new VMStorage[][] {
++ inputIntRegs,
++ inputFloatRegs,
++ },
++ new VMStorage[][] {
++ outputIntRegs,
++ outputFloatRegs,
++ },
++ new VMStorage[][] {
++ volatileIntRegs,
++ volatileFloatRegs,
++ },
++ stackAlignment,
++ shadowSpace,
++ scratch1, scratch2,
++ StubLocations.TARGET_ADDRESS.storage(StorageType.PLACEHOLDER),
++ StubLocations.RETURN_BUFFER.storage(StorageType.PLACEHOLDER),
++ StubLocations.CAPTURED_STATE_BUFFER.storage(StorageType.PLACEHOLDER));
++ }
++}
+diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/LinuxS390CallArranger.java b/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/LinuxS390CallArranger.java
+new file mode 100644
+index 00000000000..84392e45089
+--- /dev/null
++++ b/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/LinuxS390CallArranger.java
+@@ -0,0 +1,311 @@
++/*
++ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2023 IBM Corp. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++package jdk.internal.foreign.abi.s390.linux;
++
++import java.lang.foreign.AddressLayout;
++import java.lang.foreign.FunctionDescriptor;
++import java.lang.foreign.GroupLayout;
++import java.lang.foreign.MemoryLayout;
++import java.lang.foreign.MemorySegment;
++import jdk.internal.foreign.abi.ABIDescriptor;
++import jdk.internal.foreign.abi.AbstractLinker.UpcallStubFactory;
++import jdk.internal.foreign.abi.Binding;
++import jdk.internal.foreign.abi.CallingSequence;
++import jdk.internal.foreign.abi.CallingSequenceBuilder;
++import jdk.internal.foreign.abi.DowncallLinker;
++import jdk.internal.foreign.abi.LinkerOptions;
++import jdk.internal.foreign.abi.UpcallLinker;
++import jdk.internal.foreign.abi.SharedUtils;
++import jdk.internal.foreign.abi.VMStorage;
++import jdk.internal.foreign.Utils;
++
++import java.lang.foreign.ValueLayout;
++import java.lang.invoke.MethodHandle;
++import java.lang.invoke.MethodType;
++import java.util.List;
++import java.util.Map;
++import java.util.Optional;
++
++import static jdk.internal.foreign.abi.s390.linux.TypeClass.*;
++import static jdk.internal.foreign.abi.s390.S390Architecture.*;
++import static jdk.internal.foreign.abi.s390.S390Architecture.Regs.*;
++
++/**
++ * For the S390 C ABI specifically, this class uses CallingSequenceBuilder
++ * to translate a C FunctionDescriptor into a CallingSequence, which can then be turned into a MethodHandle.
++ *
++ * This includes taking care of synthetic arguments like pointers to return buffers for 'in-memory' returns.
++ */
++public class LinuxS390CallArranger {
++
++ private static final int STACK_SLOT_SIZE = 8;
++ public static final int MAX_REGISTER_ARGUMENTS = 5;
++ public static final int MAX_FLOAT_REGISTER_ARGUMENTS = 4;
++
++ private static final ABIDescriptor CLinux = abiFor(
++ new VMStorage[] { r2, r3, r4, r5, r6, }, // GP input
++ new VMStorage[] { f0, f2, f4, f6 }, // FP input
++ new VMStorage[] { r2, }, // GP output
++ new VMStorage[] { f0, }, // FP output
++ new VMStorage[] { r0, r1, r2, r3, r4, r5, r14 }, // volatile GP
++ new VMStorage[] { f1, f3, f5, f7 }, // volatile FP (excluding argument registers)
++ 8, // Stack is always 8 byte aligned on S390
++ 160, // ABI header
++ r0, r1 // scratch reg r0 & r1
++ );
++
++ public record Bindings(CallingSequence callingSequence, boolean isInMemoryReturn) {}
++
++ public static Bindings getBindings(MethodType mt, FunctionDescriptor cDesc, boolean forUpcall) {
++ return getBindings(mt, cDesc, forUpcall, LinkerOptions.empty());
++ }
++
++ public static Bindings getBindings(MethodType mt, FunctionDescriptor cDesc, boolean forUpcall, LinkerOptions options) {
++ CallingSequenceBuilder csb = new CallingSequenceBuilder(CLinux, forUpcall, options);
++
++ BindingCalculator argCalc = forUpcall ? new BoxBindingCalculator(true) : new UnboxBindingCalculator(true);
++ BindingCalculator retCalc = forUpcall ? new UnboxBindingCalculator(false) : new BoxBindingCalculator(false);
++
++ boolean returnInMemory = isInMemoryReturn(cDesc.returnLayout());
++ if (returnInMemory) {
++ Class<?> carrier = MemorySegment.class;
++ MemoryLayout layout =SharedUtils.C_POINTER;
++ csb.addArgumentBindings(carrier, layout, argCalc.getBindings(carrier, layout));
++ } else if (cDesc.returnLayout().isPresent()) {
++ Class<?> carrier = mt.returnType();
++ MemoryLayout layout = cDesc.returnLayout().get();
++ csb.setReturnBindings(carrier, layout, retCalc.getBindings(carrier, layout));
++ }
++
++ for (int i = 0; i < mt.parameterCount(); i++) {
++ Class<?> carrier = mt.parameterType(i);
++ MemoryLayout layout = cDesc.argumentLayouts().get(i);
++ csb.addArgumentBindings(carrier, layout, argCalc.getBindings(carrier, layout));
++ }
++
++ return new Bindings(csb.build(), returnInMemory);
++ }
++
++ public static MethodHandle arrangeDowncall(MethodType mt, FunctionDescriptor cDesc, LinkerOptions options) {
++ Bindings bindings = getBindings(mt, cDesc, false, options);
++
++ MethodHandle handle = new DowncallLinker(CLinux, bindings.callingSequence).getBoundMethodHandle();
++
++ if (bindings.isInMemoryReturn) {
++ handle = SharedUtils.adaptDowncallForIMR(handle, cDesc, bindings.callingSequence);
++ }
++
++ return handle;
++ }
++
++ public static UpcallStubFactory arrangeUpcall(MethodType mt, FunctionDescriptor cDesc, LinkerOptions options) {
++ Bindings bindings = getBindings(mt, cDesc, true, options);
++
++ final boolean dropReturn = true; /* drop return, since we don't have bindings for it */
++ return SharedUtils.arrangeUpcallHelper(mt, bindings.isInMemoryReturn, dropReturn, CLinux,
++ bindings.callingSequence);
++ }
++
++ private static boolean isInMemoryReturn(Optional<MemoryLayout> returnLayout) {
++ return returnLayout
++ .filter(layout -> layout instanceof GroupLayout)
++ .isPresent();
++ }
++
++ static class StorageCalculator {
++ private final boolean forArguments;
++
++ private final int[] nRegs = new int[] { 0, 0 };
++ private long stackOffset = 0;
++
++ public StorageCalculator(boolean forArguments) {
++ this.forArguments = forArguments;
++ }
++
++ VMStorage stackAlloc(long size, long alignment) {
++ long alignedStackOffset = Utils.alignUp(stackOffset, alignment);
++
++ short encodedSize = (short) size;
++ assert (encodedSize & 0xFFFF) == size;
++
++ VMStorage storage = stackStorage(encodedSize, (int) alignedStackOffset);
++ stackOffset = alignedStackOffset + size;
++ return storage;
++ }
++
++ VMStorage regAlloc(int type) {
++ int gpRegCnt = (type == StorageType.INTEGER) ? 1 : 0;
++ int fpRegCnt = (type == StorageType.FLOAT) ? 1 : 0;
++
++ // Use stack if not enough registers available.
++ if ((type == StorageType.FLOAT && (nRegs[StorageType.FLOAT] + fpRegCnt) > MAX_FLOAT_REGISTER_ARGUMENTS)
++ || (type == StorageType.INTEGER && (nRegs[StorageType.INTEGER] + gpRegCnt) > MAX_REGISTER_ARGUMENTS)) return null;
++
++ VMStorage[] source = (forArguments ? CLinux.inputStorage : CLinux.outputStorage)[type];
++ VMStorage result = source[nRegs[type]];
++
++ nRegs[StorageType.INTEGER] += gpRegCnt;
++ nRegs[StorageType.FLOAT] += fpRegCnt;
++ return result;
++
++ }
++ VMStorage getStorage(int type, boolean is32Bit) {
++ VMStorage reg = regAlloc(type);
++ if (reg != null) {
++ if (is32Bit) {
++ reg = new VMStorage(reg.type(), REG32_MASK, reg.indexOrOffset());
++ }
++ return reg;
++ }
++ VMStorage stack;
++ if (is32Bit) {
++ stackAlloc(4, STACK_SLOT_SIZE); // Skip first half of stack slot.
++ stack = stackAlloc(4, 4);
++ } else
++ stack = stackAlloc(8, STACK_SLOT_SIZE);
++
++ return stack;
++ }
++ }
++
++ abstract static class BindingCalculator {
++ protected final StorageCalculator storageCalculator;
++
++ protected BindingCalculator(boolean forArguments) {
++ this.storageCalculator = new LinuxS390CallArranger.StorageCalculator(forArguments);
++ }
++
++ abstract List<Binding> getBindings(Class<?> carrier, MemoryLayout layout);
++ }
++
++ // Compute recipe for transferring arguments / return values to C from Java.
++ static class UnboxBindingCalculator extends BindingCalculator {
++ UnboxBindingCalculator(boolean forArguments) {
++ super(forArguments);
++ }
++
++ @Override
++ List<Binding> getBindings(Class<?> carrier, MemoryLayout layout) {
++ TypeClass argumentClass = TypeClass.classifyLayout(layout);
++ Binding.Builder bindings = Binding.builder();
++ switch (argumentClass) {
++ case STRUCT_REGISTER -> {
++ assert carrier == MemorySegment.class;
++ VMStorage storage = storageCalculator.getStorage(StorageType.INTEGER, false);
++ Class<?> type = SharedUtils.primitiveCarrierForSize(layout.byteSize(), false);
++ bindings.bufferLoad(0, type)
++ .vmStore(storage, type);
++ }
++ case STRUCT_SFA -> {
++ assert carrier == MemorySegment.class;
++ VMStorage storage = storageCalculator.getStorage(StorageType.FLOAT, layout.byteSize() == 4);
++ Class<?> type = SharedUtils.primitiveCarrierForSize(layout.byteSize(), true);
++ bindings.bufferLoad(0, type)
++ .vmStore(storage, type);
++ }
++ case STRUCT_REFERENCE -> {
++ assert carrier == MemorySegment.class;
++ bindings.copy(layout)
++ .unboxAddress();
++ VMStorage storage = storageCalculator.getStorage(StorageType.INTEGER, false);
++ bindings.vmStore(storage, long.class);
++ }
++ case POINTER -> {
++ VMStorage storage = storageCalculator.getStorage(StorageType.INTEGER, false);
++ bindings.unboxAddress()
++ .vmStore(storage, long.class);
++ }
++ case INTEGER -> {
++ // ABI requires all int types to get extended to 64 bit.
++ VMStorage storage = storageCalculator.getStorage(StorageType.INTEGER, false);
++ bindings.vmStore(storage, carrier);
++ }
++ case FLOAT -> {
++ VMStorage storage = storageCalculator.getStorage(StorageType.FLOAT, carrier == float.class);
++ bindings.vmStore(storage, carrier);
++ }
++ default -> throw new UnsupportedOperationException("Unhandled class " + argumentClass);
++ }
++ return bindings.build();
++ }
++ }
++
++ // Compute recipe for transferring arguments / return values from C to Java.
++ static class BoxBindingCalculator extends BindingCalculator {
++ BoxBindingCalculator(boolean forArguments) {
++ super(forArguments);
++ }
++
++ @Override
++ List<Binding> getBindings(Class<?> carrier, MemoryLayout layout) {
++ TypeClass argumentClass = TypeClass.classifyLayout(layout);
++ Binding.Builder bindings = Binding.builder();
++ switch (argumentClass) {
++ case STRUCT_REGISTER -> {
++ assert carrier == MemorySegment.class;
++ bindings.allocate(layout)
++ .dup();
++ VMStorage storage = storageCalculator.getStorage(StorageType.INTEGER, false);
++ Class<?> type = SharedUtils.primitiveCarrierForSize(layout.byteSize(), false);
++ bindings.vmLoad(storage, type)
++ .bufferStore(0, type);
++ }
++ case STRUCT_SFA -> {
++ assert carrier == MemorySegment.class;
++ bindings.allocate(layout)
++ .dup();
++ VMStorage storage = storageCalculator.getStorage(StorageType.FLOAT, layout.byteSize() == 4);
++ Class<?> type = SharedUtils.primitiveCarrierForSize(layout.byteSize(), true);
++ bindings.vmLoad(storage, type)
++ .bufferStore(0, type);
++ }
++ case STRUCT_REFERENCE -> {
++ assert carrier == MemorySegment.class;
++ VMStorage storage = storageCalculator.getStorage(StorageType.INTEGER, false);
++ bindings.vmLoad(storage, long.class)
++ .boxAddress(layout);
++ }
++ case POINTER -> {
++ AddressLayout addressLayout = (AddressLayout) layout;
++ VMStorage storage = storageCalculator.getStorage(StorageType.INTEGER, false);
++ bindings.vmLoad(storage, long.class)
++ .boxAddressRaw(Utils.pointeeByteSize(addressLayout), Utils.pointeeByteAlign(addressLayout));
++ }
++ case INTEGER -> {
++ // We could use carrier != long.class for BoxBindingCalculator, but C always uses 64 bit slots.
++ VMStorage storage = storageCalculator.getStorage(StorageType.INTEGER, false);
++ bindings.vmLoad(storage, carrier);
++ }
++ case FLOAT -> {
++ VMStorage storage = storageCalculator.getStorage(StorageType.FLOAT, carrier == float.class);
++ bindings.vmLoad(storage, carrier);
++ }
++ default -> throw new UnsupportedOperationException("Unhandled class " + argumentClass);
++ }
++ return bindings.build();
++ }
++ }
++}
+diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/LinuxS390Linker.java b/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/LinuxS390Linker.java
+new file mode 100644
+index 00000000000..ac004b9e1e0
+--- /dev/null
++++ b/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/LinuxS390Linker.java
+@@ -0,0 +1,64 @@
++/*
++ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2023 IBM Corp. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++package jdk.internal.foreign.abi.s390.linux;
++
++import jdk.internal.foreign.abi.AbstractLinker;
++import jdk.internal.foreign.abi.LinkerOptions;
++
++import java.lang.foreign.FunctionDescriptor;
++import java.lang.invoke.MethodHandle;
++import java.lang.invoke.MethodType;
++import java.nio.ByteOrder;
++
++public final class LinuxS390Linker extends AbstractLinker {
++
++ public static LinuxS390Linker getInstance() {
++ final class Holder {
++ private static final LinuxS390Linker INSTANCE = new LinuxS390Linker();
++ }
++
++ return Holder.INSTANCE;
++ }
++
++ private LinuxS390Linker() {
++ // Ensure there is only one instance
++ }
++
++ @Override
++ protected MethodHandle arrangeDowncall(MethodType inferredMethodType, FunctionDescriptor function, LinkerOptions options) {
++ return LinuxS390CallArranger.arrangeDowncall(inferredMethodType, function, options);
++ }
++
++ @Override
++ protected UpcallStubFactory arrangeUpcall(MethodType targetType, FunctionDescriptor function, LinkerOptions options) {
++ return LinuxS390CallArranger.arrangeUpcall(targetType, function, options);
++ }
++
++ @Override
++ protected ByteOrder linkerByteOrder() {
++ return ByteOrder.BIG_ENDIAN;
++ }
++}
+diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/TypeClass.java b/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/TypeClass.java
+new file mode 100644
+index 00000000000..095cb2c08a8
+--- /dev/null
++++ b/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/TypeClass.java
+@@ -0,0 +1,126 @@
++/*
++ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2023 IBM Corp. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++package jdk.internal.foreign.abi.s390.linux;
++
++import java.lang.foreign.GroupLayout;
++import java.lang.foreign.MemoryLayout;
++import java.lang.foreign.MemorySegment;
++import java.lang.foreign.SequenceLayout;
++import java.lang.foreign.ValueLayout;
++import java.util.List;
++import java.util.ArrayList;
++
++public enum TypeClass {
++ STRUCT_REGISTER,
++ STRUCT_SFA, // Single Float Aggregate
++ STRUCT_REFERENCE,
++ POINTER,
++ INTEGER,
++ FLOAT;
++
++ private static TypeClass classifyValueType(ValueLayout type) {
++ Class<?> carrier = type.carrier();
++ if (carrier == boolean.class || carrier == byte.class || carrier == char.class ||
++ carrier == short.class || carrier == int.class || carrier == long.class) {
++ return INTEGER;
++ } else if (carrier == float.class || carrier == double.class) {
++ return FLOAT;
++ } else if (carrier == MemorySegment.class) {
++ return POINTER;
++ } else {
++ throw new IllegalStateException("Cannot get here: " + carrier.getName());
++ }
++ }
++
++ private static boolean isRegisterAggregate(MemoryLayout type) {
++ long byteSize = type.byteSize();
++ if (byteSize > 8 || byteSize == 3 || byteSize == 5 || byteSize == 6 || byteSize == 7)
++ return false;
++ return true;
++ }
++
++ static List<MemoryLayout> scalarLayouts(GroupLayout gl) {
++ List<MemoryLayout> out = new ArrayList<>();
++ scalarLayoutsInternal(out, gl);
++ return out;
++ }
++
++ private static void scalarLayoutsInternal(List<MemoryLayout> out, GroupLayout gl) {
++ for (MemoryLayout member : gl.memberLayouts()) {
++ if (member instanceof GroupLayout memberGl) {
++ scalarLayoutsInternal(out, memberGl);
++ } else if (member instanceof SequenceLayout memberSl) {
++ for (long i = 0; i < memberSl.elementCount(); i++) {
++ out.add(memberSl.elementLayout());
++ }
++ } else {
++ // padding or value layouts
++ out.add(member);
++ }
++ }
++ }
++
++ static boolean isSingleFloatAggregate(MemoryLayout type) {
++ List<MemoryLayout> scalarLayouts = scalarLayouts((GroupLayout) type);
++
++ final int numElements = scalarLayouts.size();
++ if (numElements > 1 || numElements == 0)
++ return false;
++
++ MemoryLayout baseType = scalarLayouts.get(0);
++
++ if (!(baseType instanceof ValueLayout))
++ return false;
++
++ TypeClass baseArgClass = classifyValueType((ValueLayout) baseType);
++ if (baseArgClass != FLOAT)
++ return false;
++
++ return true;
++ }
++
++ private static TypeClass classifyStructType(MemoryLayout layout) {
++
++ if (!isRegisterAggregate(layout)) {
++ return TypeClass.STRUCT_REFERENCE;
++ }
++
++ if (isSingleFloatAggregate(layout)) {
++ return TypeClass.STRUCT_SFA;
++ }
++ return TypeClass.STRUCT_REGISTER;
++ }
++
++ public static TypeClass classifyLayout(MemoryLayout type) {
++ if (type instanceof ValueLayout) {
++ return classifyValueType((ValueLayout) type);
++ } else if (type instanceof GroupLayout) {
++ return classifyStructType(type);
++ } else {
++ throw new IllegalArgumentException("Unsupported layout: " + type);
++ }
++ }
++}
+diff --git a/test/jdk/java/foreign/TestClassLoaderFindNative.java b/test/jdk/java/foreign/TestClassLoaderFindNative.java
+index 3f5fec0c195..44ec8732ed4 100644
+--- a/test/jdk/java/foreign/TestClassLoaderFindNative.java
++++ b/test/jdk/java/foreign/TestClassLoaderFindNative.java
+@@ -31,9 +31,10 @@
+ import java.lang.foreign.Arena;
+ import java.lang.foreign.MemorySegment;
+ import java.lang.foreign.SymbolLookup;
++import java.nio.ByteOrder;
+ import org.testng.annotations.Test;
+
+-import static java.lang.foreign.ValueLayout.JAVA_BYTE;
++import static java.lang.foreign.ValueLayout.JAVA_INT;
+ import static org.testng.Assert.*;
+
+ // FYI this test is run on 64-bit platforms only for now,
+@@ -58,8 +59,8 @@ public class TestClassLoaderFindNative {
+
+ @Test
+ public void testVariableSymbolLookup() {
+- MemorySegment segment = SymbolLookup.loaderLookup().find("c").get().reinterpret(1);
+- assertEquals(segment.get(JAVA_BYTE, 0), 42);
++ MemorySegment segment = SymbolLookup.loaderLookup().find("c").get().reinterpret(4);
++ assertEquals(segment.get(JAVA_INT, 0), 42);
+ }
+
+ @Test
+diff --git a/test/jdk/java/foreign/TestIllegalLink.java b/test/jdk/java/foreign/TestIllegalLink.java
+index 677f0bce62f..5d8277a5d4c 100644
+--- a/test/jdk/java/foreign/TestIllegalLink.java
++++ b/test/jdk/java/foreign/TestIllegalLink.java
+@@ -54,6 +54,7 @@ import static org.testng.Assert.fail;
+ public class TestIllegalLink extends NativeTestHelper {
+
+ private static final boolean IS_SYSV = CABI.current() == CABI.SYS_V;
++ private static final boolean IS_LE = ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN;
+
+ private static final MemorySegment DUMMY_TARGET = MemorySegment.ofAddress(1);
+ private static final MethodHandle DUMMY_TARGET_MH = MethodHandles.empty(MethodType.methodType(void.class));
+@@ -113,27 +114,27 @@ public class TestIllegalLink extends NativeTestHelper {
+ {
+ FunctionDescriptor.of(MemoryLayout.sequenceLayout(2, C_INT)),
+ NO_OPTIONS,
+- "Unsupported layout: [2:i4]"
++ IS_LE ? "Unsupported layout: [2:i4]" : "Unsupported layout: [2:I4]"
+ },
+ {
+ FunctionDescriptor.ofVoid(MemoryLayout.sequenceLayout(2, C_INT)),
+ NO_OPTIONS,
+- "Unsupported layout: [2:i4]"
++ IS_LE ? "Unsupported layout: [2:i4]" : "Unsupported layout: [2:I4]"
+ },
+ {
+ FunctionDescriptor.ofVoid(C_INT.withByteAlignment(2)),
+ NO_OPTIONS,
+- "Unsupported layout: 2%i4"
++ IS_LE ? "Unsupported layout: 2%i4" : "Unsupported layout: 2%I4"
+ },
+ {
+ FunctionDescriptor.ofVoid(C_POINTER.withByteAlignment(2)),
+ NO_OPTIONS,
+- "Unsupported layout: 2%a8"
++ IS_LE ? "Unsupported layout: 2%a8" : "Unsupported layout: 2%A8"
+ },
+ {
+ FunctionDescriptor.ofVoid(ValueLayout.JAVA_CHAR.withByteAlignment(4)),
+ NO_OPTIONS,
+- "Unsupported layout: 4%c2"
++ IS_LE ? "Unsupported layout: 4%c2" : "Unsupported layout: 4%C2"
+ },
+ {
+ FunctionDescriptor.ofVoid(MemoryLayout.structLayout(
+@@ -142,7 +143,7 @@ public class TestIllegalLink extends NativeTestHelper {
+ C_INT.withName("z").withByteAlignment(1)
+ ).withByteAlignment(1)),
+ NO_OPTIONS,
+- "Unsupported layout: 1%s2"
++ IS_LE ? "Unsupported layout: 1%s2" : "Unsupported layout: 1%S2"
+ },
+ {
+ FunctionDescriptor.ofVoid(MemoryLayout.structLayout(
+@@ -152,7 +153,7 @@ public class TestIllegalLink extends NativeTestHelper {
+ C_INT.withName("z").withByteAlignment(1)
+ ))),
+ NO_OPTIONS,
+- "Unsupported layout: 1%s2"
++ IS_LE ? "Unsupported layout: 1%s2" : "Unsupported layout: 1%S2"
+ },
+ {
+ FunctionDescriptor.ofVoid(MemoryLayout.structLayout(
+@@ -160,7 +161,7 @@ public class TestIllegalLink extends NativeTestHelper {
+ C_INT.withByteAlignment(1)
+ ))),
+ NO_OPTIONS,
+- "Unsupported layout: 1%i4"
++ IS_LE ? "Unsupported layout: 1%i4" : "Unsupported layout: 1%I4"
+ },
+ {
+ FunctionDescriptor.ofVoid(MemoryLayout.structLayout(
+@@ -173,17 +174,17 @@ public class TestIllegalLink extends NativeTestHelper {
+ {
+ FunctionDescriptor.of(C_INT.withOrder(nonNativeOrder())),
+ NO_OPTIONS,
+- "Unsupported layout: I4"
++ IS_LE ? "Unsupported layout: I4" : "Unsupported layout: i4"
+ },
+ {
+ FunctionDescriptor.of(MemoryLayout.structLayout(C_INT.withOrder(nonNativeOrder()))),
+ NO_OPTIONS,
+- "Unsupported layout: I4"
++ IS_LE ? "Unsupported layout: I4" : "Unsupported layout: i4"
+ },
+ {
+ FunctionDescriptor.of(MemoryLayout.structLayout(MemoryLayout.sequenceLayout(C_INT.withOrder(nonNativeOrder())))),
+ NO_OPTIONS,
+- "Unsupported layout: I4"
++ IS_LE ? "Unsupported layout: I4" : "Unsupported layout: i4"
+ },
+ {
+ FunctionDescriptor.ofVoid(MemoryLayout.structLayout(
+@@ -227,5 +228,4 @@ public class TestIllegalLink extends NativeTestHelper {
+ ? ByteOrder.BIG_ENDIAN
+ : ByteOrder.LITTLE_ENDIAN;
+ }
+-
+ }
+diff --git a/test/jdk/java/foreign/callarranger/platform/PlatformLayouts.java b/test/jdk/java/foreign/callarranger/platform/PlatformLayouts.java
+index 1646063fb08..97856075bef 100644
+--- a/test/jdk/java/foreign/callarranger/platform/PlatformLayouts.java
++++ b/test/jdk/java/foreign/callarranger/platform/PlatformLayouts.java
+@@ -305,5 +305,4 @@ public final class PlatformLayouts {
+ public static final AddressLayout C_POINTER = SharedUtils.C_POINTER;
+
+ }
+-
+ }
diff --git a/openjdk_news.sh b/openjdk_news.sh
index 560b356..386aa53 100755
--- a/openjdk_news.sh
+++ b/openjdk_news.sh
@@ -18,8 +18,8 @@
OLD_RELEASE=$1
NEW_RELEASE=$2
-SUBDIR=$3
-REPO=$4
+REPO=$3
+SUBDIR=$4
SCRIPT_DIR=$(dirname ${0})
if test "x${SUBDIR}" = "x"; then
diff --git a/rh1648644-java_access_bridge_privileged_security.patch b/rh1648644-java_access_bridge_privileged_security.patch
deleted file mode 100644
index 53026ad..0000000
--- a/rh1648644-java_access_bridge_privileged_security.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- openjdk/src/java.base/share/conf/security/java.security
-+++ openjdk/src/java.base/share/conf/security/java.security
-@@ -304,6 +304,8 @@
- #
- package.access=sun.misc.,\
- sun.reflect.,\
-+ org.GNOME.Accessibility.,\
-+ org.GNOME.Bonobo.,\
-
- #
- # List of comma-separated packages that start with or equal this string
-@@ -316,6 +318,8 @@
- #
- package.definition=sun.misc.,\
- sun.reflect.,\
-+ org.GNOME.Accessibility.,\
-+ org.GNOME.Bonobo.,\
-
- #
- # Determines whether this properties file can be appended to
diff --git a/sources b/sources
index a5817fd..b2b5901 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openjdk-21+35.tar.xz) = 311e954cc8d28a336b85efc05baade8945fe5292ae2d91cc7ff71c6b3a1830b1a4b9fc641f87e68a4b3db175eb5c21a18664457715da9b37720c5d4b3eb67195
+SHA512 (openjdk-21.0.1+12.tar.xz) = 96513e1346dea623183ae68f88690aa7ea41d65f6a2499b7f9c08954643dd2a6f10d3f4f529fc34e00ff14e8c1bd3764ac78a5c669937a200c910ebcc74e782b
commit 898c425bb61bb936be3117e39564691ac56b901f
Author: Jiri <jvanek(a)redhat.com>
Date: Wed Sep 20 21:39:53 2023 +0200
Returned misteriously disapeared line
diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec
index ffb74a8..8a3b968 100644
--- a/java-latest-openjdk-portable.spec
+++ b/java-latest-openjdk-portable.spec
@@ -1,3 +1,4 @@
+%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
# portable jdk 17 specific bug, _jvmdir being missing
%define _jvmdir /usr/lib/jvm
%endif
commit 9e5764b72d8f3ac8141370dea8e739ee676e914f
Author: Jiri <jvanek(a)redhat.com>
Date: Wed Sep 20 21:36:50 2023 +0200
removed %{1} from misc
diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec
index 4710c10..ffb74a8 100644
--- a/java-latest-openjdk-portable.spec
+++ b/java-latest-openjdk-portable.spec
@@ -1,4 +1,3 @@
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
# portable jdk 17 specific bug, _jvmdir being missing
%define _jvmdir /usr/lib/jvm
%endif
@@ -385,7 +384,7 @@
%global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 35
-%global rpmrelease 3
+%global rpmrelease 4
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -459,7 +458,7 @@
# Intentionally use jdkportablenameimpl here since we want to have static-libs files overlayed on
# top of the JDK archive
%define staticlibsportablename() %{expand:%{jdkportablenameimpl -- %%{1}}}
-%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable%{1}.misc;g" | sed "s;openjdkportable;el;g")
+%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable.misc;g" | sed "s;openjdkportable;el;g")
%define miscportablearchive() %{miscportablename}.tar.xz
# RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1}
@@ -1652,6 +1651,9 @@ done
%{_jvmdir}/%{miscportablearchive}.sha256sum
%changelog
+* Wed Sep 20 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.0.0.35-4.rolling
+- removed %{1} from miscportablename
+
* Fri Sep 15 2023 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:21.0.0.0.35-3.rolling
- Update documentation (README.md, add missing JEP to release notes)
- Replace alt-java patch with a binary separate from the JDK
commit 4ec83bb3a6d6f8530433036f7f73567b34326f0e
Author: Andrew John Hughes <gnu_andrew(a)member.fsf.org>
Date: Fri Sep 15 18:23:53 2023 +0100
Sync with upcoming java-21-openjdk package in RHEL
- Update documentation (README.md, add missing JEP to release notes)
- Replace alt-java patch with a binary separate from the JDK
- Drop stale patches that are of little use any more:
- * nss.cfg has been disabled since early PKCS11 work and long superseded by FIPS work
- * No accessibility subpackage to warrant RH1648242 patch any more
- * No use of system libjpeg turbo to warrant RH649512 patch any more
- Replace RH1684077 pcsc-lite-libs patch with better JDK-8009550 fix being upstreamed
- Update generate_tarball.sh to sync with upstream vanilla script
- Change top_level_dir_name to use the VCS tag, matching new upstream release style tarball
- Use upstream release URL for OpenJDK source
- Port misc tarball from RHEL to house alt-java outside the JDK tree
- Port improved tarball creation and checking from RHEL so tarballs are verified
diff --git a/.gitignore b/.gitignore
index cf8d957..79f3174 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@
/openjdk-jdk20u-jdk-20.0.2+9.tar.xz
/openjdk-jdk21u-jdk-21+34.tar.xz
/openjdk-jdk21u-jdk-21+35.tar.xz
+/openjdk-21+35.tar.xz
diff --git a/NEWS b/NEWS
index 066d951..73322e7 100644
--- a/NEWS
+++ b/NEWS
@@ -76,6 +76,20 @@ an underscore character, _.
This is a preview feature (http://openjdk.java.net/jeps/12) introduced
in OpenJDK 21 (JEP 443).
+Unnamed Classes and Instance Main Methods
+=========================================
+https://openjdk.org/jeps/445
+
+Evolve the Java language so that students can write their first
+programs without needing to understand language features designed for
+large programs. Far from using a separate dialect of Java, students
+can write streamlined declarations for single-class programs and then
+seamlessly expand their programs to use more advanced features as
+their skills grow.
+
+This is a preview feature (http://openjdk.java.net/jeps/12) introduced
+in OpenJDK 21 (JEP 445).
+
Library Features
================
@@ -128,14 +142,15 @@ Virtual Threads
===============
https://openjdk.org/jeps/425
https://openjdk.org/jeps/436
+https://openjdk.org/jeps/444
Introduce virtual threads to the Java Platform. Virtual threads are
lightweight threads that dramatically reduce the effort of writing,
maintaining, and observing high-throughput concurrent applications.
-This is a preview feature (http://openjdk.java.net/jeps/12) introduced
-in OpenJDK 19 (JEP 425) and reaching its second preview in OpenJDK 20
-(JEP 436).
+This was a preview feature (http://openjdk.java.net/jeps/12)
+introduced in OpenJDK 19 (JEP 425) and reaching its second preview in
+OpenJDK 20 (JEP 436). It became final with OpenJDK 21 (JEP 444).
Structured Concurrency
======================
diff --git a/README.md b/README.md
index d139d7d..55536ce 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,14 @@
-# java-latest-openjdk-portable
+This package contains the latest rolling release of OpenJDK. OpenJDK
+has a release cadence of six months, with a new release in March and
+September each year.
-The java-latest-openjdk-portable package
-=======
-Rolling release of (usually) STSs OpenJDK
-OpenJDK has release cadence of 6 months, but 3/4 of them are Short Term Supported for 6 months only. This package is designed to harbor them. Currently it is build of OpenJDK 12. LTSs will go also as separate packages.
+The current release is OpenJDK 21. For a list of major changes from
+OpenJDK 20, see the NEWS file included in this package and the
+upstream release page:
-JDK21 is current release of Java platform. It is bringing many cool improvements - https://openjdk.org/projects/jdk/21/ and is landing to your Fedora. Where it will be maintained for f28 and newer. Unluckily, this package is STS (short term support) version. Between individual LTS there will be always several STS. Again, please see announcement: http://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html and See java SIG plans: https://jvanek.fedorapeople.org/devconf/2018/changesInjavaReleaseProcess.pdf . So this is rolling release of all STSs to come. Its fate during the release of fresh LTS is yet to be decided. You will always be allowed to install LTS in fedora build root, alongside with latest STS via alternatives.
+https://openjdk.java.net/projects/jdk/21/
-
-See announcement: http://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html
-See java SIG plans: https://jvanek.fedorapeople.org/devconf/2018/changesInjavaReleaseProcess.pdf
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1557371#c0
-https://fedoraproject.org/wiki/Changes/java-openjdk-10
-https://fedoraproject.org/wiki/Changes/java-11-openjdk-TechPreview
+This package is intended for those who want to follow the latest
+OpenJDK releases. Long term support versions of OpenJDK are available
+in the java-1.8.0-openjdk, java-11-openjdk and java-17-openjdk
+packages.
diff --git a/alt-java.c b/alt-java.c
new file mode 100644
index 0000000..644d002
--- /dev/null
+++ b/alt-java.c
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2023 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Red Hat designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Red Hat in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+#include <errno.h>
+#include <libgen.h>
+#include <linux/limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/prctl.h>
+#include <unistd.h>
+
+/* Per task speculation control */
+#ifndef PR_GET_SPECULATION_CTRL
+# define PR_GET_SPECULATION_CTRL 52
+#endif
+#ifndef PR_SET_SPECULATION_CTRL
+# define PR_SET_SPECULATION_CTRL 53
+#endif
+/* Speculation control variants */
+#ifndef PR_SPEC_STORE_BYPASS
+# define PR_SPEC_STORE_BYPASS 0
+#endif
+/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
+
+#ifndef PR_SPEC_NOT_AFFECTED
+# define PR_SPEC_NOT_AFFECTED 0
+#endif
+#ifndef PR_SPEC_PRCTL
+# define PR_SPEC_PRCTL (1UL << 0)
+#endif
+#ifndef PR_SPEC_ENABLE
+# define PR_SPEC_ENABLE (1UL << 1)
+#endif
+#ifndef PR_SPEC_DISABLE
+# define PR_SPEC_DISABLE (1UL << 2)
+#endif
+#ifndef PR_SPEC_FORCE_DISABLE
+# define PR_SPEC_FORCE_DISABLE (1UL << 3)
+#endif
+#ifndef PR_SPEC_DISABLE_NOEXEC
+# define PR_SPEC_DISABLE_NOEXEC (1UL << 4)
+#endif
+
+static void set_speculation() {
+#if defined(__linux__) && defined(__x86_64__)
+ // PR_SPEC_DISABLE_NOEXEC doesn't survive execve, so we can't use it
+ // if ( prctl(PR_SET_SPECULATION_CTRL,
+ // PR_SPEC_STORE_BYPASS,
+ // PR_SPEC_DISABLE_NOEXEC, 0, 0) == 0 ) {
+ // return;
+ // }
+ prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
+#else
+#warning alt-java requested but SSB mitigation not available on this platform.
+#endif
+}
+
+int main(int argc, char **argv) {
+ set_speculation();
+
+ char our_name[PATH_MAX], java_name[PATH_MAX];
+ ssize_t len = readlink("/proc/self/exe", our_name, PATH_MAX - 1);
+ if (len < 0) {
+ perror("I can't find myself");
+ exit(2);
+ }
+
+ our_name[len] = '\0'; // readlink(2) doesn't append a null byte
+ char *path = dirname(our_name);
+ strncpy(java_name, path, PATH_MAX - 1);
+
+ size_t remaining_bytes = PATH_MAX - strlen(path) - 1;
+ strncat(java_name, "/java", remaining_bytes);
+
+ execv(java_name, argv);
+ fprintf(stderr, "%s failed to launch: %s\n", java_name, strerror(errno));
+
+ exit(1);
+}
+
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index b1e2009..f27158d 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -30,19 +30,20 @@ set -e
OPENJDK_URL_DEFAULT=https://github.com
COMPRESSION_DEFAULT=xz
-# Corresponding IcedTea version
-ICEDTEA_VERSION=15.0
if [ "x$1" = "xhelp" ] ; then
+ if [ "x$VERSION" = "x" ] ; then
+ VERSION="<unspecified>";
+ fi
echo -e "Behaviour may be specified by setting the following variables:\n"
- echo "VERSION - the version of the specified OpenJDK project"
+ echo "VERSION - the version of the specified OpenJDK project (current value: ${VERSION})"
echo "PROJECT_NAME -- the name of the OpenJDK project being archived (optional; only needed by defaults)"
echo "REPO_NAME - the name of the OpenJDK repository (optional; only needed by defaults)"
echo "OPENJDK_URL - the URL to retrieve code from (optional; defaults to ${OPENJDK_URL_DEFAULT})"
echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
- echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
+ echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to open${VERSION})"
echo "REPO_ROOT - the location of the Git repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
- echo "TO_COMPRESS - what part of clone to pack (default is openjdk)"
+ echo "TO_COMPRESS - what part of clone to pack (default is ${VERSION})"
echo "BOOT_JDK - the bootstrap JDK to satisfy the configure run"
exit 1;
fi
@@ -53,6 +54,7 @@ if [ "x$VERSION" = "x" ] ; then
exit 2
fi
echo "Version: ${VERSION}"
+
NUM_VER=${VERSION##jdk-}
RELEASE_VER=${NUM_VER%%+*}
BUILD_VER=${NUM_VER##*+}
@@ -109,7 +111,7 @@ fi
echo "Creating a tar.${COMPRESSION} archive"
if [ "x$FILE_NAME_ROOT" = "x" ] ; then
- FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
+ FILE_NAME_ROOT=open${VERSION}
echo "No file name root specified; default to ${FILE_NAME_ROOT}"
fi
if [ "x$REPO_ROOT" = "x" ] ; then
@@ -118,7 +120,7 @@ if [ "x$REPO_ROOT" = "x" ] ; then
fi;
if [ "x$TO_COMPRESS" = "x" ] ; then
- TO_COMPRESS="openjdk"
+ TO_COMPRESS="${VERSION}"
echo "No targets to be compressed specified, ; default to ${TO_COMPRESS}"
fi;
@@ -141,35 +143,35 @@ else
mkdir "${FILE_NAME_ROOT}"
pushd "${FILE_NAME_ROOT}"
echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
- git clone -b ${VERSION} ${REPO_ROOT} openjdk
+ git clone -b ${VERSION} ${REPO_ROOT} ${VERSION}
popd
fi
pushd "${FILE_NAME_ROOT}"
# Generate .src-rev so build has knowledge of the revision the tarball was created from
mkdir build
pushd build
- sh ${PWD}/../openjdk/configure --with-boot-jdk=${BOOT_JDK}
+ sh ${PWD}/../${VERSION}/configure --with-boot-jdk=${BOOT_JDK}
make store-source-revision
popd
rm -rf build
# Remove commit checks
- echo "Removing $(find openjdk -name '.jcheck' -print)"
- find openjdk -name '.jcheck' -print0 | xargs -0 rm -rf
+ echo "Removing $(find ${VERSION} -name '.jcheck' -print)"
+ find ${VERSION} -name '.jcheck' -print0 | xargs -0 rm -r
# Remove history and GHA
- echo "find openjdk -name '.hgtags'"
- find openjdk -name '.hgtags' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.hgignore'"
- find openjdk -name '.hgignore' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.gitattributes'"
- find openjdk -name '.gitattributes' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.gitignore'"
- find openjdk -name '.gitignore' -exec rm -fv '{}' '+'
- echo "find openjdk -name '.git'"
- find openjdk -name '.git' -exec rm -rfv '{}' '+'
- echo "find openjdk -name '.github'"
- find openjdk -name '.github' -exec rm -rfv '{}' '+'
+ echo "find ${VERSION} -name '.hgtags'"
+ find ${VERSION} -name '.hgtags' -exec rm -v '{}' '+'
+ echo "find ${VERSION} -name '.hgignore'"
+ find ${VERSION} -name '.hgignore' -exec rm -v '{}' '+'
+ echo "find ${VERSION} -name '.gitattributes'"
+ find ${VERSION} -name '.gitattributes' -exec rm -v '{}' '+'
+ echo "find ${VERSION} -name '.gitignore'"
+ find ${VERSION} -name '.gitignore' -exec rm -v '{}' '+'
+ echo "find ${VERSION} -name '.git'"
+ find ${VERSION} -name '.git' -exec rm -rv '{}' '+'
+ echo "find ${VERSION} -name '.github'"
+ find ${VERSION} -name '.github' -exec rm -rv '{}' '+'
echo "Compressing remaining forest"
if [ "X$COMPRESSION" = "Xxz" ] ; then
diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec
index 65c2533..4710c10 100644
--- a/java-latest-openjdk-portable.spec
+++ b/java-latest-openjdk-portable.spec
@@ -257,12 +257,6 @@
%global ourcppflags %(echo %ourflags | sed -e 's|-fexceptions||')
%global ourldflags %{__global_ldflags}
-# With disabled nss is NSS deactivated, so NSS_LIBDIR can contain the wrong path
-# the initialization must be here. Later the pkg-config have buggy behavior
-# looks like openjdk RPM specific bug
-# Always set this so the nss.cfg file is not broken
-%global NSS_LIBDIR %(pkg-config --variable=libdir nss)
-
# In some cases, the arch used by the JDK does
# not match _arch.
# Also, in some cases, the machine name used by SystemTap
@@ -388,10 +382,10 @@
# Standard JPackage naming and versioning defines
%global origin openjdk
%global origin_nice OpenJDK
-%global top_level_dir_name %{origin}
+%global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 35
-%global rpmrelease 2
+%global rpmrelease 3
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -444,6 +438,7 @@
%global static_libs_install_dir %{static_libs_arch_dir}/glibc
# output dir stub
%define buildoutputdir() %{expand:build/jdk%{featurever}.build%{?1}}
+%global altjavaoutputdir install/altjava.install
# we can copy the javadoc to not arched dir, or make it not noarch
%define uniquejavadocdir() %{expand:%{fullversion}.%{_arch}%{?1}}
# main id and dir of this jdk
@@ -464,6 +459,8 @@
# Intentionally use jdkportablenameimpl here since we want to have static-libs files overlayed on
# top of the JDK archive
%define staticlibsportablename() %{expand:%{jdkportablenameimpl -- %%{1}}}
+%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable%{1}.misc;g" | sed "s;openjdkportable;el;g")
+%define miscportablearchive() %{miscportablename}.tar.xz
# RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1}
# so we have to pass in "" but evaluate it, otherwise files record will include it
@@ -548,6 +545,8 @@ ExcludeArch: %{ix86}
%define java_static_libs_rpo() %{expand:
}
+%define java_misc_rpo() %{expand:
+}
# Prevent brp-java-repack-jars from being run
%global __jar_repack 0
@@ -598,7 +597,7 @@ URL: http://openjdk.java.net/
# The source tarball, generated using generate_source_tarball.sh
-Source0: openjdk-jdk%{featurever}u-%{vcstag}.tar.xz
+Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}.tar.xz
# Use 'icedtea_sync.sh' to update the following
# They are based on code contained in the IcedTea project (6.x).
@@ -613,8 +612,8 @@ Source0: openjdk-jdk%{featurever}u-%{vcstag}.tar.xz
# Release notes
Source10: NEWS
-# nss configuration file
-Source11: nss.cfg.in
+# Source code for alt-java
+Source11: alt-java.c
# Removed libraries that we link instead
# Disabled in portables
@@ -649,20 +648,6 @@ Source1004: ojdk17-s390x-17.35.tar.gz
#
############################################
-# NSS via SunPKCS11 Provider (disabled comment
-# due to memory leak).
-Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
-# RH1750419: enable build of speculative store bypass hardened alt-java (CVE-2018-3639)
-Patch600: rh1750419-redhat_alt_java.patch
-
-# Ignore AWTError when assistive technologies are loaded
-Patch1: rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
-# Restrict access to java-atk-wrapper classes
-Patch2: rh1648644-java_access_bridge_privileged_security.patch
-Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch
-# Depend on pcsc-lite-libs instead of pcsc-lite-devel as this is only in optional repo
-Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
-
# Crypto policy and FIPS support patches
# Patch is generated from the fips-21u tree at https://github.com/rh-openjdk/jdk/tree/fips-21u
# as follows: git diff %%{vcstag} src make test > fips-21u-$(git show -s --format=%h HEAD).patch
@@ -688,7 +673,8 @@ Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-d
# RH2090378: Revert to disabling system security properties and FIPS mode support together
# RH2104724: Avoid import/export of DH private keys
# RH2092507: P11Key.getEncoded does not work for DH keys in FIPS mode
-# RH2048582: Support PKCS#12 keystores
+# Build the systemconf library on all platforms
+# RH2048582: Support PKCS#12 keystores [now part of JDK-8301553 upstream]
# RH2020290: Support TLS 1.3 in FIPS mode
# Add nss.fips.cfg support to OpenJDK tree
# RH2117972: Extend the support for NSS DBs (PKCS11) in FIPS mode
@@ -697,15 +683,17 @@ Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-d
# RH2134669: Add missing attributes when registering services in FIPS mode.
# test/jdk/sun/security/pkcs11/fips/VerifyMissingAttributes.java: fixed jtreg main class
# RH1940064: Enable XML Signature provider in FIPS mode
-# Build the systemconf library on all platforms
-# Remove GCC minor versioning (JDK-8284772) to unbreak testing
-Patch1001: fips-21u-%{fipsver}.patch
+# RH2173781: Avoid calling C_GetInfo() too early, before cryptoki is initialized [now part of JDK-8301553 upstream]
+Patch1001: fips-%{featurever}u-%{fipsver}.patch
#############################################
#
# OpenJDK patches in need of upstreaming
#
#############################################
+# JDK-8009550, RH910107: Depend on pcsc-lite-libs instead of pcsc-lite-devel as this is only in optional repo
+# PR: https://github.com/openjdk/jdk/pull/15409
+Patch6: jdk8009550-rh910107-fail_to_load_pcsc_library.patch
#############################################
#
@@ -746,7 +734,7 @@ BuildRequires: libXrandr-devel
BuildRequires: libXrender-devel
BuildRequires: libXt-devel
BuildRequires: libXtst-devel
-# Requirement for setting up nss.cfg and nss.fips.cfg
+# Requirement for setting up nss.fips.cfg
BuildRequires: nss-devel
# Requirement for system security property test
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
@@ -916,6 +904,14 @@ The %{origin_nice} %{featurever} libraries for static linking - portable edition
# staticlibs
%endif
+%package misc
+Summary: %{origin_nice} %{featurever} miscellany
+
+%{java_misc_rpo %{nil}}
+
+%description misc
+The %{origin_nice} %{featurever} miscellany.
+
%package sources
Summary: %{origin_nice} %{featurever} full patched sources of portable JDK
@@ -979,18 +975,12 @@ sh %{SOURCE12} %{top_level_dir_name}
# Patch the JDK
pushd %{top_level_dir_name}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch6 -p1
# Add crypto policy and FIPS support
%patch1001 -p1
-# nss.cfg PKCS11 support; must come last as it also alters java.security
-%patch1000 -p1
+# Patches in need of upstreaming
+%patch6 -p1
popd # openjdk
-%patch600
-
# The OpenJDK version file includes the current
# upstream version information. For some reason,
# configure does not automatically use the
@@ -1043,9 +1033,6 @@ done
# Prepare desktop files
# Portables do not have desktop integration
-# Setup nss.cfg
-sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE11} > nss.cfg
-
%build
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
mkdir bootjdk
@@ -1100,6 +1087,10 @@ EXTRA_CPP_FLAGS="$(echo ${EXTRA_CPP_FLAGS} | sed -e 's|-mstackrealign|-mincoming
%endif
export EXTRA_CFLAGS EXTRA_CPP_FLAGS
+echo "Building %{SOURCE11}"
+mkdir -p %{altjavaoutputdir}
+gcc ${EXTRA_CFLAGS} -o %{altjavaoutputdir}/%{alt_java_name} %{SOURCE11}
+
function buildjdk() {
local outputdir=${1}
local buildjdk=${2}
@@ -1204,9 +1195,6 @@ function installjdk() {
find ${imagepath} -iname '*.so' -exec chmod +x {} \;
find ${imagepath}/bin/ -exec chmod +x {} \;
- # Install nss.cfg right away as we will be using the JRE above
- install -m 644 nss.cfg ${imagepath}/conf/security/
-
# Create fake alt-java as a placeholder for future alt-java
if [ -d man/man1 ] ; then
pushd ${imagepath}
@@ -1294,10 +1282,25 @@ EOF
fi
}
+function genchecksum() {
+ local checkedfile=${1}
+
+ checkdir=$(dirname ${1})
+ checkfile=$(basename ${1})
+
+ echo "Generating checksum for ${checkfile} in ${checkdir}..."
+ pushd ${checkdir}
+ sha256sum ${checkfile} > ${checkfile}.sha256sum
+ sha256sum --check ${checkfile}.sha256sum
+ popd
+}
+
+packagesdir=$(pwd)/..
+
pwd
ls -l
-tar -cJf ../%{jdkportablesourcesarchive -- ""} --transform "s|^|%{jdkportablesourcesname -- ""}/|" openjdk nss*
-sha256sum ../%{jdkportablesourcesarchive -- ""} > ../%{jdkportablesourcesarchive -- ""}.sha256sum
+tar -cJf ${packagesdir}/%{jdkportablesourcesarchive -- ""} --transform "s|^|%{jdkportablesourcesname -- ""}/|" %{top_level_dir_name}
+genchecksum ${packagesdir}/%{jdkportablesourcesarchive -- ""}
%if %{build_hotspot_first}
# Build a fresh libjvm.so first and use it to bootstrap
@@ -1410,12 +1413,12 @@ for suffix in %{build_loop} ; do
mv %{jdkimage} %{jdkportablename -- "$nameSuffix"}
mv %{jreimage} %{jreportablename -- "$nameSuffix"}
- tar -cJf ../../../../%{jdkportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jdkportablename -- "$nameSuffix"}
- sha256sum ../../../../%{jdkportablearchive -- "$nameSuffix"} > ../../../../%{jdkportablearchive -- "$nameSuffix"}.sha256sum
- tar -cJf ../../../../%{jreportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jreportablename -- "$nameSuffix"}
- sha256sum ../../../../%{jreportablearchive -- "$nameSuffix"} > ../../../../%{jreportablearchive -- "$nameSuffix"}.sha256sum
+ tar -cJf ${packagesdir}/%{jdkportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jdkportablename -- "$nameSuffix"}
+ genchecksum ${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
+ tar -cJf ${packagesdir}/%{jreportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jreportablename -- "$nameSuffix"}
+ genchecksum ${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
# copy licenses so they are avialable out of tarball
- cp -rf %{jdkportablename -- "$nameSuffix"}/legal ../../../../%{jdkportablearchive -- "%{normal_suffix}"}-legal
+ cp -rf %{jdkportablename -- "$nameSuffix"}/legal ${packagesdir}/%{jdkportablearchive -- "%{normal_suffix}"}-legal
mv %{jdkportablename -- "$nameSuffix"} %{jdkimage}
mv %{jreportablename -- "$nameSuffix"} %{jreimage}
popd #images
@@ -1426,8 +1429,8 @@ for suffix in %{build_loop} ; do
# Tar as overlay. Transform to the JDK name, since we just want to "add"
# static libraries to that folder
portableJDKname=%{staticlibsportablename -- "$nameSuffix"}
- tar -cJf ../../../../%{staticlibsportablearchive -- "$nameSuffix"} --transform "s|^%{static_libs_image}/lib/*|$portableJDKname/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib"
- sha256sum ../../../../%{staticlibsportablearchive -- "$nameSuffix"} > ../../../../%{staticlibsportablearchive -- "$nameSuffix"}.sha256sum
+ tar -cJf ${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"} --transform "s|^%{static_libs_image}/lib/*|$portableJDKname/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib"
+ genchecksum ${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
popd #staticlibs-images
%endif
################################################################################
@@ -1437,10 +1440,26 @@ for suffix in %{build_loop} ; do
# build cycles
done # end of release / debug cycle loop
+# These are from the source tree so no debug variants
+miscname=%{miscportablename}
+miscarchive=${packagesdir}/%{miscportablearchive}
+
+mkdir ${miscname}
+cp -av %{altjavaoutputdir}/%{alt_java_name} ${miscname}
+tar -cJf ${miscarchive} ${miscname}
+genchecksum ${miscarchive}
+
%install
+
+packagesdir=$(pwd)/..
+
mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
-mv ../%{jdkportablesourcesarchive -- ""} $RPM_BUILD_ROOT%{_jvmdir}/
-mv ../%{jdkportablesourcesarchive -- ""}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+# Install outside the loop as there are no debug variants
+miscarchive=${packagesdir}/%{miscportablearchive}
+mv ${packagesdir}/%{jdkportablesourcesarchive -- ""} $RPM_BUILD_ROOT%{_jvmdir}/
+mv ${packagesdir}/%{jdkportablesourcesarchive -- ""}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+mv ${miscarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+mv ${miscarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
for suffix in %{build_loop} ; do
top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
@@ -1451,13 +1470,13 @@ top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
else
nameSuffix=`echo "$suffix"| sed s/-/./`
fi
- mv ../%{jdkportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{jdkportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{jreportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{jreportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${packagesdir}/%{jdkportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${packagesdir}/%{jreportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${packagesdir}/%{jreportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
%if %{include_staticlibs}
- mv ../%{staticlibsportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ../%{staticlibsportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
%endif
if [ "x$suffix" == "x" ] ; then
dnameSuffix="$nameSuffix".debuginfo
@@ -1471,7 +1490,7 @@ done
################################################################################
# the licenses are packed onloy once and shared
mkdir -p $RPM_BUILD_ROOT%{unpacked_licenses}
-mv ../%{jdkportablearchive -- "%{normal_suffix}"}-legal $RPM_BUILD_ROOT%{unpacked_licenses}/%{jdkportablesourcesarchive -- "%{normal_suffix}"}
+mv ${packagesdir}/%{jdkportablearchive -- "%{normal_suffix}"}-legal $RPM_BUILD_ROOT%{unpacked_licenses}/%{jdkportablesourcesarchive -- "%{normal_suffix}"}
# To show sha in the build log
for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do ls -l $file ; cat $file ; done
################################################################################
@@ -1513,10 +1532,11 @@ $JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=fal
if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
# Check alt-java launcher has SSB mitigation on supported architectures
+# set_speculation function exists in both cases, so check for prctl call
%ifarch %{ssbd_arches}
-nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation
+nm %{altjavaoutputdir}/%{alt_java_name} | grep prctl
%else
-if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi
+if ! nm %{altjavaoutputdir}/%{alt_java_name} | grep prctl ; then true ; else false; fi
%endif
# Check correct vendor values have been set
@@ -1627,7 +1647,25 @@ done
%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}.sha256sum
%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
+%files misc
+%{_jvmdir}/%{miscportablearchive}
+%{_jvmdir}/%{miscportablearchive}.sha256sum
+
%changelog
+* Fri Sep 15 2023 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:21.0.0.0.35-3.rolling
+- Update documentation (README.md, add missing JEP to release notes)
+- Replace alt-java patch with a binary separate from the JDK
+- Drop stale patches that are of little use any more:
+- * nss.cfg has been disabled since early PKCS11 work and long superseded by FIPS work
+- * No accessibility subpackage to warrant RH1648242 patch any more
+- * No use of system libjpeg turbo to warrant RH649512 patch any more
+- Replace RH1684077 pcsc-lite-libs patch with better JDK-8009550 fix being upstreamed
+- Update generate_tarball.sh to sync with upstream vanilla script
+- Change top_level_dir_name to use the VCS tag, matching new upstream release style tarball
+- Use upstream release URL for OpenJDK source
+- Port misc tarball from RHEL to house alt-java outside the JDK tree
+- Port improved tarball creation and checking from RHEL so tarballs are verified
+
* Thu Sep 14 2023 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:21.0.0.0.35-2.rolling
- Bump buildjdkver now that java-21-openjdk is available in the buildroot
diff --git a/jdk8009550-rh910107-fail_to_load_pcsc_library.patch b/jdk8009550-rh910107-fail_to_load_pcsc_library.patch
new file mode 100644
index 0000000..9213937
--- /dev/null
+++ b/jdk8009550-rh910107-fail_to_load_pcsc_library.patch
@@ -0,0 +1,125 @@
+commit d0523302416bc6507696f20d1068f16427bcf6b8
+Author: Andrew Hughes <gnu.andrew(a)redhat.com>
+Date: Thu Aug 24 01:23:49 2023 +0100
+
+ 8009550: PlatformPCSC should load versioned so
+
+diff --git a/src/java.base/share/classes/sun/security/util/Debug.java b/src/java.base/share/classes/sun/security/util/Debug.java
+index bff273c6548..e5a6b288ff8 100644
+--- a/src/java.base/share/classes/sun/security/util/Debug.java
++++ b/src/java.base/share/classes/sun/security/util/Debug.java
+@@ -81,6 +81,7 @@ public static void Help()
+ System.err.println("logincontext login context results");
+ System.err.println("jca JCA engine class debugging");
+ System.err.println("keystore KeyStore debugging");
++ System.err.println("pcsc Smartcard library debugging");
+ System.err.println("policy loading and granting");
+ System.err.println("provider security provider debugging");
+ System.err.println("pkcs11 PKCS11 session manager debugging");
+diff --git a/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java b/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
+index bacff32efbc..d9f605ada1e 100644
+--- a/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
++++ b/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
+@@ -1,5 +1,6 @@
+ /*
+ * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2023, Red Hat Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -46,8 +47,13 @@ class PlatformPCSC {
+
+ private static final String PROP_NAME = "sun.security.smartcardio.library";
+
+- private static final String LIB1 = "/usr/$LIBISA/libpcsclite.so";
+- private static final String LIB2 = "/usr/local/$LIBISA/libpcsclite.so";
++ private static final String[] LIB_TEMPLATES = { "/usr/$LIBISA/libpcsclite.so",
++ "/usr/local/$LIBISA/libpcsclite.so",
++ "/usr/lib/$ARCH-linux-gnu/libpcsclite.so",
++ "/usr/lib/arm-linux-gnueabi/libpcsclite.so",
++ "/usr/lib/arm-linux-gnueabihf/libpcsclite.so",
++ "/usr/lib/$ARCH-kfreebsd-gnu/libpcsclite.so" };
++ private static final String[] LIB_SUFFIXES = { ".1", ".0", "" };
+ private static final String PCSC_FRAMEWORK = "/System/Library/Frameworks/PCSC.framework/Versions/Current/PCSC";
+
+ PlatformPCSC() {
+@@ -73,23 +79,38 @@ public Throwable run() {
+ });
+
+ // expand $LIBISA to the system specific directory name for libraries
++ // expand $ARCH to the Debian system architecture in use
+ private static String expand(String lib) {
+ int k = lib.indexOf("$LIBISA");
+- if (k == -1) {
+- return lib;
++ if (k != -1) {
++ String libDir;
++ if ("64".equals(System.getProperty("sun.arch.data.model"))) {
++ // assume Linux convention
++ libDir = "lib64";
++ } else {
++ // must be 32-bit
++ libDir = "lib";
++ }
++ lib = lib.replace("$LIBISA", libDir);
+ }
+- String s1 = lib.substring(0, k);
+- String s2 = lib.substring(k + 7);
+- String libDir;
+- if ("64".equals(System.getProperty("sun.arch.data.model"))) {
+- // assume Linux convention
+- libDir = "lib64";
+- } else {
+- // must be 32-bit
+- libDir = "lib";
++
++ k = lib.indexOf("$ARCH");
++ if (k != -1) {
++ String arch = System.getProperty("os.arch");
++ lib = lib.replace("$ARCH", getDebianArchitecture(arch));
+ }
+- String s = s1 + libDir + s2;
+- return s;
++
++ return lib;
++ }
++
++ private static String getDebianArchitecture(String jdkArch) {
++ return switch (jdkArch) {
++ case "amd64" -> "x86_64";
++ case "ppc" -> "powerpc";
++ case "ppc64" -> "powerpc64";
++ case "ppc64le" -> "powerpc64le";
++ default -> jdkArch;
++ };
+ }
+
+ private static String getLibraryName() throws IOException {
+@@ -98,15 +119,18 @@ private static String getLibraryName() throws IOException {
+ if (lib.length() != 0) {
+ return lib;
+ }
+- lib = expand(LIB1);
+- if (new File(lib).isFile()) {
+- // if LIB1 exists, use that
+- return lib;
+- }
+- lib = expand(LIB2);
+- if (new File(lib).isFile()) {
+- // if LIB2 exists, use that
+- return lib;
++
++ for (String template : LIB_TEMPLATES) {
++ for (String suffix : LIB_SUFFIXES) {
++ lib = expand(template) + suffix;
++ if (debug != null) {
++ debug.println("Looking for " + lib);
++ }
++ if (new File(lib).isFile()) {
++ // if library exists, use that
++ return lib;
++ }
++ }
+ }
+
+ // As of macos 11, framework libraries have been removed from the file
diff --git a/nss.cfg.in b/nss.cfg.in
deleted file mode 100644
index 377a39c..0000000
--- a/nss.cfg.in
+++ /dev/null
@@ -1,5 +0,0 @@
-name = NSS
-nssLibraryDirectory = @NSS_LIBDIR@
-nssDbMode = noDb
-attributes = compatibility
-handleStartupErrors = ignoreMultipleInitialisation
diff --git a/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch b/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
deleted file mode 100644
index 3042186..0000000
--- a/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -r 618ad1237e73 src/java.desktop/share/classes/java/awt/Toolkit.java
---- a/src/java.desktop/share/classes/java/awt/Toolkit.java Thu Jun 13 19:37:49 2019 +0200
-+++ b/src/java.desktop/share/classes/java/awt/Toolkit.java Thu Jul 04 10:35:42 2019 +0200
-@@ -595,7 +595,11 @@
- toolkit = new HeadlessToolkit(toolkit);
- }
- if (!GraphicsEnvironment.isHeadless()) {
-- loadAssistiveTechnologies();
-+ try {
-+ loadAssistiveTechnologies();
-+ } catch (AWTError error) {
-+ // ignore silently
-+ }
- }
- }
- return toolkit;
diff --git a/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch b/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
deleted file mode 100644
index b357edf..0000000
--- a/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git openjdk.orig/src/java.base/share/conf/security/java.security openjdk/src/java.base/share/conf/security/java.security
-index 68a9c1a2d08..7aa25eb2cb7 100644
---- openjdk.orig/src/java.base/share/conf/security/java.security
-+++ openjdk/src/java.base/share/conf/security/java.security
-@@ -78,6 +78,7 @@ security.provider.tbd=SunMSCAPI
- security.provider.tbd=Apple
- #endif
- security.provider.tbd=SunPKCS11
-+#security.provider.tbd=SunPKCS11 ${java.home}/lib/security/nss.cfg
-
- #
- # Security providers used when FIPS mode support is active
-
diff --git a/rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch b/rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
deleted file mode 100644
index 4c1476f..0000000
--- a/rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java b/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
-index bacff32efbc..ff7b3dcc81c 100644
---- openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
-+++ openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
-@@ -46,8 +46,8 @@ class PlatformPCSC {
-
- private static final String PROP_NAME = "sun.security.smartcardio.library";
-
-- private static final String LIB1 = "/usr/$LIBISA/libpcsclite.so";
-- private static final String LIB2 = "/usr/local/$LIBISA/libpcsclite.so";
-+ private static final String LIB1 = "/usr/$LIBISA/libpcsclite.so.1";
-+ private static final String LIB2 = "/usr/local/$LIBISA/libpcsclite.so.1";
- private static final String PCSC_FRAMEWORK = "/System/Library/Frameworks/PCSC.framework/Versions/Current/PCSC";
-
- PlatformPCSC() {
diff --git a/rh1750419-redhat_alt_java.patch b/rh1750419-redhat_alt_java.patch
deleted file mode 100644
index d877ca8..0000000
--- a/rh1750419-redhat_alt_java.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff --git openjdk.orig/make/modules/java.base/Launcher.gmk openjdk/make/modules/java.base/Launcher.gmk
-index 700ddefda49..2882de68eb2 100644
---- openjdk.orig/make/modules/java.base/Launcher.gmk
-+++ openjdk/make/modules/java.base/Launcher.gmk
-@@ -41,6 +41,14 @@ $(eval $(call SetupBuildLauncher, java, \
- OPTIMIZATION := HIGH, \
- ))
-
-+#Wno-error=cpp is present to allow commented warning in ifdef part of main.c
-+$(eval $(call SetupBuildLauncher, alt-java, \
-+ CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES -DREDHAT_ALT_JAVA -Wno-error=cpp, \
-+ EXTRA_RCFLAGS := $(JAVA_RCFLAGS), \
-+ VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \
-+ OPTIMIZATION := HIGH, \
-+))
-+
- ifeq ($(call isTargetOs, windows), true)
- $(eval $(call SetupBuildLauncher, javaw, \
- CFLAGS := -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \
-diff --git openjdk.orig/src/java.base/share/native/launcher/alt_main.h openjdk/src/java.base/share/native/launcher/alt_main.h
-new file mode 100644
-index 00000000000..697df2898ac
---- /dev/null
-+++ openjdk/src/java.base/share/native/launcher/alt_main.h
-@@ -0,0 +1,73 @@
-+/*
-+ * Copyright (c) 2019, Red Hat, Inc. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+#ifdef REDHAT_ALT_JAVA
-+
-+#include <sys/prctl.h>
-+
-+
-+/* Per task speculation control */
-+#ifndef PR_GET_SPECULATION_CTRL
-+# define PR_GET_SPECULATION_CTRL 52
-+#endif
-+#ifndef PR_SET_SPECULATION_CTRL
-+# define PR_SET_SPECULATION_CTRL 53
-+#endif
-+/* Speculation control variants */
-+#ifndef PR_SPEC_STORE_BYPASS
-+# define PR_SPEC_STORE_BYPASS 0
-+#endif
-+/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
-+
-+#ifndef PR_SPEC_NOT_AFFECTED
-+# define PR_SPEC_NOT_AFFECTED 0
-+#endif
-+#ifndef PR_SPEC_PRCTL
-+# define PR_SPEC_PRCTL (1UL << 0)
-+#endif
-+#ifndef PR_SPEC_ENABLE
-+# define PR_SPEC_ENABLE (1UL << 1)
-+#endif
-+#ifndef PR_SPEC_DISABLE
-+# define PR_SPEC_DISABLE (1UL << 2)
-+#endif
-+#ifndef PR_SPEC_FORCE_DISABLE
-+# define PR_SPEC_FORCE_DISABLE (1UL << 3)
-+#endif
-+#ifndef PR_SPEC_DISABLE_NOEXEC
-+# define PR_SPEC_DISABLE_NOEXEC (1UL << 4)
-+#endif
-+
-+static void set_speculation() __attribute__((constructor));
-+static void set_speculation() {
-+ if ( prctl(PR_SET_SPECULATION_CTRL,
-+ PR_SPEC_STORE_BYPASS,
-+ PR_SPEC_DISABLE_NOEXEC, 0, 0) == 0 ) {
-+ return;
-+ }
-+ prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
-+}
-+
-+#endif // REDHAT_ALT_JAVA
-diff --git openjdk.orig/src/java.base/share/native/launcher/main.c openjdk/src/java.base/share/native/launcher/main.c
-index b734fe2ba78..79dc8307650 100644
---- openjdk.orig/src/java.base/share/native/launcher/main.c
-+++ openjdk/src/java.base/share/native/launcher/main.c
-@@ -34,6 +34,14 @@
- #include "jli_util.h"
- #include "jni.h"
-
-+#ifdef REDHAT_ALT_JAVA
-+#if defined(__linux__) && defined(__x86_64__)
-+#include "alt_main.h"
-+#else
-+#warning alt-java requested but SSB mitigation not available on this platform.
-+#endif
-+#endif
-+
- /*
- * Entry point.
- */
diff --git a/rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch b/rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch
deleted file mode 100644
index 1b706a1..0000000
--- a/rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Remove uses of FAR in jpeg code
-
-Upstream libjpeg-trubo removed the (empty) FAR macro:
-http://sourceforge.net/p/libjpeg-turbo/code/1312/
-
-Adjust our code to not use the undefined FAR macro anymore.
-
-diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c b/jdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
---- openjdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
-+++ openjdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
-@@ -1385,7 +1385,7 @@
- /* and fill it in */
- dst_ptr = icc_data;
- for (seq_no = first; seq_no < last; seq_no++) {
-- JOCTET FAR *src_ptr = icc_markers[seq_no]->data + ICC_OVERHEAD_LEN;
-+ JOCTET *src_ptr = icc_markers[seq_no]->data + ICC_OVERHEAD_LEN;
- unsigned int length =
- icc_markers[seq_no]->data_length - ICC_OVERHEAD_LEN;
-
diff --git a/sources b/sources
index 443c08d..a5817fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openjdk-jdk21u-jdk-21+35.tar.xz) = 5961f12ff9828856e5ce7847a06177a6761088dbefbcac05512a7c3433d45154f6d59872cd00268fecd987128e623bb343d9879b26f6c6c811e6d6713d1b17a2
+SHA512 (openjdk-21+35.tar.xz) = 311e954cc8d28a336b85efc05baade8945fe5292ae2d91cc7ff71c6b3a1830b1a4b9fc641f87e68a4b3db175eb5c21a18664457715da9b37720c5d4b3eb67195
commit fff7874101a13073dc48d63657881324f7c9d39e
Author: Andrew John Hughes <gnu_andrew(a)member.fsf.org>
Date: Thu Sep 14 16:14:32 2023 +0100
Bump buildjdkver now that java-21-openjdk is available in the buildroot
diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec
index 80d4854..65c2533 100644
--- a/java-latest-openjdk-portable.spec
+++ b/java-latest-openjdk-portable.spec
@@ -338,7 +338,7 @@
# buildjdkver is usually same as %%{featurever},
# but in time of bootstrap of next jdk, it is featurever-1,
# and this it is better to change it here, on single place
-%global buildjdkver 20
+%global buildjdkver 21
# We don't add any LTS designator for STS packages (Fedora and EPEL).
# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
%if 0%{?rhel} && !0%{?epel}
@@ -391,7 +391,7 @@
%global top_level_dir_name %{origin}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 35
-%global rpmrelease 1
+%global rpmrelease 2
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -1628,7 +1628,10 @@ done
%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%changelog
-* Tue Aug 08 2023 Petra Alice Mikova <pmikova(a)redhat.com> 1:21.0.0.0.35-0.1.rolling
+* Thu Sep 14 2023 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:21.0.0.0.35-2.rolling
+- Bump buildjdkver now that java-21-openjdk is available in the buildroot
+
+* Tue Aug 08 2023 Petra Alice Mikova <pmikova(a)redhat.com> 1:21.0.0.0.35-1.rolling
- updated to jdk-21+35, which is no longer EA
* Tue Aug 08 2023 Petra Alice Mikova <pmikova(a)redhat.com> 1:21.0.0.0.34-0.1.ea.rolling
1
0
Architecture specific change in rpms/java-latest-openjdk-portable.git
by githook-noreply＠fedoraproject.org 23 Nov '23
by githook-noreply＠fedoraproject.org 23 Nov '23
23 Nov '23
The package rpms/java-latest-openjdk-portable.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-latest-openjdk-portable.git/co…
https://src.fedoraproject.org/cgit/rpms/java-latest-openjdk-portable.git/co….
Change:
+ExcludeArch: %{ix86}
+%ifarch %{gdb_arches}
Thanks.
Full change:
============
commit e4459f4dcc7ba596c3d140a04dd284ccaa1ead0a
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Wed Nov 22 11:07:30 2023 +0100
moved docs and miscs to release-only condition
diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec
index 7bac98c..3fa3abd 100644
--- a/java-latest-openjdk-portable.spec
+++ b/java-latest-openjdk-portable.spec
@@ -915,6 +915,7 @@ The %{origin_nice} %{featurever} runtime environment.
%endif
+%if %{include_normal_build}
%package docs
Summary: %{origin_nice} %{featurever} API documentation
@@ -930,6 +931,7 @@ Summary: %{origin_nice} %{featurever} miscellany
%description misc
The %{origin_nice} %{featurever} miscellany.
+%endif
%package sources
Summary: %{origin_nice} %{featurever} full patched sources of portable JDK
@@ -1302,7 +1304,6 @@ function packagejdk() {
echo "Packaging build from ${imagesdir} to ${packagesdir}..."
mkdir -p ${packagesdir}
- pushd ${imagesdir}
if [ "x$suffix" = "x" ] ; then
nameSuffix=""
@@ -1318,10 +1319,11 @@ function packagejdk() {
staticarchive=${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
- # We only use docs for the release build
- docname=%{docportablename}
- docarchive=${packagesdir}/%{docportablearchive}
- built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
+ if [ "x$suffix" = "x" ] ; then
+ docname=%{docportablename}
+ docarchive=${packagesdir}/%{docportablearchive}
+ built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
+ fi
# These are from the source tree so no debug variants
miscname=%{miscportablename}
miscarchive=${packagesdir}/%{miscportablearchive}
@@ -1661,15 +1663,16 @@ for suffix in %{build_loop} ; do
fi
done
-# These definitions should match those in installjdk
-# Install outside the loop as there are no debug variants
-docarchive=${packagesdir}/%{docportablearchive}
-miscarchive=${packagesdir}/%{miscportablearchive}
-
-mv ${docarchive} $RPM_BUILD_ROOT%{_jvmdir}/
-mv ${docarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
-mv ${miscarchive} $RPM_BUILD_ROOT%{_jvmdir}/
-mv ${miscarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ if [ "x$suffix" = "x" ] ; then
+ # These definitions should match those in installjdk
+ # Install outside the loop as there are no debug variants
+ docarchive=${packagesdir}/%{docportablearchive}
+ miscarchive=${packagesdir}/%{miscportablearchive}
+ mv ${docarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${docarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${miscarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${miscarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ fi
# To show sha in the build log
for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do
@@ -1744,6 +1747,7 @@ done
%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}
%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}.sha256sum
+%if %{include_normal_build}
%files docs
%{_jvmdir}/%{docportablearchive}
%{_jvmdir}/%{docportablearchive}.sha256sum
@@ -1751,6 +1755,7 @@ done
%files misc
%{_jvmdir}/%{miscportablearchive}
%{_jvmdir}/%{miscportablearchive}.sha256sum
+%endif
%changelog
* Wed Nov 22 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.1.0.12-2.rolling
@@ -1765,6 +1770,7 @@ done
- removed no longer needed jdk8296108-tzdata2022f.patch, jdk8296715-cldr2022f.patch, rh1648644-java_access_bridge_privileged_security.patch
- added jdk8311630-s390_ffmapi.patch to support virtual threads on s390x
- aligned fips-21u-75ffdc48eda.patch (gnu_andrew)
+- fixed '--without release' build-ability by moving docs and misc to if-release only
* Wed Sep 20 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.0.0.35-4.rolling
- removed %{1} from miscportablename
commit 26504dac4c5d1ddf0ec7e85199b12e54be85e259
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Tue Nov 21 16:02:43 2023 +0100
restricted to java-arches
diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec
index f487843..7bac98c 100644
--- a/java-latest-openjdk-portable.spec
+++ b/java-latest-openjdk-portable.spec
@@ -518,6 +518,13 @@
%global alternatives_requires %{_sbindir}/alternatives
%endif
+# x86 is no longer supported
+%if 0%{?java_arches:1}
+ExclusiveArch: %{java_arches}
+%else
+ExcludeArch: %{ix86}
+%endif
+
# Portables have no repo (requires/provides), but these are awesome for orientation in spec
# Also scriptlets are happily missing and files are handled old fashion
# not-duplicated requires/provides/obsoletes for normal/debug packages
commit 1eb10e704bfd129924882085b3519c94f50b9454
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Tue Nov 21 15:48:20 2023 +0100
updated to OpenJDK 21.0.1 (2023-10-17)
- adjsuted generate_source_tarball
- removed icedtea_sync
- dropped standalone licenses
- added usntripped subpkg
- added docs subpkg
- adjsuted versions of bundled libraries
- build refactored to several solid methods following gnu_andrew
- removed no longer needed jdk8296108-tzdata2022f.patch, jdk8296715-cldr2022f.patch, rh1648644-java_access_bridge_privileged_security.patch
- added jdk8311630-s390_ffmapi.patch to support virtual threads on s390x
- aligned fips-21u-75ffdc48eda.patch (gnu_andrew)
diff --git a/.gitignore b/.gitignore
index 79f3174..3f711a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@
/openjdk-jdk21u-jdk-21+34.tar.xz
/openjdk-jdk21u-jdk-21+35.tar.xz
/openjdk-21+35.tar.xz
+/openjdk-21.0.1+12.tar.xz
diff --git a/NEWS b/NEWS
index 73322e7..09d1dfe 100644
--- a/NEWS
+++ b/NEWS
@@ -3,13 +3,210 @@ Key:
JDK-X - https://bugs.openjdk.java.net/browse/JDK-X
CVE-XXXX-YYYY: https://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
+New in release OpenJDK 21.0.1 (2023-10-17):
+===========================================
+
+* CVEs
+ - CVE-2023-22081
+ - CVE-2023-22025
+* Security fixes
+ - JDK-8286503, JDK-8312367: Enhance security classes
+ - JDK-8296581: Better system proxy support
+ - JDK-8297856: Improve handling of Bidi characters
+ - JDK-8309966: Enhanced TLS connections
+ - JDK-8312248: Enhanced archival support redux
+ - JDK-8314649: Enhanced archival support redux
+ - JDK-8317121: vector_masked_load instruction is moved too early after JDK-8286941
+* Other changes
+ - JDK-8240567: MethodTooLargeException thrown while creating a jlink image
+ - JDK-8284772: GHA: Use GCC Major Version Dependencies Only
+ - JDK-8293114: JVM should trim the native heap
+ - JDK-8299658: C1 compilation crashes in LinearScan::resolve_exception_edge
+ - JDK-8302017: Allocate BadPaddingException only if it will be thrown
+ - JDK-8303815: Improve Metaspace test speed
+ - JDK-8304954: SegmentedCodeCache fails when using large pages
+ - JDK-8307766: Linux: Provide the option to override the timer slack
+ - JDK-8308042: [macos] Developer ID Application Certificate not picked up by jpackage if it contains UNICODE characters
+ - JDK-8308047: java/util/concurrent/ScheduledThreadPoolExecutor/BasicCancelTest.java timed out and also had jcmd pipe errors
+ - JDK-8308184: Launching java with large number of jars in classpath with java.protocol.handler.pkgs system property set can lead to StackOverflowError
+ - JDK-8308474: DSA does not reset SecureRandom when initSign is called again
+ - JDK-8308609: java/lang/ScopedValue/StressStackOverflow.java fails with "-XX:-VMContinuations"
+ - JDK-8309032: jpackage does not work for module projects unless --module-path is specified
+ - JDK-8309088: security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java fails
+ - JDK-8309214: sun/security/pkcs11/KeyStore/CertChainRemoval.java fails after 8301154
+ - JDK-8309475: Test java/foreign/TestByteBuffer.java fails: a problem with msync (aix)
+ - JDK-8309502: RISC-V: String.indexOf intrinsic may produce misaligned memory loads
+ - JDK-8309591: Socket.setOption(TCP_QUICKACK) uses wrong level
+ - JDK-8309746: Reconfigure check should include make/conf/version-numbers.conf
+ - JDK-8309889: [s390] Missing return statement after calling jump_to_native_invoker method in generate_method_handle_dispatch.
+ - JDK-8310106: sun.security.ssl.SSLHandshake.getHandshakeProducer() incorrectly checks handshakeConsumers
+ - JDK-8310171: Bump version numbers for 21.0.1
+ - JDK-8310211: serviceability/jvmti/thread/GetStackTrace/getstacktr03/getstacktr03.java failing
+ - JDK-8310233: Fix THP detection on Linux
+ - JDK-8310268: RISC-V: misaligned memory access in String.Compare intrinsic
+ - JDK-8310321: make JDKOPT_CHECK_CODESIGN_PARAMS more verbose
+ - JDK-8310586: ProblemList java/lang/ScopedValue/StressStackOverflow.java#default with virtual threads on linux-all
+ - JDK-8310687: JDK-8303215 is incomplete
+ - JDK-8310873: Re-enable locked_create_entry symbol check in runtime/NMT/CheckForProperDetailStackTrace.java for RISC-V
+ - JDK-8311026: Some G1 specific tests do not set -XX:+UseG1GC
+ - JDK-8311033: [macos] PrinterJob does not take into account Sides attribute
+ - JDK-8311160: [macOS, Accessibility] VoiceOver: No announcements on JRadioButtonMenuItem and JCheckBoxMenuItem
+ - JDK-8311249: Remove unused MemAllocator::obj_memory_range
+ - JDK-8311285: report some fontconfig related environment variables in hs_err file
+ - JDK-8311511: Improve description of NativeLibrary JFR event
+ - JDK-8311592: ECKeySizeParameterSpec causes too many exceptions on third party providers
+ - JDK-8311682: Change milestone to fcs for all releases
+ - JDK-8311862: RISC-V: small improvements to shift immediate instructions
+ - JDK-8311917: MAP_FAILED definition seems to be obsolete in src/java.desktop/unix/native/common/awt/fontpath.c
+ - JDK-8311921: Inform about MaxExpectedDataSegmentSize in case of pthread_create failures on AIX
+ - JDK-8311923: TestIRMatching.java fails on RISC-V
+ - JDK-8311926: java/lang/ScopedValue/StressStackOverflow.java takes 9mins in tier1
+ - JDK-8311955: c++filt is now ibm-llvm-cxxfilt when using xlc17 / clang on AIX
+ - JDK-8311981: Test gc/stringdedup/TestStringDeduplicationAgeThreshold.java#ZGenerational timed out
+ - JDK-8312127: FileDescriptor.sync should temporarily increase parallelism
+ - JDK-8312180: (bf) MappedMemoryUtils passes incorrect arguments to msync (aix)
+ - JDK-8312182: THPs cause huge RSS due to thread start timing issue
+ - JDK-8312394: [linux] SIGSEGV if kernel was built without hugepage support
+ - JDK-8312395: Improve assertions in growableArray
+ - JDK-8312401: SymbolTable::do_add_if_needed hangs when called in InstanceKlass::add_initialization_error path with requesting length exceeds max_symbol_length
+ - JDK-8312489: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar
+ - JDK-8312525: New test runtime/os/TestTrimNative.java#trimNative is failing: did not see the expected RSS reduction
+ - JDK-8312535: MidiSystem.getSoundbank() throws unexpected SecurityException
+ - JDK-8312555: Ideographic characters aren't stretched by AffineTransform.scale(2, 1)
+ - JDK-8312573: Failure during CompileOnly parsing leads to ShouldNotReachHere
+ - JDK-8312585: Rename DisableTHPStackMitigation flag to THPStackMitigation
+ - JDK-8312591: GCC 6 build failure after JDK-8280982
+ - JDK-8312619: Strange error message when switching over long
+ - JDK-8312620: WSL Linux build crashes after JDK-8310233
+ - JDK-8312625: Test serviceability/dcmd/vm/TrimLibcHeapTest.java failed: RSS use increased
+ - JDK-8312909: C1 should not inline through interface calls with non-subtype receiver
+ - JDK-8312976: MatchResult produces StringIndexOutOfBoundsException for groups outside match
+ - JDK-8312984: javac may crash on a record pattern with too few components
+ - JDK-8313081: MonitoringSupport_lock should be unconditionally initialized after 8304074
+ - JDK-8313248: C2: setScopedValueCache intrinsic exposes nullptr pre-values to store barriers
+ - JDK-8313262: C2: Sinking node may cause required cast to be dropped
+ - JDK-8313307: java/util/Formatter/Padding.java fails on some Locales
+ - JDK-8313312: Add missing classpath exception copyright header
+ - JDK-8313323: javac -g on a java file which uses unnamed variable leads to ClassFormatError when launching that class
+ - JDK-8313402: C1: Incorrect LoadIndexed value numbering
+ - JDK-8313428: GHA: Bump GCC versions for July 2023 updates
+ - JDK-8313576: GCC 7 reports compiler warning in bundled freetype 2.13.0
+ - JDK-8313602: increase timeout for jdk/classfile/CorpusTest.java
+ - JDK-8313626: C2 crash due to unexpected exception control flow
+ - JDK-8313657: com.sun.jndi.ldap.Connection.cleanup does not close connections on SocketTimeoutErrors
+ - JDK-8313676: Amend TestLoadIndexedMismatch test to target intrinsic directly
+ - JDK-8313678: SymbolTable can leak Symbols during cleanup
+ - JDK-8313691: use close after failing os::fdopen in vmError and ciEnv
+ - JDK-8313701: GHA: RISC-V should use the official repository for bootstrap
+ - JDK-8313707: GHA: Bootstrap sysroots with --variant=minbase
+ - JDK-8313752: InstanceKlassFlags::print_on doesn't print the flag names
+ - JDK-8313765: Invalid CEN header (invalid zip64 extra data field size)
+ - JDK-8313796: AsyncGetCallTrace crash on unreadable interpreter method pointer
+ - JDK-8313874: JNI NewWeakGlobalRef throws exception for null arg
+ - JDK-8313901: [TESTBUG] test/hotspot/jtreg/compiler/codecache/CodeCacheFullCountTest.java fails with java.lang.VirtualMachineError
+ - JDK-8313904: [macos] All signing tests which verifies unsigned app images are failing
+ - JDK-8314020: Print instruction blocks in byte units
+ - JDK-8314024: SIGSEGV in PhaseIdealLoop::build_loop_late_post_work due to bad immediate dominator info
+ - JDK-8314063: The socket is not closed in Connection::createSocket when the handshake failed for LDAP connection
+ - JDK-8314117: RISC-V: Incorrect VMReg encoding in RISCV64Frame.java
+ - JDK-8314118: Update JMH devkit to 1.37
+ - JDK-8314139: TEST_BUG: runtime/os/THPsInThreadStackPreventionTest.java could fail on machine with large number of cores
+ - JDK-8314144: gc/g1/ihop/TestIHOPStatic.java fails due to extra concurrent mark with -Xcomp
+ - JDK-8314216: Case enumConstant, pattern compilation fails
+ - JDK-8314262: GHA: Cut down cross-compilation sysroots deeper
+ - JDK-8314423: Multiple patterns without unnamed variables
+ - JDK-8314426: runtime/os/TestTrimNative.java is failing on slow machines
+ - JDK-8314501: Shenandoah: sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java fails
+ - JDK-8314517: some tests fail in case ipv6 is disabled on the machine
+ - JDK-8314618: RISC-V: -XX:MaxVectorSize does not work as expected
+ - JDK-8314656: GHA: No need for Debian ports keyring installation after JDK-8313701
+ - JDK-8314679: SA fails to properly attach to JVM after having just detached from a different JVM
+ - JDK-8314730: GHA: Drop libfreetype6-dev transitional package in favor of libfreetype-dev
+ - JDK-8314850: SharedRuntime::handle_wrong_method() gets called too often when resolving Continuation.enter
+ - JDK-8314960: Add Certigna Root CA - 2
+ - JDK-8315020: The macro definition for LoongArch64 zero build is not accurate.
+ - JDK-8315051: jdk/jfr/jvm/TestGetEventWriter.java fails with non-JVMCI GCs
+ - JDK-8315534: Incorrect warnings about implicit annotation processing
+
+Notes on individual issues:
+===========================
+
+core-libs/java.util.jar:
+
+JDK-8313765: Invalid CEN header (invalid zip64 extra data field size)
+=====================================================================
+Additional validity checks in the handling of Zip64 files,
+JDK-8302483, introduced in 21.0.0, caused the use of some valid zip
+files to now fail with the error, `Invalid CEN header (invalid zip64
+extra data field size)`
+
+This release, 21.0.1, allows for zero length headers and additional
+padding produced by some Zip64 creation tools.
+
+The following third party tools have also released patches to better
+adhere to the ZIP File Format Specification:
+
+* Apache Commons Compress fix for Empty CEN Zip64 Extra Headers fixed in Commons Compress release 1.11
+* Apache Ant fix for Empty CEN Zip64 Extra Headers fixed in Ant 1.10.14
+* BND issue with writing invalid Extra Headers fixed in BND 5.3
+
+The maven-bundle-plugin 5.1.5 includes the BND 5.3 patch.
+
+If these improved validation checks cause issues for deployed zip or
+jar files, check how the file was created and whether patches are
+available from the generating software to resolve the issue. With
+both JDK releases, the checks can be disabled by setting the new
+system property, `jdk.util.zip.disableZip64ExtraFieldValidation` to
+`true`.
+
+hotspot/runtime:
+
+JDK-8311981: JVM May Hang When Using Generational ZGC if a VM Handshake Stalls on Memory
+========================================================================================
+The JVM can hang under an uncommon condition that involves the JVM
+running out of heap memory, the GC just starting a relocation phase to
+reclaim memory, and a JVM thread-local Handshake asking to relocate an
+object. This potential deadlock should now be avoided in this
+release.
+
+core-libs/java.util.regex:
+
+JDK-8312976: `java.util.regex.MatchResult` Might Throw `StringIndexOutOfBoundsException` on Regex Patterns Containing Lookaheads and Lookbehinds
+================================================================================================================================================
+JDK-8132995 introduced an unintended regression when using instances
+returned by `java.util.regex.Matcher.toMatchResult()`.
+
+This regression happens with a `java.util.regex.Pattern`s containing
+lookaheads and lookbehinds that, in turn, contain groups. If these are
+located outside the match, a `StringIndexOutOfBoundsException` is
+thrown when accessing these groups. See JDK-8312976 for an example.
+
+The issue is resolved in this release by calculating a minimum start
+location as part of the match result and using this in constructing
+String objects, rather than the location of the first match.
+
+JDK-8314960: Added Certigna Root CA Certificate
+===============================================
+The following root certificate has been added to the cacerts
+truststore:
+
+Name: Certigna (Dhimyotis)
+Alias Name: certignarootca
+Distinguished Name: CN=Certigna Root CA, OU=0002 48146308100036, O=Dhimyotis, C=FR
+
+JDK-8312489: Increase Default Value of the System Property `jdk.jar.maxSignatureFileSize`
+=========================================================================================
+A maximum signature file size property, jdk.jar.maxSignatureFileSize,
+was introduced in the 21.0.0 release of OpenJDK by JDK-8300596 to
+control the maximum size of signature files in a signed JAR. The
+default value of 8MB proved to be too small for some JAR files. This
+release, 21.0.1, increases it to 16MB.
+
New in release OpenJDK 21.0.0 (2023-09-XX):
===========================================
Major changes are listed below. Some changes may have been backported
-to earlier releases following their first appearance in OpenJDK 21.
-
-The full list of changes in 21u can be found at:
-- * https://builds.shipilev.net/backports-monitor/release-notes-21.txt
+to earlier releases following their first appearance in OpenJDK 18
+through to 21.
NEW FEATURES
============
@@ -76,8 +273,8 @@ an underscore character, _.
This is a preview feature (http://openjdk.java.net/jeps/12) introduced
in OpenJDK 21 (JEP 443).
-Unnamed Classes and Instance Main Methods
-=========================================
+Unnamed Classes and Instance Main Methods (Preview)
+===================================================
https://openjdk.org/jeps/445
Evolve the Java language so that students can write their first
@@ -93,6 +290,24 @@ in OpenJDK 21 (JEP 445).
Library Features
================
+UTF-8 by Default
+================
+https://openjdk.org/jeps/400
+
+Specify UTF-8 as the default charset of the standard Java APIs. With
+this change, APIs that depend upon the default charset will behave
+consistently across all implementations, operating systems, locales,
+and configurations.
+
+Reimplement Core Reflection with Method Handles
+===============================================
+https://openjdk.org/jeps/416
+
+Reimplement java.lang.reflect.Method, Constructor, and Field on top of
+java.lang.invoke method handles. Making method handles the underlying
+mechanism for reflection will reduce the maintenance and development
+cost of both the java.lang.reflect and java.lang.invoke APIs.
+
Vector API
==========
https://openjdk.org/jeps/338
@@ -113,6 +328,14 @@ place in OpenJDK 17 (JEP 414), OpenJDK 18 (JEP 417) saw a third,
OpenJDK 19 a fourth (JEP 426), OpenJDK 20 (JEP 438) a fifth and
OpenJDK 21 a sixth (JEP 448).
+Internet-Address Resolution SPI
+===============================
+https://openjdk.org/jeps/418
+
+Define a service-provider interface (SPI) for host name and address
+resolution, so that java.net.InetAddress can make use of resolvers
+other than the platform's built-in resolver.
+
Foreign Function & Memory API
=============================
https://openjdk.org/jeps/412
@@ -211,9 +434,55 @@ Improve application performance by extending the Z Garbage Collector
will allow ZGC to collect young objects — which tend to die young —
more frequently.
+Tools
+=====
+
+Simple Web Server
+=================
+https://openjdk.org/jeps/408
+
+Provide a command-line tool, `jwebserver`, to start a minimal web
+server that serves static files only. No CGI or servlet-like
+functionality is available. This tool will be useful for prototyping,
+ad-hoc coding, and testing purposes, particularly in educational
+contexts.
+
+Code Snippets in Java API Documentation
+=======================================
+https://openjdk.org/jeps/413
+
+Introduce an @snippet tag for JavaDoc's Standard Doclet, to simplify
+the inclusion of example source code in API documentation.
+
+Ports
+=====
+
+Linux/RISC-V Port
+=================
+https://openjdk.org/jeps/422
+
+RISC-V is a free and open-source RISC instruction set architecture
+(ISA) designed originally at the University of California, Berkeley,
+and now developed collaboratively under the sponsorship of RISC-V
+International. It is already supported by a wide range of language
+toolchains. With the increasing availability of RISC-V hardware, a
+port of the JDK would be valuable.
+
DEPRECATIONS
============
+Deprecate Finalization for Removal
+==================================
+https://openjdk.org/jeps/421
+
+Deprecate finalization for removal in a future release. Finalization
+remains enabled by default for now, but can be disabled to facilitate
+early testing. In a future release it will be disabled by default, and
+in a later release it will be removed. Maintainers of libraries and
+applications that rely upon finalization should consider migrating to
+other resource management techniques such as the try-with-resources
+statement and cleaners.
+
Deprecate the Windows 32-bit x86 Port for Removal
=================================================
https://openjdk.org/jeps/449
@@ -230,4 +499,3 @@ JVM. These warnings aim to prepare users for a future release which
disallows the dynamic loading of agents by default in order to improve
integrity by default. Serviceability tools that load agents at startup
will not cause warnings to be issued in any release.
-
diff --git a/discover_trees.sh b/discover_trees.sh
new file mode 100755
index 0000000..8c31278
--- /dev/null
+++ b/discover_trees.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# Copyright (C) 2020 Red Hat, Inc.
+# Written by Andrew John Hughes <gnu.andrew(a)redhat.com>.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+TREE=${1}
+
+if test "x${TREE}" = "x"; then
+ TREE=${PWD}
+fi
+
+if [ -e ${TREE}/nashorn/.hg -o -e ${TREE}/nashorn/merge.changeset ] ; then
+ NASHORN="nashorn" ;
+fi
+
+if [ -e ${TREE}/corba/.hg -o -e ${TREE}/corba/merge.changeset ] ; then
+ CORBA="corba";
+fi
+
+if [ -e ${TREE}/jaxp/.hg -o -e ${TREE}/jaxp/merge.changeset ] ; then
+ JAXP="jaxp";
+fi
+
+if [ -e ${TREE}/jaxws/.hg -o -e ${TREE}/jaxws/merge.changeset ] ; then
+ JAXWS="jaxws";
+fi
+
+if [ -e ${TREE}/langtools/.hg -o -e ${TREE}/langtools/merge.changeset ] ; then
+ LANGTOOLS="langtools";
+fi
+
+if [ -e ${TREE}/jdk/.hg -o -e ${TREE}/jdk/merge.changeset ] ; then
+ JDK="jdk";
+fi
+
+if [ -e ${TREE}/hotspot/.hg -o -e ${TREE}/hotspot/merge.changeset ] ; then
+ HOTSPOT="hotspot";
+fi
+
+SUBTREES="${CORBA} ${JAXP} ${JAXWS} ${LANGTOOLS} ${NASHORN} ${JDK} ${HOTSPOT}";
+echo ${SUBTREES}
diff --git a/fips-21u-75ffdc48eda.patch b/fips-21u-75ffdc48eda.patch
index 7ffbe3a..8413fe1 100644
--- a/fips-21u-75ffdc48eda.patch
+++ b/fips-21u-75ffdc48eda.patch
@@ -4231,4 +4231,3 @@ index 00000000000..87f1ad04505
+ }
+ }
+}
-
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index f27158d..5d6efd9 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -6,10 +6,9 @@
# If your local repo follows upstream forests conventions, it may be enough to set OPENJDK_URL
#
# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
-# BOOT_JDK=/usr/lib/jvm/java-20-openjdk
# PROJECT_NAME=openjdk
# REPO_NAME=jdk21u
-# VERSION=jdk-21+35
+# VERSION=jdk-21.0.1+12
# or to eg prepare systemtap:
# icedtea7's jstack and other tapsets
# VERSION=6327cf1cea9e
@@ -36,13 +35,13 @@ if [ "x$1" = "xhelp" ] ; then
VERSION="<unspecified>";
fi
echo -e "Behaviour may be specified by setting the following variables:\n"
- echo "VERSION - the version of the specified OpenJDK project (current value: ${VERSION})"
+ echo "VERSION - the version of the specified OpenJDK project"
echo "PROJECT_NAME -- the name of the OpenJDK project being archived (optional; only needed by defaults)"
echo "REPO_NAME - the name of the OpenJDK repository (optional; only needed by defaults)"
echo "OPENJDK_URL - the URL to retrieve code from (optional; defaults to ${OPENJDK_URL_DEFAULT})"
echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
- echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to open${VERSION})"
- echo "REPO_ROOT - the location of the Git repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
+ echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
+ echo "REPO_ROOT - the location of the Git repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME.git)"
echo "TO_COMPRESS - what part of clone to pack (default is ${VERSION})"
echo "BOOT_JDK - the bootstrap JDK to satisfy the configure run"
exit 1;
@@ -111,7 +110,7 @@ fi
echo "Creating a tar.${COMPRESSION} archive"
if [ "x$FILE_NAME_ROOT" = "x" ] ; then
- FILE_NAME_ROOT=open${VERSION}
+ FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
echo "No file name root specified; default to ${FILE_NAME_ROOT}"
fi
if [ "x$REPO_ROOT" = "x" ] ; then
@@ -121,7 +120,7 @@ fi;
if [ "x$TO_COMPRESS" = "x" ] ; then
TO_COMPRESS="${VERSION}"
- echo "No targets to be compressed specified, ; default to ${TO_COMPRESS}"
+ echo "No targets to be compressed specified ; default to ${TO_COMPRESS}"
fi;
echo -e "Settings:"
@@ -147,6 +146,7 @@ else
popd
fi
pushd "${FILE_NAME_ROOT}"
+
# Generate .src-rev so build has knowledge of the revision the tarball was created from
mkdir build
pushd build
@@ -161,17 +161,17 @@ pushd "${FILE_NAME_ROOT}"
# Remove history and GHA
echo "find ${VERSION} -name '.hgtags'"
- find ${VERSION} -name '.hgtags' -exec rm -v '{}' '+'
+ find ${VERSION} -name '.hgtags' -exec rm -fv '{}' '+'
echo "find ${VERSION} -name '.hgignore'"
- find ${VERSION} -name '.hgignore' -exec rm -v '{}' '+'
+ find ${VERSION} -name '.hgignore' -exec rm -fv '{}' '+'
echo "find ${VERSION} -name '.gitattributes'"
- find ${VERSION} -name '.gitattributes' -exec rm -v '{}' '+'
+ find ${VERSION} -name '.gitattributes' -exec rm -fv '{}' '+'
echo "find ${VERSION} -name '.gitignore'"
- find ${VERSION} -name '.gitignore' -exec rm -v '{}' '+'
+ find ${VERSION} -name '.gitignore' -exec rm -fv '{}' '+'
echo "find ${VERSION} -name '.git'"
- find ${VERSION} -name '.git' -exec rm -rv '{}' '+'
+ find ${VERSION} -name '.git' -exec rm -rfv '{}' '+'
echo "find ${VERSION} -name '.github'"
- find ${VERSION} -name '.github' -exec rm -rv '{}' '+'
+ find ${VERSION} -name '.github' -exec rm -rfv '{}' '+'
echo "Compressing remaining forest"
if [ "X$COMPRESSION" = "Xxz" ] ; then
diff --git a/icedtea_sync.sh b/icedtea_sync.sh
index e5c54f3..c1b8f6a 100755
--- a/icedtea_sync.sh
+++ b/icedtea_sync.sh
@@ -1,192 +1 @@
-#!/bin/bash
-
-# Copyright (C) 2019 Red Hat, Inc.
-# Written by Andrew John Hughes <gnu.andrew(a)redhat.com>.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-ICEDTEA_USE_VCS=true
-
-ICEDTEA_VERSION=3.15.0
-ICEDTEA_URL=https://icedtea.classpath.org/download/source
-ICEDTEA_SIGNING_KEY=CFDA0F9B35964222
-
-ICEDTEA_HG_URL=https://icedtea.classpath.org/hg/icedtea11
-
-set -e
-
-RPM_DIR=${PWD}
-if [ ! -f ${RPM_DIR}/jconsole.desktop.in ] ; then
- echo "Not in RPM source tree.";
- exit 1;
-fi
-
-if test "x${TMPDIR}" = "x"; then
- TMPDIR=/tmp;
-fi
-WORKDIR=${TMPDIR}/it.sync
-
-echo "Using working directory ${WORKDIR}"
-mkdir ${WORKDIR}
-pushd ${WORKDIR}
-
-if test "x${WGET}" = "x"; then
- WGET=$(which wget);
- if test "x${WGET}" = "x"; then
- echo "wget not found";
- exit 1;
- fi
-fi
-
-if test "x${TAR}" = "x"; then
- TAR=$(which tar)
- if test "x${TAR}" = "x"; then
- echo "tar not found";
- exit 2;
- fi
-fi
-
-echo "Dependencies:";
-echo -e "\tWGET: ${WGET}";
-echo -e "\tTAR: ${TAR}\n";
-
-if test "x${ICEDTEA_USE_VCS}" = "xtrue"; then
- echo "Mode: Using VCS";
-
- if test "x${GREP}" = "x"; then
- GREP=$(which grep);
- if test "x${GREP}" = "x"; then
- echo "grep not found";
- exit 3;
- fi
- fi
-
- if test "x${CUT}" = "x"; then
- CUT=$(which cut);
- if test "x${CUT}" = "x"; then
- echo "cut not found";
- exit 4;
- fi
- fi
-
- if test "x${TR}" = "x"; then
- TR=$(which tr);
- if test "x${TR}" = "x"; then
- echo "tr not found";
- exit 5;
- fi
- fi
-
- if test "x${HG}" = "x"; then
- HG=$(which hg);
- if test "x${HG}" = "x"; then
- echo "hg not found";
- exit 6;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tGREP: ${GREP}";
- echo -e "\tCUT: ${CUT}";
- echo -e "\tTR: ${TR}";
- echo -e "\tHG: ${HG}";
-
- echo "Checking out repository from VCS...";
- ${HG} clone ${ICEDTEA_HG_URL} icedtea
-
- echo "Obtaining version from configure.ac...";
- ROOT_VER=$(${GREP} '^AC_INIT' icedtea/configure.ac|${CUT} -d ',' -f 2|${TR} -d '[][:space:]')
- echo "Root version from configure: ${ROOT_VER}";
-
- VCS_REV=$(${HG} log -R icedtea --template '{node|short}' -r tip)
- echo "VCS revision: ${VCS_REV}";
-
- ICEDTEA_VERSION="${ROOT_VER}-${VCS_REV}"
- echo "Creating icedtea-${ICEDTEA_VERSION}";
- mkdir icedtea-${ICEDTEA_VERSION}
- echo "Copying required files from checkout to icedtea-${ICEDTEA_VERSION}";
- # Commented out for now as IcedTea 6's jconsole.desktop.in is outdated
- #cp -a icedtea/jconsole.desktop.in ../icedtea-${ICEDTEA_VERSION}
- cp -a ${RPM_DIR}/jconsole.desktop.in icedtea-${ICEDTEA_VERSION}
- cp -a icedtea/tapset icedtea-${ICEDTEA_VERSION}
-
- rm -rf icedtea
-else
- echo "Mode: Using tarball";
-
- if test "x${ICEDTEA_VERSION}" = "x"; then
- echo "No IcedTea version specified for tarball download.";
- exit 3;
- fi
-
- if test "x${CHECKSUM}" = "x"; then
- CHECKSUM=$(which sha256sum)
- if test "x${CHECKSUM}" = "x"; then
- echo "sha256sum not found";
- exit 4;
- fi
- fi
-
- if test "x${PGP}" = "x"; then
- PGP=$(which gpg)
- if test "x${PGP}" = "x"; then
- echo "gpg not found";
- exit 5;
- fi
- fi
-
- echo "Dependencies:";
- echo -e "\tCHECKSUM: ${CHECKSUM}";
- echo -e "\tPGP: ${PGP}\n";
-
- echo "Checking for IcedTea signing key ${ICEDTEA_SIGNING_KEY}...";
- if ! gpg --list-keys ${ICEDTEA_SIGNING_KEY}; then
- echo "IcedTea signing key ${ICEDTEA_SIGNING_KEY} not installed.";
- exit 6;
- fi
-
- echo "Downloading IcedTea release tarball...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz
- echo "Downloading IcedTea tarball signature...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- echo "Downloading IcedTea tarball checksums...";
- ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Verifying checksums...";
- ${CHECKSUM} --check --ignore-missing icedtea-${ICEDTEA_VERSION}.sha256
-
- echo "Checking signature...";
- ${PGP} --verify icedtea-${ICEDTEA_VERSION}.tar.xz.sig
-
- echo "Extracting files...";
- ${TAR} xJf icedtea-${ICEDTEA_VERSION}.tar.xz \
- icedtea-${ICEDTEA_VERSION}/tapset \
- icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in
-
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz
- rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz.sig
- rm -vf icedtea-${ICEDTEA_VERSION}.sha256
-fi
-
-echo "Replacing desktop files...";
-mv -v icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in ${RPM_DIR}
-
-echo "Creating new tapset tarball...";
-mv -v icedtea-${ICEDTEA_VERSION} openjdk
-${TAR} cJf ${RPM_DIR}/tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz openjdk
-
-rm -rvf openjdk
-
-popd
-rm -rf ${WORKDIR}
+# this file is intentionally not here, as portable builds do not have desktop integration
diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec
index 8a3b968..f487843 100644
--- a/java-latest-openjdk-portable.spec
+++ b/java-latest-openjdk-portable.spec
@@ -1,8 +1,3 @@
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-# portable jdk 17 specific bug, _jvmdir being missing
-%define _jvmdir /usr/lib/jvm
-%endif
-
# debug_package %%{nil} is portable-jdks specific
%define debug_package %{nil}
@@ -41,8 +36,6 @@
%define __os_install_post %{nil}
%endif
-%global unpacked_licenses %{_datarootdir}/licenses
-
# Workaround for stripping of debug symbols from static libraries
%if %{with staticlibs}
%define __brp_strip_static_archive %{nil}
@@ -66,10 +59,6 @@
# See: https://bugzilla.redhat.com/show_bug.cgi?id=1520879
%global _find_debuginfo_opts -g
-# With LTO flags enabled, debuginfo checks fail for some reason. Disable
-# LTO for a passing build. This really needs to be looked at.
-%define _lto_cflags %{nil}
-
# note: parametrized macros are order-sensitive (unlike not-parametrized) even with normal macros
# also necessary when passing it as parameter to other macros. If not macro, then it is considered a switch
# see the difference between global and define:
@@ -147,9 +136,9 @@
# Set of architectures which support the serviceability agent
%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm}
# Set of architectures which support class data sharing
-# See https://bugzilla.redhat.com/show_bug.cgi?id=513605
-# MetaspaceShared::generate_vtable_methods is not implemented for the PPC JIT
-%global share_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{arm} s390x
+# As of JDK-8005165 in OpenJDK 10, class sharing is not arch-specific
+# However, it does segfault on the Zero assembler port, so currently JIT only
+%global share_arches %{jit_arches}
# Set of architectures for which we build the Shenandoah garbage collector
%global shenandoah_arches x86_64 %{aarch64}
# Set of architectures for which we build the Z garbage collector
@@ -166,7 +155,7 @@
%global gdb_arches %{jit_arches} %{zero_arches}
%endif
-# By default, we build a debug build during main build on JIT architectures
+# By default, we build a slowdebug build during main build on JIT architectures
%if %{with slowdebug}
%ifarch %{debug_arches}
%global include_debug_build 1
@@ -237,17 +226,24 @@
%global static_libs_target %{nil}
%endif
-# RPM JDK builds keep the debug symbols internal, to be later stripped by RPM
-%global debug_symbols internal
-
-# unlike portables,the rpms have to use static_libs_target very dynamically
-%global bootstrap_targets images legacy-jre-image
-%global release_targets images docs-zip legacy-jre-image
+# The static libraries are produced under the same configuration as the main
+# build for portables, as we expect in-tree libraries to be used throughout.
+# If system libraries are enabled, the static libraries will also use them
+# which may cause issues.
+%global bootstrap_targets images %{static_libs_target} legacy-jre-image
+%global release_targets images docs-zip %{static_libs_target} legacy-jre-image
# No docs nor bootcycle for debug builds
-%global debug_targets images legacy-jre-image
+%global debug_targets images %{static_libs_target} legacy-jre-image
# Target to use to just build HotSpot
%global hotspot_target hotspot
+# DTS toolset to use to provide gcc & binutils
+%global dtsversion 10
+
+# Disable LTO as this causes build failures at the moment.
+# See RHBZ#1861401
+%define _lto_cflags %{nil}
+
# Filter out flags from the optflags macro that cause problems with the OpenJDK build
# We filter out -O flags so that the optimization of HotSpot is not lowered from O3 to O2
# We filter out -Wall which will otherwise cause HotSpot to produce hundreds of thousands of warnings (100+mb logs)
@@ -327,20 +323,20 @@
# New Version-String scheme-style defines
%global featurever 21
%global interimver 0
-%global updatever 0
+%global updatever 1
%global patchver 0
# buildjdkver is usually same as %%{featurever},
# but in time of bootstrap of next jdk, it is featurever-1,
# and this it is better to change it here, on single place
-%global buildjdkver 21
+%global buildjdkver %{featurever}
# We don't add any LTS designator for STS packages (Fedora and EPEL).
# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
%if 0%{?rhel} && !0%{?epel}
%global lts_designator "LTS"
%global lts_designator_zip -%{lts_designator}
%else
- %global lts_designator ""
- %global lts_designator_zip ""
+ %global lts_designator ""
+ %global lts_designator_zip ""
%endif
# JDK to use for bootstrapping
%global bootjdk /usr/lib/jvm/java-%{buildjdkver}-openjdk
@@ -366,26 +362,34 @@
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{name}&…
%else
%if 0%{?rhel}
-%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20…
+%global oj_vendor_bug_url https://access.redhat.com/support/cases/
%else
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi
%endif
%endif
%endif
-%global oj_vendor_version (Red_Hat-%{version}-%{release})
+%global oj_vendor_version (Red_Hat-%{version}-%{rpmrelease})
# Define IcedTea version used for SystemTap tapsets and desktop file
%global icedteaver 6.0.0pre00-c848b93a8598
# Define current Git revision for the FIPS support patches
%global fipsver 75ffdc48eda
+# Define JDK versions
+%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
+%global javaver %{featurever}
+# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
+%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
+# The tag used to create the OpenJDK tarball
+%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Standard JPackage naming and versioning defines
%global origin openjdk
%global origin_nice OpenJDK
%global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
-%global buildver 35
-%global rpmrelease 4
+%global buildver 12
+%global rpmrelease 2
+#%%global tagsuffix %%{nil}
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -398,14 +402,6 @@
# for techpreview, using 1, so slowdebugs can have 0
%global priority %( printf '%08d' 1 )
%endif
-%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
-%global javaver %{featurever}
-
-# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
-%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
-
-# The tag used to create the OpenJDK tarball
-%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
# Define milestone (EA for pre-releases, GA for releases)
# Release will be (where N is usually a number starting at 1):
@@ -415,7 +411,7 @@
%if %{is_ga}
%global build_type GA
%global ea_designator ""
-%global ea_designator_zip ""
+%global ea_designator_zip %{nil}
%global extraver %{nil}
%global eaprefix %{nil}
%else
@@ -438,7 +434,9 @@
%global static_libs_install_dir %{static_libs_arch_dir}/glibc
# output dir stub
%define buildoutputdir() %{expand:build/jdk%{featurever}.build%{?1}}
+%define installoutputdir() %{expand:install/jdk%{featurever}.install%{?1}}
%global altjavaoutputdir install/altjava.install
+%define packageoutputdir() %{expand:packages/jdk%{featurever}.packages%{?1}}
# we can copy the javadoc to not arched dir, or make it not noarch
%define uniquejavadocdir() %{expand:%{fullversion}.%{_arch}%{?1}}
# main id and dir of this jdk
@@ -459,6 +457,8 @@
# Intentionally use jdkportablenameimpl here since we want to have static-libs files overlayed on
# top of the JDK archive
%define staticlibsportablename() %{expand:%{jdkportablenameimpl -- %%{1}}}
+%define docportablename() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable.docs;g" | sed "s;openjdkportable;el;g")
+%define docportablearchive() %{docportablename}.tar.xz
%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;%{version}-%{release};\\0.portable.misc;g" | sed "s;openjdkportable;el;g")
%define miscportablearchive() %{miscportablename}.tar.xz
@@ -490,6 +490,12 @@
%global __requires_exclude ^(%{_privatelibs}|%{_publiclibs})$
%endif
+# VM variant being built
+%ifarch %{zero_arches}
+%global vm_variant zero
+%else
+%global vm_variant server
+%endif
%global etcjavasubdir %{_sysconfdir}/java/java-%{javaver}-%{origin}
%define etcjavadir() %{expand:%{etcjavasubdir}/%{uniquesuffix -- %{?1}}}
@@ -512,29 +518,8 @@
%global alternatives_requires %{_sbindir}/alternatives
%endif
-%if %{with_systemtap}
-# Where to install systemtap tapset (links)
-# We would like these to be in a package specific sub-dir,
-# but currently systemtap doesn't support that, so we have to
-# use the root tapset dir for now. To distinguish between 64
-# and 32 bit architectures we place the tapsets under the arch
-# specific dir (note that systemtap will only pickup the tapset
-# for the primary arch for now). Systemtap uses the machine name
-# aka target_cpu as architecture specific directory name.
-%global tapsetroot /usr/share/systemtap
-%global tapsetdirttapset %{tapsetroot}/tapset/
-%global tapsetdir %{tapsetdirttapset}/%{stapinstall}
-%endif
-
-# x86 is no longer supported
-%if 0%{?java_arches:1}
-ExclusiveArch: %{java_arches}
-%else
-ExcludeArch: %{ix86}
-%endif
-
-# Portables have no rpo (requires/provides), but thsoe are awesome for orientation in spec
-# also scriptlets are hapily missing and files are handled old fashion
+# Portables have no repo (requires/provides), but these are awesome for orientation in spec
+# Also scriptlets are happily missing and files are handled old fashion
# not-duplicated requires/provides/obsoletes for normal/debug packages
%define java_rpo() %{expand:
}
@@ -545,16 +530,18 @@ ExcludeArch: %{ix86}
%define java_static_libs_rpo() %{expand:
}
+%define java_unstripped_rpo() %{expand:
+}
+
+%define java_docs_rpo() %{expand:
+}
+
%define java_misc_rpo() %{expand:
}
# Prevent brp-java-repack-jars from being run
%global __jar_repack 0
-# portables have grown out of its component, moving back to java-x-vendor
-# this expression, when declared as global, filled component with java-x-vendor portable
-%define component %(echo %{name} | sed "s;-portable;;g")
-
Name: java-latest-%{origin}-portable
Version: %{newjavaver}.%{buildver}
# This package needs `.rolling` as part of Release so as to not conflict on install with
@@ -572,6 +559,11 @@ Release: %{?eaprefix}%{rpmrelease}%{?extraver}.rolling%{?dist}
# provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0".
Epoch: 1
+
+# portables have grown out of its component, moving back to java-x-vendor
+# this expression, when declared as global, filled component with java-x-vendor portable
+%define component %(echo %{name} | sed "s;-portable;;g")
+
Summary: %{origin_nice} %{featurever} Runtime Environment portable edition
# Groups are only used up to RHEL 8 and on Fedora versions prior to F30
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
@@ -595,9 +587,8 @@ Group: Development/Languages
License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib and ISC and FTL and RSA
URL: http://openjdk.java.net/
-
# The source tarball, generated using generate_source_tarball.sh
-Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}.tar.xz
+Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}%{ea_desi…
# Use 'icedtea_sync.sh' to update the following
# They are based on code contained in the IcedTea project (6.x).
@@ -616,8 +607,7 @@ Source10: NEWS
Source11: alt-java.c
# Removed libraries that we link instead
-# Disabled in portables
-#Source12: remove-intree-libraries.sh
+Source12: remove-intree-libraries.sh
# Ensure we aren't using the limited crypto policy
Source13: TestCryptoLevel.java
@@ -634,14 +624,6 @@ Source16: CheckVendor.java
# Ensure translations are available for new timezones
Source18: TestTranslations.java
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-# boot jdk for portable build root on
-Source1001: ojdk17-aarch64-17.35.tar.gz
-Source1002: ojdk17-ppc64le-17.35.tar.gz
-Source1003: ojdk17-x86_64-17.35.tar.gz
-Source1004: ojdk17-s390x-17.35.tar.gz
-%endif
-
############################################
#
# RPM/distribution specific patches
@@ -691,16 +673,29 @@ Patch1001: fips-%{featurever}u-%{fipsver}.patch
# OpenJDK patches in need of upstreaming
#
#############################################
+
# JDK-8009550, RH910107: Depend on pcsc-lite-libs instead of pcsc-lite-devel as this is only in optional repo
# PR: https://github.com/openjdk/jdk/pull/15409
Patch6: jdk8009550-rh910107-fail_to_load_pcsc_library.patch
+# Currently empty
+
#############################################
#
# OpenJDK patches which missed last update
#
#############################################
-#empty now
+
+# JDK-8311630: [s390] Implementation of Foreign Function & Memory API (Preview)
+Patch100: jdk8311630-s390_ffmapi.patch
+
+#############################################
+#
+# Portable build specific patches
+#
+#############################################
+
+# Currently empty
BuildRequires: autoconf
BuildRequires: automake
@@ -710,11 +705,11 @@ BuildRequires: cups-devel
BuildRequires: desktop-file-utils
# elfutils only are OK for build without AOT
BuildRequires: elfutils-devel
+BuildRequires: file
BuildRequires: fontconfig-devel
-BuildRequires: freetype-devel
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-BuildRequires: devtoolset-8-gcc
-BuildRequires: devtoolset-8-gcc-c++
+BuildRequires: devtoolset-%{dtsversion}-gcc
+BuildRequires: devtoolset-%{dtsversion}-gcc-c++
%else
BuildRequires: gcc
# gcc-c++ is already needed
@@ -737,9 +732,8 @@ BuildRequires: libXtst-devel
# Requirement for setting up nss.fips.cfg
BuildRequires: nss-devel
# Requirement for system security property test
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-BuildRequires: crypto-policies
-%endif
+#N/A
+#BuildRequires: crypto-policies
BuildRequires: pkgconfig
BuildRequires: xorg-x11-proto-devel
BuildRequires: zip
@@ -758,7 +752,6 @@ BuildRequires: libffi-devel
%endif
# 2023c required as of JDK-8305113
BuildRequires: tzdata-java >= 2023c
-
# cacerts build requirement in portable mode
BuildRequires: ca-certificates
# Earlier versions have a bug in tree vectorization on PPC
@@ -777,18 +770,18 @@ BuildRequires: lcms2-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
%else
-# Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h
-Provides: bundled(freetype) = 2.12.1
+# Version in src/java.desktop/share/legal/freetype.md
+Provides: bundled(freetype) = 2.13.0
# Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
Provides: bundled(giflib) = 5.2.1
# Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
-Provides: bundled(harfbuzz) = 4.4.1
+Provides: bundled(harfbuzz) = 7.2.0
# Version in src/java.desktop/share/native/liblcms/lcms2.h
-Provides: bundled(lcms2) = 2.12.0
+Provides: bundled(lcms2) = 2.15.0
# Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
Provides: bundled(libjpeg) = 6b
# Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h
-Provides: bundled(libpng) = 1.6.37
+Provides: bundled(libpng) = 1.6.39
# We link statically against libstdc++ to increase portability
BuildRequires: libstdc++-static
%endif
@@ -863,7 +856,7 @@ Group: Development/Tools
%{java_devel_rpo -- %{fastdebug_suffix_unquoted}}
%description devel-fastdebug
-The %{origin_nice} %{featurever} development tools - portable edition.
+The %{origin_nice} %{featurever} runtime environment and development tools - portable edition
%{fastdebug_warning}
%endif
@@ -871,7 +864,7 @@ The %{origin_nice} %{featurever} development tools - portable edition.
%if %{include_normal_build}
%package static-libs
-Summary: %{origin_nice} %{featurever} libraries for static linking - portable edition.
+Summary: %{origin_nice} %{featurever} libraries for static linking - portable edition
%{java_static_libs_rpo %{nil}}
@@ -886,7 +879,7 @@ Summary: %{origin_nice} %{featurever} libraries for static linking - portable ed
%{java_static_libs_rpo -- %{debug_suffix_unquoted}}
%description static-libs-slowdebug
-The %{origin_nice} %{featurever} libraries for static linking - portable edition.
+The %{origin_nice} %{featurever} libraries for static linking - portable edition
%{debug_warning}
%endif
@@ -897,13 +890,32 @@ Summary: %{origin_nice} %{featurever} libraries for static linking - portable ed
%{java_static_libs_rpo -- %{fastdebug_suffix_unquoted}}
%description static-libs-fastdebug
-The %{origin_nice} %{featurever} libraries for static linking - portable edition.
+The %{origin_nice} %{featurever} libraries for static linking - portable edition
%{fastdebug_warning}
%endif
# staticlibs
%endif
+%if %{include_normal_build}
+%package unstripped
+Summary: The %{origin_nice} %{featurever} runtime environment.
+
+%{java_unstripped_rpo %{nil}}
+
+%description unstripped
+The %{origin_nice} %{featurever} runtime environment.
+
+%endif
+
+%package docs
+Summary: %{origin_nice} %{featurever} API documentation
+
+%{java_docs_rpo %{nil}}
+
+%description docs
+The %{origin_nice} %{featurever} API documentation.
+
%package misc
Summary: %{origin_nice} %{featurever} miscellany
@@ -923,10 +935,10 @@ The %{origin_nice} %{featurever} full patched sources of portable JDK to build,
echo "Preparing %{oj_vendor_version}"
# Using the echo macro breaks rpmdev-bumpspec, as it parses the first line of stdout :-(
-%if 0%{?stapinstall:1}
- echo "CPU: %{_target_cpu}, arch install directory: %{archinstall}, SystemTap install directory: %{stapinstall}"
+%if 0%{?_build_cpu:1}
+ echo "CPU: %{_target_cpu}, arch install directory: %{archinstall}, SystemTap install directory: %{_build_cpu}"
%else
- %{error:Unrecognised architecture %{_target_cpu}}
+ %{error:Unrecognised architecture %{_build_cpu}}
%endif
if [ %{include_normal_build} -eq 0 -o %{include_normal_build} -eq 1 ] ; then
@@ -947,7 +959,6 @@ else
echo "include_fastdebug_build is %{include_fastdebug_build}, that is invalid. Use 1 for yes or 0 for no"
exit 13
fi
-
if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 -a %{include_fastdebug_build} -eq 0 ] ; then
echo "You have disabled all builds (normal,fastdebug,slowdebug). That is a no go."
exit 14
@@ -979,8 +990,11 @@ pushd %{top_level_dir_name}
%patch1001 -p1
# Patches in need of upstreaming
%patch6 -p1
+# Patches in next release
+%patch100 -p1
popd # openjdk
+
# The OpenJDK version file includes the current
# upstream version information. For some reason,
# configure does not automatically use the
@@ -1001,59 +1015,12 @@ if [ "x${UPSTREAM_EA_DESIGNATOR}" != "x%{ea_designator}" ] ; then
exit 17
fi
-# Extract systemtap tapsets
-%if %{with_systemtap}
-tar --strip-components=1 -x -I xz -f %{SOURCE8}
-%if %{include_debug_build}
-cp -r tapset tapset%{debug_suffix}
-%endif
-%if %{include_fastdebug_build}
-cp -r tapset tapset%{fastdebug_suffix}
-%endif
-
-for suffix in %{build_loop} ; do
- for file in "tapset"$suffix/*.in; do
- OUTPUT_FILE=`echo $file | sed -e "s:\.stp\.in$:-%{version}-%{release}.%{_arch}.stp:g"`
- sed -e "s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/server/libjvm.so:g" $file > $file.1
- sed -e "s:@JAVA_SPEC_VER@:%{javaver}:g" $file.1 > $file.2
-# TODO find out which architectures other than i686 have a client vm
-%ifarch %{ix86}
- sed -e "s:@ABS_CLIENT_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/client/libjvm.so:g" $file.2 > $OUTPUT_FILE
-%else
- sed -e "/@ABS_CLIENT_LIBJVM_SO@/d" $file.2 > $OUTPUT_FILE
-%endif
- sed -i -e "s:@ABS_JAVA_HOME_DIR@:%{_jvmdir}/%{sdkdir -- $suffix}:g" $OUTPUT_FILE
- sed -i -e "s:@INSTALL_ARCH_DIR@:%{archinstall}:g" $OUTPUT_FILE
- sed -i -e "s:@prefix@:%{_jvmdir}/%{sdkdir -- $suffix}/:g" $OUTPUT_FILE
- done
-done
-# systemtap tapsets ends
-%endif
+# Systemtap is processed in rpms
# Prepare desktop files
# Portables do not have desktop integration
%build
-%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
-mkdir bootjdk
-pushd bootjdk
-%ifarch %{aarch64}
-tar --strip-components=1 -xf %{SOURCE1001}
-%endif
-%ifarch %{ppc64le}
-tar --strip-components=1 -xf %{SOURCE1002}
-%endif
-%ifarch x86_64
-tar --strip-components=1 -xf %{SOURCE1003}
-%endif
-%ifarch s390x
-tar --strip-components=1 -xf %{SOURCE1004}
-%endif
-BOOT_JDK=$PWD
-popd
-%else
-BOOT_JDK=%{bootjdk}
-%endif
# How many CPU's do we have?
export NUM_PROC=%(/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :)
@@ -1091,12 +1058,15 @@ echo "Building %{SOURCE11}"
mkdir -p %{altjavaoutputdir}
gcc ${EXTRA_CFLAGS} -o %{altjavaoutputdir}/%{alt_java_name} %{SOURCE11}
+echo "Building %{newjavaver}-%{buildver}, pre=%{ea_designator}, opt=%{lts_designator}"
+
function buildjdk() {
local outputdir=${1}
local buildjdk=${2}
local maketargets="${3}"
local debuglevel=${4}
local link_opt=${5}
+ local debug_symbols=${6}
local top_dir_abs_src_path=$(pwd)/%{top_level_dir_name}
local top_dir_abs_build_path=$(pwd)/${outputdir}
@@ -1115,6 +1085,7 @@ function buildjdk() {
echo "Using make targets: ${maketargets}"
echo "Using debuglevel: ${debuglevel}"
echo "Using link_opt: ${link_opt}"
+ echo "Using debug_symbols: ${debug_symbols}"
echo "Building %{newjavaver}-%{buildver}, pre=%{ea_designator}, opt=%{lts_designator}"
mkdir -p ${outputdir}
@@ -1125,7 +1096,7 @@ function buildjdk() {
# are always used in a system_libs build, even
# for the static library build
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
- scl enable devtoolset-8 -- bash ${top_dir_abs_src_path}/configure \
+ scl enable devtoolset-%{dtsversion} -- bash ${top_dir_abs_src_path}/configure \
%else
bash ${top_dir_abs_src_path}/configure \
%endif
@@ -1145,7 +1116,7 @@ function buildjdk() {
--with-vendor-vm-bug-url="%{oj_vendor_bug_url}" \
--with-boot-jdk=${buildjdk} \
--with-debug-level=${debuglevel} \
- --with-native-debug-symbols="%{debug_symbols}" \
+ --with-native-debug-symbols="${debug_symbols}" \
--disable-sysconf-nss \
--enable-unlimited-crypto \
--with-zlib=%{link_type} \
@@ -1169,7 +1140,7 @@ function buildjdk() {
cat spec.gmk
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
- scl enable devtoolset-8 -- make \
+ scl enable devtoolset-%{dtsversion} -- make \
%else
make \
%endif
@@ -1177,109 +1148,117 @@ function buildjdk() {
WARNINGS_ARE_ERRORS="-Wno-error" \
CFLAGS_WARNINGS_ARE_ERRORS="-Wno-error" \
$maketargets || ( pwd; find ${top_dir_abs_src_path} ${top_dir_abs_build_path} -name "hs_err_pid*.log" | xargs cat && false )
-
popd
}
-function installjdk() {
- local imagepath=${1}
-
- if [ -d ${imagepath} ] ; then
- # the build (erroneously) removes read permissions from some jars
- # this is a regression in OpenJDK 7 (our compiler):
- # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
- find ${imagepath} -iname '*.jar' -exec chmod ugo+r {} \;
-
- # Build screws up permissions on binaries
- # https://bugs.openjdk.java.net/browse/JDK-8173610
- find ${imagepath} -iname '*.so' -exec chmod +x {} \;
- find ${imagepath}/bin/ -exec chmod +x {} \;
-
- # Create fake alt-java as a placeholder for future alt-java
- if [ -d man/man1 ] ; then
- pushd ${imagepath}
- # add alt-java man page
- echo "Hardened java binary recommended for launching untrusted code from the Web e.g. javaws" > man/man1/%{alt_java_name}.1
- cat man/man1/java.1 >> man/man1/%{alt_java_name}.1
- popd
- fi
- fi
-}
-
-# Checks on debuginfo must be performed before the files are stripped
-# by the RPM installation stage
-function debugcheckjdk() {
- local imagepath=${1}
-
- if [ -d ${imagepath} ] ; then
-
- so_suffix="so"
- # Check debug symbols are present and can identify code
- find "${imagepath}" -iname "*.$so_suffix" -print0 | while read -d $'\0' lib
- do
- if [ -f "$lib" ] ; then
- echo "Testing $lib for debug symbols"
- # All these tests rely on RPM failing the build if the exit code of any set
- # of piped commands is non-zero.
-
- # Test for .debug_* sections in the shared object. This is the main test
- # Stripped objects will not contain these
- eu-readelf -S "$lib" | grep "] .debug_"
- test $(eu-readelf -S "$lib" | grep -E "\]\ .debug_(info|abbrev)" | wc --lines) == 2
-
- # Test FILE symbols. These will most likely be removed by anything that
- # manipulates symbol tables because it's generally useless. So a nice test
- # that nothing has messed with symbols
- old_IFS="$IFS"
- IFS=$'\n'
- for line in $(eu-readelf -s "$lib" | grep "00000000 0 FILE LOCAL DEFAULT")
- do
- # We expect to see .cpp and .S files, except for architectures like aarch64 and
- # s390 where we expect .o and .oS files
- echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|S|oS))?$"
- done
- IFS="$old_IFS"
-
- # If this is the JVM, look for javaCalls.(cpp|o) in FILEs, for extra sanity checking
- if [ "`basename $lib`" = "libjvm.so" ]; then
- eu-readelf -s "$lib" | \
- grep -E "00000000 0 FILE LOCAL DEFAULT ABS javaCalls.(cpp|o)$"
- fi
-
- # Test that there are no .gnu_debuglink sections pointing to another
- # debuginfo file. There shouldn't be any debuginfo files, so the link makes
- # no sense either
- eu-readelf -S "$lib" | grep 'gnu'
- if eu-readelf -S "$lib" | grep "\] .gnu_debuglink" | grep PROGBITS; then
- echo "bad .gnu_debuglink section."
- eu-readelf -x .gnu_debuglink "$lib"
- false
- fi
+function stripjdk() {
+ local outputdir=${1}
+ local jdkimagepath=${outputdir}/images/%{jdkimage}
+ local jreimagepath=${outputdir}/images/%{jreimage}
+ local jmodimagepath=${outputdir}/images/jmods
+ local supportdir=${outputdir}/support
+
+ if [ "x$suffix" = "x" ] ; then
+ # Keep the unstripped version for consumption by RHEL RPMs
+ cp -a ${jdkimagepath}{,.unstripped}
+
+ # Strip the files
+ for file in $(find ${jdkimagepath} ${jreimagepath} ${supportdir} -type f) ; do
+ if file ${file} | grep -q 'ELF'; then
+ noextfile=${file/.so/};
+ objcopy --only-keep-debug ${file} ${noextfile}.debuginfo;
+ objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file};
+ strip -g ${file};
fi
done
- # Make sure gdb can do a backtrace based on line numbers on libjvm.so
- # javaCalls.cpp:58 should map to:
- # http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/…
- # Using line number 1 might cause build problems. See:
- # https://bugzilla.redhat.com/show_bug.cgi?id=1539664
- # https://bugzilla.redhat.com/show_bug.cgi?id=1538767
- gdb -q "${imagepath}/bin/java" <<EOF | tee gdb.out
-handle SIGSEGV pass nostop noprint
-handle SIGILL pass nostop noprint
-set breakpoint pending on
-break javaCalls.cpp:58
-commands 1
-backtrace
-quit
-end
-run -version
-EOF
-%ifarch %{gdb_arches}
- grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
-%endif
+ # Rebuild jmod files against the stripped binaries
+ if [ ! -d ${supportdir} ] ; then
+ echo "Support directory missing.";
+ exit 15
+ fi
+ for cmd in $(find ${supportdir} -name '*.jmod_exec.cmdline') ; do
+ pre=${cmd/_exec/_pre};
+ post=${cmd/_exec/_post};
+ jmod=$(echo ${cmd}|sed 's#.*_create_##'|sed 's#_exec.cmdline##')
+ echo "Rebuilding ${jmod} against stripped binaries...";
+ if [ -e ${pre} ] ; then
+ echo "Executing ${pre}...";
+ cat ${pre} | sh -s ;
+ fi
+ echo "Executing ${cmd}...";
+ cat ${cmd} | sh -s ;
+ if [ -e ${post} ] ; then
+ echo "Executing ${post}...";
+ cat ${post} | sh -s ;
+ fi
+ done
+ rm -rf ${jdkimagepath}/jmods
+ cp -a ${jmodimagepath} ${jdkimagepath}
+ fi
+}
+function installjdk() {
+ local outputdir=${1}
+ local installdir=${2}
+ local jdkimagepath=${installdir}/images/%{jdkimage}
+ local jreimagepath=${installdir}/images/%{jreimage}
+ local unstripped=${jdkimagepath}.unstripped
+
+ echo "Installing build from ${outputdir} to ${installdir}..."
+ mkdir -p ${installdir}
+ echo "Installing images..."
+ mv ${outputdir}/images ${installdir}
+ if [ -d ${outputdir}/bundles ] ; then
+ echo "Installing bundles...";
+ mv ${outputdir}/bundles ${installdir} ;
fi
+
+%if !%{with artifacts}
+ echo "Removing output directory...";
+ rm -rf ${outputdir}
+%endif
+
+ # legacy-jre-image target does not install any man pages for the JRE
+ # We copy the jdk man directory and then remove pages for binaries that
+ # don't exist in the JRE
+ cp -a ${jdkimagepath}/man ${jreimagepath}
+ for manpage in $(find ${jreimagepath}/man -name '*.1'); do
+ filename=$(basename ${manpage});
+ binary=${filename/.1/};
+ if [ ! -f ${jreimagepath}/bin/${binary} ] ; then
+ echo "Removing ${manpage} from JRE for which no binary ${binary} exists";
+ rm -f ${manpage};
+ fi;
+ done
+
+ for imagepath in ${jdkimagepath} ${jreimagepath} ${unstripped}; do
+
+ if [ -d ${imagepath} ] ; then
+ # the build (erroneously) removes read permissions from some jars
+ # this is a regression in OpenJDK 7 (our compiler):
+ # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
+ find ${imagepath} -iname '*.jar' -exec chmod ugo+r {} \;
+
+ # Build screws up permissions on binaries
+ # https://bugs.openjdk.java.net/browse/JDK-8173610
+ find ${imagepath} -iname '*.so' -exec chmod +x {} \;
+ find ${imagepath}/bin/ -exec chmod +x {} \;
+
+ # Install local files which are distributed with the JDK
+ install -m 644 %{SOURCE10} ${imagepath}
+
+ # Create fake alt-java as a placeholder for future alt-java
+ pushd ${imagepath}
+ # add alt-java man page
+ echo "Hardened java binary recommended for launching untrusted code from the Web e.g. javaws" > man/man1/%{alt_java_name}.1
+ cat man/man1/java.1 >> man/man1/%{alt_java_name}.1
+ popd
+
+ # Print release information
+ cat ${imagepath}/release
+ fi
+ done
}
function genchecksum() {
@@ -1295,218 +1274,202 @@ function genchecksum() {
popd
}
-packagesdir=$(pwd)/..
-
-pwd
-ls -l
-tar -cJf ${packagesdir}/%{jdkportablesourcesarchive -- ""} --transform "s|^|%{jdkportablesourcesname -- ""}/|" %{top_level_dir_name}
-genchecksum ${packagesdir}/%{jdkportablesourcesarchive -- ""}
-
-%if %{build_hotspot_first}
- # Build a fresh libjvm.so first and use it to bootstrap
- cp -LR --preserve=mode,timestamps %{bootjdk} newboot
- systemjdk=$(pwd)/newboot
- buildjdk build/newboot ${systemjdk} %{hotspot_target} "release" "bundled"
- mv build/newboot/jdk/lib/server/libjvm.so newboot/lib/server
-%else
- systemjdk=%{bootjdk}
-%endif
+function packFullPatchedSources() {
+ srcpackagesdir=`pwd`
+ tar -cJf ${srcpackagesdir}/%{jdkportablesourcesarchive -- ""} --transform "s|^|%{jdkportablesourcesname -- ""}/|" %{top_level_dir_name}
+ genchecksum ${srcpackagesdir}/%{jdkportablesourcesarchive -- ""}
+}
-for suffix in %{build_loop} ; do
- if [ "x$suffix" = "x" ] ; then
- debugbuild=release
- else
- # change --something to something
- debugbuild=`echo $suffix | sed "s/-//g"`
- fi
- for loop in %{main_suffix} %{staticlibs_loop} ; do
- builddir=%{buildoutputdir -- ${suffix}${loop}}
- bootbuilddir=boot${builddir}
- if test "x${loop}" = "x%{main_suffix}" ; then
- link_opt="%{link_type}"
-%if %{system_libs}
- # Copy the source tree so we can remove all in-tree libraries
- cp -a %{top_level_dir_name} %{top_level_dir_name_backup}
- # Remove all libraries that are linked
- sh %{SOURCE12} %{top_level_dir_name} full
-%endif
- # Debug builds don't need same targets as release for
- # build speed-up. We also avoid bootstrapping these
- # slower builds.
- if echo $debugbuild | grep -q "debug" ; then
- maketargets="%{debug_targets}"
- run_bootstrap=false
- else
- maketargets="%{release_targets}"
- run_bootstrap=%{bootstrap_build}
- fi
- if ${run_bootstrap} ; then
- buildjdk ${bootbuilddir} ${systemjdk} "%{bootstrap_targets}" ${debugbuild} ${link_opt}
- buildjdk ${builddir} $(pwd)/${bootbuilddir}/images/%{jdkimage} "${maketargets}" ${debugbuild} ${link_opt}
- rm -rf ${bootbuilddir}
- else
- buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt}
- fi
-%if %{system_libs}
- # Restore original source tree we modified by removing full in-tree sources
- rm -rf %{top_level_dir_name}
- mv %{top_level_dir_name_backup} %{top_level_dir_name}
-%endif
+function packagejdk() {
+ local imagesdir=$(pwd)/${1}/images
+ local docdir=$(pwd)/${1}/images/docs
+ local bundledir=$(pwd)/${1}/bundles
+ local packagesdir=$(pwd)/${2}
+ local srcdir=$(pwd)/%{top_level_dir_name}
+ local tapsetdir=$(pwd)/tapset
+ local altjavadir=$(pwd)/${3}
+
+ echo "Packaging build from ${imagesdir} to ${packagesdir}..."
+ mkdir -p ${packagesdir}
+ pushd ${imagesdir}
+
+ echo "Packaging build from ${imagesdir} to ${packagesdir}..."
+ mkdir -p ${packagesdir}
+ pushd ${imagesdir}
+
+ if [ "x$suffix" = "x" ] ; then
+ nameSuffix=""
else
- # Use bundled libraries for building statically
- link_opt="bundled"
- # Static library cycle only builds the static libraries
- maketargets="%{static_libs_target}"
- # Always just do the one build for the static libraries
- buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt}
+ nameSuffix=`echo "$suffix"| sed s/-/./`
fi
- done # end of main / staticlibs loop
+ jdkname=%{jdkportablename -- "$nameSuffix"}
+ jdkarchive=${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
+ jrename=%{jreportablename -- "$nameSuffix"}
+ jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
+ staticname=%{staticlibsportablename -- "$nameSuffix"}
+ staticarchive=${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
+ debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
+ unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
+ # We only use docs for the release build
+ docname=%{docportablename}
+ docarchive=${packagesdir}/%{docportablearchive}
+ built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
+ # These are from the source tree so no debug variants
+ miscname=%{miscportablename}
+ miscarchive=${packagesdir}/%{miscportablearchive}
+
+ if [ "x$suffix" = "x" ] ; then
+ # Keep the unstripped version for consumption by RHEL RPMs
+ mv %{jdkimage}.unstripped ${jdkname}
+ tar -cJf ${unstrippedarchive} ${jdkname}
+ genchecksum ${unstrippedarchive}
+ mv ${jdkname} %{jdkimage}.unstripped
+ fi
- # Final setup on the main image
- top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
- for image in %{jdkimage} %{jreimage} ; do
- imagePath=${top_dir_abs_main_build_path}/images/${image}
- installjdk ${imagePath}
- done
- # Check debug symbols were built into the dynamic libraries; todo, why it passes in JDK only?
- debugcheckjdk ${top_dir_abs_main_build_path}/images/%{jdkimage}
+ # Rename directories for packaging
+ mv %{jdkimage} ${jdkname}
+ mv %{jreimage} ${jrename}
- # Print release information
- cat ${top_dir_abs_main_build_path}/images/%{jdkimage}/release
+ # Release images have external debug symbols
+ if [ "x$suffix" = "x" ] ; then
+ tar -cJf ${debugarchive} $(find ${jdkname} -name \*.debuginfo)
+ genchecksum ${debugarchive}
-################################################################################
- pushd ${top_dir_abs_main_build_path}/images
- if [ "x$suffix" == "x" ] ; then
- nameSuffix=""
- else
- nameSuffix=`echo "$suffix"| sed s/-/./`
- fi
- # additional steps needed for fluent repack; most of them done twice, as images are already populated
- # maybe most of them should be done in upstream build?
- for imagedir in %{jdkimage} %{jreimage} ; do
- pushd $imagedir
- # Convert man pages to UTF8 encoding
- if [ -d man/man1 ] ; then # jre do not have man pages...
- for manpage in man/man1/* ; do
- iconv -f ISO_8859-1 -t UTF8 $manpage -o $manpage.tmp
- mv -f $manpage.tmp $manpage
- done
- fi
- # Install release notes
- cp -a %{SOURCE10} `pwd`
- cp -a %{SOURCE10} `pwd`/legal
- # stabilize permissions; aprtially duplicated in instalojdk
- find `pwd` -name "*.so" -exec chmod 755 {} \; -exec echo "set 755 to so {}" \; ;
- find `pwd` -type d -exec chmod 755 {} \; -exec echo "set 755 to dir {}" \; ;
- find `pwd`/legal -type f -exec chmod 644 {} \; -exec echo "set 644 to licences {}" \; ;
- popd # jdkimage/jreimage
- done # jre/sdk work in loop
- # javadoc is done only for release sdkimage
- if ! echo $suffix | grep -q "debug" ; then
- # Install Javadoc documentation
- #cp -a docs %{jdkimage} # not sure if the plaintext javadoc is for some use
- built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
- cp -a `pwd`/../bundles/${built_doc_archive} `pwd`/%{jdkimage}/javadocs.zip || ls -l `pwd`/../bundles
+ mkdir ${docname}
+ mv ${docdir} ${docname}
+ mv ${bundledir}/${built_doc_archive} ${docname}
+ tar -cJf ${docarchive} ${docname}
+ genchecksum ${docarchive}
+
+ mkdir ${miscname}
+ for s in 16 24 32 48 ; do
+ cp -av ${srcdir}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png ${miscname}
+ done
+%if %{with_systemtap}
+ cp -a ${tapsetdir}* ${miscname}
+%endif
+ cp -av ${altjavadir}/%{alt_java_name} ${miscname}
+ tar -cJf ${miscarchive} ${miscname}
+ genchecksum ${miscarchive}
fi
- # end of additional steps
-
- mv %{jdkimage} %{jdkportablename -- "$nameSuffix"}
- mv %{jreimage} %{jreportablename -- "$nameSuffix"}
- tar -cJf ${packagesdir}/%{jdkportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jdkportablename -- "$nameSuffix"}
- genchecksum ${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
- tar -cJf ${packagesdir}/%{jreportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jreportablename -- "$nameSuffix"}
- genchecksum ${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
- # copy licenses so they are avialable out of tarball
- cp -rf %{jdkportablename -- "$nameSuffix"}/legal ${packagesdir}/%{jdkportablearchive -- "%{normal_suffix}"}-legal
- mv %{jdkportablename -- "$nameSuffix"} %{jdkimage}
- mv %{jreportablename -- "$nameSuffix"} %{jreimage}
- popd #images
+
+ tar -cJf ${jdkarchive} --exclude='**.debuginfo' ${jdkname}
+ genchecksum ${jdkarchive}
+
+ tar -cJf ${jrearchive} --exclude='**.debuginfo' ${jrename}
+ genchecksum ${jrearchive}
+
%if %{include_staticlibs}
- top_dir_abs_staticlibs_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{staticlibs_suffix}}
- pushd ${top_dir_abs_staticlibs_build_path}/images
# Static libraries (needed for building graal vm with native image)
# Tar as overlay. Transform to the JDK name, since we just want to "add"
# static libraries to that folder
- portableJDKname=%{staticlibsportablename -- "$nameSuffix"}
- tar -cJf ${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"} --transform "s|^%{static_libs_image}/lib/*|$portableJDKname/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib"
- genchecksum ${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
- popd #staticlibs-images
+ tar -cJf ${staticarchive} \
+ --transform "s|^%{static_libs_image}/lib/*|${staticname}/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib"
+ genchecksum ${staticarchive}
%endif
-################################################################################
-# note, currently no debuginfo, consult portbale spec for external (zipped) debuginfo, being tarred alone
-################################################################################
-# build cycles
-done # end of release / debug cycle loop
+ # Revert directory renaming so testing will run
+ # TODO: testing should run on the packaged JDK
+ mv ${jdkname} %{jdkimage}
+ mv ${jrename} %{jreimage}
-# These are from the source tree so no debug variants
-miscname=%{miscportablename}
-miscarchive=${packagesdir}/%{miscportablearchive}
+ popd #images
-mkdir ${miscname}
-cp -av %{altjavaoutputdir}/%{alt_java_name} ${miscname}
-tar -cJf ${miscarchive} ${miscname}
-genchecksum ${miscarchive}
-
-%install
+}
-packagesdir=$(pwd)/..
+packFullPatchedSources
-mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
-# Install outside the loop as there are no debug variants
-miscarchive=${packagesdir}/%{miscportablearchive}
-mv ${packagesdir}/%{jdkportablesourcesarchive -- ""} $RPM_BUILD_ROOT%{_jvmdir}/
-mv ${packagesdir}/%{jdkportablesourcesarchive -- ""}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
-mv ${miscarchive} $RPM_BUILD_ROOT%{_jvmdir}/
-mv ${miscarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+%if %{build_hotspot_first}
+ # Build a fresh libjvm.so first and use it to bootstrap
+ cp -LR --preserve=mode,timestamps %{bootjdk} newboot
+ systemjdk=$(pwd)/newboot
+ buildjdk build/newboot ${systemjdk} %{hotspot_target} "release" "bundled" "internal"
+ mv build/newboot/jdk/lib/%{vm_variant}/libjvm.so newboot/lib/%{vm_variant}
+%else
+ systemjdk=%{bootjdk}
+%endif
for suffix in %{build_loop} ; do
-top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
-################################################################################
- if [ "x$suffix" == "x" ] ; then
- nameSuffix=""
+ if [ "x$suffix" = "x" ] ; then
+ debugbuild=release
else
- nameSuffix=`echo "$suffix"| sed s/-/./`
+ # change --something to something
+ debugbuild=`echo $suffix | sed "s/-//g"`
fi
- mv ${packagesdir}/%{jdkportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
- mv ${packagesdir}/%{jreportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ${packagesdir}/%{jreportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
-%if %{include_staticlibs}
- mv ${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
- mv ${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
-%endif
- if [ "x$suffix" == "x" ] ; then
- dnameSuffix="$nameSuffix".debuginfo
-# todo handle debuginfo, see note at build (we will need to pack one stripped and one unstripped release build)
-# mv ../%{jdkportablearchive -- "$dnameSuffix"} $RPM_BUILD_ROOT%{_jvmdir}/
-# mv ../%{jdkportablearchive -- "$dnameSuffix"}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ # We build with internal debug symbols and do
+ # our own stripping for one version of the
+ # release build
+ debug_symbols=internal
+
+ builddir=%{buildoutputdir -- ${suffix}}
+ bootbuilddir=boot${builddir}
+ installdir=%{installoutputdir -- ${suffix}}
+ bootinstalldir=boot${installdir}
+ packagesdir=%{packageoutputdir -- ${suffix}}
+
+ link_opt="%{link_type}"
+%if %{system_libs}
+ # Copy the source tree so we can remove all in-tree libraries
+ cp -a %{top_level_dir_name} %{top_level_dir_name_backup}
+ # Remove all libraries that are linked
+ sh %{SOURCE12} %{top_level_dir_name} full
+%endif
+ # Debug builds don't need same targets as release for
+ # build speed-up. We also avoid bootstrapping these
+ # slower builds.
+ if echo $debugbuild | grep -q "debug" ; then
+ maketargets="%{debug_targets}"
+ run_bootstrap=false
+ else
+ maketargets="%{release_targets}"
+ run_bootstrap=%{bootstrap_build}
fi
-################################################################################
-# end, dual install
-done
-################################################################################
-# the licenses are packed onloy once and shared
-mkdir -p $RPM_BUILD_ROOT%{unpacked_licenses}
-mv ${packagesdir}/%{jdkportablearchive -- "%{normal_suffix}"}-legal $RPM_BUILD_ROOT%{unpacked_licenses}/%{jdkportablesourcesarchive -- "%{normal_suffix}"}
-# To show sha in the build log
-for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do ls -l $file ; cat $file ; done
-################################################################################
+ if ${run_bootstrap} ; then
+ buildjdk ${bootbuilddir} ${systemjdk} "%{bootstrap_targets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ installjdk ${bootbuilddir} ${bootinstalldir}
+ buildjdk ${builddir} $(pwd)/${bootinstalldir}/images/%{jdkimage} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ stripjdk ${builddir}
+ installjdk ${builddir} ${installdir}
+ %{!?with_artifacts:rm -rf ${bootinstalldir}}
+ else
+ buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols}
+ stripjdk ${builddir}
+ installjdk ${builddir} ${installdir}
+ fi
+ packagejdk ${installdir} ${packagesdir} %{altjavaoutputdir}
+
+%if %{system_libs}
+ # Restore original source tree we modified by removing full in-tree sources
+ rm -rf %{top_level_dir_name}
+ mv %{top_level_dir_name_backup} %{top_level_dir_name}
+%endif
+
+# build cycles
+done # end of release / debug cycle loop
%check
# We test debug first as it will give better diagnostics on a crash
for suffix in %{build_loop} ; do
-# Tests in the check stage are performed on the installed image
-# rpmbuild operates as follows: build -> install -> test
-# however in portbales, we test built image instead of installed one
-top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
+# portable builds have static_libs embedded, thus top_dir_abs_main_build_path is same as top_dir_abs_staticlibs_build_path
+top_dir_abs_main_build_path=$(pwd)/%{installoutputdir -- ${suffix}}
+%if %{include_staticlibs}
+top_dir_abs_staticlibs_build_path=${top_dir_abs_main_build_path}
+%endif
+
export JAVA_HOME=${top_dir_abs_main_build_path}/images/%{jdkimage}
-#check Shenandoah is enabled
+# Pre-test setup
+
+# System security properties are disabled by default on portable.
+# Turn on system security properties
+#sed -i -e "s:^security.useSystemPropertiesFile=.*:security.useSystemPropertiesFile=true:" \
+#${JAVA_HOME}/conf/security/java.security
+
+# Check Shenandoah is enabled
%if %{use_shenandoah_hotspot}
$JAVA_HOME/bin/java -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -version
%endif
@@ -1525,9 +1488,14 @@ $JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||")
$JAVA_HOME/bin/javac -d . %{SOURCE15}
export PROG=$(echo $(basename %{SOURCE15})|sed "s|\.java||")
export SEC_DEBUG="-Djava.security.debug=properties"
+# Specific to portable:System security properties to be off by default
$JAVA_HOME/bin/java ${SEC_DEBUG} ${PROG} false
$JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=false ${PROG} false
+# Check correct vendor values have been set
+$JAVA_HOME/bin/javac -d . %{SOURCE16}
+$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
+
# Check java launcher has no SSB mitigation
if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
@@ -1539,14 +1507,11 @@ nm %{altjavaoutputdir}/%{alt_java_name} | grep prctl
if ! nm %{altjavaoutputdir}/%{alt_java_name} | grep prctl ; then true ; else false; fi
%endif
-# Check correct vendor values have been set
-$JAVA_HOME/bin/javac -d . %{SOURCE16}
-$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
-
%if ! 0%{?flatpak}
# Check translations are available for new timezones (during flatpak builds, the
# tzdb.dat used by this test is not where the test expects it, so this is
-# disabled for flatpak builds)
+# disabled for flatpak builds)
+# Disable test until we are on the latest JDK
$JAVA_HOME/bin/javac -d . %{SOURCE18}
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE
$JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR
@@ -1554,9 +1519,82 @@ $JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|
%if %{include_staticlibs}
# Check debug symbols in static libraries (smoke test)
-export STATIC_LIBS_HOME=${top_dir_abs_main_build_path}/../../%{buildoutputdir -- ${suffix}%{staticlibs_suffix}}/images/static-libs/lib/
-readelf --debug-dump $STATIC_LIBS_HOME/libnet.a | grep Inet4AddressImpl.c
-readelf --debug-dump $STATIC_LIBS_HOME/libnet.a | grep Inet6AddressImpl.c
+export STATIC_LIBS_HOME=${top_dir_abs_staticlibs_build_path}/images/%{static_libs_image}
+ls -l $STATIC_LIBS_HOME
+ls -l $STATIC_LIBS_HOME/lib
+readelf --debug-dump $STATIC_LIBS_HOME/lib/libnet.a | grep Inet4AddressImpl.c
+readelf --debug-dump $STATIC_LIBS_HOME/lib/libnet.a | grep Inet6AddressImpl.c
+%endif
+
+# Release builds strip the debug symbols into external .debuginfo files
+if [ "x$suffix" = "x" ] ; then
+ so_suffix="debuginfo"
+else
+ so_suffix="so"
+fi
+# Check debug symbols are present and can identify code
+find "$JAVA_HOME" -iname "*.$so_suffix" -print0 | while read -d $'\0' lib
+do
+ if [ -f "$lib" ] ; then
+ echo "Testing $lib for debug symbols"
+ # All these tests rely on RPM failing the build if the exit code of any set
+ # of piped commands is non-zero.
+
+ # Test for .debug_* sections in the shared object. This is the main test
+ # Stripped objects will not contain these
+ eu-readelf -S "$lib" | grep "] .debug_"
+ test $(eu-readelf -S "$lib" | grep -E "\]\ .debug_(info|abbrev)" | wc --lines) == 2
+
+ # Test FILE symbols. These will most likely be removed by anything that
+ # manipulates symbol tables because it's generally useless. So a nice test
+ # that nothing has messed with symbols
+ old_IFS="$IFS"
+ IFS=$'\n'
+ for line in $(eu-readelf -s "$lib" | grep "00000000 0 FILE LOCAL DEFAULT")
+ do
+ # We expect to see .cpp and .S files, except for architectures like aarch64 and
+ # s390 where we expect .o and .oS files
+ echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|S|oS))?$"
+ done
+ IFS="$old_IFS"
+
+ # If this is the JVM, look for javaCalls.(cpp|o) in FILEs, for extra sanity checking
+ if [ "`basename $lib`" = "libjvm.so" ]; then
+ eu-readelf -s "$lib" | \
+ grep -E "00000000 0 FILE LOCAL DEFAULT ABS javaCalls.(cpp|o)$"
+ fi
+
+ # Test that there are no .gnu_debuglink sections pointing to another
+ # debuginfo file. There shouldn't be any debuginfo files, so the link makes
+ # no sense either
+ eu-readelf -S "$lib" | grep 'gnu'
+ if eu-readelf -S "$lib" | grep '] .gnu_debuglink' | grep PROGBITS; then
+ echo "bad .gnu_debuglink section."
+ eu-readelf -x .gnu_debuglink "$lib"
+ false
+ fi
+ fi
+done
+
+# Make sure gdb can do a backtrace based on line numbers on libjvm.so
+# javaCalls.cpp:58 should map to:
+# http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/…
+# Using line number 1 might cause build problems. See:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1539664
+# https://bugzilla.redhat.com/show_bug.cgi?id=1538767
+gdb -q "$JAVA_HOME/bin/java" <<EOF | tee gdb.out
+handle SIGSEGV pass nostop noprint
+handle SIGILL pass nostop noprint
+set breakpoint pending on
+break javaCalls.cpp:58
+commands 1
+backtrace
+quit
+end
+run -version
+EOF
+%ifarch %{gdb_arches}
+grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
%endif
# Check src.zip has all sources. See RHBZ#1130490
@@ -1575,12 +1613,69 @@ $JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LocalVariableTable
# build cycles check
done
+%install
+
+ mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
+ mv %{jdkportablesourcesarchive -- ""} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv %{jdkportablesourcesarchive -- ""}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+
+for suffix in %{build_loop} ; do
+
+ packagesdir=%{packageoutputdir -- ${suffix}}
+
+ if [ "x$suffix" == "x" ] ; then
+ nameSuffix=""
+ else
+ nameSuffix=`echo "$suffix"| sed s/-/./`
+ fi
+
+ # These definitions should match those in installjdk
+ jdkarchive=${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
+ jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
+ staticarchive=${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
+ debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
+ unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
+
+ mv ${jdkarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jdkarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jrearchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${jrearchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+
+%if %{include_staticlibs}
+ mv ${staticarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${staticarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+%endif
+
+ if [ "x$suffix" = "x" ] ; then
+ mv ${debugarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${debugarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${unstrippedarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+ mv ${unstrippedarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+ fi
+done
+
+# These definitions should match those in installjdk
+# Install outside the loop as there are no debug variants
+docarchive=${packagesdir}/%{docportablearchive}
+miscarchive=${packagesdir}/%{miscportablearchive}
+
+mv ${docarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+mv ${docarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+mv ${miscarchive} $RPM_BUILD_ROOT%{_jvmdir}/
+mv ${miscarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
+
+# To show sha in the build log
+for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do
+ ls -l $file ;
+ cat $file ;
+done
+
%if %{include_normal_build}
+
%files
# main package builds always
%{_jvmdir}/%{jreportablearchiveForFiles}
%{_jvmdir}/%{jreportablearchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%else
%files
# placeholder
@@ -1589,10 +1684,9 @@ done
%if %{include_normal_build}
%files devel
%{_jvmdir}/%{jdkportablearchiveForFiles}
-#%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
+%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
%{_jvmdir}/%{jdkportablearchiveForFiles}.sha256sum
-#%{_jvmdir}/%{jdkportablearchive -- .debuginfo}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
+%{_jvmdir}/%{jdkportablearchive -- .debuginfo}.sha256sum
%endif
%if %{include_normal_build}
@@ -1600,26 +1694,26 @@ done
%files static-libs
%{_jvmdir}/%{staticlibsportablearchiveForFiles}
%{_jvmdir}/%{staticlibsportablearchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
+
+%files unstripped
+%{_jvmdir}/%{jdkportablearchive -- .unstripped}
+%{_jvmdir}/%{jdkportablearchive -- .unstripped}.sha256sum
%endif
%if %{include_debug_build}
%files slowdebug
%{_jvmdir}/%{jreportablearchive -- .slowdebug}
%{_jvmdir}/%{jreportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%files devel-slowdebug
%{_jvmdir}/%{jdkportablearchive -- .slowdebug}
%{_jvmdir}/%{jdkportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%if %{include_staticlibs}
%files static-libs-slowdebug
%{_jvmdir}/%{staticlibsportablearchive -- .slowdebug}
%{_jvmdir}/%{staticlibsportablearchive -- .slowdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
%endif
@@ -1627,31 +1721,44 @@ done
%files fastdebug
%{_jvmdir}/%{jreportablearchive -- .fastdebug}
%{_jvmdir}/%{jreportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%files devel-fastdebug
%{_jvmdir}/%{jdkportablearchive -- .fastdebug}
%{_jvmdir}/%{jdkportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%if %{include_staticlibs}
%files static-libs-fastdebug
%{_jvmdir}/%{staticlibsportablearchive -- .fastdebug}
%{_jvmdir}/%{staticlibsportablearchive -- .fastdebug}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
%endif
%endif
%files sources
%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}
%{_jvmdir}/%{jdkportablesourcesarchiveForFiles}.sha256sum
-%license %{unpacked_licenses}/%{jdkportablesourcesarchiveForFiles}
+
+%files docs
+%{_jvmdir}/%{docportablearchive}
+%{_jvmdir}/%{docportablearchive}.sha256sum
%files misc
%{_jvmdir}/%{miscportablearchive}
%{_jvmdir}/%{miscportablearchive}.sha256sum
%changelog
+* Wed Nov 22 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.1.0.12-2.rolling
+- updated to OpenJDK 21.0.1 (2023-10-17)
+- adjsuted generate_source_tarball
+- removed icedtea_sync
+- dropped standalone licenses
+- added usntripped subpkg
+- added docs subpkg
+- adjsuted versions of bundled libraries
+- build refactored to several solid methods following gnu_andrew
+- removed no longer needed jdk8296108-tzdata2022f.patch, jdk8296715-cldr2022f.patch, rh1648644-java_access_bridge_privileged_security.patch
+- added jdk8311630-s390_ffmapi.patch to support virtual threads on s390x
+- aligned fips-21u-75ffdc48eda.patch (gnu_andrew)
+
* Wed Sep 20 2023 Jiri Vanek <jvanek(a)redhat.com> - 1:21.0.0.0.35-4.rolling
- removed %{1} from miscportablename
diff --git a/jconsole.desktop.in b/jconsole.desktop.in
index 8a3b04d..c1b8f6a 100644
--- a/jconsole.desktop.in
+++ b/jconsole.desktop.in
@@ -1,10 +1 @@
-[Desktop Entry]
-Name=OpenJDK @JAVA_VER@ for @target_cpu@ Monitoring & Management Console (@OPENJDK_VER@)
-Comment=Monitor and manage OpenJDK applications
-Exec=_SDKBINDIR_/jconsole
-Icon=java-@JAVA_VER@-@JAVA_VENDOR@
-Terminal=false
-Type=Application
-StartupWMClass=sun-tools-jconsole-JConsole
-Categories=Development;Profiling;Java;
-Version=1.0
+# this file is intentionally not here, as portable builds do not have desktop integration
diff --git a/jdk8296108-tzdata2022f.patch b/jdk8296108-tzdata2022f.patch
deleted file mode 100644
index 8b13789..0000000
--- a/jdk8296108-tzdata2022f.patch
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jdk8296715-cldr2022f.patch b/jdk8296715-cldr2022f.patch
deleted file mode 100644
index 8b13789..0000000
--- a/jdk8296715-cldr2022f.patch
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jdk8311630-s390_ffmapi.patch b/jdk8311630-s390_ffmapi.patch
new file mode 100644
index 0000000..cd3bc08
--- /dev/null
+++ b/jdk8311630-s390_ffmapi.patch
@@ -0,0 +1,1906 @@
+commit 27f635fabe7c2933674ad40443906fc35eecf785
+Author: Sidraya Jayagond <sjayagond(a)openjdk.org>
+Date: Tue Sep 12 09:07:09 2023 +0000
+
+ 8311630: [s390] Implementation of Foreign Function & Memory API (Preview)
+
+ Backport-of: ec1f7a8480db025a6f405817a106af8e92b69c44
+
+diff --git a/src/hotspot/cpu/s390/downcallLinker_s390.cpp b/src/hotspot/cpu/s390/downcallLinker_s390.cpp
+index baee7d7a043..f831da90755 100644
+--- a/src/hotspot/cpu/s390/downcallLinker_s390.cpp
++++ b/src/hotspot/cpu/s390/downcallLinker_s390.cpp
+@@ -23,8 +23,76 @@
+ */
+
+ #include "precompiled.hpp"
++#include "asm/macroAssembler.inline.hpp"
++#include "code/codeBlob.hpp"
++#include "code/codeCache.hpp"
++#include "code/vmreg.inline.hpp"
++#include "compiler/oopMap.hpp"
++#include "logging/logStream.hpp"
++#include "memory/resourceArea.hpp"
+ #include "prims/downcallLinker.hpp"
+-#include "utilities/debug.hpp"
++#include "runtime/globals.hpp"
++#include "runtime/stubCodeGenerator.hpp"
++
++#define __ _masm->
++
++class DowncallStubGenerator : public StubCodeGenerator {
++ BasicType* _signature;
++ int _num_args;
++ BasicType _ret_bt;
++ const ABIDescriptor& _abi;
++
++ const GrowableArray<VMStorage>& _input_registers;
++ const GrowableArray<VMStorage>& _output_registers;
++
++ bool _needs_return_buffer;
++ int _captured_state_mask;
++ bool _needs_transition;
++
++ int _frame_complete;
++ int _frame_size_slots;
++ OopMapSet* _oop_maps;
++ public:
++ DowncallStubGenerator(CodeBuffer* buffer,
++ BasicType* signature,
++ int num_args,
++ BasicType ret_bt,
++ const ABIDescriptor& abi,
++ const GrowableArray<VMStorage>& input_registers,
++ const GrowableArray<VMStorage>& output_registers,
++ bool needs_return_buffer,
++ int captured_state_mask,
++ bool needs_transition)
++ :StubCodeGenerator(buffer, PrintMethodHandleStubs),
++ _signature(signature),
++ _num_args(num_args),
++ _ret_bt(ret_bt),
++ _abi(abi),
++ _input_registers(input_registers),
++ _output_registers(output_registers),
++ _needs_return_buffer(needs_return_buffer),
++ _captured_state_mask(captured_state_mask),
++ _needs_transition(needs_transition),
++ _frame_complete(0),
++ _frame_size_slots(0),
++ _oop_maps(nullptr) {
++ }
++ void generate();
++ int frame_complete() const {
++ return _frame_complete;
++ }
++
++ int framesize() const {
++ return (_frame_size_slots >> (LogBytesPerWord - LogBytesPerInt));
++ }
++
++ OopMapSet* oop_maps() const {
++ return _oop_maps;
++ }
++};
++
++static const int native_invoker_code_base_size = 512;
++static const int native_invoker_size_per_args = 8;
+
+ RuntimeStub* DowncallLinker::make_downcall_stub(BasicType* signature,
+ int num_args,
+@@ -35,6 +103,197 @@ RuntimeStub* DowncallLinker::make_downcall_stub(BasicType* signature,
+ bool needs_return_buffer,
+ int captured_state_mask,
+ bool needs_transition) {
+- Unimplemented();
+- return nullptr;
++
++ int code_size = native_invoker_code_base_size + (num_args * native_invoker_size_per_args);
++ int locs_size = 1; //must be non zero
++ CodeBuffer code("nep_invoker_blob", code_size, locs_size);
++
++ DowncallStubGenerator g(&code, signature, num_args, ret_bt, abi,
++ input_registers, output_registers,
++ needs_return_buffer, captured_state_mask,
++ needs_transition);
++ g.generate();
++ code.log_section_sizes("nep_invoker_blob");
++
++ RuntimeStub* stub =
++ RuntimeStub::new_runtime_stub("nep_invoker_blob",
++ &code,
++ g.frame_complete(),
++ g.framesize(),
++ g.oop_maps(), false);
++
++#ifndef PRODUCT
++ LogTarget(Trace, foreign, downcall) lt;
++ if (lt.is_enabled()) {
++ ResourceMark rm;
++ LogStream ls(lt);
++ stub->print_on(&ls);
++ }
++#endif
++
++ return stub;
++}
++
++void DowncallStubGenerator::generate() {
++ Register call_target_address = Z_R1_scratch,
++ tmp = Z_R0_scratch;
++
++ VMStorage shuffle_reg = _abi._scratch1;
++
++ JavaCallingConvention in_conv;
++ NativeCallingConvention out_conv(_input_registers);
++ ArgumentShuffle arg_shuffle(_signature, _num_args, _signature, _num_args, &in_conv, &out_conv, shuffle_reg);
++
++#ifndef PRODUCT
++ LogTarget(Trace, foreign, downcall) lt;
++ if (lt.is_enabled()) {
++ ResourceMark rm;
++ LogStream ls(lt);
++ arg_shuffle.print_on(&ls);
++ }
++#endif
++
++ assert(_abi._shadow_space_bytes == frame::z_abi_160_size, "expected space according to ABI");
++ int allocated_frame_size = _abi._shadow_space_bytes;
++ allocated_frame_size += arg_shuffle.out_arg_bytes();
++
++ assert(!_needs_return_buffer, "unexpected needs_return_buffer");
++ RegSpiller out_reg_spiller(_output_registers);
++ int spill_offset = allocated_frame_size;
++ allocated_frame_size += BytesPerWord;
++
++ StubLocations locs;
++ locs.set(StubLocations::TARGET_ADDRESS, _abi._scratch2);
++
++ if (_captured_state_mask != 0) {
++ __ block_comment("{ _captured_state_mask is set");
++ locs.set_frame_data(StubLocations::CAPTURED_STATE_BUFFER, allocated_frame_size);
++ allocated_frame_size += BytesPerWord;
++ __ block_comment("} _captured_state_mask is set");
++ }
++
++ allocated_frame_size = align_up(allocated_frame_size, StackAlignmentInBytes);
++ _frame_size_slots = allocated_frame_size >> LogBytesPerInt;
++
++ _oop_maps = _needs_transition ? new OopMapSet() : nullptr;
++ address start = __ pc();
++
++ __ save_return_pc();
++ __ push_frame(allocated_frame_size, Z_R11); // Create a new frame for the wrapper.
++
++ _frame_complete = __ pc() - start; // frame build complete.
++
++ if (_needs_transition) {
++ __ block_comment("{ thread java2native");
++ __ get_PC(Z_R1_scratch);
++ address the_pc = __ pc();
++ __ set_last_Java_frame(Z_SP, Z_R1_scratch);
++
++ OopMap* map = new OopMap(_frame_size_slots, 0);
++ _oop_maps->add_gc_map(the_pc - start, map);
++
++ // State transition
++ __ set_thread_state(_thread_in_native);
++ __ block_comment("} thread java2native");
++ }
++ __ block_comment("{ argument shuffle");
++ arg_shuffle.generate(_masm, shuffle_reg, frame::z_jit_out_preserve_size, _abi._shadow_space_bytes, locs);
++ __ block_comment("} argument shuffle");
++
++ __ call(as_Register(locs.get(StubLocations::TARGET_ADDRESS)));
++
++ //////////////////////////////////////////////////////////////////////////////
++
++ if (_captured_state_mask != 0) {
++ __ block_comment("{ save thread local");
++
++ out_reg_spiller.generate_spill(_masm, spill_offset);
++
++ __ load_const_optimized(call_target_address, CAST_FROM_FN_PTR(uint64_t, DowncallLinker::capture_state));
++ __ z_lg(Z_ARG1, Address(Z_SP, locs.data_offset(StubLocations::CAPTURED_STATE_BUFFER)));
++ __ load_const_optimized(Z_ARG2, _captured_state_mask);
++ __ call(call_target_address);
++
++ out_reg_spiller.generate_fill(_masm, spill_offset);
++
++ __ block_comment("} save thread local");
++ }
++
++ //////////////////////////////////////////////////////////////////////////////
++
++ Label L_after_safepoint_poll;
++ Label L_safepoint_poll_slow_path;
++ Label L_reguard;
++ Label L_after_reguard;
++
++ if (_needs_transition) {
++ __ block_comment("{ thread native2java");
++ __ set_thread_state(_thread_in_native_trans);
++
++ if (!UseSystemMemoryBarrier) {
++ __ z_fence(); // Order state change wrt. safepoint poll.
++ }
++
++ __ safepoint_poll(L_safepoint_poll_slow_path, tmp);
++
++ __ load_and_test_int(tmp, Address(Z_thread, JavaThread::suspend_flags_offset()));
++ __ z_brne(L_safepoint_poll_slow_path);
++
++ __ bind(L_after_safepoint_poll);
++
++ // change thread state
++ __ set_thread_state(_thread_in_Java);
++
++ __ block_comment("reguard stack check");
++ __ z_cli(Address(Z_thread, JavaThread::stack_guard_state_offset() + in_ByteSize(sizeof(StackOverflow::StackGuardState) - 1)),
++ StackOverflow::stack_guard_yellow_reserved_disabled);
++ __ z_bre(L_reguard);
++ __ bind(L_after_reguard);
++
++ __ reset_last_Java_frame();
++ __ block_comment("} thread native2java");
++ }
++
++ __ pop_frame();
++ __ restore_return_pc(); // This is the way back to the caller.
++ __ z_br(Z_R14);
++
++ //////////////////////////////////////////////////////////////////////////////
++
++ if (_needs_transition) {
++ __ block_comment("{ L_safepoint_poll_slow_path");
++ __ bind(L_safepoint_poll_slow_path);
++
++ // Need to save the native result registers around any runtime calls.
++ out_reg_spiller.generate_spill(_masm, spill_offset);
++
++ __ load_const_optimized(call_target_address, CAST_FROM_FN_PTR(uint64_t, JavaThread::check_special_condition_for_native_trans));
++ __ z_lgr(Z_ARG1, Z_thread);
++ __ call(call_target_address);
++
++ out_reg_spiller.generate_fill(_masm, spill_offset);
++
++ __ z_bru(L_after_safepoint_poll);
++ __ block_comment("} L_safepoint_poll_slow_path");
++
++ //////////////////////////////////////////////////////////////////////////////
++ __ block_comment("{ L_reguard");
++ __ bind(L_reguard);
++
++ // Need to save the native result registers around any runtime calls.
++ out_reg_spiller.generate_spill(_masm, spill_offset);
++
++ __ load_const_optimized(call_target_address, CAST_FROM_FN_PTR(uint64_t, SharedRuntime::reguard_yellow_pages));
++ __ call(call_target_address);
++
++ out_reg_spiller.generate_fill(_masm, spill_offset);
++
++ __ z_bru(L_after_reguard);
++
++ __ block_comment("} L_reguard");
++ }
++
++ //////////////////////////////////////////////////////////////////////////////
++
++ __ flush();
+ }
+diff --git a/src/hotspot/cpu/s390/foreignGlobals_s390.cpp b/src/hotspot/cpu/s390/foreignGlobals_s390.cpp
+index d3a318536bd..9796ab4ffe4 100644
+--- a/src/hotspot/cpu/s390/foreignGlobals_s390.cpp
++++ b/src/hotspot/cpu/s390/foreignGlobals_s390.cpp
+@@ -23,34 +23,209 @@
+ */
+
+ #include "precompiled.hpp"
+-#include "code/vmreg.hpp"
++#include "asm/macroAssembler.inline.hpp"
++#include "code/vmreg.inline.hpp"
++#include "runtime/jniHandles.hpp"
++#include "runtime/jniHandles.inline.hpp"
++#include "oops/typeArrayOop.inline.hpp"
++#include "oops/oopCast.inline.hpp"
+ #include "prims/foreignGlobals.hpp"
+-#include "utilities/debug.hpp"
++#include "prims/foreignGlobals.inline.hpp"
++#include "prims/vmstorage.hpp"
++#include "utilities/formatBuffer.hpp"
+
+-class MacroAssembler;
++#define __ masm->
++
++bool ABIDescriptor::is_volatile_reg(Register reg) const {
++ return _integer_volatile_registers.contains(reg);
++}
++
++bool ABIDescriptor::is_volatile_reg(FloatRegister reg) const {
++ return _float_argument_registers.contains(reg)
++ || _float_additional_volatile_registers.contains(reg);
++}
+
+ bool ForeignGlobals::is_foreign_linker_supported() {
+- return false;
++ return true;
+ }
+
+ const ABIDescriptor ForeignGlobals::parse_abi_descriptor(jobject jabi) {
+- Unimplemented();
+- return {};
++ oop abi_oop = JNIHandles::resolve_non_null(jabi);
++ ABIDescriptor abi;
++
++ objArrayOop inputStorage = jdk_internal_foreign_abi_ABIDescriptor::inputStorage(abi_oop);
++ parse_register_array(inputStorage, StorageType::INTEGER, abi._integer_argument_registers, as_Register);
++ parse_register_array(inputStorage, StorageType::FLOAT, abi._float_argument_registers, as_FloatRegister);
++
++ objArrayOop outputStorage = jdk_internal_foreign_abi_ABIDescriptor::outputStorage(abi_oop);
++ parse_register_array(outputStorage, StorageType::INTEGER, abi._integer_return_registers, as_Register);
++ parse_register_array(outputStorage, StorageType::FLOAT, abi._float_return_registers, as_FloatRegister);
++
++ objArrayOop volatileStorage = jdk_internal_foreign_abi_ABIDescriptor::volatileStorage(abi_oop);
++ parse_register_array(volatileStorage, StorageType::INTEGER, abi._integer_volatile_registers, as_Register);
++ parse_register_array(volatileStorage, StorageType::FLOAT, abi._float_additional_volatile_registers, as_FloatRegister);
++
++ abi._stack_alignment_bytes = jdk_internal_foreign_abi_ABIDescriptor::stackAlignment(abi_oop);
++ abi._shadow_space_bytes = jdk_internal_foreign_abi_ABIDescriptor::shadowSpace(abi_oop);
++
++ abi._scratch1 = parse_vmstorage(jdk_internal_foreign_abi_ABIDescriptor::scratch1(abi_oop));
++ abi._scratch2 = parse_vmstorage(jdk_internal_foreign_abi_ABIDescriptor::scratch2(abi_oop));
++
++ return abi;
+ }
+
+ int RegSpiller::pd_reg_size(VMStorage reg) {
+- Unimplemented();
+- return -1;
++ if (reg.type() == StorageType::INTEGER || reg.type() == StorageType::FLOAT) {
++ return 8;
++ }
++ return 0; // stack and BAD
+ }
+
+ void RegSpiller::pd_store_reg(MacroAssembler* masm, int offset, VMStorage reg) {
+- Unimplemented();
++ if (reg.type() == StorageType::INTEGER) {
++ __ reg2mem_opt(as_Register(reg), Address(Z_SP, offset), true);
++ } else if (reg.type() == StorageType::FLOAT) {
++ __ freg2mem_opt(as_FloatRegister(reg), Address(Z_SP, offset), true);
++ } else {
++ // stack and BAD
++ }
+ }
+
+ void RegSpiller::pd_load_reg(MacroAssembler* masm, int offset, VMStorage reg) {
+- Unimplemented();
++ if (reg.type() == StorageType::INTEGER) {
++ __ mem2reg_opt(as_Register(reg), Address(Z_SP, offset), true);
++ } else if (reg.type() == StorageType::FLOAT) {
++ __ mem2freg_opt(as_FloatRegister(reg), Address(Z_SP, offset), true);
++ } else {
++ // stack and BAD
++ }
++}
++
++static int reg2offset(VMStorage vms, int stk_bias) {
++ assert(!vms.is_reg(), "wrong usage");
++ return vms.index_or_offset() + stk_bias;
++}
++
++static void move_reg(MacroAssembler* masm, int out_stk_bias,
++ VMStorage from_reg, VMStorage to_reg) {
++ int out_bias = 0;
++ switch (to_reg.type()) {
++ case StorageType::INTEGER:
++ if (to_reg.segment_mask() == REG64_MASK && from_reg.segment_mask() == REG32_MASK ) {
++ // see CCallingConventionRequiresIntsAsLongs
++ __ z_lgfr(as_Register(to_reg), as_Register(from_reg));
++ } else {
++ __ lgr_if_needed(as_Register(to_reg), as_Register(from_reg));
++ }
++ break;
++ case StorageType::STACK:
++ out_bias = out_stk_bias; //fallthrough
++ case StorageType::FRAME_DATA: {
++ // Integer types always get a 64 bit slot in C.
++ if (from_reg.segment_mask() == REG32_MASK) {
++ // see CCallingConventionRequiresIntsAsLongs
++ __ z_lgfr(as_Register(from_reg), as_Register(from_reg));
++ }
++ switch (to_reg.stack_size()) {
++ case 8: __ reg2mem_opt(as_Register(from_reg), Address(Z_SP, reg2offset(to_reg, out_bias)), true); break;
++ case 4: __ reg2mem_opt(as_Register(from_reg), Address(Z_SP, reg2offset(to_reg, out_bias)), false); break;
++ default: ShouldNotReachHere();
++ }
++ } break;
++ default: ShouldNotReachHere();
++ }
++}
++
++static void move_float(MacroAssembler* masm, int out_stk_bias,
++ VMStorage from_reg, VMStorage to_reg) {
++ switch (to_reg.type()) {
++ case StorageType::FLOAT:
++ if (from_reg.segment_mask() == REG64_MASK)
++ __ move_freg_if_needed(as_FloatRegister(to_reg), T_DOUBLE, as_FloatRegister(from_reg), T_DOUBLE);
++ else
++ __ move_freg_if_needed(as_FloatRegister(to_reg), T_FLOAT, as_FloatRegister(from_reg), T_FLOAT);
++ break;
++ case StorageType::STACK:
++ if (from_reg.segment_mask() == REG64_MASK) {
++ assert(to_reg.stack_size() == 8, "size should match");
++ __ freg2mem_opt(as_FloatRegister(from_reg), Address(Z_SP, reg2offset(to_reg, out_stk_bias)), true);
++ } else {
++ assert(to_reg.stack_size() == 4, "size should match");
++ __ freg2mem_opt(as_FloatRegister(from_reg), Address(Z_SP, reg2offset(to_reg, out_stk_bias)), false);
++ }
++ break;
++ default: ShouldNotReachHere();
++ }
++}
++
++static void move_stack(MacroAssembler* masm, Register tmp_reg, int in_stk_bias, int out_stk_bias,
++ VMStorage from_reg, VMStorage to_reg) {
++ int out_bias = 0;
++ Address from_addr(Z_R11, reg2offset(from_reg, in_stk_bias));
++ switch (to_reg.type()) {
++ case StorageType::INTEGER:
++ switch (from_reg.stack_size()) {
++ case 8: __ mem2reg_opt(as_Register(to_reg), from_addr, true);break;
++ case 4: __ mem2reg_opt(as_Register(to_reg), from_addr, false);break;
++ default: ShouldNotReachHere();
++ }
++ break;
++ case StorageType::FLOAT:
++ switch (from_reg.stack_size()) {
++ case 8: __ mem2freg_opt(as_FloatRegister(to_reg), from_addr, true);break;
++ case 4: __ mem2freg_opt(as_FloatRegister(to_reg), from_addr, false);break;
++ default: ShouldNotReachHere();
++ }
++ break;
++ case StorageType::STACK:
++ out_bias = out_stk_bias; // fallthrough
++ case StorageType::FRAME_DATA: {
++ switch (from_reg.stack_size()) {
++ case 8: __ mem2reg_opt(tmp_reg, from_addr, true); break;
++ case 4: if (to_reg.stack_size() == 8) {
++ __ mem2reg_signed_opt(tmp_reg, from_addr);
++ } else {
++ __ mem2reg_opt(tmp_reg, from_addr, false);
++ }
++ break;
++ default: ShouldNotReachHere();
++ }
++ switch (to_reg.stack_size()) {
++ case 8: __ reg2mem_opt(tmp_reg, Address (Z_SP, reg2offset(to_reg, out_bias)), true); break;
++ case 4: __ reg2mem_opt(tmp_reg, Address (Z_SP, reg2offset(to_reg, out_bias)), false); break;
++ default: ShouldNotReachHere();
++ }
++ } break;
++ default: ShouldNotReachHere();
++ }
+ }
+
+ void ArgumentShuffle::pd_generate(MacroAssembler* masm, VMStorage tmp, int in_stk_bias, int out_stk_bias, const StubLocations& locs) const {
+- Unimplemented();
++ Register tmp_reg = as_Register(tmp);
++ for (int i = 0; i < _moves.length(); i++) {
++ Move move = _moves.at(i);
++ VMStorage from_reg = move.from;
++ VMStorage to_reg = move.to;
++
++ // replace any placeholders
++ if (from_reg.type() == StorageType::PLACEHOLDER) {
++ from_reg = locs.get(from_reg);
++ }
++ if (to_reg.type() == StorageType::PLACEHOLDER) {
++ to_reg = locs.get(to_reg);
++ }
++
++ switch (from_reg.type()) {
++ case StorageType::INTEGER:
++ move_reg(masm, out_stk_bias, from_reg, to_reg);
++ break;
++ case StorageType::FLOAT:
++ move_float(masm, out_stk_bias, from_reg, to_reg);
++ break;
++ case StorageType::STACK:
++ move_stack(masm, tmp_reg, in_stk_bias, out_stk_bias, from_reg, to_reg);
++ break;
++ default: ShouldNotReachHere();
++ }
++ }
+ }
+diff --git a/src/hotspot/cpu/s390/foreignGlobals_s390.hpp b/src/hotspot/cpu/s390/foreignGlobals_s390.hpp
+index 8b86a2b06a6..4ff3b3e40b4 100644
+--- a/src/hotspot/cpu/s390/foreignGlobals_s390.hpp
++++ b/src/hotspot/cpu/s390/foreignGlobals_s390.hpp
+@@ -24,6 +24,23 @@
+ #ifndef CPU_S390_VM_FOREIGN_GLOBALS_S390_HPP
+ #define CPU_S390_VM_FOREIGN_GLOBALS_S390_HPP
+
+-class ABIDescriptor {};
++struct ABIDescriptor {
++ GrowableArray<Register> _integer_argument_registers;
++ GrowableArray<Register> _integer_return_registers;
++ GrowableArray<FloatRegister> _float_argument_registers;
++ GrowableArray<FloatRegister> _float_return_registers;
++
++ GrowableArray<Register> _integer_volatile_registers;
++ GrowableArray<FloatRegister> _float_additional_volatile_registers;
++
++ int32_t _stack_alignment_bytes;
++ int32_t _shadow_space_bytes;
++
++ VMStorage _scratch1;
++ VMStorage _scratch2;
++
++ bool is_volatile_reg(Register reg) const;
++ bool is_volatile_reg(FloatRegister reg) const;
++};
+
+ #endif // CPU_S390_VM_FOREIGN_GLOBALS_S390_HPP
+diff --git a/src/hotspot/cpu/s390/frame_s390.cpp b/src/hotspot/cpu/s390/frame_s390.cpp
+index 23547fa6617..ac24e43f00c 100644
+--- a/src/hotspot/cpu/s390/frame_s390.cpp
++++ b/src/hotspot/cpu/s390/frame_s390.cpp
+@@ -218,13 +218,32 @@ frame frame::sender_for_entry_frame(RegisterMap *map) const {
+ }
+
+ UpcallStub::FrameData* UpcallStub::frame_data_for_frame(const frame& frame) const {
+- ShouldNotCallThis();
+- return nullptr;
++ assert(frame.is_upcall_stub_frame(), "wrong frame");
++ // need unextended_sp here, since normal sp is wrong for interpreter callees
++ return reinterpret_cast<UpcallStub::FrameData*>(
++ reinterpret_cast<address>(frame.unextended_sp()) + in_bytes(_frame_data_offset));
+ }
+
+ bool frame::upcall_stub_frame_is_first() const {
+- ShouldNotCallThis();
+- return false;
++ assert(is_upcall_stub_frame(), "must be optimized entry frame");
++ UpcallStub* blob = _cb->as_upcall_stub();
++ JavaFrameAnchor* jfa = blob->jfa_for_frame(*this);
++ return jfa->last_Java_sp() == nullptr;
++}
++
++frame frame::sender_for_upcall_stub_frame(RegisterMap* map) const {
++ assert(map != nullptr, "map must be set");
++ UpcallStub* blob = _cb->as_upcall_stub();
++ // Java frame called from C; skip all C frames and return top C
++ // frame of that chunk as the sender
++ JavaFrameAnchor* jfa = blob->jfa_for_frame(*this);
++ assert(!upcall_stub_frame_is_first(), "must have a frame anchor to go back to");
++ assert(jfa->last_Java_sp() > sp(), "must be above this frame on stack");
++ map->clear();
++ assert(map->include_argument_oops(), "should be set by clear");
++ frame fr(jfa->last_Java_sp(), jfa->last_Java_pc());
++
++ return fr;
+ }
+
+ frame frame::sender_for_interpreter_frame(RegisterMap *map) const {
+diff --git a/src/hotspot/cpu/s390/frame_s390.inline.hpp b/src/hotspot/cpu/s390/frame_s390.inline.hpp
+index dfa68940bac..c188618653d 100644
+--- a/src/hotspot/cpu/s390/frame_s390.inline.hpp
++++ b/src/hotspot/cpu/s390/frame_s390.inline.hpp
+@@ -352,12 +352,10 @@ inline frame frame::sender(RegisterMap* map) const {
+ // update it accordingly.
+ map->set_include_argument_oops(false);
+
+- if (is_entry_frame()) {
+- return sender_for_entry_frame(map);
+- }
+- if (is_interpreted_frame()) {
+- return sender_for_interpreter_frame(map);
+- }
++ if (is_entry_frame()) return sender_for_entry_frame(map);
++ if (is_upcall_stub_frame()) return sender_for_upcall_stub_frame(map);
++ if (is_interpreted_frame()) return sender_for_interpreter_frame(map);
++
+ assert(_cb == CodeCache::find_blob(pc()),"Must be the same");
+ if (_cb != nullptr) return sender_for_compiled_frame(map);
+
+diff --git a/src/hotspot/cpu/s390/globalDefinitions_s390.hpp b/src/hotspot/cpu/s390/globalDefinitions_s390.hpp
+index 99906bb369e..2232215a587 100644
+--- a/src/hotspot/cpu/s390/globalDefinitions_s390.hpp
++++ b/src/hotspot/cpu/s390/globalDefinitions_s390.hpp
+@@ -28,7 +28,7 @@
+
+ #define ShortenBranches true
+
+-const int StackAlignmentInBytes = 16;
++const int StackAlignmentInBytes = 8;
+
+ #define SUPPORTS_NATIVE_CX8
+
+diff --git a/src/hotspot/cpu/s390/methodHandles_s390.cpp b/src/hotspot/cpu/s390/methodHandles_s390.cpp
+index 6392ba45a6c..ef8722f2499 100644
+--- a/src/hotspot/cpu/s390/methodHandles_s390.cpp
++++ b/src/hotspot/cpu/s390/methodHandles_s390.cpp
+@@ -349,7 +349,16 @@ address MethodHandles::generate_method_handle_interpreter_entry(MacroAssembler*
+
+ void MethodHandles::jump_to_native_invoker(MacroAssembler* _masm, Register nep_reg, Register temp_target) {
+ BLOCK_COMMENT("jump_to_native_invoker {");
+- __ should_not_reach_here();
++ assert(nep_reg != noreg, "required register");
++
++ // Load the invoker, as NEP -> .invoker
++ __ verify_oop(nep_reg);
++
++ __ z_lg(temp_target, Address(nep_reg,
++ NONZERO(jdk_internal_foreign_abi_NativeEntryPoint::downcall_stub_address_offset_in_bytes())));
++
++ __ z_br(temp_target);
++
+ BLOCK_COMMENT("} jump_to_native_invoker");
+ }
+
+diff --git a/src/hotspot/cpu/s390/upcallLinker_s390.cpp b/src/hotspot/cpu/s390/upcallLinker_s390.cpp
+index 3e1fb04218b..b748ec547cc 100644
+--- a/src/hotspot/cpu/s390/upcallLinker_s390.cpp
++++ b/src/hotspot/cpu/s390/upcallLinker_s390.cpp
+@@ -22,15 +22,287 @@
+ */
+
+ #include "precompiled.hpp"
++#include "asm/macroAssembler.inline.hpp"
++#include "logging/logStream.hpp"
++#include "memory/resourceArea.hpp"
+ #include "prims/upcallLinker.hpp"
+-#include "utilities/debug.hpp"
++#include "runtime/sharedRuntime.hpp"
++#include "runtime/signature.hpp"
++#include "runtime/stubRoutines.hpp"
++#include "utilities/formatBuffer.hpp"
++#include "utilities/globalDefinitions.hpp"
+
++#define __ _masm->
++
++// for callee saved regs, according to the caller's ABI
++static int compute_reg_save_area_size(const ABIDescriptor& abi) {
++ int size = 0;
++ for (int i = 0; i < Register::number_of_registers; i++) {
++ Register reg = as_Register(i);
++ // Z_SP saved/restored by prologue/epilogue
++ if (reg == Z_SP) continue;
++ if (!abi.is_volatile_reg(reg)) {
++ size += 8; // bytes
++ }
++ }
++
++ for (int i = 0; i < FloatRegister::number_of_registers; i++) {
++ FloatRegister reg = as_FloatRegister(i);
++ if (!abi.is_volatile_reg(reg)) {
++ size += 8; // bytes
++ }
++ }
++
++ return size;
++}
++
++static void preserve_callee_saved_registers(MacroAssembler* _masm, const ABIDescriptor& abi, int reg_save_area_offset) {
++ // 1. iterate all registers in the architecture
++ // - check if they are volatile or not for the given abi
++ // - if NOT, we need to save it here
++
++ int offset = reg_save_area_offset;
++
++ __ block_comment("{ preserve_callee_saved_regs ");
++ for (int i = 0; i < Register::number_of_registers; i++) {
++ Register reg = as_Register(i);
++ // Z_SP saved/restored by prologue/epilogue
++ if (reg == Z_SP) continue;
++ if (!abi.is_volatile_reg(reg)) {
++ __ z_stg(reg, Address(Z_SP, offset));
++ offset += 8;
++ }
++ }
++
++ for (int i = 0; i < FloatRegister::number_of_registers; i++) {
++ FloatRegister reg = as_FloatRegister(i);
++ if (!abi.is_volatile_reg(reg)) {
++ __ z_std(reg, Address(Z_SP, offset));
++ offset += 8;
++ }
++ }
++
++ __ block_comment("} preserve_callee_saved_regs ");
++}
++
++static void restore_callee_saved_registers(MacroAssembler* _masm, const ABIDescriptor& abi, int reg_save_area_offset) {
++ // 1. iterate all registers in the architecture
++ // - check if they are volatile or not for the given abi
++ // - if NOT, we need to restore it here
++
++ int offset = reg_save_area_offset;
++
++ __ block_comment("{ restore_callee_saved_regs ");
++ for (int i = 0; i < Register::number_of_registers; i++) {
++ Register reg = as_Register(i);
++ // Z_SP saved/restored by prologue/epilogue
++ if (reg == Z_SP) continue;
++ if (!abi.is_volatile_reg(reg)) {
++ __ z_lg(reg, Address(Z_SP, offset));
++ offset += 8;
++ }
++ }
++
++ for (int i = 0; i < FloatRegister::number_of_registers; i++) {
++ FloatRegister reg = as_FloatRegister(i);
++ if (!abi.is_volatile_reg(reg)) {
++ __ z_ld(reg, Address(Z_SP, offset));
++ offset += 8;
++ }
++ }
++
++ __ block_comment("} restore_callee_saved_regs ");
++}
++
++static const int upcall_stub_code_base_size = 1024; // depends on GC (resolve_jobject)
++static const int upcall_stub_size_per_arg = 16; // arg save & restore + move
+ address UpcallLinker::make_upcall_stub(jobject receiver, Method* entry,
+ BasicType* in_sig_bt, int total_in_args,
+ BasicType* out_sig_bt, int total_out_args,
+ BasicType ret_type,
+ jobject jabi, jobject jconv,
+ bool needs_return_buffer, int ret_buf_size) {
+- ShouldNotCallThis();
+- return nullptr;
++ ResourceMark rm;
++ const ABIDescriptor abi = ForeignGlobals::parse_abi_descriptor(jabi);
++ const CallRegs call_regs = ForeignGlobals::parse_call_regs(jconv);
++ int code_size = upcall_stub_code_base_size + (total_in_args * upcall_stub_size_per_arg);
++ CodeBuffer buffer("upcall_stub", code_size, /* locs_size = */ 0);
++
++ Register call_target_address = Z_R1_scratch;
++
++ VMStorage shuffle_reg = abi._scratch1;
++ JavaCallingConvention out_conv;
++ NativeCallingConvention in_conv(call_regs._arg_regs);
++ ArgumentShuffle arg_shuffle(in_sig_bt, total_in_args, out_sig_bt, total_out_args, &in_conv, &out_conv, shuffle_reg);
++
++ // The Java call uses the JIT ABI, but we also call C.
++ int out_arg_area = MAX2(frame::z_jit_out_preserve_size + arg_shuffle.out_arg_bytes(), (int)frame::z_abi_160_size);
++
++#ifndef PRODUCT
++ LogTarget(Trace, foreign, upcall) lt;
++ if (lt.is_enabled()) {
++ ResourceMark rm;
++ LogStream ls(lt);
++ arg_shuffle.print_on(&ls);
++ }
++#endif
++
++
++ int reg_save_area_size = compute_reg_save_area_size(abi);
++ RegSpiller arg_spiller(call_regs._arg_regs);
++ RegSpiller result_spiller(call_regs._ret_regs);
++
++ int res_save_area_offset = out_arg_area;
++ int arg_save_area_offset = res_save_area_offset + result_spiller.spill_size_bytes();
++ int reg_save_area_offset = arg_save_area_offset + arg_spiller.spill_size_bytes();
++ int frame_data_offset = reg_save_area_offset + reg_save_area_size;
++ int frame_bottom_offset = frame_data_offset + sizeof(UpcallStub::FrameData);
++
++ int frame_size = align_up(frame_bottom_offset, StackAlignmentInBytes);
++ StubLocations locs;
++
++ // The space we have allocated will look like:
++ //
++ //
++ // FP-> | |
++ // |---------------------| = frame_bottom_offset = frame_size
++ // | |
++ // | FrameData |
++ // |---------------------| = frame_data_offset
++ // | |
++ // | reg_save_area |
++ // |---------------------| = reg_save_are_offset
++ // | |
++ // | arg_save_area |
++ // |---------------------| = arg_save_are_offset
++ // | |
++ // | res_save_area |
++ // |---------------------| = res_save_are_offset
++ // | |
++ // SP-> | out_arg_area | needs to be at end for shadow space
++ //
++ //
++
++ //////////////////////////////////////////////////////////////////////////////
++
++ MacroAssembler* _masm = new MacroAssembler(&buffer);
++ address start = __ pc();
++
++ __ save_return_pc();
++ assert((abi._stack_alignment_bytes % StackAlignmentInBytes) == 0, "must be 8 byte aligned");
++ // allocate frame (frame_size is also aligned, so stack is still aligned)
++ __ push_frame(frame_size);
++
++ // we have to always spill args since we need to do a call to get the thread
++ // (and maybe attach it).
++ arg_spiller.generate_spill(_masm, arg_save_area_offset);
++ // Java methods won't preserve them, so save them here:
++ preserve_callee_saved_registers(_masm, abi, reg_save_area_offset);
++
++ __ block_comment("{ on_entry");
++ __ load_const_optimized(call_target_address, CAST_FROM_FN_PTR(uint64_t, UpcallLinker::on_entry));
++ __ z_aghik(Z_ARG1, Z_SP, frame_data_offset);
++ __ call(call_target_address);
++ __ z_lgr(Z_thread, Z_RET);
++ __ block_comment("} on_entry");
++
++ arg_spiller.generate_fill(_masm, arg_save_area_offset);
++ __ block_comment("{ argument shuffle");
++ arg_shuffle.generate(_masm, shuffle_reg, abi._shadow_space_bytes, frame::z_jit_out_preserve_size, locs);
++ __ block_comment("} argument shuffle");
++
++ __ block_comment("{ receiver ");
++ __ load_const_optimized(Z_ARG1, (intptr_t)receiver);
++ __ resolve_jobject(Z_ARG1, Z_tmp_1, Z_tmp_2);
++ __ block_comment("} receiver ");
++
++ __ load_const_optimized(Z_method, (intptr_t)entry);
++ __ z_stg(Z_method, Address(Z_thread, in_bytes(JavaThread::callee_target_offset())));
++
++ __ z_lg(call_target_address, Address(Z_method, in_bytes(Method::from_compiled_offset())));
++ __ call(call_target_address);
++
++ // return value shuffle
++ assert(!needs_return_buffer, "unexpected needs_return_buffer");
++ // CallArranger can pick a return type that goes in the same reg for both CCs.
++ if (call_regs._ret_regs.length() > 0) { // 0 or 1
++ VMStorage ret_reg = call_regs._ret_regs.at(0);
++ // Check if the return reg is as expected.
++ switch (ret_type) {
++ case T_BOOLEAN:
++ case T_BYTE:
++ case T_SHORT:
++ case T_CHAR:
++ case T_INT:
++ __ z_lgfr(Z_RET, Z_RET); // Clear garbage in high half.
++ // fallthrough
++ case T_LONG:
++ assert(as_Register(ret_reg) == Z_RET, "unexpected result register");
++ break;
++ case T_FLOAT:
++ case T_DOUBLE:
++ assert(as_FloatRegister(ret_reg) == Z_FRET, "unexpected result register");
++ break;
++ default:
++ fatal("unexpected return type: %s", type2name(ret_type));
++ }
++ }
++
++ result_spiller.generate_spill(_masm, res_save_area_offset);
++
++ __ block_comment("{ on_exit");
++ __ load_const_optimized(call_target_address, CAST_FROM_FN_PTR(uint64_t, UpcallLinker::on_exit));
++ __ z_aghik(Z_ARG1, Z_SP, frame_data_offset);
++ __ call(call_target_address);
++ __ block_comment("} on_exit");
++
++ restore_callee_saved_registers(_masm, abi, reg_save_area_offset);
++
++ result_spiller.generate_fill(_masm, res_save_area_offset);
++
++ __ pop_frame();
++ __ restore_return_pc();
++ __ z_br(Z_R14);
++
++ //////////////////////////////////////////////////////////////////////////////
++
++ __ block_comment("{ exception handler");
++
++ intptr_t exception_handler_offset = __ pc() - start;
++
++ // Native caller has no idea how to handle exceptions,
++ // so we just crash here. Up to callee to catch exceptions.
++ __ verify_oop(Z_ARG1);
++ __ load_const_optimized(call_target_address, CAST_FROM_FN_PTR(uint64_t, UpcallLinker::handle_uncaught_exception));
++ __ call_c(call_target_address);
++ __ should_not_reach_here();
++
++ __ block_comment("} exception handler");
++
++ _masm->flush();
++
++#ifndef PRODUCT
++ stringStream ss;
++ ss.print("upcall_stub_%s", entry->signature()->as_C_string());
++ const char* name = _masm->code_string(ss.as_string());
++#else // PRODUCT
++ const char* name = "upcall_stub";
++#endif // PRODUCT
++
++ buffer.log_section_sizes(name);
++ UpcallStub* blob
++ = UpcallStub::create(name,
++ &buffer,
++ exception_handler_offset,
++ receiver,
++ in_ByteSize(frame_data_offset));
++#ifndef PRODUCT
++ if (lt.is_enabled()) {
++ ResourceMark rm;
++ LogStream ls(lt);
++ blob->print_on(&ls);
++ }
++#endif
++
++ return blob->code_begin();
+ }
+diff --git a/src/hotspot/cpu/s390/vmstorage_s390.hpp b/src/hotspot/cpu/s390/vmstorage_s390.hpp
+index 192159adc4c..6a595670920 100644
+--- a/src/hotspot/cpu/s390/vmstorage_s390.hpp
++++ b/src/hotspot/cpu/s390/vmstorage_s390.hpp
+@@ -29,24 +29,79 @@
+ #include "asm/register.hpp"
+
+ enum class StorageType : int8_t {
+- STACK = 0,
+- PLACEHOLDER = 1,
+-// special locations used only by native code
+- FRAME_DATA = PLACEHOLDER + 1,
++ INTEGER = 0,
++ FLOAT = 1,
++ STACK = 2,
++ PLACEHOLDER = 3,
++ // special locations used only by native code
++ FRAME_DATA = 4,
+ INVALID = -1
+ };
+
+ // need to define this before constructing VMStorage (below)
+ constexpr inline bool VMStorage::is_reg(StorageType type) {
+- return false;
++ return type == StorageType::INTEGER || type == StorageType::FLOAT;
+ }
+ constexpr inline StorageType VMStorage::stack_type() { return StorageType::STACK; }
+ constexpr inline StorageType VMStorage::placeholder_type() { return StorageType::PLACEHOLDER; }
+ constexpr inline StorageType VMStorage::frame_data_type() { return StorageType::FRAME_DATA; }
+
++// Needs to be consistent with S390Architecture.java.
++constexpr uint16_t REG32_MASK = 0b0000000000000001;
++constexpr uint16_t REG64_MASK = 0b0000000000000011;
++
++inline Register as_Register(VMStorage vms) {
++ assert(vms.type() == StorageType::INTEGER, "not the right type");
++ return ::as_Register(vms.index());
++}
++
++inline FloatRegister as_FloatRegister(VMStorage vms) {
++ assert(vms.type() == StorageType::FLOAT, "not the right type");
++ return ::as_FloatRegister(vms.index());
++}
++
++inline VMStorage as_VMStorage(Register reg, uint16_t segment_mask = REG64_MASK) {
++ return VMStorage::reg_storage(StorageType::INTEGER, segment_mask, reg->encoding());
++}
++
++inline VMStorage as_VMStorage(FloatRegister reg, uint16_t segment_mask = REG64_MASK) {
++ return VMStorage::reg_storage(StorageType::FLOAT, segment_mask, reg->encoding());
++}
++
+ inline VMStorage as_VMStorage(VMReg reg, BasicType bt) {
++ if (reg->is_Register()) {
++ uint16_t segment_mask = 0;
++ switch (bt) {
++ case T_BOOLEAN:
++ case T_CHAR :
++ case T_BYTE :
++ case T_SHORT :
++ case T_INT : segment_mask = REG32_MASK; break;
++ default : segment_mask = REG64_MASK; break;
++ }
++ return as_VMStorage(reg->as_Register(), segment_mask);
++ } else if (reg->is_FloatRegister()) {
++ // FP regs always use double format. However, we need the correct format for loads /stores.
++ return as_VMStorage(reg->as_FloatRegister(), (bt == T_FLOAT) ? REG32_MASK : REG64_MASK);
++ } else if (reg->is_stack()) {
++ uint16_t size = 0;
++ switch (bt) {
++ case T_BOOLEAN:
++ case T_CHAR :
++ case T_BYTE :
++ case T_SHORT :
++ case T_INT :
++ case T_FLOAT : size = 4; break;
++ default : size = 8; break;
++ }
++ return VMStorage(StorageType::STACK, size,
++ checked_cast<uint16_t>(reg->reg2stack() * VMRegImpl::stack_slot_size));
++ } else if (!reg->is_valid()) {
++ return VMStorage::invalid();
++ }
++
+ ShouldNotReachHere();
+ return VMStorage::invalid();
+ }
+
+-#endif // CPU_S390_VMSTORAGE_S390_INLINE_HPP
+\ No newline at end of file
++#endif // CPU_S390_VMSTORAGE_S390_INLINE_HPP
+diff --git a/src/java.base/share/classes/jdk/internal/foreign/CABI.java b/src/java.base/share/classes/jdk/internal/foreign/CABI.java
+index eee4ae67457..d376a196333 100644
+--- a/src/java.base/share/classes/jdk/internal/foreign/CABI.java
++++ b/src/java.base/share/classes/jdk/internal/foreign/CABI.java
+@@ -41,6 +41,7 @@ public enum CABI {
+ WIN_AARCH_64,
+ LINUX_PPC_64_LE,
+ LINUX_RISCV_64,
++ LINUX_S390,
+ FALLBACK,
+ UNSUPPORTED;
+
+@@ -81,7 +82,11 @@ public enum CABI {
+ if (OperatingSystem.isLinux()) {
+ return LINUX_RISCV_64;
+ }
+- }
++ } else if (arch.equals("s390x")) {
++ if (OperatingSystem.isLinux()) {
++ return LINUX_S390;
++ }
++ }
+ } else if (FallbackLinker.isSupported()) {
+ return FALLBACK; // fallback linker
+ }
+diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java b/src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java
+index b5eb1029ff5..8a322cdcf7a 100644
+--- a/src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java
++++ b/src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java
+@@ -32,6 +32,7 @@ import jdk.internal.foreign.abi.aarch64.windows.WindowsAArch64Linker;
+ import jdk.internal.foreign.abi.fallback.FallbackLinker;
+ import jdk.internal.foreign.abi.ppc64.linux.LinuxPPC64leLinker;
+ import jdk.internal.foreign.abi.riscv64.linux.LinuxRISCV64Linker;
++import jdk.internal.foreign.abi.s390.linux.LinuxS390Linker;
+ import jdk.internal.foreign.abi.x64.sysv.SysVx64Linker;
+ import jdk.internal.foreign.abi.x64.windows.Windowsx64Linker;
+ import jdk.internal.foreign.layout.AbstractLayout;
+@@ -60,7 +61,8 @@ import java.util.Set;
+ public abstract sealed class AbstractLinker implements Linker permits LinuxAArch64Linker, MacOsAArch64Linker,
+ SysVx64Linker, WindowsAArch64Linker,
+ Windowsx64Linker, LinuxPPC64leLinker,
+- LinuxRISCV64Linker, FallbackLinker {
++ LinuxRISCV64Linker, LinuxS390Linker,
++ FallbackLinker {
+
+ public interface UpcallStubFactory {
+ MemorySegment makeStub(MethodHandle target, Arena arena);
+diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java b/src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java
+index 1e417245543..92d10a1dbdf 100644
+--- a/src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java
++++ b/src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java
+@@ -35,6 +35,7 @@ import jdk.internal.foreign.abi.aarch64.windows.WindowsAArch64Linker;
+ import jdk.internal.foreign.abi.fallback.FallbackLinker;
+ import jdk.internal.foreign.abi.ppc64.linux.LinuxPPC64leLinker;
+ import jdk.internal.foreign.abi.riscv64.linux.LinuxRISCV64Linker;
++import jdk.internal.foreign.abi.s390.linux.LinuxS390Linker;
+ import jdk.internal.foreign.abi.x64.sysv.SysVx64Linker;
+ import jdk.internal.foreign.abi.x64.windows.Windowsx64Linker;
+ import jdk.internal.vm.annotation.ForceInline;
+@@ -242,6 +243,7 @@ public final class SharedUtils {
+ case WIN_AARCH_64 -> WindowsAArch64Linker.getInstance();
+ case LINUX_PPC_64_LE -> LinuxPPC64leLinker.getInstance();
+ case LINUX_RISCV_64 -> LinuxRISCV64Linker.getInstance();
++ case LINUX_S390 -> LinuxS390Linker.getInstance();
+ case FALLBACK -> FallbackLinker.getInstance();
+ case UNSUPPORTED -> throw new UnsupportedOperationException("Platform does not support native linker");
+ };
+diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/s390/S390Architecture.java b/src/java.base/share/classes/jdk/internal/foreign/abi/s390/S390Architecture.java
+new file mode 100644
+index 00000000000..bbafef2f3dc
+--- /dev/null
++++ b/src/java.base/share/classes/jdk/internal/foreign/abi/s390/S390Architecture.java
+@@ -0,0 +1,151 @@
++/*
++ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2023 IBM Corp. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++package jdk.internal.foreign.abi.s390;
++
++import jdk.internal.foreign.abi.ABIDescriptor;
++import jdk.internal.foreign.abi.Architecture;
++import jdk.internal.foreign.abi.StubLocations;
++import jdk.internal.foreign.abi.VMStorage;
++
++public final class S390Architecture implements Architecture {
++ public static final Architecture INSTANCE = new S390Architecture();
++
++ // Needs to be consistent with vmstorage_s390.hpp.
++ public static final short REG32_MASK = 0b0000_0000_0000_0001;
++ public static final short REG64_MASK = 0b0000_0000_0000_0011;
++
++ private static final int INTEGER_REG_SIZE = 8;
++ private static final int FLOAT_REG_SIZE = 8;
++ private static final int STACK_SLOT_SIZE = 8;
++
++ // Suppresses default constructor, ensuring non-instantiability.
++ private S390Architecture() {
++ }
++
++ @Override
++ public boolean isStackType(int cls) {
++ return cls == StorageType.STACK;
++ }
++
++ @Override
++ public int typeSize(int cls) {
++ switch (cls) {
++ case StorageType.INTEGER:
++ return INTEGER_REG_SIZE;
++ case StorageType.FLOAT:
++ return FLOAT_REG_SIZE;
++ // STACK is deliberately omitted
++ }
++
++ throw new IllegalArgumentException("Invalid Storage Class: " + cls);
++ }
++
++ public interface StorageType {
++ byte INTEGER = 0;
++ byte FLOAT = 1;
++ byte STACK = 2;
++ byte PLACEHOLDER = 3;
++ }
++
++ public static class Regs { // break circular dependency
++ public static final VMStorage r0 = integerRegister(0);
++ public static final VMStorage r1 = integerRegister(1);
++ public static final VMStorage r2 = integerRegister(2);
++ public static final VMStorage r3 = integerRegister(3);
++ public static final VMStorage r4 = integerRegister(4);
++ public static final VMStorage r5 = integerRegister(5);
++ public static final VMStorage r6 = integerRegister(6);
++ public static final VMStorage r7 = integerRegister(7);
++ public static final VMStorage r8 = integerRegister(8);
++ public static final VMStorage r9 = integerRegister(9);
++ public static final VMStorage r10 = integerRegister(10);
++ public static final VMStorage r11 = integerRegister(11);
++ public static final VMStorage r12 = integerRegister(12);
++ public static final VMStorage r13 = integerRegister(13);
++ public static final VMStorage r14 = integerRegister(14);
++ public static final VMStorage r15 = integerRegister(15);
++
++ public static final VMStorage f0 = floatRegister(0);
++ public static final VMStorage f1 = floatRegister(1);
++ public static final VMStorage f2 = floatRegister(2);
++ public static final VMStorage f3 = floatRegister(3);
++ public static final VMStorage f4 = floatRegister(4);
++ public static final VMStorage f5 = floatRegister(5);
++ public static final VMStorage f6 = floatRegister(6);
++ public static final VMStorage f7 = floatRegister(7);
++ public static final VMStorage f8 = floatRegister(8);
++ public static final VMStorage f9 = floatRegister(9);
++ public static final VMStorage f10 = floatRegister(10);
++ public static final VMStorage f11 = floatRegister(11);
++ public static final VMStorage f12 = floatRegister(12);
++ public static final VMStorage f13 = floatRegister(13);
++ public static final VMStorage f14 = floatRegister(14);
++ public static final VMStorage f15 = floatRegister(15);
++ }
++
++ private static VMStorage integerRegister(int index) {
++ return new VMStorage(StorageType.INTEGER, REG64_MASK, index, "r" + index);
++ }
++
++ private static VMStorage floatRegister(int index) {
++ return new VMStorage(StorageType.FLOAT, REG64_MASK, index, "f" + index);
++ }
++
++ public static VMStorage stackStorage(short size, int byteOffset) {
++ return new VMStorage(StorageType.STACK, size, byteOffset);
++ }
++
++ public static ABIDescriptor abiFor(VMStorage[] inputIntRegs,
++ VMStorage[] inputFloatRegs,
++ VMStorage[] outputIntRegs,
++ VMStorage[] outputFloatRegs,
++ VMStorage[] volatileIntRegs,
++ VMStorage[] volatileFloatRegs,
++ int stackAlignment,
++ int shadowSpace,
++ VMStorage scratch1, VMStorage scratch2) {
++ return new ABIDescriptor(
++ INSTANCE,
++ new VMStorage[][] {
++ inputIntRegs,
++ inputFloatRegs,
++ },
++ new VMStorage[][] {
++ outputIntRegs,
++ outputFloatRegs,
++ },
++ new VMStorage[][] {
++ volatileIntRegs,
++ volatileFloatRegs,
++ },
++ stackAlignment,
++ shadowSpace,
++ scratch1, scratch2,
++ StubLocations.TARGET_ADDRESS.storage(StorageType.PLACEHOLDER),
++ StubLocations.RETURN_BUFFER.storage(StorageType.PLACEHOLDER),
++ StubLocations.CAPTURED_STATE_BUFFER.storage(StorageType.PLACEHOLDER));
++ }
++}
+diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/LinuxS390CallArranger.java b/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/LinuxS390CallArranger.java
+new file mode 100644
+index 00000000000..84392e45089
+--- /dev/null
++++ b/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/LinuxS390CallArranger.java
+@@ -0,0 +1,311 @@
++/*
++ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2023 IBM Corp. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++package jdk.internal.foreign.abi.s390.linux;
++
++import java.lang.foreign.AddressLayout;
++import java.lang.foreign.FunctionDescriptor;
++import java.lang.foreign.GroupLayout;
++import java.lang.foreign.MemoryLayout;
++import java.lang.foreign.MemorySegment;
++import jdk.internal.foreign.abi.ABIDescriptor;
++import jdk.internal.foreign.abi.AbstractLinker.UpcallStubFactory;
++import jdk.internal.foreign.abi.Binding;
++import jdk.internal.foreign.abi.CallingSequence;
++import jdk.internal.foreign.abi.CallingSequenceBuilder;
++import jdk.internal.foreign.abi.DowncallLinker;
++import jdk.internal.foreign.abi.LinkerOptions;
++import jdk.internal.foreign.abi.UpcallLinker;
++import jdk.internal.foreign.abi.SharedUtils;
++import jdk.internal.foreign.abi.VMStorage;
++import jdk.internal.foreign.Utils;
++
++import java.lang.foreign.ValueLayout;
++import java.lang.invoke.MethodHandle;
++import java.lang.invoke.MethodType;
++import java.util.List;
++import java.util.Map;
++import java.util.Optional;
++
++import static jdk.internal.foreign.abi.s390.linux.TypeClass.*;
++import static jdk.internal.foreign.abi.s390.S390Architecture.*;
++import static jdk.internal.foreign.abi.s390.S390Architecture.Regs.*;
++
++/**
++ * For the S390 C ABI specifically, this class uses CallingSequenceBuilder
++ * to translate a C FunctionDescriptor into a CallingSequence, which can then be turned into a MethodHandle.
++ *
++ * This includes taking care of synthetic arguments like pointers to return buffers for 'in-memory' returns.
++ */
++public class LinuxS390CallArranger {
++
++ private static final int STACK_SLOT_SIZE = 8;
++ public static final int MAX_REGISTER_ARGUMENTS = 5;
++ public static final int MAX_FLOAT_REGISTER_ARGUMENTS = 4;
++
++ private static final ABIDescriptor CLinux = abiFor(
++ new VMStorage[] { r2, r3, r4, r5, r6, }, // GP input
++ new VMStorage[] { f0, f2, f4, f6 }, // FP input
++ new VMStorage[] { r2, }, // GP output
++ new VMStorage[] { f0, }, // FP output
++ new VMStorage[] { r0, r1, r2, r3, r4, r5, r14 }, // volatile GP
++ new VMStorage[] { f1, f3, f5, f7 }, // volatile FP (excluding argument registers)
++ 8, // Stack is always 8 byte aligned on S390
++ 160, // ABI header
++ r0, r1 // scratch reg r0 & r1
++ );
++
++ public record Bindings(CallingSequence callingSequence, boolean isInMemoryReturn) {}
++
++ public static Bindings getBindings(MethodType mt, FunctionDescriptor cDesc, boolean forUpcall) {
++ return getBindings(mt, cDesc, forUpcall, LinkerOptions.empty());
++ }
++
++ public static Bindings getBindings(MethodType mt, FunctionDescriptor cDesc, boolean forUpcall, LinkerOptions options) {
++ CallingSequenceBuilder csb = new CallingSequenceBuilder(CLinux, forUpcall, options);
++
++ BindingCalculator argCalc = forUpcall ? new BoxBindingCalculator(true) : new UnboxBindingCalculator(true);
++ BindingCalculator retCalc = forUpcall ? new UnboxBindingCalculator(false) : new BoxBindingCalculator(false);
++
++ boolean returnInMemory = isInMemoryReturn(cDesc.returnLayout());
++ if (returnInMemory) {
++ Class<?> carrier = MemorySegment.class;
++ MemoryLayout layout =SharedUtils.C_POINTER;
++ csb.addArgumentBindings(carrier, layout, argCalc.getBindings(carrier, layout));
++ } else if (cDesc.returnLayout().isPresent()) {
++ Class<?> carrier = mt.returnType();
++ MemoryLayout layout = cDesc.returnLayout().get();
++ csb.setReturnBindings(carrier, layout, retCalc.getBindings(carrier, layout));
++ }
++
++ for (int i = 0; i < mt.parameterCount(); i++) {
++ Class<?> carrier = mt.parameterType(i);
++ MemoryLayout layout = cDesc.argumentLayouts().get(i);
++ csb.addArgumentBindings(carrier, layout, argCalc.getBindings(carrier, layout));
++ }
++
++ return new Bindings(csb.build(), returnInMemory);
++ }
++
++ public static MethodHandle arrangeDowncall(MethodType mt, FunctionDescriptor cDesc, LinkerOptions options) {
++ Bindings bindings = getBindings(mt, cDesc, false, options);
++
++ MethodHandle handle = new DowncallLinker(CLinux, bindings.callingSequence).getBoundMethodHandle();
++
++ if (bindings.isInMemoryReturn) {
++ handle = SharedUtils.adaptDowncallForIMR(handle, cDesc, bindings.callingSequence);
++ }
++
++ return handle;
++ }
++
++ public static UpcallStubFactory arrangeUpcall(MethodType mt, FunctionDescriptor cDesc, LinkerOptions options) {
++ Bindings bindings = getBindings(mt, cDesc, true, options);
++
++ final boolean dropReturn = true; /* drop return, since we don't have bindings for it */
++ return SharedUtils.arrangeUpcallHelper(mt, bindings.isInMemoryReturn, dropReturn, CLinux,
++ bindings.callingSequence);
++ }
++
++ private static boolean isInMemoryReturn(Optional<MemoryLayout> returnLayout) {
++ return returnLayout
++ .filter(layout -> layout instanceof GroupLayout)
++ .isPresent();
++ }
++
++ static class StorageCalculator {
++ private final boolean forArguments;
++
++ private final int[] nRegs = new int[] { 0, 0 };
++ private long stackOffset = 0;
++
++ public StorageCalculator(boolean forArguments) {
++ this.forArguments = forArguments;
++ }
++
++ VMStorage stackAlloc(long size, long alignment) {
++ long alignedStackOffset = Utils.alignUp(stackOffset, alignment);
++
++ short encodedSize = (short) size;
++ assert (encodedSize & 0xFFFF) == size;
++
++ VMStorage storage = stackStorage(encodedSize, (int) alignedStackOffset);
++ stackOffset = alignedStackOffset + size;
++ return storage;
++ }
++
++ VMStorage regAlloc(int type) {
++ int gpRegCnt = (type == StorageType.INTEGER) ? 1 : 0;
++ int fpRegCnt = (type == StorageType.FLOAT) ? 1 : 0;
++
++ // Use stack if not enough registers available.
++ if ((type == StorageType.FLOAT && (nRegs[StorageType.FLOAT] + fpRegCnt) > MAX_FLOAT_REGISTER_ARGUMENTS)
++ || (type == StorageType.INTEGER && (nRegs[StorageType.INTEGER] + gpRegCnt) > MAX_REGISTER_ARGUMENTS)) return null;
++
++ VMStorage[] source = (forArguments ? CLinux.inputStorage : CLinux.outputStorage)[type];
++ VMStorage result = source[nRegs[type]];
++
++ nRegs[StorageType.INTEGER] += gpRegCnt;
++ nRegs[StorageType.FLOAT] += fpRegCnt;
++ return result;
++
++ }
++ VMStorage getStorage(int type, boolean is32Bit) {
++ VMStorage reg = regAlloc(type);
++ if (reg != null) {
++ if (is32Bit) {
++ reg = new VMStorage(reg.type(), REG32_MASK, reg.indexOrOffset());
++ }
++ return reg;
++ }
++ VMStorage stack;
++ if (is32Bit) {
++ stackAlloc(4, STACK_SLOT_SIZE); // Skip first half of stack slot.
++ stack = stackAlloc(4, 4);
++ } else
++ stack = stackAlloc(8, STACK_SLOT_SIZE);
++
++ return stack;
++ }
++ }
++
++ abstract static class BindingCalculator {
++ protected final StorageCalculator storageCalculator;
++
++ protected BindingCalculator(boolean forArguments) {
++ this.storageCalculator = new LinuxS390CallArranger.StorageCalculator(forArguments);
++ }
++
++ abstract List<Binding> getBindings(Class<?> carrier, MemoryLayout layout);
++ }
++
++ // Compute recipe for transferring arguments / return values to C from Java.
++ static class UnboxBindingCalculator extends BindingCalculator {
++ UnboxBindingCalculator(boolean forArguments) {
++ super(forArguments);
++ }
++
++ @Override
++ List<Binding> getBindings(Class<?> carrier, MemoryLayout layout) {
++ TypeClass argumentClass = TypeClass.classifyLayout(layout);
++ Binding.Builder bindings = Binding.builder();
++ switch (argumentClass) {
++ case STRUCT_REGISTER -> {
++ assert carrier == MemorySegment.class;
++ VMStorage storage = storageCalculator.getStorage(StorageType.INTEGER, false);
++ Class<?> type = SharedUtils.primitiveCarrierForSize(layout.byteSize(), false);
++ bindings.bufferLoad(0, type)
++ .vmStore(storage, type);
++ }
++ case STRUCT_SFA -> {
++ assert carrier == MemorySegment.class;
++ VMStorage storage = storageCalculator.getStorage(StorageType.FLOAT, layout.byteSize() == 4);
++ Class<?> type = SharedUtils.primitiveCarrierForSize(layout.byteSize(), true);
++ bindings.bufferLoad(0, type)
++ .vmStore(storage, type);
++ }
++ case STRUCT_REFERENCE -> {
++ assert carrier == MemorySegment.class;
++ bindings.copy(layout)
++ .unboxAddress();
++ VMStorage storage = storageCalculator.getStorage(StorageType.INTEGER, false);
++ bindings.vmStore(storage, long.class);
++ }
++ case POINTER -> {
++ VMStorage storage = storageCalculator.getStorage(StorageType.INTEGER, false);
++ bindings.unboxAddress()
++ .vmStore(storage, long.class);
++ }
++ case INTEGER -> {
++ // ABI requires all int types to get extended to 64 bit.
++ VMStorage storage = storageCalculator.getStorage(StorageType.INTEGER, false);
++ bindings.vmStore(storage, carrier);
++ }
++ case FLOAT -> {
++ VMStorage storage = storageCalculator.getStorage(StorageType.FLOAT, carrier == float.class);
++ bindings.vmStore(storage, carrier);
++ }
++ default -> throw new UnsupportedOperationException("Unhandled class " + argumentClass);
++ }
++ return bindings.build();
++ }
++ }
++
++ // Compute recipe for transferring arguments / return values from C to Java.
++ static class BoxBindingCalculator extends BindingCalculator {
++ BoxBindingCalculator(boolean forArguments) {
++ super(forArguments);
++ }
++
++ @Override
++ List<Binding> getBindings(Class<?> carrier, MemoryLayout layout) {
++ TypeClass argumentClass = TypeClass.classifyLayout(layout);
++ Binding.Builder bindings = Binding.builder();
++ switch (argumentClass) {
++ case STRUCT_REGISTER -> {
++ assert carrier == MemorySegment.class;
++ bindings.allocate(layout)
++ .dup();
++ VMStorage storage = storageCalculator.getStorage(StorageType.INTEGER, false);
++ Class<?> type = SharedUtils.primitiveCarrierForSize(layout.byteSize(), false);
++ bindings.vmLoad(storage, type)
++ .bufferStore(0, type);
++ }
++ case STRUCT_SFA -> {
++ assert carrier == MemorySegment.class;
++ bindings.allocate(layout)
++ .dup();
++ VMStorage storage = storageCalculator.getStorage(StorageType.FLOAT, layout.byteSize() == 4);
++ Class<?> type = SharedUtils.primitiveCarrierForSize(layout.byteSize(), true);
++ bindings.vmLoad(storage, type)
++ .bufferStore(0, type);
++ }
++ case STRUCT_REFERENCE -> {
++ assert carrier == MemorySegment.class;
++ VMStorage storage = storageCalculator.getStorage(StorageType.INTEGER, false);
++ bindings.vmLoad(storage, long.class)
++ .boxAddress(layout);
++ }
++ case POINTER -> {
++ AddressLayout addressLayout = (AddressLayout) layout;
++ VMStorage storage = storageCalculator.getStorage(StorageType.INTEGER, false);
++ bindings.vmLoad(storage, long.class)
++ .boxAddressRaw(Utils.pointeeByteSize(addressLayout), Utils.pointeeByteAlign(addressLayout));
++ }
++ case INTEGER -> {
++ // We could use carrier != long.class for BoxBindingCalculator, but C always uses 64 bit slots.
++ VMStorage storage = storageCalculator.getStorage(StorageType.INTEGER, false);
++ bindings.vmLoad(storage, carrier);
++ }
++ case FLOAT -> {
++ VMStorage storage = storageCalculator.getStorage(StorageType.FLOAT, carrier == float.class);
++ bindings.vmLoad(storage, carrier);
++ }
++ default -> throw new UnsupportedOperationException("Unhandled class " + argumentClass);
++ }
++ return bindings.build();
++ }
++ }
++}
+diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/LinuxS390Linker.java b/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/LinuxS390Linker.java
+new file mode 100644
+index 00000000000..ac004b9e1e0
+--- /dev/null
++++ b/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/LinuxS390Linker.java
+@@ -0,0 +1,64 @@
++/*
++ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2023 IBM Corp. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++package jdk.internal.foreign.abi.s390.linux;
++
++import jdk.internal.foreign.abi.AbstractLinker;
++import jdk.internal.foreign.abi.LinkerOptions;
++
++import java.lang.foreign.FunctionDescriptor;
++import java.lang.invoke.MethodHandle;
++import java.lang.invoke.MethodType;
++import java.nio.ByteOrder;
++
++public final class LinuxS390Linker extends AbstractLinker {
++
++ public static LinuxS390Linker getInstance() {
++ final class Holder {
++ private static final LinuxS390Linker INSTANCE = new LinuxS390Linker();
++ }
++
++ return Holder.INSTANCE;
++ }
++
++ private LinuxS390Linker() {
++ // Ensure there is only one instance
++ }
++
++ @Override
++ protected MethodHandle arrangeDowncall(MethodType inferredMethodType, FunctionDescriptor function, LinkerOptions options) {
++ return LinuxS390CallArranger.arrangeDowncall(inferredMethodType, function, options);
++ }
++
++ @Override
++ protected UpcallStubFactory arrangeUpcall(MethodType targetType, FunctionDescriptor function, LinkerOptions options) {
++ return LinuxS390CallArranger.arrangeUpcall(targetType, function, options);
++ }
++
++ @Override
++ protected ByteOrder linkerByteOrder() {
++ return ByteOrder.BIG_ENDIAN;
++ }
++}
+diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/TypeClass.java b/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/TypeClass.java
+new file mode 100644
+index 00000000000..095cb2c08a8
+--- /dev/null
++++ b/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/TypeClass.java
+@@ -0,0 +1,126 @@
++/*
++ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2023 IBM Corp. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++package jdk.internal.foreign.abi.s390.linux;
++
++import java.lang.foreign.GroupLayout;
++import java.lang.foreign.MemoryLayout;
++import java.lang.foreign.MemorySegment;
++import java.lang.foreign.SequenceLayout;
++import java.lang.foreign.ValueLayout;
++import java.util.List;
++import java.util.ArrayList;
++
++public enum TypeClass {
++ STRUCT_REGISTER,
++ STRUCT_SFA, // Single Float Aggregate
++ STRUCT_REFERENCE,
++ POINTER,
++ INTEGER,
++ FLOAT;
++
++ private static TypeClass classifyValueType(ValueLayout type) {
++ Class<?> carrier = type.carrier();
++ if (carrier == boolean.class || carrier == byte.class || carrier == char.class ||
++ carrier == short.class || carrier == int.class || carrier == long.class) {
++ return INTEGER;
++ } else if (carrier == float.class || carrier == double.class) {
++ return FLOAT;
++ } else if (carrier == MemorySegment.class) {
++ return POINTER;
++ } else {
++ throw new IllegalStateException("Cannot get here: " + carrier.getName());
++ }
++ }
++
++ private static boolean isRegisterAggregate(MemoryLayout type) {
++ long byteSize = type.byteSize();
++ if (byteSize > 8 || byteSize == 3 || byteSize == 5 || byteSize == 6 || byteSize == 7)
++ return false;
++ return true;
++ }
++
++ static List<MemoryLayout> scalarLayouts(GroupLayout gl) {
++ List<MemoryLayout> out = new ArrayList<>();
++ scalarLayoutsInternal(out, gl);
++ return out;
++ }
++
++ private static void scalarLayoutsInternal(List<MemoryLayout> out, GroupLayout gl) {
++ for (MemoryLayout member : gl.memberLayouts()) {
++ if (member instanceof GroupLayout memberGl) {
++ scalarLayoutsInternal(out, memberGl);
++ } else if (member instanceof SequenceLayout memberSl) {
++ for (long i = 0; i < memberSl.elementCount(); i++) {
++ out.add(memberSl.elementLayout());
++ }
++ } else {
++ // padding or value layouts
++ out.add(member);
++ }
++ }
++ }
++
++ static boolean isSingleFloatAggregate(MemoryLayout type) {
++ List<MemoryLayout> scalarLayouts = scalarLayouts((GroupLayout) type);
++
++ final int numElements = scalarLayouts.size();
++ if (numElements > 1 || numElements == 0)
++ return false;
++
++ MemoryLayout baseType = scalarLayouts.get(0);
++
++ if (!(baseType instanceof ValueLayout))
++ return false;
++
++ TypeClass baseArgClass = classifyValueType((ValueLayout) baseType);
++ if (baseArgClass != FLOAT)
++ return false;
++
++ return true;
++ }
++
++ private static TypeClass classifyStructType(MemoryLayout layout) {
++
++ if (!isRegisterAggregate(layout)) {
++ return TypeClass.STRUCT_REFERENCE;
++ }
++
++ if (isSingleFloatAggregate(layout)) {
++ return TypeClass.STRUCT_SFA;
++ }
++ return TypeClass.STRUCT_REGISTER;
++ }
++
++ public static TypeClass classifyLayout(MemoryLayout type) {
++ if (type instanceof ValueLayout) {
++ return classifyValueType((ValueLayout) type);
++ } else if (type instanceof GroupLayout) {
++ return classifyStructType(type);
++ } else {
++ throw new IllegalArgumentException("Unsupported layout: " + type);
++ }
++ }
++}
+diff --git a/test/jdk/java/foreign/TestClassLoaderFindNative.java b/test/jdk/java/foreign/TestClassLoaderFindNative.java
+index 3f5fec0c195..44ec8732ed4 100644
+--- a/test/jdk/java/foreign/TestClassLoaderFindNative.java
++++ b/test/jdk/java/foreign/TestClassLoaderFindNative.java
+@@ -31,9 +31,10 @@
+ import java.lang.foreign.Arena;
+ import java.lang.foreign.MemorySegment;
+ import java.lang.foreign.SymbolLookup;
++import java.nio.ByteOrder;
+ import org.testng.annotations.Test;
+
+-import static java.lang.foreign.ValueLayout.JAVA_BYTE;
++import static java.lang.foreign.ValueLayout.JAVA_INT;
+ import static org.testng.Assert.*;
+
+ // FYI this test is run on 64-bit platforms only for now,
+@@ -58,8 +59,8 @@ public class TestClassLoaderFindNative {
+
+ @Test
+ public void testVariableSymbolLookup() {
+- MemorySegment segment = SymbolLookup.loaderLookup().find("c").get().reinterpret(1);
+- assertEquals(segment.get(JAVA_BYTE, 0), 42);
++ MemorySegment segment = SymbolLookup.loaderLookup().find("c").get().reinterpret(4);
++ assertEquals(segment.get(JAVA_INT, 0), 42);
+ }
+
+ @Test
+diff --git a/test/jdk/java/foreign/TestIllegalLink.java b/test/jdk/java/foreign/TestIllegalLink.java
+index 677f0bce62f..5d8277a5d4c 100644
+--- a/test/jdk/java/foreign/TestIllegalLink.java
++++ b/test/jdk/java/foreign/TestIllegalLink.java
+@@ -54,6 +54,7 @@ import static org.testng.Assert.fail;
+ public class TestIllegalLink extends NativeTestHelper {
+
+ private static final boolean IS_SYSV = CABI.current() == CABI.SYS_V;
++ private static final boolean IS_LE = ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN;
+
+ private static final MemorySegment DUMMY_TARGET = MemorySegment.ofAddress(1);
+ private static final MethodHandle DUMMY_TARGET_MH = MethodHandles.empty(MethodType.methodType(void.class));
+@@ -113,27 +114,27 @@ public class TestIllegalLink extends NativeTestHelper {
+ {
+ FunctionDescriptor.of(MemoryLayout.sequenceLayout(2, C_INT)),
+ NO_OPTIONS,
+- "Unsupported layout: [2:i4]"
++ IS_LE ? "Unsupported layout: [2:i4]" : "Unsupported layout: [2:I4]"
+ },
+ {
+ FunctionDescriptor.ofVoid(MemoryLayout.sequenceLayout(2, C_INT)),
+ NO_OPTIONS,
+- "Unsupported layout: [2:i4]"
++ IS_LE ? "Unsupported layout: [2:i4]" : "Unsupported layout: [2:I4]"
+ },
+ {
+ FunctionDescriptor.ofVoid(C_INT.withByteAlignment(2)),
+ NO_OPTIONS,
+- "Unsupported layout: 2%i4"
++ IS_LE ? "Unsupported layout: 2%i4" : "Unsupported layout: 2%I4"
+ },
+ {
+ FunctionDescriptor.ofVoid(C_POINTER.withByteAlignment(2)),
+ NO_OPTIONS,
+- "Unsupported layout: 2%a8"
++ IS_LE ? "Unsupported layout: 2%a8" : "Unsupported layout: 2%A8"
+ },
+ {
+ FunctionDescriptor.ofVoid(ValueLayout.JAVA_CHAR.withByteAlignment(4)),
+ NO_OPTIONS,
+- "Unsupported layout: 4%c2"
++ IS_LE ? "Unsupported layout: 4%c2" : "Unsupported layout: 4%C2"
+ },
+ {
+ FunctionDescriptor.ofVoid(MemoryLayout.structLayout(
+@@ -142,7 +143,7 @@ public class TestIllegalLink extends NativeTestHelper {
+ C_INT.withName("z").withByteAlignment(1)
+ ).withByteAlignment(1)),
+ NO_OPTIONS,
+- "Unsupported layout: 1%s2"
++ IS_LE ? "Unsupported layout: 1%s2" : "Unsupported layout: 1%S2"
+ },
+ {
+ FunctionDescriptor.ofVoid(MemoryLayout.structLayout(
+@@ -152,7 +153,7 @@ public class TestIllegalLink extends NativeTestHelper {
+ C_INT.withName("z").withByteAlignment(1)
+ ))),
+ NO_OPTIONS,
+- "Unsupported layout: 1%s2"
++ IS_LE ? "Unsupported layout: 1%s2" : "Unsupported layout: 1%S2"
+ },
+ {
+ FunctionDescriptor.ofVoid(MemoryLayout.structLayout(
+@@ -160,7 +161,7 @@ public class TestIllegalLink extends NativeTestHelper {
+ C_INT.withByteAlignment(1)
+ ))),
+ NO_OPTIONS,
+- "Unsupported layout: 1%i4"
++ IS_LE ? "Unsupported layout: 1%i4" : "Unsupported layout: 1%I4"
+ },
+ {
+ FunctionDescriptor.ofVoid(MemoryLayout.structLayout(
+@@ -173,17 +174,17 @@ public class TestIllegalLink extends NativeTestHelper {
+ {
+ FunctionDescriptor.of(C_INT.withOrder(nonNativeOrder())),
+ NO_OPTIONS,
+- "Unsupported layout: I4"
++ IS_LE ? "Unsupported layout: I4" : "Unsupported layout: i4"
+ },
+ {
+ FunctionDescriptor.of(MemoryLayout.structLayout(C_INT.withOrder(nonNativeOrder()))),
+ NO_OPTIONS,
+- "Unsupported layout: I4"
++ IS_LE ? "Unsupported layout: I4" : "Unsupported layout: i4"
+ },
+ {
+ FunctionDescriptor.of(MemoryLayout.structLayout(MemoryLayout.sequenceLayout(C_INT.withOrder(nonNativeOrder())))),
+ NO_OPTIONS,
+- "Unsupported layout: I4"
++ IS_LE ? "Unsupported layout: I4" : "Unsupported layout: i4"
+ },
+ {
+ FunctionDescriptor.ofVoid(MemoryLayout.structLayout(
+@@ -227,5 +228,4 @@ public class TestIllegalLink extends NativeTestHelper {
+ ? ByteOrder.BIG_ENDIAN
+ : ByteOrder.LITTLE_ENDIAN;
+ }
+-
+ }
+diff --git a/test/jdk/java/foreign/callarranger/platform/PlatformLayouts.java b/test/jdk/java/foreign/callarranger/platform/PlatformLayouts.java
+index 1646063fb08..97856075bef 100644
+--- a/test/jdk/java/foreign/callarranger/platform/PlatformLayouts.java
++++ b/test/jdk/java/foreign/callarranger/platform/PlatformLayouts.java
+@@ -305,5 +305,4 @@ public final class PlatformLayouts {
+ public static final AddressLayout C_POINTER = SharedUtils.C_POINTER;
+
+ }
+-
+ }
diff --git a/openjdk_news.sh b/openjdk_news.sh
index 560b356..386aa53 100755
--- a/openjdk_news.sh
+++ b/openjdk_news.sh
@@ -18,8 +18,8 @@
OLD_RELEASE=$1
NEW_RELEASE=$2
-SUBDIR=$3
-REPO=$4
+REPO=$3
+SUBDIR=$4
SCRIPT_DIR=$(dirname ${0})
if test "x${SUBDIR}" = "x"; then
diff --git a/rh1648644-java_access_bridge_privileged_security.patch b/rh1648644-java_access_bridge_privileged_security.patch
deleted file mode 100644
index 53026ad..0000000
--- a/rh1648644-java_access_bridge_privileged_security.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- openjdk/src/java.base/share/conf/security/java.security
-+++ openjdk/src/java.base/share/conf/security/java.security
-@@ -304,6 +304,8 @@
- #
- package.access=sun.misc.,\
- sun.reflect.,\
-+ org.GNOME.Accessibility.,\
-+ org.GNOME.Bonobo.,\
-
- #
- # List of comma-separated packages that start with or equal this string
-@@ -316,6 +318,8 @@
- #
- package.definition=sun.misc.,\
- sun.reflect.,\
-+ org.GNOME.Accessibility.,\
-+ org.GNOME.Bonobo.,\
-
- #
- # Determines whether this properties file can be appended to
diff --git a/sources b/sources
index a5817fd..b2b5901 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openjdk-21+35.tar.xz) = 311e954cc8d28a336b85efc05baade8945fe5292ae2d91cc7ff71c6b3a1830b1a4b9fc641f87e68a4b3db175eb5c21a18664457715da9b37720c5d4b3eb67195
+SHA512 (openjdk-21.0.1+12.tar.xz) = 96513e1346dea623183ae68f88690aa7ea41d65f6a2499b7f9c08954643dd2a6f10d3f4f529fc34e00ff14e8c1bd3764ac78a5c669937a200c910ebcc74e782b
1
0
List of packages currently excluding arches (1133)
===========================================
- 0ad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- 90-Second-Portraits
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- BareBonesBrowserLaunch
ExclusiveArch: %{java_arches} noarch
- CFR
ExclusiveArch: %{java_arches} noarch
- CardManager
ExclusiveArch: %{java_arches} noarch
- GAPDoc
ExclusiveArch: %{gap_arches} noarch
- GoldenCheetah
ExclusiveArch: %{qt5_qtwebengine_arches}
- GtkAda
ExclusiveArch: %{GPRbuild_arches}
- GtkAda3
ExclusiveArch: %{GPRbuild_arches}
- IPAddress
ExclusiveArch: %{java_arches} noarch
- Mars
ExclusiveArch: %{java_arches} noarch
- OpenColorIO
ExclusiveArch: x86_64 ppc64le
- OpenImageIO
ExclusiveArch: x86_64 ppc64le
- OpenMolcas
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- OpenStego
ExclusiveArch: %{java_arches} noarch
- PragmARC
ExclusiveArch: %{GPRbuild_arches}
- R-V8
ExclusiveArch: %{nodejs_arches}
- R-rJava
ExclusiveArch: %{java_arches}
- RdRand
ExclusiveArch: %{ix86} x86_64
- RediSearch
ExclusiveArch: x86_64
- SLOF
ExclusiveArch: ppc64le
- YafaRay
ExclusiveArch: %{ix86} x86_64
- aardvark-dns
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- accel-config
ExclusiveArch: %{ix86} x86_64
- acpid
ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64
- ahven
ExclusiveArch: %{GPRbuild_arches}
- algobox
ExclusiveArch: %{qt5_qtwebengine_arches}
- american-fuzzy-lop
ExclusiveArch: %{ix86} x86_64 s390x
- anet
ExclusiveArch: %{GPRbuild_arches}
- ant
ExclusiveArch: %{java_arches} noarch
- ant-antunit
ExclusiveArch: %{java_arches} noarch
- ant-contrib
ExclusiveArch: %{java_arches} noarch
- antlr
ExclusiveArch: %{java_arches}
- antlr3
ExclusiveArch: %{java_arches}
- antlr4-project
ExclusiveArch: %{java_arches}
- antlrworks
ExclusiveArch: %{java_arches} noarch
- aopalliance
ExclusiveArch: %{java_arches} noarch
- apache-commons-beanutils
ExclusiveArch: %{java_arches} noarch
- apache-commons-cli
ExclusiveArch: %{java_arches} noarch
- apache-commons-codec
ExclusiveArch: %{java_arches} noarch
- apache-commons-collections
ExclusiveArch: %{java_arches} noarch
- apache-commons-collections4
ExclusiveArch: %{java_arches} noarch
- apache-commons-compress
ExclusiveArch: %{java_arches} noarch
- apache-commons-configuration
ExclusiveArch: %{java_arches} noarch
- apache-commons-digester
ExclusiveArch: %{java_arches} noarch
- apache-commons-exec
ExclusiveArch: %{java_arches} noarch
- apache-commons-io
ExclusiveArch: %{java_arches} noarch
- apache-commons-jexl
ExclusiveArch: %{java_arches} noarch
- apache-commons-jxpath
ExclusiveArch: %{java_arches} noarch
- apache-commons-lang3
ExclusiveArch: %{java_arches} noarch
- apache-commons-logging
ExclusiveArch: %{java_arches} noarch
- apache-commons-math
ExclusiveArch: %{java_arches} noarch
- apache-commons-modeler
ExclusiveArch: %{java_arches} noarch
- apache-commons-net
ExclusiveArch: %{java_arches} noarch
- apache-commons-parent
ExclusiveArch: %{java_arches} noarch
- apache-commons-pool
ExclusiveArch: %{java_arches} noarch
- apache-commons-vfs
ExclusiveArch: %{java_arches} noarch
- apache-ivy
ExclusiveArch: %{java_arches} noarch
- apache-parent
ExclusiveArch: %{java_arches} noarch
- apache-resource-bundles
ExclusiveArch: %{java_arches} noarch
- apache-sshd
ExclusiveArch: %{java_arches} noarch
- apiguardian
ExclusiveArch: %{java_arches} noarch
- apmd
ExclusiveArch: %{ix86}
- appstream-generator
ExclusiveArch: %{ldc_arches}
- aqute-bnd
ExclusiveArch: %{java_arches} noarch
- args4j
ExclusiveArch: %{java_arches} noarch
- arianna
ExclusiveArch: %{qt5_qtwebengine_arches}
- arm-trusted-firmware
ExclusiveArch: aarch64
- asmjit
ExclusiveArch: aarch64 x86_64
- assertj-core
ExclusiveArch: %{java_arches} noarch
- atinject
ExclusiveArch: %{java_arches} noarch
- aunit
ExclusiveArch: %GPRbuild_arches
- auto
ExclusiveArch: %{java_arches} noarch
- autolink-java
ExclusiveArch: noarch %{java_arches}
- avgtime
ExclusiveArch: %{ldc_arches}
- aws
ExclusiveArch: %GPRbuild_arches
- azure-cli
ExclusiveArch: %{java_arches} noarch
- batik
ExclusiveArch: %{java_arches} noarch
- bcal
ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x
- bcc
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
- bcel
ExclusiveArch: %{java_arches} noarch
- bcm283x-firmware
ExclusiveArch: aarch64
- beansbinding
ExclusiveArch: %{java_arches} noarch
- berusky2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips}
- beust-jcommander
ExclusiveArch: %{java_arches} noarch
- bibletime
ExclusiveArch: %{java_arches}
- biosdevname
ExclusiveArch: %{ix86} x86_64
- bless
ExclusiveArch: %mono_arches
- bodhi-server
ExclusiveArch: %{golang_arches_future}
- bolzplatz2006
ExclusiveArch: %{java_arches}
- bouncycastle
ExclusiveArch: %{java_arches} noarch
- box64
ExclusiveArch: aarch64 ppc64le x86_64
- bpftrace
ExclusiveArch: x86_64 %{power64} aarch64 s390x
- brazil
ExclusiveArch: %{java_arches} noarch
- bsf
ExclusiveArch: %{java_arches} noarch
- bsh
ExclusiveArch: %{java_arches} noarch
- build-helper-maven-plugin
ExclusiveArch: %{java_arches} noarch
- buildah
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- byebyebios
ExclusiveArch: x86_64
- byte-buddy
ExclusiveArch: %{java_arches} noarch
- byteman
ExclusiveArch: %{java_arches} noarch
- cachelib
ExclusiveArch: x86_64 aarch64 ppc64le
- caddy
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: %{golang_arches}
- caffe
ExclusiveArch: x86_64 aarch64 ppc64le
- calamares
ExclusiveArch: %{ix86} x86_64 aarch64
- calibre
ExclusiveArch: aarch64 x86_64
- cambozola
ExclusiveArch: %{java_arches} noarch
- canl-java
ExclusiveArch: %{java_arches} noarch
- catatonit
ExclusiveArch: aarch64 ppc64le s390x x86_64
ExclusiveArch: %{golang_arches_future}
- ccdciel
ExclusiveArch: %{fpc_arches}
- cdcollect
ExclusiveArch: %{mono_arches}
- cdi-api
ExclusiveArch: %{java_arches} noarch
- ceph
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- cglib
ExclusiveArch: %{java_arches} noarch
- chromium
ExclusiveArch: x86_64
ExclusiveArch: x86_64 aarch64
- cjdns
ExclusiveArch: %{nodejs_arches}
- classloader-leak-test-framework
ExclusiveArch: %{java_arches} noarch
- classpathless-compiler
ExclusiveArch: %{java_arches} noarch
- clevis-pin-tpm2
ExclusiveArch: %{rust_arches}
- clojure
ExclusiveArch: %{java_arches} noarch
- clojure-core-specs-alpha
ExclusiveArch: %{java_arches} noarch
- clojure-maven-plugin
ExclusiveArch: %{java_arches} noarch
- clojure-spec-alpha
ExclusiveArch: %{java_arches} noarch
- cmospwd
ExclusiveArch: %{ix86} x86_64
- cmrt
ExclusiveArch: %{ix86} x86_64 ia64
- codehaus-parent
ExclusiveArch: %{java_arches} noarch
- colorful
ExclusiveArch: %{fpc_arches}
- colossus
ExclusiveArch: %{java_arches} noarch
- conmon
ExclusiveArch: %{golang_arches_future}
- console-image-viewer
ExclusiveArch: %{java_arches} noarch
- containernetworking-plugins
ExclusiveArch: %{golang_arches}
- coq
ExclusiveArch: %{ocaml_native_compiler}
- cortado
ExclusiveArch: %{java_arches} noarch
- cpu-x
ExclusiveArch: i686 x86_64
- cpufetch
ExclusiveArch: %{arm} aarch64 x86_64 ppc ppc64 ppc64le
- cpuid
ExclusiveArch: %{ix86} x86_64
- cpuinfo
ExclusiveArch: x86_64 aarch64
- cqrlog
ExclusiveArch: %{fpc_arches}
- crash
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- crash-gcore-command
ExclusiveArch: aarch64 ppc64le x86_64
- crash-trace-command
ExclusiveArch: aarch64 ppc64le s390x x86_64
- credentials-fetcher
ExclusiveArch: x86_64 aarch64 s390x
- cri-o
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- cri-tools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- criu
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- crun
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le riscv64 s390x x86_64
- cryptlib
ExclusiveArch: x86_64 aarch64 ppc64le
- crypto-policies
ExclusiveArch: %{java_arches} noarch
- cryptobone
ExclusiveArch: x86_64 ppc64le aarch64
- csslint
ExclusiveArch: %{nodejs_arches} noarch
- daq
ExclusiveArch: x86_64 aarch64
- dbus-sharp
ExclusiveArch: %mono_arches
- dbus-sharp-glib
ExclusiveArch: %mono_arches
- decentxml
ExclusiveArch: %{java_arches} noarch
- deepin-daemon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- deepin-desktop-schemas
ExclusiveArch: %{go_arches}
- directory-maven-plugin
ExclusiveArch: %{java_arches} noarch
- dirgra
ExclusiveArch: %{java_arches} noarch
- disruptor
ExclusiveArch: %{java_arches} noarch
- ditaa
ExclusiveArch: %{java_arches} noarch
- dlm
ExclusiveArch: i686 x86_64
- dmidecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- dmtcp
ExclusiveArch: x86_64
- docker-distribution
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- dogtag-pki
ExclusiveArch: %{java_arches}
- dolphin-emu
ExclusiveArch: x86_64 aarch64
- dom4j
ExclusiveArch: %{java_arches} noarch
- dotnet6.0
ExclusiveArch: aarch64 x86_64 s390x
ExclusiveArch: x86_64
- dotnet7.0
ExclusiveArch: aarch64 ppc64le s390x x86_64
ExclusiveArch: x86_64
- doublecmd
ExclusiveArch: %{ix86} x86_64
- dpdk
ExclusiveArch: x86_64 i686 aarch64 ppc64le
- dub
ExclusiveArch: %{ldc_arches}
- dxvk-native
ExclusiveArch: %{ix86} x86_64
- dyninst
ExclusiveArch: %{ix86} x86_64 ppc64le aarch64
- e3
ExclusiveArch: %{ix86} x86_64
- easymock
ExclusiveArch: %{java_arches} noarch
- ecj
ExclusiveArch: %{java_arches} noarch
- eclipse-swt
ExclusiveArch: %{java_arches}
- ed25519-java
ExclusiveArch: %{java_arches} noarch
- edk2
ExclusiveArch: x86_64 aarch64 riscv64
- efibootmgr
ExclusiveArch: %{efi}
- efifs
ExclusiveArch: %{efi}
- efitools
ExclusiveArch: %{efi}
- efivar
ExclusiveArch: %{efi}
- elk
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- emacs-slime
ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64
- embree
ExclusiveArch: aarch64 x86_64
- embree3
ExclusiveArch: aarch64 x86_64
- enjarify
ExclusiveArch: %{java_arches} noarch
- enki
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
- envytools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- eric
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
- erlang-corba
ExclusiveArch: %{java_arches}
- esmi_ib_library
ExclusiveArch: x86_64
- eth-tools
ExclusiveArch: x86_64
- exec-maven-plugin
ExclusiveArch: %{java_arches} noarch
- external-editor-revived
ExclusiveArch: %{rust_arches}
- extra-enforcer-rules
ExclusiveArch: %{java_arches} noarch
- fasterxml-oss-parent
ExclusiveArch: %{java_arches} noarch
- fb303
ExclusiveArch: x86_64 aarch64 ppc64le
- fbthrift
ExclusiveArch: x86_64 aarch64 ppc64le
- fcitx-libpinyin
ExclusiveArch: %{qt5_qtwebengine_arches}
- fedora-dockerfiles
ExclusiveArch: %{go_arches}
- felix-parent
ExclusiveArch: %{java_arches} noarch
- felix-utils
ExclusiveArch: %{java_arches} noarch
- fernflower
ExclusiveArch: %{java_arches} noarch
- fes
ExclusiveArch: %{ix86} x86_64
- filedrop
ExclusiveArch: %{java_arches} noarch
- firecracker
ExclusiveArch: aarch64 x86_64
- fishbowl
ExclusiveArch: %{java_arches} noarch
- fizz
ExclusiveArch: x86_64 aarch64 ppc64le
- flexmark-java
ExclusiveArch: noarch %{java_arches}
- flocq
ExclusiveArch: %{ocaml_native_compiler}
- florist
ExclusiveArch: %{GPRbuild_arches}
- fluent-bit
ExclusiveArch: x86_64 aarch64
- flute
ExclusiveArch: %{java_arches} noarch
- folly
ExclusiveArch: x86_64 aarch64 ppc64le
- fop
ExclusiveArch: %{java_arches} noarch
- forge-parent
ExclusiveArch: %{java_arches} noarch
- fpc
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc64le
- frama-c
ExclusiveArch: %{ocaml_native_compiler}
- freecol
ExclusiveArch: %{java_arches} noarch
- freemarker
ExclusiveArch: %{java_arches} noarch
- freerouting
ExclusiveArch: %{java_arches} noarch
- frescobaldi
ExclusiveArch: %{qt5_qtwebengine_arches}
- frysk
ExclusiveArch: x86_64 ppc64
- fuse-overlayfs
ExclusiveArch: %{arm64} ppc64le s390x x86_64
- fusesource-pom
ExclusiveArch: %{java_arches} noarch
- fwts
ExclusiveArch: x86_64 %{arm} aarch64 s390x riscv64 %{power64}
- fwupd-efi
ExclusiveArch: x86_64 aarch64
- ga
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- gap
ExclusiveArch: %{gap_arches}
- gap-pkg-ace
ExclusiveArch: %{gap_arches}
- gap-pkg-aclib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-alnuth
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-atlasrep
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-autodoc
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-automata
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-autpgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-browse
ExclusiveArch: %{gap_arches}
- gap-pkg-caratinterface
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-circle
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-cohomolo
ExclusiveArch: %{gap_arches}
- gap-pkg-congruence
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-corelg
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crime
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crisp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crypting
ExclusiveArch: %{gap_arches}
- gap-pkg-cryst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crystcat
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-ctbllib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-curlinterface
ExclusiveArch: %{gap_arches}
- gap-pkg-cvec
ExclusiveArch: %{gap_arches}
- gap-pkg-datastructures
ExclusiveArch: %{gap_arches}
- gap-pkg-design
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-digraphs
ExclusiveArch: %{gap_arches}
- gap-pkg-edim
ExclusiveArch: %{gap_arches}
- gap-pkg-factint
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-ferret
ExclusiveArch: %{gap_arches}
- gap-pkg-fga
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-fining
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-float
ExclusiveArch: %{gap_arches}
- gap-pkg-format
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-forms
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-fr
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-francy
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-gbnp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-genss
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-grape
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-groupoids
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-grpconst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-guava
ExclusiveArch: %{gap_arches}
- gap-pkg-hap
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-hapcryst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-hecke
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-images
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-io
ExclusiveArch: %{gap_arches}
- gap-pkg-irredsol
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-json
ExclusiveArch: %{gap_arches}
- gap-pkg-jupyterkernel
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-jupyterviz
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-laguna
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liealgdb
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liepring
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liering
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-loops
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-lpres
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-mapclass
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-nautytracesinterface
ExclusiveArch: %{gap_arches}
- gap-pkg-nq
ExclusiveArch: %{gap_arches}
- gap-pkg-openmath
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-orb
ExclusiveArch: %{gap_arches}
- gap-pkg-polenta
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-polycyclic
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-polymaking
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-primgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-profiling
ExclusiveArch: %{gap_arches}
- gap-pkg-qpa
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-quagroup
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-radiroot
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-recog
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-repsn
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-resclasses
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-scscp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-semigroups
ExclusiveArch: %{gap_arches}
- gap-pkg-singular
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sla
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-smallgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-smallsemi
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sonata
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sophus
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-spinsym
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-standardff
ExclusiveArch: %{gap_arches}
- gap-pkg-tomlib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-toric
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-transgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-utils
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-uuid
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-xmod
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-zeromqinterface
ExclusiveArch: %{gap_arches}
- gappalib-coq
ExclusiveArch: %{ocaml_native_compiler}
- gbrainy
ExclusiveArch: %mono_arches
- gdb
ExclusiveArch: %{ix86} x86_64
- gdb-exploitable
ExclusiveArch: x86_64 i386
ExclusiveArch: x86_64 noarch
- gearhead1
ExclusiveArch: %{fpc_arches}
- gearhead2
ExclusiveArch: %{fpc_arches}
- ghdl
ExclusiveArch: %{GNAT_arches}
- ghostwriter
ExclusiveArch: %{qt5_qtwebengine_arches}
- gio-sharp
ExclusiveArch: %mono_arches
- gir-to-d
ExclusiveArch: %{ldc_arches}
- git-octopus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- gitqlient
ExclusiveArch: %{qt5_qtwebengine_arches}
- giver
ExclusiveArch: %{mono_arches}
- gkeyfile-sharp
ExclusiveArch: %mono_arches
- glibc32
ExclusiveArch: x86_64
- glibd
ExclusiveArch: %{ldc_arches}
- gnatcoll
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-bindings
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-db
ExclusiveArch: %{GPRbuild_arches}
- gnome-boxes
ExclusiveArch: x86_64
- gnome-desktop-sharp
ExclusiveArch: %mono_arches
- gnome-do
ExclusiveArch: %mono_arches
- gnome-keyring-sharp
ExclusiveArch: %mono_arches
- gnome-rdp
ExclusiveArch: %{mono_arches}
- gnome-sharp
ExclusiveArch: %mono_arches
- gnome-subtitles
ExclusiveArch: %mono_arches
- gnu-efi
ExclusiveArch: %{efi}
- go-bindata
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- godep
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang
ExclusiveArch: %{golang_arches}
- google-gson
ExclusiveArch: %{java_arches} noarch
- google-guice
ExclusiveArch: %{java_arches} noarch
- gotun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: x86_64
- goverlay
ExclusiveArch: %{fpc_arches}
- gprbuild
ExclusiveArch: %{GPRbuild_arches}
- gprolog
ExclusiveArch: x86_64 %{ix86} ppc alpha aarch64
- grafana
ExclusiveArch: %{grafana_arches}
- grafana-pcp
ExclusiveArch: %{grafanapcp_arches}
- gtk-sharp-beans
ExclusiveArch: %mono_arches
- gtk-sharp2
ExclusiveArch: %mono_arches
- gtk-sharp3
ExclusiveArch: %{mono_arches}
- gtkd
ExclusiveArch: %{ldc_arches}
- guava
ExclusiveArch: %{java_arches} noarch
- gudev-sharp
ExclusiveArch: %mono_arches
- guestfs-tools
ExclusiveArch: %{kernel_arches}
- gvisor-tap-vsock
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- hamcrest
ExclusiveArch: %{java_arches} noarch
- harec
ExclusiveArch: x86_64 aarch64
- hawtjni
ExclusiveArch: %{java_arches} noarch
- hedgewars
ExclusiveArch: %{fpc_arches}
- hibernate-jpa-2.0-api
ExclusiveArch: %{java_arches} noarch
- hid4java
ExclusiveArch: %{java_arches} noarch
- hipblas
ExclusiveArch: x86_64
- hipcub
ExclusiveArch: x86_64
- hipify
ExclusiveArch: x86_64
- hsakmt
ExclusiveArch: x86_64 aarch64 ppc64le
- httpcomponents-client
ExclusiveArch: %{java_arches} noarch
- httpcomponents-core
ExclusiveArch: %{java_arches} noarch
- httpcomponents-project
ExclusiveArch: %{java_arches} noarch
- hyena
ExclusiveArch: %{mono_arches}
- hyperscan
ExclusiveArch: x86_64
- hyperv-daemons
ExclusiveArch: i686 x86_64 aarch64
- icaro
ExclusiveArch: %{ix86} x86_64 noarch
- icedtea-web
ExclusiveArch: %{java_arches}
- icu4j
ExclusiveArch: %{java_arches} noarch
- imagej
ExclusiveArch: %{java_arches} noarch
- imhex
ExclusiveArch: x86_64 %{arm64}
- imvirt
ExclusiveArch: %{ix86} x86_64 ia64
- indistarter
ExclusiveArch: %{fpc_arches}
- infinipath-psm
ExclusiveArch: x86_64
- intel-cm-compiler
ExclusiveArch: i686 x86_64
- intel-cmt-cat
ExclusiveArch: x86_64
- intel-compute-runtime
ExclusiveArch: x86_64
- intel-gmmlib
ExclusiveArch: x86_64 i686
- intel-igc
ExclusiveArch: x86_64
- intel-ipp-crypto-mb
ExclusiveArch: x86_64
- intel-ipsec-mb
ExclusiveArch: x86_64
- intel-mediasdk
ExclusiveArch: x86_64
- intel-undervolt
ExclusiveArch: i386 x86_64
- ioport
ExclusiveArch: %{ix86} x86_64
- ipmctl
ExclusiveArch: x86_64
- ispc
ExclusiveArch: x86_64 aarch64
- iucode-tool
ExclusiveArch: %{ix86} x86_64
- iyfct
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- jFormatString
ExclusiveArch: %{java_arches} noarch
- jackson-annotations
ExclusiveArch: %{java_arches} noarch
- jackson-bom
ExclusiveArch: %{java_arches} noarch
- jackson-core
ExclusiveArch: %{java_arches} noarch
- jackson-databind
ExclusiveArch: %{java_arches} noarch
- jackson-dataformats-binary
ExclusiveArch: %{java_arches} noarch
- jackson-dataformats-text
ExclusiveArch: %{java_arches} noarch
- jackson-jaxrs-providers
ExclusiveArch: %{java_arches} noarch
- jackson-modules-base
ExclusiveArch: %{java_arches} noarch
- jackson-parent
ExclusiveArch: %{java_arches} noarch
- jacoco
ExclusiveArch: %{java_arches} noarch
- jacop
ExclusiveArch: %{java_arches} noarch
- jakarta-activation
ExclusiveArch: %{java_arches} noarch
- jakarta-activation1
ExclusiveArch: %{java_arches} noarch
- jakarta-annotations
ExclusiveArch: %{java_arches} noarch
- jakarta-el
ExclusiveArch: %{java_arches} noarch
- jakarta-interceptors
ExclusiveArch: %{java_arches} noarch
- jakarta-json
ExclusiveArch: %{java_arches} noarch
- jakarta-mail
ExclusiveArch: %{java_arches} noarch
- jakarta-mail1
ExclusiveArch: %{java_arches} noarch
- jakarta-oro
ExclusiveArch: %{java_arches} noarch
- jakarta-saaj
ExclusiveArch: %{java_arches} noarch
- jakarta-server-pages
ExclusiveArch: %{java_arches} noarch
- jakarta-servlet
ExclusiveArch: %{java_arches} noarch
- jakarta-xml-ws
ExclusiveArch: %{java_arches} noarch
- janino
ExclusiveArch: %{java_arches} noarch
- jansi
ExclusiveArch: %{java_arches}
- jansi-native
ExclusiveArch: %{java_arches}
- jansi1
ExclusiveArch: %{java_arches} noarch
- java-1.8.0-openjdk
ExclusiveArch: %{java_arches}
- java-1.8.0-openjdk-aarch32
ExclusiveArch: %{arm}
- java-1.8.0-openjdk-portable
ExclusiveArch: %{java_arches}
- java-11-openjdk
ExclusiveArch: %{java_arches}
- java-11-openjdk-portable
ExclusiveArch: %{java_arches}
- java-17-openjdk
ExclusiveArch: %{java_arches}
- java-17-openjdk-portable
ExclusiveArch: %{java_arches}
- java-diff-utils
ExclusiveArch: %{java_arches} noarch
- java-dirq
ExclusiveArch: %{java_arches} noarch
- java-jd-decompiler
ExclusiveArch: %{java_arches} noarch
- java-latest-openjdk
ExclusiveArch: %{java_arches}
- java-latest-openjdk-portable
ExclusiveArch: %{java_arches}
- java-runtime-decompiler
ExclusiveArch: %{java_arches} noarch
- java-scrypt
ExclusiveArch: %{java_arches} noarch
- java_cup
ExclusiveArch: %{java_arches} noarch
- javacc
ExclusiveArch: %{java_arches} noarch
- javacc-maven-plugin
ExclusiveArch: %{java_arches} noarch
- javaewah
ExclusiveArch: %{java_arches} noarch
- javapackages-bootstrap
ExclusiveArch: %{java_arches}
- javaparser
ExclusiveArch: %{java_arches} noarch
- javapoet
ExclusiveArch: %{java_arches} noarch
- javassist
ExclusiveArch: %{java_arches} noarch
- jaxb
ExclusiveArch: %{java_arches} noarch
- jaxb-api
ExclusiveArch: %{java_arches} noarch
- jaxb-api2
ExclusiveArch: %{java_arches} noarch
- jaxb-dtd-parser
ExclusiveArch: %{java_arches} noarch
- jaxb-fi
ExclusiveArch: %{java_arches} noarch
- jaxb-istack-commons
ExclusiveArch: %{java_arches} noarch
- jaxb-stax-ex
ExclusiveArch: %{java_arches} noarch
- jaxen
ExclusiveArch: %{java_arches} noarch
- jboss-jaxrs-2.0-api
ExclusiveArch: %{java_arches} noarch
- jboss-logging
ExclusiveArch: %{java_arches} noarch
- jboss-logging-tools
ExclusiveArch: %{java_arches} noarch
- jboss-parent
ExclusiveArch: %{java_arches} noarch
- jchardet
ExclusiveArch: %{java_arches} noarch
- jcip-annotations
ExclusiveArch: %{java_arches} noarch
- jctools
ExclusiveArch: %{java_arches} noarch
- jcuber
ExclusiveArch: %{java_arches} noarch
- jdeparser
ExclusiveArch: %{java_arches} noarch
- jdepend
ExclusiveArch: %{java_arches} noarch
- jdependency
ExclusiveArch: %{java_arches} noarch
- jdom
ExclusiveArch: %{java_arches} noarch
- jdom2
ExclusiveArch: %{java_arches} noarch
- jedit
ExclusiveArch: %{java_arches} noarch
- jericho-html
ExclusiveArch: %{java_arches} noarch
- jetbrains-annotations
ExclusiveArch: noarch %{java_arches}
- jetty
ExclusiveArch: %{java_arches} noarch
- jflex
ExclusiveArch: %{java_arches} noarch
- jfreechart
ExclusiveArch: %{java_arches} noarch
- jgit
ExclusiveArch: %{java_arches} noarch
- jglobus
ExclusiveArch: %{java_arches} noarch
- jgoodies-common
ExclusiveArch: %{java_arches} noarch
- jgoodies-forms
ExclusiveArch: %{java_arches} noarch
- jgoodies-looks
ExclusiveArch: %{java_arches} noarch
- jigawatts
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- jline
ExclusiveArch: %{java_arches}
- jline2
ExclusiveArch: %{java_arches} noarch
- jmock
ExclusiveArch: %{java_arches} noarch
- jmol
ExclusiveArch: %{java_arches} noarch
- jna
ExclusiveArch: %{java_arches}
- jneuroml-core
ExclusiveArch: %{java_arches} noarch
- jni-inchi
ExclusiveArch: %{java_arches}
- jol
ExclusiveArch: %{java_arches} noarch
- jolokia-jvm-agent
ExclusiveArch: %{java_arches} noarch
- jopt-simple
ExclusiveArch: %{java_arches} noarch
- jorbis
ExclusiveArch: %{java_arches} noarch
- jowl
ExclusiveArch: %{nodejs_arches} noarch
- jpanoramamaker
ExclusiveArch: %{java_arches} noarch
- jsch
ExclusiveArch: %{java_arches} noarch
- jsch-agent-proxy
ExclusiveArch: %{java_arches} noarch
- json_simple
ExclusiveArch: %{java_arches} noarch
- jsoup
ExclusiveArch: %{java_arches} noarch
- jsr-305
ExclusiveArch: %{java_arches} noarch
- jss
ExclusiveArch: %{java_arches}
- jssc
ExclusiveArch: %{java_arches}
- jtidy
ExclusiveArch: %{java_arches} noarch
- julia
ExclusiveArch: x86_64
- junit
ExclusiveArch: %{java_arches} noarch
- junit5
ExclusiveArch: %{java_arches} noarch
- juniversalchardet
ExclusiveArch: %{java_arches} noarch
- jzlib
ExclusiveArch: %{java_arches} noarch
- kaidan
ExclusiveArch: %{qt5_qtwebengine_arches}
- kchmviewer
ExclusiveArch: %{qt5_qtwebengine_arches}
- kernel
ExclusiveArch: noarch x86_64 s390x aarch64 ppc64le
ExclusiveArch: noarch i386 i686 x86_64 s390x aarch64 ppc64le
- keylime-agent-rust
ExclusiveArch: %{rust_arches}
- keyring-ima-signer
ExclusiveArch: %{rust_arches}
- kf5-akonadi-search
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-audiocd-kio
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kblog
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarcore
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarutils
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kitinerary
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-ktnef
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-libkdcraw
ExclusiveArch: x86_64 ppc64le %{arm}
- kicad
ExclusiveArch: x86_64 aarch64 ppc64le
- kiwix-desktop
ExclusiveArch: %{qt5_qtwebengine_arches}
- knot-resolver
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- knotes
ExclusiveArch: x86_64 %{arm}
- kubernetes
ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm}
- laf-plugin
ExclusiveArch: %{java_arches} noarch
- lazarus
ExclusiveArch: %{fpc_arches}
- lazpaint
ExclusiveArch: %{fpc_arches}
- ldapjdk
ExclusiveArch: %{java_arches} noarch
- ldc
ExclusiveArch: %{ldc_arches} ppc64le
- ldc1.32
ExclusiveArch: %{ldc_arches} ppc64le
- libbase
ExclusiveArch: %{java_arches} noarch
- libclc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x
- libcxl
ExclusiveArch: %{power64}
- libdfp
ExclusiveArch: ppc ppc64 ppc64le s390 s390x x86_64
- libdispatch
ExclusiveArch: x86_64 aarch64 ppc64le
- libfonts
ExclusiveArch: %{java_arches} noarch
- libformula
ExclusiveArch: %{java_arches} noarch
- libguestfs
ExclusiveArch: %{kernel_arches}
- libica
ExclusiveArch: s390 s390x
- libipt
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- libkgapi
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- libkrun
ExclusiveArch: x86_64 aarch64
- libkrunfw
ExclusiveArch: x86_64 aarch64
- liblayout
ExclusiveArch: %{java_arches} noarch
- libloader
ExclusiveArch: %{java_arches} noarch
- libnxz
ExclusiveArch: ppc64le
- libocxl
ExclusiveArch: ppc64le
- libpsm2
ExclusiveArch: x86_64
- libquentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- libreoffice-TexMaths
ExclusiveArch: %{java_arches}
- librepository
ExclusiveArch: %{java_arches} noarch
- libretro-desmume2015
ExclusiveArch: i686 x86_64
- librtas
ExclusiveArch: %{power64}
- libserializer
ExclusiveArch: %{java_arches} noarch
- libservicelog
ExclusiveArch: ppc %{power64}
- libsmbios
ExclusiveArch: x86_64 %{ix86}
- libunicode
ExclusiveArch: x86_64 aarch64
- libunwind
ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64
- libva-nvidia-driver
ExclusiveArch: %{x86_64} %{ix86} %{arm64} ppc64le
- libvirt-java
ExclusiveArch: %{java_arches} noarch
- libvma
ExclusiveArch: x86_64 ppc64le ppc64 aarch64
- libvmi
ExclusiveArch: x86_64
- libvpd
ExclusiveArch: %{power64}
- libxsmm
ExclusiveArch: x86_64
- libzdnn
ExclusiveArch: s390x
- libzfcphbaapi
ExclusiveArch: s390 s390x
- libzpc
ExclusiveArch: s390x
- llhttp
ExclusiveArch: %{nodejs_arches}
- log4j
ExclusiveArch: %{java_arches} noarch
- log4net
ExclusiveArch: %mono_arches
- lrmi
ExclusiveArch: %{ix86}
- lsvpd
ExclusiveArch: %{power64}
- luajit
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- lucene
ExclusiveArch: %{java_arches} noarch
- lujavrite
ExclusiveArch: %{java_arches}
- luxcorerender
ExclusiveArch: x86_64
- mactel-boot
ExclusiveArch: x86_64
- magicmirror
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-airnow
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-onthisday
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-singlestock
ExclusiveArch: %{nodejs_arches} noarch
- manifest-tool
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- mariadb-java-client
ExclusiveArch: %{java_arches} noarch
- marked
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- matrix-synapse
ExclusiveArch: %{rust_arches}
- maui-mauikit
ExclusiveArch: %{ix86} s390x aarch64 x86_64
- maven
ExclusiveArch: %{java_arches} noarch
- maven-antrun-plugin
ExclusiveArch: %{java_arches} noarch
- maven-archetype
ExclusiveArch: %{java_arches} noarch
- maven-archiver
ExclusiveArch: %{java_arches} noarch
- maven-artifact-transfer
ExclusiveArch: %{java_arches} noarch
- maven-assembly-plugin
ExclusiveArch: %{java_arches} noarch
- maven-bundle-plugin
ExclusiveArch: %{java_arches} noarch
- maven-clean-plugin
ExclusiveArch: %{java_arches} noarch
- maven-common-artifact-filters
ExclusiveArch: %{java_arches} noarch
- maven-compiler-plugin
ExclusiveArch: %{java_arches} noarch
- maven-dependency-analyzer
ExclusiveArch: %{java_arches} noarch
- maven-dependency-plugin
ExclusiveArch: %{java_arches} noarch
- maven-dependency-tree
ExclusiveArch: %{java_arches} noarch
- maven-doxia
ExclusiveArch: %{java_arches} noarch
- maven-doxia-sitetools
ExclusiveArch: %{java_arches} noarch
- maven-enforcer
ExclusiveArch: %{java_arches} noarch
- maven-file-management
ExclusiveArch: %{java_arches} noarch
- maven-filtering
ExclusiveArch: %{java_arches} noarch
- maven-invoker
ExclusiveArch: %{java_arches} noarch
- maven-invoker-plugin
ExclusiveArch: %{java_arches} noarch
- maven-jar-plugin
ExclusiveArch: %{java_arches} noarch
- maven-mapping
ExclusiveArch: %{java_arches} noarch
- maven-native
ExclusiveArch: %{java_arches} noarch
- maven-parent
ExclusiveArch: %{java_arches} noarch
- maven-patch-plugin
ExclusiveArch: %{java_arches} noarch
- maven-plugin-testing
ExclusiveArch: %{java_arches} noarch
- maven-plugin-tools
ExclusiveArch: %{java_arches} noarch
- maven-remote-resources-plugin
ExclusiveArch: %{java_arches} noarch
- maven-reporting-api
ExclusiveArch: %{java_arches} noarch
- maven-reporting-impl
ExclusiveArch: %{java_arches} noarch
- maven-resolver
ExclusiveArch: %{java_arches} noarch
- maven-resources-plugin
ExclusiveArch: %{java_arches} noarch
- maven-script-interpreter
ExclusiveArch: %{java_arches} noarch
- maven-shade-plugin
ExclusiveArch: %{java_arches} noarch
- maven-shared-incremental
ExclusiveArch: %{java_arches} noarch
- maven-shared-io
ExclusiveArch: %{java_arches} noarch
- maven-shared-utils
ExclusiveArch: %{java_arches} noarch
- maven-source-plugin
ExclusiveArch: %{java_arches} noarch
- maven-surefire
ExclusiveArch: %{java_arches} noarch
- maven-verifier
ExclusiveArch: %{java_arches} noarch
- maven-verifier-plugin
ExclusiveArch: %{java_arches} noarch
- maven-wagon
ExclusiveArch: %{java_arches} noarch
- maxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- mbpfan
ExclusiveArch: x86_64
- mcelog
ExclusiveArch: i686 x86_64
- mcrouter
ExclusiveArch: x86_64 aarch64 ppc64le
- mecab-java
ExclusiveArch: %java_arches
- mediaconch
ExclusiveArch: %{qt5_qtwebengine_arches}
- mellowplayer
ExclusiveArch: %{qt5_qtwebengine_arches}
- memkind
ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64
- memtest86+
ExclusiveArch: x86_64 %{ix86}
- merkuro
ExclusiveArch: %{qt5_qtwebengine_arches}
- microcode_ctl
ExclusiveArch: %{ix86} x86_64
- micropython
ExclusiveArch: %{arm} x86_64 riscv64
- miglayout
ExclusiveArch: %{java_arches} noarch
- mine_detector
ExclusiveArch: %{GPRbuild_arches}
- minetest
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mingw-libidn2
ExclusiveArch: %{ix86} x86_64 %{arm}
- mingw-wine-gecko
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- mkbootdisk
ExclusiveArch: %{ix86} sparc sparc64 x86_64
- moby-engine
ExclusiveArch: %{golang_arches}
- mockito
ExclusiveArch: %{java_arches} noarch
- mod_mono
ExclusiveArch: %mono_arches
- modello
ExclusiveArch: %{java_arches} noarch
- moditect
ExclusiveArch: %{java_arches} noarch
- module-build-service
ExclusiveArch: %{ix86} x86_64 noarch
- modulemaker-maven-plugin
ExclusiveArch: %{java_arches} noarch
- mojo-executor
ExclusiveArch: %{java_arches} noarch
- mojo-parent
ExclusiveArch: %{java_arches} noarch
- mokutil
ExclusiveArch: %{ix86} x86_64 aarch64 %{arm}
- mono
ExclusiveArch: %mono_arches
- mono-addins
ExclusiveArch: %mono_arches
- mono-basic
ExclusiveArch: %{mono_arches}
- mono-bouncycastle
ExclusiveArch: %mono_arches
- mono-cecil
ExclusiveArch: %mono_arches
- mono-cecil-flowanalysis
ExclusiveArch: %mono_arches
- mono-reflection
ExclusiveArch: %mono_arches
- mono-tools
ExclusiveArch: %mono_arches
- mono-zeroconf
ExclusiveArch: %mono_arches
- monodevelop
ExclusiveArch: %mono_arches
- monodevelop-debugger-gdb
ExclusiveArch: %{mono_arches}
- mrrescue
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- msr-tools
ExclusiveArch: %{ix86} x86_64
- mvfst
ExclusiveArch: x86_64 aarch64 ppc64le
- mxparser
ExclusiveArch: %{java_arches} noarch
- mysql-connector-java
ExclusiveArch: %{java_arches} noarch
- mysql-connector-net
ExclusiveArch: %{mono_arches}
- naev
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- naga
ExclusiveArch: %{java_arches} noarch
- nant
ExclusiveArch: %mono_arches
- nativejit
ExclusiveArch: x86_64
- nbc
ExclusiveArch: %{fpc_arches}
- nbdkit
ExclusiveArch: x86_64
- ndesk-dbus
ExclusiveArch: %{mono_arches}
- ndesk-dbus-glib
ExclusiveArch: %{mono_arches}
- nekohtml
ExclusiveArch: %{java_arches} noarch
- netavark
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- newtonsoft-json
ExclusiveArch: %{mono_arches}
- nodejs-acorn-object-spread
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-backbone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bash-language-server
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buble
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cjs-module-lexer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-generic-pool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-less
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-linefix
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nodemon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-packaging
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-replace-require-self
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-underscore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-undici
ExclusiveArch: %{nodejs_arches} noarch
- nodejs18
ExclusiveArch: %{nodejs_arches}
- nodejs20
ExclusiveArch: %{nodejs_arches}
- nom-tam-fits
ExclusiveArch: %{java_arches} noarch
- notify-sharp
ExclusiveArch: %{mono_arches}
- notify-sharp3
ExclusiveArch: %{mono_arches}
- nuget
ExclusiveArch: %{mono_arches}
- numatop
ExclusiveArch: x86_64 ppc64le
- nunit
ExclusiveArch: %{mono_arches}
- nunit2
ExclusiveArch: %{mono_arches}
- nvml
ExclusiveArch: x86_64 ppc64le
- objectweb-asm
ExclusiveArch: %{java_arches} noarch
- objenesis
ExclusiveArch: %{java_arches} noarch
- obs-service-rust2rpm
ExclusiveArch: %{rust_arches} noarch
- oci-seccomp-bpf-hook
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
ExclusiveArch: %{golang_arches_future}
- oidn
ExclusiveArch: x86_64
- olpc-utils
ExclusiveArch: %{ix86} %{arm}
- oneVPL
ExclusiveArch: x86_64
- oneVPL-intel-gpu
ExclusiveArch: x86_64
- oneapi-level-zero
ExclusiveArch: x86_64
- onednn
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- onedrive
ExclusiveArch: %{ldc_arches}
- ongres-scram
ExclusiveArch: %{java_arches} noarch
- ongres-stringprep
ExclusiveArch: %{java_arches} noarch
- opae
ExclusiveArch: x86_64
- opal-prd
ExclusiveArch: ppc64le
- open-vm-tools
ExclusiveArch: x86_64 aarch64
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: x86_64
- openblas
ExclusiveArch: %{openblas_arches}
- openjdk-asmtools
ExclusiveArch: %{java_arches} noarch
- openjdk-asmtools7
ExclusiveArch: %{java_arches} noarch
- openjfx
ExclusiveArch: %{java_arches}
- openjfx8
ExclusiveArch: x86_64
- openlibm
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64}
- openms
ExclusiveArch: %{qt5_qtwebengine_arches}
- openni
ExclusiveArch: x86_64 %{arm}
- openni-primesense
ExclusiveArch: %{ix86} x86_64 %{arm}
- openoffice.org-diafilter
ExclusiveArch: %{java_arches}
- openpgl
ExclusiveArch: aarch64 x86_64
- openssl-ibmca
ExclusiveArch: s390 s390x
- openstack-java-sdk
ExclusiveArch: %{java_arches} noarch
- opentest4j
ExclusiveArch: %{java_arches} noarch
- openvkl
ExclusiveArch: aarch64 x86_64
- optee_client
ExclusiveArch: aarch64
- optee_os
ExclusiveArch: aarch64
- options
ExclusiveArch: %{java_arches} noarch
- orthorobot
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- osgi-annotation
ExclusiveArch: %{java_arches} noarch
- osgi-compendium
ExclusiveArch: %{java_arches} noarch
- osgi-core
ExclusiveArch: %{java_arches} noarch
- pacemaker
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64 %{arm}
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- pageedit
ExclusiveArch: %{qt5_qtwebengine_arches}
- parserng
ExclusiveArch: %{java_arches} noarch
- pasdoc
ExclusiveArch: %{fpc_arches}
- pcc
ExclusiveArch: %{ix86} x86_64
- pcfi
ExclusiveArch: %{java_arches} noarch
- pcm
ExclusiveArch: %{ix86} x86_64
- pcmciautils
ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm}
- pdbg
ExclusiveArch: ppc64le
- pdfbox
ExclusiveArch: %{java_arches} noarch
- pdfmod
ExclusiveArch: %mono_arches
- pdftk-java
ExclusiveArch: %{java_arches} noarch
- pentaho-libxml
ExclusiveArch: %{java_arches} noarch
- pentaho-reporting-flow-engine
ExclusiveArch: %{java_arches} noarch
- perl-Dumbbench
ExclusiveArch: %{ix86} x86_64 noarch
- perl-Parse-DMIDecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- pesign
ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm}
- pesign-test-app
ExclusiveArch: x86_64
- picocli
ExclusiveArch: %{java_arches} noarch
- pinta
ExclusiveArch: %mono_arches
- pioneer
ExclusiveArch: %{ix86} x86_64
- plantuml
ExclusiveArch: %{java_arches} noarch
- plasma-dialer
ExclusiveArch: %{java_arches}
- playonlinux
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- plexus-archiver
ExclusiveArch: %{java_arches} noarch
- plexus-build-api
ExclusiveArch: %{java_arches} noarch
- plexus-build-api0
ExclusiveArch: %{java_arches} noarch
- plexus-cipher
ExclusiveArch: %{java_arches} noarch
- plexus-classworlds
ExclusiveArch: %{java_arches} noarch
- plexus-compiler
ExclusiveArch: %{java_arches} noarch
- plexus-component-api
ExclusiveArch: %{java_arches} noarch
- plexus-components-pom
ExclusiveArch: %{java_arches} noarch
- plexus-containers
ExclusiveArch: %{java_arches} noarch
- plexus-i18n
ExclusiveArch: %{java_arches} noarch
- plexus-interpolation
ExclusiveArch: %{java_arches} noarch
- plexus-io
ExclusiveArch: %{java_arches} noarch
- plexus-languages
ExclusiveArch: %{java_arches} noarch
- plexus-pom
ExclusiveArch: %{java_arches} noarch
- plexus-resources
ExclusiveArch: %{java_arches} noarch
- plexus-sec-dispatcher
ExclusiveArch: %{java_arches} noarch
- plexus-utils
ExclusiveArch: %{java_arches} noarch
- plexus-velocity
ExclusiveArch: %{java_arches} noarch
- podman
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- poppler-sharp
ExclusiveArch: %mono_arches
- popub
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- postgresql-jdbc
ExclusiveArch: %{java_arches} noarch
- powerpc-utils
ExclusiveArch: ppc %{power64}
- powerstat
ExclusiveArch: %{ix86} x86_64
- ppc64-diag
ExclusiveArch: ppc %{power64}
- procyon
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
- proguard
ExclusiveArch: %{java_arches} noarch
- prometheus-jmx-exporter
ExclusiveArch: %{java_arches} noarch
- prometheus-simpleclient-java
ExclusiveArch: %{java_arches} noarch
- proxygen
ExclusiveArch: x86_64 aarch64 ppc64le
- pveclib
ExclusiveArch: ppc %{power64}
- pyqtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- python-ast-monitor
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
- python-cryptography
ExclusiveArch: %{rust_arches}
- python-damo
ExclusiveArch: x86_64 aarch64 ppc64le s390x noarch
- python-etcd
ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- python-javaobj
ExclusiveArch: %{java_arches} noarch
- python-jnius
ExclusiveArch: %{java_arches}
- python-jupyter-polymake
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- python-openoffice
ExclusiveArch: noarch x86_64
- python-pyahocorasick
ExclusiveArch: x86_64 %{arm64} ppc64le
- python-pymoc
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-pyqt6-webengine
ExclusiveArch: aarch64 x86_64
- q4wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- qatengine
ExclusiveArch: x86_64
- qatzip
ExclusiveArch: x86_64
- qbe
ExclusiveArch: x86_64 aarch64
- qcint
ExclusiveArch: x86_64
- qclib
ExclusiveArch: s390 s390x
- qdox
ExclusiveArch: %{java_arches} noarch
- qemu-sanity-check
ExclusiveArch: %{kernel_arches}
- qevercloud
ExclusiveArch: %{qt5_qtwebengine_arches}
- qmapshack
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt4pas
ExclusiveArch: %{fpc_arches}
- qt5-qtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt6-qtwebengine
ExclusiveArch: aarch64 x86_64
- qt6-qtwebview
ExclusiveArch: aarch64 x86_64
- quantum-espresso
ExclusiveArch: x86_64 %{ix86} aarch64 %{power64}
- quentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- rEFInd
ExclusiveArch: %{efi}
- rachota
ExclusiveArch: %{java_arches} noarch
- rear
ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64
- reflections
ExclusiveArch: %{java_arches} noarch
- reg
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- regexp
ExclusiveArch: %{java_arches} noarch
- relaxng-datatype-java
ExclusiveArch: %{java_arches} noarch
- replacer
ExclusiveArch: %{java_arches} noarch
- reptyr
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- rescene
ExclusiveArch: %{mono_arches}
- resteasy
ExclusiveArch: %{java_arches} noarch
- restool
ExclusiveArch: aarch64
- restsharp
ExclusiveArch: %{mono_arches}
- retsnoop
ExclusiveArch: %{rust_arches}
- rhino
ExclusiveArch: %{java_arches} noarch
- river
ExclusiveArch: %{zig_arches}
- rkcommon
ExclusiveArch: x86_64 aarch64
- rocalution
ExclusiveArch: x86_64
- rocblas
ExclusiveArch: x86_64
- rocclr
ExclusiveArch: x86_64
- rocm-compilersupport
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-device-libs
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-rpm-macros
ExclusiveArch: x86_64
- rocm-runtime
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-smi
ExclusiveArch: x86_64 aarch64 ppc64le
- rocminfo
ExclusiveArch: x86_64 aarch64 ppc64le
- rocprim
ExclusiveArch: x86_64
- rocrand
ExclusiveArch: x86_64
- rocsparse
ExclusiveArch: x86_64
- rocthrust
ExclusiveArch: x86_64
- rpm-ostree
ExclusiveArch: %{rust_arches}
- rr
ExclusiveArch: %{ix86} x86_64 aarch64
- rssguard
ExclusiveArch: %{qt6_qtwebengine_arches}
- rstudio
ExclusiveArch: %{java_arches}
- rsyntaxtextarea
ExclusiveArch: %{java_arches} noarch
- rubygem-childprocess
ExclusiveArch: %{ix86} x86_64 noarch
- runc
ExclusiveArch: %{golang_arches_future}
- rundoc
ExclusiveArch: %{java_arches} noarch
- rust
ExclusiveArch: %{rust_arches}
- rust-askalono-cli
ExclusiveArch: %{rust_arches}
- rust-brotli
ExclusiveArch: %{rust_arches}
- rust-compress-tools
ExclusiveArch: %{rust_arches}
- rust-coreos-installer
ExclusiveArch: %{rust_arches}
- rust-ctr
ExclusiveArch: %{rust_arches}
- rust-dashmap4
ExclusiveArch: %{rust_arches}
- rust-deflate
ExclusiveArch: %{rust_arches}
- rust-deflate0.8
ExclusiveArch: %{rust_arches}
- rust-drg
ExclusiveArch: %{rust_arches}
- rust-epoll
ExclusiveArch: %{rust_arches}
- rust-getch
ExclusiveArch: %{rust_arches}
- rust-gzip-header
ExclusiveArch: %{rust_arches}
- rust-hamming
ExclusiveArch: %{rust_arches}
- rust-hidapi
ExclusiveArch: %{rust_arches}
- rust-httparse
ExclusiveArch: %{rust_arches}
- rust-humantime-serde
ExclusiveArch: %{rust_arches}
- rust-hyperlocal
ExclusiveArch: %{rust_arches}
- rust-image0.23
ExclusiveArch: %{rust_arches}
- rust-inflate
ExclusiveArch: %{rust_arches}
- rust-jpeg-decoder0.1
ExclusiveArch: %{rust_arches}
- rust-k9
ExclusiveArch: %{rust_arches}
- rust-krunvm
ExclusiveArch: x86_64 aarch64
- rust-kstring
ExclusiveArch: %{rust_arches}
- rust-kvm-ioctls
ExclusiveArch: x86_64 aarch64
- rust-lebe
ExclusiveArch: %{rust_arches}
- rust-libslirp-sys
ExclusiveArch: %{rust_arches}
- rust-msru
ExclusiveArch: x86_64
- rust-nanorand
ExclusiveArch: %{rust_arches}
- rust-netstat2
ExclusiveArch: %{rust_arches}
- rust-onig
ExclusiveArch: %{rust_arches}
- rust-openat-ext
ExclusiveArch: %{rust_arches}
- rust-os_type
ExclusiveArch: %{rust_arches}
- rust-pager
ExclusiveArch: %{rust_arches}
- rust-pathsearch
ExclusiveArch: %{rust_arches}
- rust-pretty-bytes
ExclusiveArch: %{rust_arches}
- rust-pretty-hex
ExclusiveArch: %{rust_arches}
- rust-primal-bit
ExclusiveArch: %{rust_arches}
- rust-primal-check
ExclusiveArch: %{rust_arches}
- rust-primal-estimate
ExclusiveArch: %{rust_arches}
- rust-procfs0.9
ExclusiveArch: %{rust_arches}
- rust-psl-types
ExclusiveArch: %{rust_arches}
- rust-psm
ExclusiveArch: %{rust_arches}
- rust-pwd
ExclusiveArch: %{rust_arches}
- rust-rand_core
ExclusiveArch: %{rust_arches}
- rust-schemafy_core
ExclusiveArch: %{rust_arches}
- rust-schemafy_lib
ExclusiveArch: %{rust_arches}
- rust-seahash
ExclusiveArch: %{rust_arches}
- rust-serde-big-array
ExclusiveArch: %{rust_arches}
- rust-serde_qs
ExclusiveArch: %{rust_arches}
- rust-serde_yaml0.8
ExclusiveArch: %{rust_arches}
- rust-sev
ExclusiveArch: x86_64
- rust-sevctl
ExclusiveArch: x86_64
- rust-silver
ExclusiveArch: %{rust_arches}
- rust-sinit
ExclusiveArch: %{rust_arches}
- rust-snphost
ExclusiveArch: x86_64
- rust-ssh-key-dir
ExclusiveArch: %{rust_arches}
- rust-stacker
ExclusiveArch: %{rust_arches}
- rust-structopt
ExclusiveArch: %{rust_arches}
- rust-tiff0.6
ExclusiveArch: %{rust_arches}
- rust-totp-lite
ExclusiveArch: %{rust_arches}
- rust-tower-layer
ExclusiveArch: %{rust_arches}
- rust-tpm2-policy
ExclusiveArch: %{rust_arches}
- rust-unicode-normalization
ExclusiveArch: %{rust_arches}
- rust-unicode-xid
ExclusiveArch: %{rust_arches}
- rust-uriparse
ExclusiveArch: %{rust_arches}
- rust-uucore
ExclusiveArch: %{rust_arches}
- rust-varlink_generator
ExclusiveArch: %{rust_arches}
- rust-varlink_parser
ExclusiveArch: %{rust_arches}
- rust-virtio-bindings
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-vmm-sys-util
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-vtparse
ExclusiveArch: %{rust_arches}
- rust-web-ext-native-messaging
ExclusiveArch: %{rust_arches}
- rust-wezterm-color-types
ExclusiveArch: %{rust_arches}
- rust-wezterm-dynamic
ExclusiveArch: %{rust_arches}
- rust-wezterm-dynamic-derive
ExclusiveArch: %{rust_arches}
- rust-zbus1
ExclusiveArch: %{rust_arches}
- rust-zbus_macros1
ExclusiveArch: %{rust_arches}
- rust-zvariant2
ExclusiveArch: %{rust_arches}
- rust-zvariant_derive2
ExclusiveArch: %{rust_arches}
- rutabaga-gfx-ffi
ExclusiveArch: x86_64 aarch64
- sac
ExclusiveArch: %{java_arches} noarch
- safetyblanket
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- sat4j
ExclusiveArch: %{java_arches} noarch
- sbcl
ExclusiveArch: %{ix86} x86_64 aarch64 %{power64}
- sbd
ExclusiveArch: i686 x86_64 s390x aarch64 ppc64le
- sblim-cim-client
ExclusiveArch: %{java_arches} noarch
- sblim-cim-client2
ExclusiveArch: %{java_arches} noarch
- sbsigntools
ExclusiveArch: x86_64 aarch64 %{arm} %{ix86}
- scala
ExclusiveArch: %{java_arches} noarch
- scannotation
ExclusiveArch: %{java_arches} noarch
- sdljava
ExclusiveArch: %{java_arches}
- sdrangel
ExclusiveArch: %{qt5_qtwebengine_arches}
- sdsl-lite
ExclusiveArch: %{power64} x86_64 aarch64
- sdubby
ExclusiveArch: %{efi}
- seabios
ExclusiveArch: x86_64
- seadrive-gui
ExclusiveArch: %{qt5_qtwebengine_arches}
- seafile-client
ExclusiveArch: %{qt5_qtwebengine_arches}
- seamonkey
ExclusiveArch: x86_64
- seqan3
ExclusiveArch: %{power64} x86_64 aarch64
- sequence-library
ExclusiveArch: %{java_arches} noarch
- servicelog
ExclusiveArch: ppc %{power64}
- shaman
ExclusiveArch: %{java_arches} noarch
- sharpfont
ExclusiveArch: %mono_arches
- sharpziplib
ExclusiveArch: %{mono_arches}
- shim
ExclusiveArch: %{efi}
- shim-unsigned-aarch64
ExclusiveArch: aarch64
- shim-unsigned-x64
ExclusiveArch: x86_64
- sigil
ExclusiveArch: %{qt5_qtwebengine_arches}
- sigul
ExclusiveArch: x86_64
- singularity-ce
ExclusiveArch: %{go_arches}
- sisu
ExclusiveArch: %{java_arches} noarch
- sisu-mojos
ExclusiveArch: %{java_arches} noarch
- skopeo
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- skychart
ExclusiveArch: %{fpc_arches}
- slf4j
ExclusiveArch: %{java_arches} noarch
- slirp4netns
ExclusiveArch: %{golang_arches_future}
- snakeyaml
ExclusiveArch: %{java_arches} noarch
- snapd
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x}
- snip
ExclusiveArch: %{java_arches} noarch
- softnet-stat
ExclusiveArch: %{rust_arches}
- soup-sharp
ExclusiveArch: %{mono_arches}
- spacebar
ExclusiveArch: %{java_arches}
- sparkleshare
ExclusiveArch: %{mono_arches}
- spec-version-maven-plugin
ExclusiveArch: %{java_arches} noarch
- spicctrl
ExclusiveArch: %{ix86} x86_64
- spice
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- spice-parent
ExclusiveArch: %{java_arches} noarch
- springlobby
ExclusiveArch: %{ix86} x86_64
- spyder
ExclusiveArch: %{qt5_qtwebengine_arches}
- sqljet
ExclusiveArch: %{java_arches} noarch
- squeekboard
ExclusiveArch: %{rust_arches}
- startdde
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- stats-collect
ExclusiveArch: %{ix86} x86_64 noarch
- statsd
ExclusiveArch: %{nodejs_arches} noarch
- stratis-cli
ExclusiveArch: %{rust_arches} noarch
- stratisd
ExclusiveArch: %{rust_arches}
ExclusiveArch: %{rust_arches}
ExclusiveArch: %{rust_arches}
- string-template-maven-plugin
ExclusiveArch: %{java_arches} noarch
- stringtemplate
ExclusiveArch: %{java_arches} noarch
- stringtemplate4
ExclusiveArch: %{java_arches} noarch
- stripesnoop
ExclusiveArch: %{ix86} x86_64
- subscription-manager-cockpit
ExclusiveArch: %{nodejs_arches} noarch
- supercollider
ExclusiveArch: %{qt5_qtwebengine_arches}
- supermin
ExclusiveArch: %{kernel_arches}
- svnkit
ExclusiveArch: %{java_arches} noarch
- svt-vp9
ExclusiveArch: x86_64
- swift-lang
ExclusiveArch: x86_64 aarch64
- swiftlint
ExclusiveArch: x86_64 aarch64
- swing-layout
ExclusiveArch: %{java_arches} noarch
- sysbench
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64le s390x
- syslinux
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- system-rules
ExclusiveArch: %{java_arches} noarch
- systemd-boot
ExclusiveArch: %efi
- t-digest
ExclusiveArch: %{java_arches} noarch
- taglib-sharp
ExclusiveArch: %{mono_arches}
- tagsoup
ExclusiveArch: %{java_arches} noarch
- tarantool
ExclusiveArch: %{ix86} x86_64
- tboot
ExclusiveArch: %{ix86} x86_64
- tdlib
ExclusiveArch: x86_64 aarch64
- templates_parser
ExclusiveArch: %GPRbuild_arches
- ternimal
ExclusiveArch: %{rust_arches}
- testcloud
ExclusiveArch: %{kernel_arches} noarch
- testng
ExclusiveArch: %{java_arches} noarch
- texlive
ExclusiveArch: %{java_arches} noarch
- thermald
ExclusiveArch: %{ix86} x86_64
- tilix
ExclusiveArch: %{ldc_arches}
- tomboy
ExclusiveArch: %{mono_arches}
- tomcat
ExclusiveArch: %{java_arches} noarch
- tomcat-native
ExclusiveArch: %{java_arches}
- tomcat-taglibs-parent
ExclusiveArch: %{java_arches} noarch
- tomcatjss
ExclusiveArch: %{java_arches} noarch
- torbrowser-launcher
ExclusiveArch: %{ix86} x86_64
- treelayout
ExclusiveArch: %{java_arches} noarch
- trilead-ssh2
ExclusiveArch: %{java_arches} noarch
- truth
ExclusiveArch: %{java_arches} noarch
- tuned-profiles-nfv-host-bin
ExclusiveArch: %{ix86} x86_64
- typescript
ExclusiveArch: %{nodejs_arches} noarch
- uClibc
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
- ucx
ExclusiveArch: aarch64 ppc64le x86_64
- uglify-js
ExclusiveArch: %{nodejs_arches} noarch
- umr
ExclusiveArch: x86_64 aarch64 ppc64le
- unetbootin
ExclusiveArch: %{ix86} x86_64
- univocity-parsers
ExclusiveArch: %{java_arches} noarch
- ursa-major
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- usd
ExclusiveArch: aarch64 x86_64
- v8-314
ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64
- vakzination
ExclusiveArch: %{java_arches}
- valgrind
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
- vboot-utils
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- vecmath1.2
ExclusiveArch: %{java_arches} noarch
- velocity
ExclusiveArch: %{java_arches} noarch
- vim-go
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}}
- vim-syntastic
ExclusiveArch: %{java_arches} noarch
- virt-p2v
ExclusiveArch: x86_64
- virt-v2v
ExclusiveArch: x86_64
- virtiofsd
ExclusiveArch: %{rust_arches}
- virtualbox-guest-additions
ExclusiveArch: i686 x86_64
- vkd3d
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- vmaf
ExclusiveArch: x86_64
- voms-api-java
ExclusiveArch: %{java_arches} noarch
- voms-clients-java
ExclusiveArch: %{java_arches} noarch
- vrq
ExclusiveArch: %{ix86} x86_64
- wangle
ExclusiveArch: x86_64 aarch64 ppc64le
- warsow
ExclusiveArch: %{ix86} x86_64 %{arm}
- warsow-data
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{ix86} x86_64 %{arm}
- wasmedge
ExclusiveArch: x86_64 aarch64
- watchman
ExclusiveArch: x86_64 aarch64 ppc64le
- wdt
ExclusiveArch: x86_64 aarch64 ppc64le
- webkit2-sharp
ExclusiveArch: %mono_arches
- weld-parent
ExclusiveArch: %{java_arches} noarch
- why3
ExclusiveArch: %{ocaml_native_compiler}
- widevine-installer
ExclusiveArch: aarch64
- wine
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86}
- wine-dxvk
ExclusiveArch: %{ix86} x86_64
- winetricks
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- ws-commons-util
ExclusiveArch: %{java_arches} noarch
- wsdl4j
ExclusiveArch: %{java_arches} noarch
- wult
ExclusiveArch: x86_64
- wxMaxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
- x2goclient
ExclusiveArch: x86_64
- x86-simd-sort
ExclusiveArch: x86_64
- xalan-j2
ExclusiveArch: %{java_arches} noarch
- xbean
ExclusiveArch: %{java_arches} noarch
- xbyak
ExclusiveArch: x86_64
- xbyak_aarch64
ExclusiveArch: aarch64
- xe-guest-utilities-latest
ExclusiveArch: %{ix86} x86_64
- xen
ExclusiveArch: x86_64 aarch64
- xerces-j2
ExclusiveArch: %{java_arches} noarch
- xgap
ExclusiveArch: %{gap_arches}
- xml-commons-apis
ExclusiveArch: %{java_arches} noarch
- xml-commons-resolver
ExclusiveArch: %{java_arches} noarch
- xml-maven-plugin
ExclusiveArch: %{java_arches} noarch
- xmlada
ExclusiveArch: %{GPRbuild_arches}
- xmlgraphics-commons
ExclusiveArch: %{java_arches} noarch
- xmlpull
ExclusiveArch: %{java_arches} noarch
- xmlstreambuffer
ExclusiveArch: %{java_arches} noarch
- xmlunit
ExclusiveArch: %{java_arches} noarch
- xmvn
ExclusiveArch: %{java_arches} noarch
- xmvn-connector-ivy
ExclusiveArch: %{java_arches} noarch
- xmvn-generator
ExclusiveArch: %{java_arches}
- xnnpack
ExclusiveArch: x86_64 aarch64
- xorg-x11-drv-armsoc
ExclusiveArch: %{arm} aarch64
- xorg-x11-drv-intel
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-openchrome
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vesa
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vmware
ExclusiveArch: %{ix86} x86_64 ia64
- xsp
ExclusiveArch: %mono_arches
- xstream
ExclusiveArch: %{java_arches} noarch
- xz-java
ExclusiveArch: %{java_arches} noarch
- yarnpkg
ExclusiveArch: %{nodejs_arches} noarch
- zcfan
ExclusiveArch: x86_64
- zeal
ExclusiveArch: aarch64 x86_64
- zenon
ExclusiveArch: %{ocaml_native_compiler}
- zeromq-ada
ExclusiveArch: %{GPRbuild_arches}
- zig
ExclusiveArch: %{zig_arches}
- zlib-ada
ExclusiveArch: %{GPRbuild_arches}
- zlib-ng
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- zola
ExclusiveArch: %{rust_arches}
1
0
22 Nov '23
The package rpms/kernel.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/kernel.git/commit/?id=4c5a57b6e250a….
Change:
+%ifnarch %nobuildarches
Thanks.
Full change:
============
commit 4c5a57b6e250a3337d5bcd95f7ac8048158f8406
Author: Justin M. Forbes <jforbes(a)fedoraproject.org>
Date: Wed Nov 22 14:49:12 2023 -0600
kernel-6.6.2-101
* Mon Nov 20 2023 Justin M. Forbes <jforbes(a)fedoraproject.org> [6.6.2-0]
- Add bug for AMD ACPI alarm (Justin M. Forbes)
- rtc: cmos: Use ACPI alarm for non-Intel x86 systems too (Mario Limonciello)
- Add bluetooth fixes to BugsFixed (Justin M. Forbes)
- Drop F37 from release targets as it will not rebase to 6.6 (Justin M. Forbes)
- Linux v6.6.2
Resolves:
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
diff --git a/Patchlist.changelog b/Patchlist.changelog
index eb625d3bd..f8e12a3dd 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,135 +1,105 @@
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/acc130077a200c2467cd265c2ef75e82f653a1ad
- acc130077a200c2467cd265c2ef75e82f653a1ad rtc: cmos: Use ACPI alarm for non-Intel x86 systems too
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/ed5f19c3892cc5dcfe95dd4d296c5e617a26c821
+ ed5f19c3892cc5dcfe95dd4d296c5e617a26c821 Revert "netfilter: nf_tables: remove catchall element in GC sync path"
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/9ed1817997b0d2f283275cce33cd7043b220d990
- 9ed1817997b0d2f283275cce33cd7043b220d990 power: supply: core: Use blocking_notifier_call_chain to avoid RCU complaint
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/81689414a7974a3f3fa3b28c18226c9d583761d4
+ 81689414a7974a3f3fa3b28c18226c9d583761d4 netfilter: nf_tables: remove catchall element in GC sync path
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/a3359bb88c8debcf1ed9aeeab15090cff336c8fd
- a3359bb88c8debcf1ed9aeeab15090cff336c8fd Revert "Add linux-next specific files for 20231004"
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/91d392fbbe771b2b4c45fd39b9150e27be3251ba
+ 91d392fbbe771b2b4c45fd39b9150e27be3251ba ACPI: video: Use acpi_device_fix_up_power_children()
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/4ef04c8ed25522fe1e4f917fe557716145c7361d
- 4ef04c8ed25522fe1e4f917fe557716145c7361d Add linux-next specific files for 20231004
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/3bd5c005766e37c5c60b1210e844091ddebd28d6
+ 3bd5c005766e37c5c60b1210e844091ddebd28d6 ACPI: PM: Add acpi_device_fix_up_power_children() function
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/afdab9b20ab7455f752527125b57c92d24601c6e
- afdab9b20ab7455f752527125b57c92d24601c6e drm/amdgpu: set completion status as preempted for the resubmission
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/46f41fa0448229c32bbc60d3c8ef50d22c33b117
+ 46f41fa0448229c32bbc60d3c8ef50d22c33b117 rtc: cmos: Use ACPI alarm for non-Intel x86 systems too
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/fe8fa52d7059d2dd7b171a0ad1a53bd55c7d449a
- fe8fa52d7059d2dd7b171a0ad1a53bd55c7d449a iommu/apple-dart: Handle DMA_FQ domains in attach_dev()
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/84c68fe1f91beef8b25ca2202d3581260447b334
+ 84c68fe1f91beef8b25ca2202d3581260447b334 drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/d08eefa0932515ada7d972c51b99153a7ea3d6ac
- d08eefa0932515ada7d972c51b99153a7ea3d6ac locking/atomic: scripts: fix fallback ifdeffery
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/51d40b1c54cf09e93d42dc0d090765016362d692
+ 51d40b1c54cf09e93d42dc0d090765016362d692 scsi: sd: Add "probe_type" module parameter to allow synchronous probing
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/d39b077dee33176ab97b22593fc8ae8a130ee768
- d39b077dee33176ab97b22593fc8ae8a130ee768 btrfs: adjust overcommit logic when very close to full
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/6e9d8352504d3de95ebdff5289e2da6e93b90767
+ 6e9d8352504d3de95ebdff5289e2da6e93b90767 Enable IO_URING for RHEL
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/a1c2565138b048b69ec731e22118ec1837fa5ceb
- a1c2565138b048b69ec731e22118ec1837fa5ceb btrfs: properly report 0 avail for very full file systems
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/e65e1c9cfce51744f3ccce9ede248e74a6e7bb5c
+ e65e1c9cfce51744f3ccce9ede248e74a6e7bb5c redhat: version two of Makefile.rhelver tweaks
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/60528063540aabceb7c4d79c7938d229ed5efc4f
- 60528063540aabceb7c4d79c7938d229ed5efc4f selinux: fix handling of empty opts in selinux_fs_context_submount()
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/97edcc85a591ed63b65fa583a1593e379ec779a0
+ 97edcc85a591ed63b65fa583a1593e379ec779a0 redhat: adapt to upstream Makefile change
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/80c615ec2edb4aadded21fe924e2caa172d59577
- 80c615ec2edb4aadded21fe924e2caa172d59577 Revert "misc: rtsx: judge ASPM Mode to set PETXCFG Reg"
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/f0274138f93a5de8d5757dc1310a51fd9adae739
+ f0274138f93a5de8d5757dc1310a51fd9adae739 Change acpi_bus_get_acpi_device to acpi_get_acpi_dev
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/c53302b2ed77cf6f3a125135a1f85af8cbc0ba4b
- c53302b2ed77cf6f3a125135a1f85af8cbc0ba4b tpm: Enable hwrng only for Pluton on AMD CPUs
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/b18359baab10beb33452ec4bac68a25db0ac2531
+ b18359baab10beb33452ec4bac68a25db0ac2531 RHEL: disable io_uring support
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/065cd69d44a8c576d6ff671ceae019f991cee492
- 065cd69d44a8c576d6ff671ceae019f991cee492 erofs: ensure that the post-EOF tails are all zeroed
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/e86246f6bff2cae6ed0728cb9855dc321aa22442
+ e86246f6bff2cae6ed0728cb9855dc321aa22442 REDHAT: coresight: etm4x: Disable coresight on HPE Apollo 70
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/b0da866f75833f1bb8570d7978a8d5179c8d9ab6
- b0da866f75833f1bb8570d7978a8d5179c8d9ab6 drm/msm/a690: Switch to a660_gmu.bin
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/780e15df6bfda4a86de773b5a76348845cd287e2
+ 780e15df6bfda4a86de773b5a76348845cd287e2 KEYS: Make use of platform keyring for module signature verify
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/f3cdb1143146a65982f46846cd590affb2b87538
- f3cdb1143146a65982f46846cd590affb2b87538 drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/e16c46de5e538011a405f267e0591a03fe4434f1
+ e16c46de5e538011a405f267e0591a03fe4434f1 Input: rmi4 - remove the need for artificial IRQ in case of HID
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/ea332dbc69a256a04bd53fee92db956439acee06
- ea332dbc69a256a04bd53fee92db956439acee06 scsi: sd: Add "probe_type" module parameter to allow synchronous probing
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/cefdb4374d26857e1d90cdd35936f219693dff11
+ cefdb4374d26857e1d90cdd35936f219693dff11 ARM: tegra: usb no reset
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/66721aea3aaa311bb78cf0947f06070f4101ee0e
- 66721aea3aaa311bb78cf0947f06070f4101ee0e Revert "Remove EXPERT from ARCH_FORCE_MAX_ORDER for aarch64"
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/161fba6e6557f41e7d2e1be2d4300aac25894c22
+ 161fba6e6557f41e7d2e1be2d4300aac25894c22 s390: Lock down the kernel when the IPL secure flag is set
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/29cd90a2b4cade829ac1401ef13314620b6c38a1
- 29cd90a2b4cade829ac1401ef13314620b6c38a1 Remove EXPERT from ARCH_FORCE_MAX_ORDER for aarch64
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/f23df5d91bbc852ed9a289c88b478b5890ff3aff
+ f23df5d91bbc852ed9a289c88b478b5890ff3aff efi: Lock down the kernel if booted in secure boot mode
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/ff96030d973a1b9233402a64d48d53e0d9461781
- ff96030d973a1b9233402a64d48d53e0d9461781 redhat: version two of Makefile.rhelver tweaks
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/388c5040283f7748c06961a807ab82960cfac7b2
+ 388c5040283f7748c06961a807ab82960cfac7b2 efi: Add an EFI_SECURE_BOOT flag to indicate secure boot mode
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/66064bbf7222c53ef297bfa4a14ffe4193b0fe94
- 66064bbf7222c53ef297bfa4a14ffe4193b0fe94 redhat: adapt to upstream Makefile change
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/e81d15d326fecd1c90d82b2acb9bdb259b4033ac
+ e81d15d326fecd1c90d82b2acb9bdb259b4033ac security: lockdown: expose a hook to lock the kernel down
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/c42de182b354644930e07bc92257d586a6c4ed18
- c42de182b354644930e07bc92257d586a6c4ed18 Change acpi_bus_get_acpi_device to acpi_get_acpi_dev
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/1297962689c5c00929be45b6261ab21f0e5de41c
+ 1297962689c5c00929be45b6261ab21f0e5de41c Make get_cert_list() use efi_status_to_str() to print error messages.
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/2e2a2e49f61d066d4bb8bfe0efde2d0f90b1491c
- 2e2a2e49f61d066d4bb8bfe0efde2d0f90b1491c nvme: nvme_mpath_init remove multipath check
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/2b290761ed33270b9f8fea815c9f29476ead5d5d
+ 2b290761ed33270b9f8fea815c9f29476ead5d5d Add efi_status_to_str() and rework efi_status_to_err().
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/5481da71dd1b1b88c550492b28e8b250e299f24c
- 5481da71dd1b1b88c550492b28e8b250e299f24c nvme: decouple basic ANA log page re-read support from native multipathing
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/4f23de5adca7e96a6bb3abc9f7e0546b997c8ea0
+ 4f23de5adca7e96a6bb3abc9f7e0546b997c8ea0 iommu/arm-smmu: workaround DMA mode issues
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/184662e0b0701841ad0229caf0e6d0ddb2a96231
- 184662e0b0701841ad0229caf0e6d0ddb2a96231 nvme: allow local retry and proper failover for REQ_FAILFAST_TRANSPORT
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/3c9be29ba9986f465b7c8fc6e391978833ffac22
+ 3c9be29ba9986f465b7c8fc6e391978833ffac22 ipmi: do not configure ipmi for HPE m400
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/00eb6277b582c42373c536e70d13860f87522e38
- 00eb6277b582c42373c536e70d13860f87522e38 nvme: Return BLK_STS_TARGET if the DNR bit is set
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/f9bd4dd2a3e0ce4fc91eea39c747a2b06ac8852c
+ f9bd4dd2a3e0ce4fc91eea39c747a2b06ac8852c kABI: Add generic kABI macros to use for kABI workarounds
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/80063932c894c04a6266f2543dc8a8c66cf0f4b5
- 80063932c894c04a6266f2543dc8a8c66cf0f4b5 REDHAT: coresight: etm4x: Disable coresight on HPE Apollo 70
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/0a826069d941f0249fa44005fbc6511875553497
+ 0a826069d941f0249fa44005fbc6511875553497 ahci: thunderx2: Fix for errata that affects stop engine
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/90f006ba80d847b4c8c689616b07370c2292a804
- 90f006ba80d847b4c8c689616b07370c2292a804 KEYS: Make use of platform keyring for module signature verify
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/b156077e6f7cdf9bc390551e7b65b80d1d5e285d
+ b156077e6f7cdf9bc390551e7b65b80d1d5e285d Vulcan: AHCI PCI bar fix for Broadcom Vulcan early silicon
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/856b4c54f954509436a51da2bfc0f0d44425d173
- 856b4c54f954509436a51da2bfc0f0d44425d173 Input: rmi4 - remove the need for artificial IRQ in case of HID
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/129dc65edece93e256a9c79b3e1f962fc7074406
+ 129dc65edece93e256a9c79b3e1f962fc7074406 tags.sh: Ignore redhat/rpm
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/9c10ed2c097b09b20c928d555bf030c56502cf88
- 9c10ed2c097b09b20c928d555bf030c56502cf88 ARM: tegra: usb no reset
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/7558a6cc3029f6cce7cb79ad0ab6348fa1083bb1
+ 7558a6cc3029f6cce7cb79ad0ab6348fa1083bb1 put RHEL info into generated headers
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/b136b0c2e0bf2f6f8f75f37fa00376563a78f6b2
- b136b0c2e0bf2f6f8f75f37fa00376563a78f6b2 s390: Lock down the kernel when the IPL secure flag is set
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/fabdc6fc464674d789063463c8a9abe954ed9f0e
+ fabdc6fc464674d789063463c8a9abe954ed9f0e aarch64: acpi scan: Fix regression related to X-Gene UARTs
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/8ffab3ce8c323b13cf4dbbd0291fb4748cae60a0
- 8ffab3ce8c323b13cf4dbbd0291fb4748cae60a0 efi: Lock down the kernel if booted in secure boot mode
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/3332716406fc60dbfbe218275c546081215fd4b3
+ 3332716406fc60dbfbe218275c546081215fd4b3 ACPI / irq: Workaround firmware issue on X-Gene based m400
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/9cae435c2ee4380b4086fa3a7ef859090e9f70d2
- 9cae435c2ee4380b4086fa3a7ef859090e9f70d2 efi: Add an EFI_SECURE_BOOT flag to indicate secure boot mode
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/ad67ea7af8f6e47745455046d807a8cf0b4e3864
+ ad67ea7af8f6e47745455046d807a8cf0b4e3864 modules: add rhelversion MODULE_INFO tag
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/de90fd8131ce4ed22c547c2bd1af1c20ea173a46
- de90fd8131ce4ed22c547c2bd1af1c20ea173a46 security: lockdown: expose a hook to lock the kernel down
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/4a9e157a9522218c86b14c2f91423dc8c6cc32ed
+ 4a9e157a9522218c86b14c2f91423dc8c6cc32ed ACPI: APEI: arm64: Ignore broken HPE moonshot APEI support
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/6fa94ce53295ae4440005260005078d7c737b828
- 6fa94ce53295ae4440005260005078d7c737b828 Make get_cert_list() use efi_status_to_str() to print error messages.
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/dd03abf0c6a7dde42a4f540f782c67d81319118d
+ dd03abf0c6a7dde42a4f540f782c67d81319118d Pull the RHEL version defines out of the Makefile
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/6c671f6b733c4ee8b88e6c314208b90486b98446
- 6c671f6b733c4ee8b88e6c314208b90486b98446 Add efi_status_to_str() and rework efi_status_to_err().
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/676e5b1fd3ede3a4d20157b2604dfd1d0e1405c3
- 676e5b1fd3ede3a4d20157b2604dfd1d0e1405c3 iommu/arm-smmu: workaround DMA mode issues
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/adbf82278579ad712bbdf5d3eaabc4c7fbf3305c
- adbf82278579ad712bbdf5d3eaabc4c7fbf3305c ipmi: do not configure ipmi for HPE m400
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/150baa5a728754cbf8f8c385a10af6b52a408cee
- 150baa5a728754cbf8f8c385a10af6b52a408cee ahci: thunderx2: Fix for errata that affects stop engine
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/0a757157eddee28f46bec619cbaf9d2015fda707
- 0a757157eddee28f46bec619cbaf9d2015fda707 Vulcan: AHCI PCI bar fix for Broadcom Vulcan early silicon
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/6ae5c032ab0cd35e82241c29e1f2bb1272b39fea
- 6ae5c032ab0cd35e82241c29e1f2bb1272b39fea tags.sh: Ignore redhat/rpm
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/36c76ea8d8223e20d158ee0928e9e9798b5b878d
- 36c76ea8d8223e20d158ee0928e9e9798b5b878d aarch64: acpi scan: Fix regression related to X-Gene UARTs
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/3ed45652209eeccc3918663abebc70001760111b
- 3ed45652209eeccc3918663abebc70001760111b ACPI / irq: Workaround firmware issue on X-Gene based m400
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/92d7a8c46934f658c9017966a90a8745e4b085bd
- 92d7a8c46934f658c9017966a90a8745e4b085bd ACPI: APEI: arm64: Ignore broken HPE moonshot APEI support
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/9e9a1ea80fc3ef4bf60f7ee2e41e1dbdd41f17cc
- 9e9a1ea80fc3ef4bf60f7ee2e41e1dbdd41f17cc Pull the RHEL version defines out of the Makefile
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/792dcdfdb07c00a91ad8f8c4624b057b84f5f2ae
- 792dcdfdb07c00a91ad8f8c4624b057b84f5f2ae [initial commit] Add Red Hat variables in the top level makefile
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/866075bfad9aeeb466f2516e071428e9ac5aafaa
+ 866075bfad9aeeb466f2516e071428e9ac5aafaa [initial commit] Add Red Hat variables in the top level makefile
diff --git a/check-kabi b/check-kabi
index f9d4dcb84..3809209ad 100755
--- a/check-kabi
+++ b/check-kabi
@@ -41,7 +41,8 @@ def load_symvers(symvers, filename):
break
if in_line == "\n":
continue
- checksum, symbol, directory, type = in_line.split()
+ checksum, symbol, directory, type, *ns = in_line.split()
+ ns = ns[0] if ns else None
symvers[symbol] = in_line[0:-1]
@@ -57,7 +58,8 @@ def load_kabi(kabi, filename):
break
if in_line == "\n":
continue
- checksum, symbol, directory, type = in_line.split()
+ checksum, symbol, directory, type, *ns = in_line.split()
+ ns = ns[0] if ns else None
kabi[symbol] = in_line[0:-1]
@@ -69,11 +71,14 @@ def check_kabi(symvers, kabi):
warn = 0
changed_symbols = []
moved_symbols = []
+ ns_symbols = []
for symbol in kabi:
- abi_hash, abi_sym, abi_dir, abi_type = kabi[symbol].split()
+ abi_hash, abi_sym, abi_dir, abi_type, *abi_ns = kabi[symbol].split()
+ abi_ns = abi_ns[0] if abi_ns else None
if symbol in symvers:
- sym_hash, sym_sym, sym_dir, sym_type = symvers[symbol].split()
+ sym_hash, sym_sym, sym_dir, sym_type, *sym_ns = symvers[symbol].split()
+ sym_ns = sym_ns[0] if sym_ns else None
if abi_hash != sym_hash:
fail = 1
changed_symbols.append(symbol)
@@ -81,6 +86,10 @@ def check_kabi(symvers, kabi):
if abi_dir != sym_dir:
warn = 1
moved_symbols.append(symbol)
+
+ if abi_ns != sym_ns:
+ warn = 1
+ ns_symbols.append(symbol)
else:
fail = 1
changed_symbols.append(symbol)
@@ -96,13 +105,21 @@ def check_kabi(symvers, kabi):
if warn:
print("*** WARNING - ABI SYMBOLS MOVED ***")
- print("")
- print("The following symbols moved (typically caused by moving a symbol from being")
- print("provided by the kernel vmlinux out to a loadable module):")
- print("")
- for symbol in moved_symbols:
- print(symbol)
- print("")
+ if moved_symbols:
+ print("")
+ print("The following symbols moved (typically caused by moving a symbol from being")
+ print("provided by the kernel vmlinux out to a loadable module):")
+ print("")
+ for symbol in moved_symbols:
+ print(symbol)
+ print("")
+ if ns_symbols:
+ print("")
+ print("The following symbols changed symbol namespaces:")
+ print("")
+ for symbol in ns_symbols:
+ print(symbol)
+ print("")
"""Halt the build, if we got errors and/or warnings. In either case,
double-checkig is required to avoid introducing / concealing
diff --git a/filter-aarch64.sh.fedora b/filter-aarch64.sh.fedora
index accb31c06..e970310a8 100644
--- a/filter-aarch64.sh.fedora
+++ b/filter-aarch64.sh.fedora
@@ -15,4 +15,4 @@ ethdrvs="3com adaptec arc alteon atheros broadcom cadence calxeda chelsio cisco
drmdrvs="amd arm bridge ast exynos hisilicon i2c imx mgag200 meson msm nouveau panel pl111 radeon rockchip tegra sun4i tiny vc4"
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr rnbd-client rnbd-server mlx5_vdpa dfl-emif octeontx2-cpt octeontx2-cptvf spi-altera-dfl rvu_cptpf rvu_cptvf regmap-sdw regmap-sdw-mbq hid-playstation hid-nintendo nvmem_u-boot-env intel-m10-bmc-pmci intel-m10-bmc-hwmon ptp_dfl_tod pds_vdpa"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr rnbd-client rnbd-server mlx5_vdpa dfl-emif octeontx2-cpt octeontx2-cptvf spi-altera-dfl rvu_cptpf rvu_cptvf regmap-sdw regmap-sdw-mbq hid-playstation hid-nintendo nvmem_u-boot-env intel-m10-bmc-pmci intel-m10-bmc-hwmon ptp_dfl_tod pds_vdpa usb_f_midi2 cs42l43-sdw"
diff --git a/filter-modules.sh.fedora b/filter-modules.sh.fedora
index 862223757..c14a79032 100755
--- a/filter-modules.sh.fedora
+++ b/filter-modules.sh.fedora
@@ -45,7 +45,7 @@ netprots="6lowpan appletalk atm ax25 batman-adv bluetooth can dsa ieee802154 l2t
drmdrvs="amd ast bridge gma500 i2c i915 mgag200 nouveau panel radeon"
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr parport_serial regmap-sdw regmap-sdw-mbq arizona-micsupp hid-asus iTCO_wdt rnbd-client rnbd-server mlx5_vdpa spi-altera-dfl nct6775 hid-playstation hid-nintendo asus_wmi_sensors asus_wmi_ec_sensors mlx5-vfio-pci video int3406_thermal apple_bl ptp_dfl_tod intel-m10-bmc-hwmon intel_rapl_tpmi pds_vdpa hp-wmi-sensors"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr parport_serial regmap-sdw regmap-sdw-mbq arizona-micsupp hid-asus iTCO_wdt rnbd-client rnbd-server mlx5_vdpa spi-altera-dfl nct6775 hid-playstation hid-nintendo asus_wmi_sensors asus_wmi_ec_sensors mlx5-vfio-pci video int3406_thermal apple_bl ptp_dfl_tod intel-m10-bmc-hwmon intel_rapl_tpmi pds_vdpa hp-wmi-sensors pds-vfio-pci"
# Grab the arch-specific filter list overrides
source ./filter-$2.sh
diff --git a/filter-ppc64le.sh.fedora b/filter-ppc64le.sh.fedora
index 63413617b..5794edd7c 100644
--- a/filter-ppc64le.sh.fedora
+++ b/filter-ppc64le.sh.fedora
@@ -11,4 +11,4 @@
driverdirs="atm auxdisplay bcma bluetooth firewire fpga infiniband leds media memstick message mmc mtd nfc ntb pcmcia platform power ssb staging tty uio w1"
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr rnbd-client rnbd-server mlx5_vdpa hid-playstation hid-nintendo mlx5-vfio-pci nvmem_u-boot-env intel-m10-bmc-pmci intel-m10-bmc-hwmon ptp_dfl_tod pds_vdpa"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr rnbd-client rnbd-server mlx5_vdpa hid-playstation hid-nintendo mlx5-vfio-pci nvmem_u-boot-env intel-m10-bmc-pmci intel-m10-bmc-hwmon ptp_dfl_tod pds_vdpa pds-vfio-pci"
diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config
index e7432ca2b..e33b90b3a 100644
--- a/kernel-aarch64-16k-debug-fedora.config
+++ b/kernel-aarch64-16k-debug-fedora.config
@@ -145,6 +145,7 @@ CONFIG_AD7949=m
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
CONFIG_ADAPTEC_STARFIRE=m
+# CONFIG_ADDRESS_MASKING is not set
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -1275,6 +1276,7 @@ CONFIG_COMMON_CLK_SI5341=m
# CONFIG_COMMON_CLK_SI5351 is not set
CONFIG_COMMON_CLK_SI544=m
# CONFIG_COMMON_CLK_SI570 is not set
+CONFIG_COMMON_CLK_VC3=m
# CONFIG_COMMON_CLK_VC5 is not set
CONFIG_COMMON_CLK_VC7=m
CONFIG_COMMON_CLK_XGENE=y
@@ -1297,6 +1299,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=3
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1352,6 +1355,8 @@ CONFIG_CPU_THERMAL=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -1781,6 +1786,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
CONFIG_DMA_OF=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
@@ -1809,6 +1815,7 @@ CONFIG_DM_INIT=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=y
@@ -1943,6 +1950,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
CONFIG_DRM_LONTIUM_LT9611=m
CONFIG_DRM_LONTIUM_LT9611UXC=m
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
CONFIG_DRM_MALI_DISPLAY=m
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -2047,11 +2055,13 @@ CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
+CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m
# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
CONFIG_DRM_PANEL_TPO_TPG110=m
CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
+CONFIG_DRM_PANEL_VISIONOX_R66451=m
CONFIG_DRM_PANEL_VISIONOX_RM69299=m
CONFIG_DRM_PANEL_VISIONOX_VTDR6130=m
CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
@@ -2099,6 +2109,7 @@ CONFIG_DRM_TOSHIBA_TC358764=m
CONFIG_DRM_TOSHIBA_TC358767=m
CONFIG_DRM_TOSHIBA_TC358768=m
CONFIG_DRM_TOSHIBA_TC358775=m
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
CONFIG_DRM_V3D=m
@@ -2307,6 +2318,7 @@ CONFIG_EROFS_FS=m
CONFIG_EROFS_FS_POSIX_ACL=y
CONFIG_EROFS_FS_SECURITY=y
CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP_DEFLATE=y
CONFIG_EROFS_FS_ZIP_LZMA=y
CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
@@ -2396,6 +2408,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -2637,6 +2650,7 @@ CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
CONFIG_GPIO_DAVINCI=m
CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_DS4520=m
CONFIG_GPIO_DWAPB=m
CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_FTGPIO010 is not set
@@ -2776,6 +2790,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
CONFIG_HID_GLORIOUS=m
# CONFIG_HID_GOOGLE_HAMMER is not set
+CONFIG_HID_GOOGLE_STADIA_FF=m
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2995,6 +3010,7 @@ CONFIG_I2C_ALGOPCF=m
CONFIG_I2C_AMD_MP2=m
CONFIG_I2C_APPLE=m
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+CONFIG_I2C_ATR=m
CONFIG_I2C_BCM2835=m
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_BRCMSTB=y
@@ -3438,6 +3454,7 @@ CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
CONFIG_IOSM=m
CONFIG_IO_STRICT_DEVMEM=y
+CONFIG_IO_URING=y
CONFIG_IP5XXX_POWER=m
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -3507,6 +3524,7 @@ CONFIG_IP_PIMSM_V2=y
# CONFIG_IPQ_APSS_6018 is not set
# CONFIG_IPQ_APSS_PLL is not set
# CONFIG_IPQ_GCC_4019 is not set
+CONFIG_IPQ_GCC_5018=m
# CONFIG_IPQ_GCC_5332 is not set
# CONFIG_IPQ_GCC_6018 is not set
# CONFIG_IPQ_GCC_806X is not set
@@ -3534,6 +3552,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+CONFIG_IPU_BRIDGE=m
CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_IOAM6_LWTUNNEL=y
@@ -3611,6 +3630,7 @@ CONFIG_IR_RC6_DECODER=m
CONFIG_IR_RCMM_DECODER=m
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
CONFIG_IR_SERIAL=m
CONFIG_IR_SERIAL_TRANSMITTER=y
CONFIG_IR_SHARP_DECODER=m
@@ -3832,11 +3852,13 @@ CONFIG_KSM=y
CONFIG_KSZ884X_PCI=m
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KUSER_HELPERS=y
+CONFIG_KVM_PROVE_MMU=y
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
CONFIG_KVM_XEN=y
@@ -3890,6 +3912,7 @@ CONFIG_LEDS_CR0014114=m
# CONFIG_LEDS_DAC124S085 is not set
# CONFIG_LEDS_EL15203000 is not set
CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GROUP_MULTICOLOR=m
# CONFIG_LEDS_IS31FL319X is not set
CONFIG_LEDS_IS31FL32XX=m
# CONFIG_LEDS_KTD2692 is not set
@@ -3917,6 +3940,7 @@ CONFIG_LEDS_PCA9532_GPIO=y
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
CONFIG_LEDS_PCA963X=m
+CONFIG_LEDS_PCA995X=m
CONFIG_LEDS_PWM=m
CONFIG_LEDS_PWM_MULTICOLOR=m
CONFIG_LEDS_QCOM_FLASH=m
@@ -4069,9 +4093,11 @@ CONFIG_MAILBOX=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88Q2XXX_PHY=m
CONFIG_MARVELL_88X2222_PHY=m
CONFIG_MARVELL_CN10K_DDR_PMU=m
CONFIG_MARVELL_CN10K_TAD_PMU=m
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -4116,11 +4142,13 @@ CONFIG_MCP41010=m
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+CONFIG_MCP4728=m
# CONFIG_MCP4922 is not set
CONFIG_MCTP_SERIAL=m
# CONFIG_MCTP_TRANSPORT_I2C is not set
CONFIG_MCTP=y
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -4244,6 +4272,8 @@ CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=y
# CONFIG_MFD_CPCAP is not set
CONFIG_MFD_CROS_EC_DEV=m
+CONFIG_MFD_CS42L43_I2C=m
+CONFIG_MFD_CS42L43_SDW=m
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
@@ -4406,6 +4436,7 @@ CONFIG_MLX5_ESWITCH=y
# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -4799,6 +4830,7 @@ CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -5314,6 +5346,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -5366,6 +5399,7 @@ CONFIG_NVMEM_LAYOUT_SL28_VPD=m
CONFIG_NVMEM_MESON_EFUSE=m
CONFIG_NVMEM_MESON_MX_EFUSE=m
CONFIG_NVMEM_QCOM_QFPROM=m
+CONFIG_NVMEM_QCOM_SEC_QFPROM=m
CONFIG_NVMEM_REBOOT_MODE=m
CONFIG_NVMEM_RMEM=m
CONFIG_NVMEM_ROCKCHIP_EFUSE=m
@@ -5445,6 +5479,7 @@ CONFIG_ORINOCO_USB=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -5535,6 +5570,7 @@ CONFIG_PCC=y
CONFIG_PCI_AARDVARK=y
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_AL is not set
@@ -5617,6 +5653,7 @@ CONFIG_PCS_XPCS=m
CONFIG_PDC_ADMA=m
CONFIG_PDS_CORE=m
CONFIG_PDS_VDPA=m
+CONFIG_PDS_VFIO_PCI=m
# CONFIG_PECI is not set
CONFIG_PERCPU_STATS=y
# CONFIG_PERCPU_TEST is not set
@@ -5675,12 +5712,14 @@ CONFIG_PHY_QCOM_EUSB2_REPEATER=m
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
CONFIG_PHY_QCOM_PCIE2=m
CONFIG_PHY_QCOM_QMP_COMBO=m
CONFIG_PHY_QCOM_QMP=m
CONFIG_PHY_QCOM_QMP_PCIE_8996=m
CONFIG_PHY_QCOM_QMP_PCIE=m
CONFIG_PHY_QCOM_QMP_UFS=m
+CONFIG_PHY_QCOM_QMP_USB_LEGACY=m
CONFIG_PHY_QCOM_QMP_USB=m
CONFIG_PHY_QCOM_QUSB2=m
CONFIG_PHY_QCOM_SGMII_ETH=m
@@ -5702,6 +5741,8 @@ CONFIG_PHY_ROCKCHIP_PCIE=y
CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=m
CONFIG_PHY_ROCKCHIP_TYPEC=m
CONFIG_PHY_ROCKCHIP_USB=m
+CONFIG_PHY_RTK_RTD_USB2PHY=m
+CONFIG_PHY_RTK_RTD_USB3PHY=m
# CONFIG_PHY_SAMSUNG_USB2 is not set
CONFIG_PHY_SUN4I_USB=m
CONFIG_PHY_SUN50I_USB3=m
@@ -5719,6 +5760,7 @@ CONFIG_PID_NS=y
CONFIG_PINCONF=y
CONFIG_PINCTRL_ALDERLAKE=m
CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_AMLOGIC_C3=y
CONFIG_PINCTRL_APPLE_GPIO=m
CONFIG_PINCTRL_AS3722=y
CONFIG_PINCTRL_AXP209=m
@@ -5727,6 +5769,7 @@ CONFIG_PINCTRL_AXP209=m
# CONFIG_PINCTRL_CANNONLAKE is not set
CONFIG_PINCTRL_CEDARFORK=m
# CONFIG_PINCTRL_CHERRYVIEW is not set
+CONFIG_PINCTRL_CS42L43=m
CONFIG_PINCTRL_CY8C95X0=m
CONFIG_PINCTRL_ELKHARTLAKE=m
CONFIG_PINCTRL_EMMITSBURG=m
@@ -5804,6 +5847,7 @@ CONFIG_PINCTRL_SDM845=m
# CONFIG_PINCTRL_SDX75 is not set
CONFIG_PINCTRL_SINGLE=y
# CONFIG_PINCTRL_SM6115 is not set
+# CONFIG_PINCTRL_SM6115_LPASS_LPI is not set
# CONFIG_PINCTRL_SM6125 is not set
# CONFIG_PINCTRL_SM6350 is not set
# CONFIG_PINCTRL_SM6375 is not set
@@ -5812,6 +5856,7 @@ CONFIG_PINCTRL_SINGLE=y
# CONFIG_PINCTRL_SM8250 is not set
CONFIG_PINCTRL_SM8250_LPASS_LPI=m
# CONFIG_PINCTRL_SM8350 is not set
+CONFIG_PINCTRL_SM8350_LPASS_LPI=m
CONFIG_PINCTRL_SM8450_LPASS_LPI=m
CONFIG_PINCTRL_SM8450=m
# CONFIG_PINCTRL_SM8550 is not set
@@ -5975,6 +6020,7 @@ CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
CONFIG_PSTORE_842_COMPRESS=y
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -5996,6 +6042,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
CONFIG_PTP_1588_CLOCK_IDTCM=m
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_PTP_1588_CLOCK_QORIQ=m
@@ -6167,6 +6214,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -6228,6 +6276,7 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=y
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP_MMIO=y
@@ -6239,6 +6288,7 @@ CONFIG_REGULATOR_ACT8865=m
CONFIG_REGULATOR_ANATOP=m
CONFIG_REGULATOR_ARM_SCMI=m
CONFIG_REGULATOR_AS3722=m
+CONFIG_REGULATOR_AW37503=m
CONFIG_REGULATOR_AXP20X=m
CONFIG_REGULATOR_BD718XX=m
CONFIG_REGULATOR_BD9571MWV=m
@@ -6266,12 +6316,14 @@ CONFIG_REGULATOR_HI655X=m
# CONFIG_REGULATOR_MAX1586 is not set
# CONFIG_REGULATOR_MAX20086 is not set
CONFIG_REGULATOR_MAX20411=m
+CONFIG_REGULATOR_MAX5970=m
CONFIG_REGULATOR_MAX597X=m
CONFIG_REGULATOR_MAX77620=y
CONFIG_REGULATOR_MAX77650=m
CONFIG_REGULATOR_MAX77686=m
CONFIG_REGULATOR_MAX77802=m
# CONFIG_REGULATOR_MAX77826 is not set
+CONFIG_REGULATOR_MAX77857=m
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
CONFIG_REGULATOR_MAX8893=m
@@ -6293,6 +6345,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_PV88090 is not set
CONFIG_REGULATOR_PWM=y
CONFIG_REGULATOR_QCOM_LABIBB=m
+CONFIG_REGULATOR_QCOM_REFGEN=m
CONFIG_REGULATOR_QCOM_RPMH=y
# CONFIG_REGULATOR_QCOM_RPM is not set
CONFIG_REGULATOR_QCOM_SMD_RPM=m
@@ -6313,6 +6366,7 @@ CONFIG_REGULATOR_RT6190=m
CONFIG_REGULATOR_RT6245=m
CONFIG_REGULATOR_RTMV20=m
CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTQ2208=m
CONFIG_REGULATOR_RTQ6752=m
# CONFIG_REGULATOR_SLG51000 is not set
CONFIG_REGULATOR_SY7636A=m
@@ -6372,8 +6426,7 @@ CONFIG_RESOURCE_KUNIT_TEST=m
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-# CONFIG_RH_DISABLE_DEPRECATED is not set
-CONFIG_RH_FEDORA=y
+# CONFIG_RHEL_DIFFERENCES is not set
CONFIG_RICHTEK_RTQ6056=m
CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
@@ -6856,6 +6909,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -6933,6 +6987,7 @@ CONFIG_SENSORS_GPIO_FAN=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
CONFIG_SENSORS_HP_WMI=m
+CONFIG_SENSORS_HS3001=m
# CONFIG_SENSORS_I5K_AMB is not set
CONFIG_SENSORS_IBMAEM=m
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -7019,6 +7074,7 @@ CONFIG_SENSORS_MCP3021=m
CONFIG_SENSORS_MLXREG_FAN=m
CONFIG_SENSORS_MP2888=m
CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_MP2975_REGULATOR=y
CONFIG_SENSORS_MP5023=m
CONFIG_SENSORS_MPQ7932=m
CONFIG_SENSORS_MPQ7932_REGULATOR=y
@@ -7390,6 +7446,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=2048
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
CONFIG_SND_HDA_TEGRA=m
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -7512,7 +7571,9 @@ CONFIG_SND_SOC_AK5558=m
CONFIG_SND_SOC_APPLE_MCA=m
CONFIG_SND_SOC_APQ8016_SBC=m
CONFIG_SND_SOC_ARNDALE=m
+CONFIG_SND_SOC_AUDIO_IIO_AUX=m
CONFIG_SND_SOC_AW8738=m
+CONFIG_SND_SOC_AW88261=m
CONFIG_SND_SOC_AW88395=m
CONFIG_SND_SOC_BD28623=m
CONFIG_SND_SOC_BT_SCO=m
@@ -7538,6 +7599,8 @@ CONFIG_SND_SOC_CS4271_I2C=m
# CONFIG_SND_SOC_CS4271_SPI is not set
CONFIG_SND_SOC_CS42L42=m
CONFIG_SND_SOC_CS42L42_SDW=m
+CONFIG_SND_SOC_CS42L43=m
+CONFIG_SND_SOC_CS42L43_SDW=m
# CONFIG_SND_SOC_CS42L51_I2C is not set
# CONFIG_SND_SOC_CS42L52 is not set
# CONFIG_SND_SOC_CS42L56 is not set
@@ -7729,6 +7792,7 @@ CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
CONFIG_SND_SOC_ROCKCHIP_PDM=m
CONFIG_SND_SOC_ROCKCHIP_RT5645=m
CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
+CONFIG_SND_SOC_RT1017_SDCA_SDW=m
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -7875,6 +7939,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
CONFIG_SND_SOC_TLV320AIC3X_I2C=m
CONFIG_SND_SOC_TLV320AIC3X=m
CONFIG_SND_SOC_TLV320AIC3X_SPI=m
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
CONFIG_SND_SOC_TPA6130A2=m
CONFIG_SND_SOC_TS3A227E=m
@@ -8016,6 +8081,7 @@ CONFIG_SPI_BITBANG=m
CONFIG_SPI_CADENCE=m
CONFIG_SPI_CADENCE_QUADSPI=m
CONFIG_SPI_CADENCE_XSPI=m
+# CONFIG_SPI_CS42L43 is not set
# CONFIG_SPI_DEBUG is not set
CONFIG_SPI_DESIGNWARE=m
CONFIG_SPI_DLN2=m
@@ -8159,6 +8225,7 @@ CONFIG_ST_UVIS25=m
CONFIG_ST_UVIS25_SPI=m
# CONFIG_SUN20I_D1_CCU is not set
# CONFIG_SUN20I_D1_R_CCU is not set
+CONFIG_SUN20I_GPADC=m
# CONFIG_SUN20I_PPU is not set
# CONFIG_SUN4I_EMAC is not set
CONFIG_SUN50I_A100_CCU=y
@@ -8213,6 +8280,7 @@ CONFIG_SURFACE_PRO3_BUTTON=m
CONFIG_SUSPEND=y
CONFIG_SVC_I3C_MASTER=m
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_SWP_EMULATION=y
# CONFIG_SW_SYNC is not set
CONFIG_SX9310=m
@@ -8348,6 +8416,7 @@ CONFIG_TEST_FPU=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIST_SORT=m
@@ -8431,6 +8500,8 @@ CONFIG_TIFM_7XX1=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+# CONFIG_TI_ICSSG_PRUETH is not set
+CONFIG_TI_ICSS_IEP=m
CONFIG_TI_K3_AM65_CPSW_NUSS=m
CONFIG_TI_K3_AM65_CPSW_SWITCHDEV=y
CONFIG_TI_K3_AM65_CPTS=m
@@ -8470,6 +8541,7 @@ CONFIG_TI_SCI_PM_DOMAINS=y
CONFIG_TI_SCI_PROTOCOL=y
# CONFIG_TI_ST is not set
CONFIG_TI_SYSCON_CLK=m
+CONFIG_TI_SYSC=y
# CONFIG_TI_TLC4541 is not set
# CONFIG_TI_TMAG5273 is not set
CONFIG_TI_TSC2046=m
@@ -8482,6 +8554,7 @@ CONFIG_TMP006=m
CONFIG_TMP117=m
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_QUOTA=y
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
CONFIG_TORTURE_TEST=m
@@ -8527,6 +8600,7 @@ CONFIG_TOUCHSCREEN_IMAGIS=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_IQS7211=m
# CONFIG_TOUCHSCREEN_MAX11801 is not set
CONFIG_TOUCHSCREEN_MCS5000=m
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -8753,6 +8827,7 @@ CONFIG_USB_CONFIGFS_EEM=y
# CONFIG_USB_CONFIGFS_F_FS is not set
CONFIG_USB_CONFIGFS_F_HID=y
# CONFIG_USB_CONFIGFS_F_LB_SS is not set
+CONFIG_USB_CONFIGFS_F_MIDI2=y
# CONFIG_USB_CONFIGFS_F_MIDI is not set
# CONFIG_USB_CONFIGFS_F_PRINTER is not set
CONFIG_USB_CONFIGFS_F_TCM=y
@@ -9147,7 +9222,9 @@ CONFIG_VFAT_FS=m
CONFIG_VFIO_AMBA=m
CONFIG_VFIO_CDX=m
CONFIG_VFIO_CONTAINER=y
+# CONFIG_VFIO_DEVICE_CDEV is not set
CONFIG_VFIO_FSL_MC=m
+CONFIG_VFIO_GROUP=y
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
CONFIG_VFIO_MDEV=m
@@ -9222,9 +9299,13 @@ CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_DS90UB913=m
+CONFIG_VIDEO_DS90UB953=m
+CONFIG_VIDEO_DS90UB960=m
# CONFIG_VIDEO_DT3155 is not set
CONFIG_VIDEO_DW100=m
CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9719=m
CONFIG_VIDEO_DW9768=m
CONFIG_VIDEO_DW9807_VCM=m
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -9598,6 +9679,7 @@ CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
# CONFIG_XEN is not set
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
+CONFIG_XEN_PRIVCMD_IRQFD=y
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_PVHVM_GUEST=y
@@ -9615,6 +9697,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config
index 9d8750123..24c5b3f6a 100644
--- a/kernel-aarch64-16k-fedora.config
+++ b/kernel-aarch64-16k-fedora.config
@@ -145,6 +145,7 @@ CONFIG_AD7949=m
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
CONFIG_ADAPTEC_STARFIRE=m
+# CONFIG_ADDRESS_MASKING is not set
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -1275,6 +1276,7 @@ CONFIG_COMMON_CLK_SI5341=m
# CONFIG_COMMON_CLK_SI5351 is not set
CONFIG_COMMON_CLK_SI544=m
# CONFIG_COMMON_CLK_SI570 is not set
+CONFIG_COMMON_CLK_VC3=m
# CONFIG_COMMON_CLK_VC5 is not set
CONFIG_COMMON_CLK_VC7=m
CONFIG_COMMON_CLK_XGENE=y
@@ -1297,6 +1299,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=3
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1352,6 +1355,8 @@ CONFIG_CPU_THERMAL=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -1772,6 +1777,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
CONFIG_DMA_OF=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
@@ -1800,6 +1806,7 @@ CONFIG_DM_INIT=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=y
@@ -1934,6 +1941,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
CONFIG_DRM_LONTIUM_LT9611=m
CONFIG_DRM_LONTIUM_LT9611UXC=m
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
CONFIG_DRM_MALI_DISPLAY=m
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -2038,11 +2046,13 @@ CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
+CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m
# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
CONFIG_DRM_PANEL_TPO_TPG110=m
CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
+CONFIG_DRM_PANEL_VISIONOX_R66451=m
CONFIG_DRM_PANEL_VISIONOX_RM69299=m
CONFIG_DRM_PANEL_VISIONOX_VTDR6130=m
CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
@@ -2090,6 +2100,7 @@ CONFIG_DRM_TOSHIBA_TC358764=m
CONFIG_DRM_TOSHIBA_TC358767=m
CONFIG_DRM_TOSHIBA_TC358768=m
CONFIG_DRM_TOSHIBA_TC358775=m
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
CONFIG_DRM_V3D=m
@@ -2298,6 +2309,7 @@ CONFIG_EROFS_FS=m
CONFIG_EROFS_FS_POSIX_ACL=y
CONFIG_EROFS_FS_SECURITY=y
CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP_DEFLATE=y
CONFIG_EROFS_FS_ZIP_LZMA=y
CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
@@ -2379,6 +2391,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -2620,6 +2633,7 @@ CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
CONFIG_GPIO_DAVINCI=m
CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_DS4520=m
CONFIG_GPIO_DWAPB=m
CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_FTGPIO010 is not set
@@ -2759,6 +2773,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
CONFIG_HID_GLORIOUS=m
# CONFIG_HID_GOOGLE_HAMMER is not set
+CONFIG_HID_GOOGLE_STADIA_FF=m
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2978,6 +2993,7 @@ CONFIG_I2C_ALGOPCF=m
CONFIG_I2C_AMD_MP2=m
CONFIG_I2C_APPLE=m
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+CONFIG_I2C_ATR=m
CONFIG_I2C_BCM2835=m
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_BRCMSTB=y
@@ -3421,6 +3437,7 @@ CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
CONFIG_IOSM=m
CONFIG_IO_STRICT_DEVMEM=y
+CONFIG_IO_URING=y
CONFIG_IP5XXX_POWER=m
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -3490,6 +3507,7 @@ CONFIG_IP_PIMSM_V2=y
# CONFIG_IPQ_APSS_6018 is not set
# CONFIG_IPQ_APSS_PLL is not set
# CONFIG_IPQ_GCC_4019 is not set
+CONFIG_IPQ_GCC_5018=m
# CONFIG_IPQ_GCC_5332 is not set
# CONFIG_IPQ_GCC_6018 is not set
# CONFIG_IPQ_GCC_806X is not set
@@ -3517,6 +3535,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+CONFIG_IPU_BRIDGE=m
CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_IOAM6_LWTUNNEL=y
@@ -3594,6 +3613,7 @@ CONFIG_IR_RC6_DECODER=m
CONFIG_IR_RCMM_DECODER=m
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
CONFIG_IR_SERIAL=m
CONFIG_IR_SERIAL_TRANSMITTER=y
CONFIG_IR_SHARP_DECODER=m
@@ -3808,11 +3828,13 @@ CONFIG_KSM=y
CONFIG_KSZ884X_PCI=m
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KUSER_HELPERS=y
+# CONFIG_KVM_PROVE_MMU is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
CONFIG_KVM_XEN=y
@@ -3866,6 +3888,7 @@ CONFIG_LEDS_CR0014114=m
# CONFIG_LEDS_DAC124S085 is not set
# CONFIG_LEDS_EL15203000 is not set
CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GROUP_MULTICOLOR=m
# CONFIG_LEDS_IS31FL319X is not set
CONFIG_LEDS_IS31FL32XX=m
# CONFIG_LEDS_KTD2692 is not set
@@ -3893,6 +3916,7 @@ CONFIG_LEDS_PCA9532_GPIO=y
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
CONFIG_LEDS_PCA963X=m
+CONFIG_LEDS_PCA995X=m
CONFIG_LEDS_PWM=m
CONFIG_LEDS_PWM_MULTICOLOR=m
CONFIG_LEDS_QCOM_FLASH=m
@@ -4045,9 +4069,11 @@ CONFIG_MAILBOX=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88Q2XXX_PHY=m
CONFIG_MARVELL_88X2222_PHY=m
CONFIG_MARVELL_CN10K_DDR_PMU=m
CONFIG_MARVELL_CN10K_TAD_PMU=m
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -4091,11 +4117,13 @@ CONFIG_MCP41010=m
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+CONFIG_MCP4728=m
# CONFIG_MCP4922 is not set
CONFIG_MCTP_SERIAL=m
# CONFIG_MCTP_TRANSPORT_I2C is not set
CONFIG_MCTP=y
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -4219,6 +4247,8 @@ CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=y
# CONFIG_MFD_CPCAP is not set
CONFIG_MFD_CROS_EC_DEV=m
+CONFIG_MFD_CS42L43_I2C=m
+CONFIG_MFD_CS42L43_SDW=m
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
@@ -4381,6 +4411,7 @@ CONFIG_MLX5_ESWITCH=y
# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -4773,6 +4804,7 @@ CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -5288,6 +5320,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -5340,6 +5373,7 @@ CONFIG_NVMEM_LAYOUT_SL28_VPD=m
CONFIG_NVMEM_MESON_EFUSE=m
CONFIG_NVMEM_MESON_MX_EFUSE=m
CONFIG_NVMEM_QCOM_QFPROM=m
+CONFIG_NVMEM_QCOM_SEC_QFPROM=m
CONFIG_NVMEM_REBOOT_MODE=m
CONFIG_NVMEM_RMEM=m
CONFIG_NVMEM_ROCKCHIP_EFUSE=m
@@ -5419,6 +5453,7 @@ CONFIG_ORINOCO_USB=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -5508,6 +5543,7 @@ CONFIG_PCC=y
CONFIG_PCI_AARDVARK=y
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_AL is not set
@@ -5590,6 +5626,7 @@ CONFIG_PCS_XPCS=m
CONFIG_PDC_ADMA=m
CONFIG_PDS_CORE=m
CONFIG_PDS_VDPA=m
+CONFIG_PDS_VFIO_PCI=m
# CONFIG_PECI is not set
# CONFIG_PERCPU_STATS is not set
# CONFIG_PERCPU_TEST is not set
@@ -5648,12 +5685,14 @@ CONFIG_PHY_QCOM_EUSB2_REPEATER=m
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
CONFIG_PHY_QCOM_PCIE2=m
CONFIG_PHY_QCOM_QMP_COMBO=m
CONFIG_PHY_QCOM_QMP=m
CONFIG_PHY_QCOM_QMP_PCIE_8996=m
CONFIG_PHY_QCOM_QMP_PCIE=m
CONFIG_PHY_QCOM_QMP_UFS=m
+CONFIG_PHY_QCOM_QMP_USB_LEGACY=m
CONFIG_PHY_QCOM_QMP_USB=m
CONFIG_PHY_QCOM_QUSB2=m
CONFIG_PHY_QCOM_SGMII_ETH=m
@@ -5675,6 +5714,8 @@ CONFIG_PHY_ROCKCHIP_PCIE=y
CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=m
CONFIG_PHY_ROCKCHIP_TYPEC=m
CONFIG_PHY_ROCKCHIP_USB=m
+CONFIG_PHY_RTK_RTD_USB2PHY=m
+CONFIG_PHY_RTK_RTD_USB3PHY=m
# CONFIG_PHY_SAMSUNG_USB2 is not set
CONFIG_PHY_SUN4I_USB=m
CONFIG_PHY_SUN50I_USB3=m
@@ -5692,6 +5733,7 @@ CONFIG_PID_NS=y
CONFIG_PINCONF=y
CONFIG_PINCTRL_ALDERLAKE=m
CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_AMLOGIC_C3=y
CONFIG_PINCTRL_APPLE_GPIO=m
CONFIG_PINCTRL_AS3722=y
CONFIG_PINCTRL_AXP209=m
@@ -5700,6 +5742,7 @@ CONFIG_PINCTRL_AXP209=m
# CONFIG_PINCTRL_CANNONLAKE is not set
CONFIG_PINCTRL_CEDARFORK=m
# CONFIG_PINCTRL_CHERRYVIEW is not set
+CONFIG_PINCTRL_CS42L43=m
CONFIG_PINCTRL_CY8C95X0=m
CONFIG_PINCTRL_ELKHARTLAKE=m
CONFIG_PINCTRL_EMMITSBURG=m
@@ -5777,6 +5820,7 @@ CONFIG_PINCTRL_SDM845=m
# CONFIG_PINCTRL_SDX75 is not set
CONFIG_PINCTRL_SINGLE=y
# CONFIG_PINCTRL_SM6115 is not set
+# CONFIG_PINCTRL_SM6115_LPASS_LPI is not set
# CONFIG_PINCTRL_SM6125 is not set
# CONFIG_PINCTRL_SM6350 is not set
# CONFIG_PINCTRL_SM6375 is not set
@@ -5785,6 +5829,7 @@ CONFIG_PINCTRL_SINGLE=y
# CONFIG_PINCTRL_SM8250 is not set
CONFIG_PINCTRL_SM8250_LPASS_LPI=m
# CONFIG_PINCTRL_SM8350 is not set
+CONFIG_PINCTRL_SM8350_LPASS_LPI=m
CONFIG_PINCTRL_SM8450_LPASS_LPI=m
CONFIG_PINCTRL_SM8450=m
# CONFIG_PINCTRL_SM8550 is not set
@@ -5948,6 +5993,7 @@ CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
CONFIG_PSTORE_842_COMPRESS=y
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -5969,6 +6015,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
CONFIG_PTP_1588_CLOCK_IDTCM=m
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_PTP_1588_CLOCK_QORIQ=m
@@ -6140,6 +6187,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -6201,6 +6249,7 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=y
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP_MMIO=y
@@ -6212,6 +6261,7 @@ CONFIG_REGULATOR_ACT8865=m
CONFIG_REGULATOR_ANATOP=m
CONFIG_REGULATOR_ARM_SCMI=m
CONFIG_REGULATOR_AS3722=m
+CONFIG_REGULATOR_AW37503=m
CONFIG_REGULATOR_AXP20X=m
CONFIG_REGULATOR_BD718XX=m
CONFIG_REGULATOR_BD9571MWV=m
@@ -6239,12 +6289,14 @@ CONFIG_REGULATOR_HI655X=m
# CONFIG_REGULATOR_MAX1586 is not set
# CONFIG_REGULATOR_MAX20086 is not set
CONFIG_REGULATOR_MAX20411=m
+CONFIG_REGULATOR_MAX5970=m
CONFIG_REGULATOR_MAX597X=m
CONFIG_REGULATOR_MAX77620=y
CONFIG_REGULATOR_MAX77650=m
CONFIG_REGULATOR_MAX77686=m
CONFIG_REGULATOR_MAX77802=m
# CONFIG_REGULATOR_MAX77826 is not set
+CONFIG_REGULATOR_MAX77857=m
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
CONFIG_REGULATOR_MAX8893=m
@@ -6266,6 +6318,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_PV88090 is not set
CONFIG_REGULATOR_PWM=y
CONFIG_REGULATOR_QCOM_LABIBB=m
+CONFIG_REGULATOR_QCOM_REFGEN=m
CONFIG_REGULATOR_QCOM_RPMH=y
# CONFIG_REGULATOR_QCOM_RPM is not set
CONFIG_REGULATOR_QCOM_SMD_RPM=m
@@ -6286,6 +6339,7 @@ CONFIG_REGULATOR_RT6190=m
CONFIG_REGULATOR_RT6245=m
CONFIG_REGULATOR_RTMV20=m
CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTQ2208=m
CONFIG_REGULATOR_RTQ6752=m
# CONFIG_REGULATOR_SLG51000 is not set
CONFIG_REGULATOR_SY7636A=m
@@ -6345,8 +6399,7 @@ CONFIG_RESOURCE_KUNIT_TEST=m
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-# CONFIG_RH_DISABLE_DEPRECATED is not set
-CONFIG_RH_FEDORA=y
+# CONFIG_RHEL_DIFFERENCES is not set
CONFIG_RICHTEK_RTQ6056=m
CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
@@ -6829,6 +6882,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -6906,6 +6960,7 @@ CONFIG_SENSORS_GPIO_FAN=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
CONFIG_SENSORS_HP_WMI=m
+CONFIG_SENSORS_HS3001=m
# CONFIG_SENSORS_I5K_AMB is not set
CONFIG_SENSORS_IBMAEM=m
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -6992,6 +7047,7 @@ CONFIG_SENSORS_MCP3021=m
CONFIG_SENSORS_MLXREG_FAN=m
CONFIG_SENSORS_MP2888=m
CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_MP2975_REGULATOR=y
CONFIG_SENSORS_MP5023=m
CONFIG_SENSORS_MPQ7932=m
CONFIG_SENSORS_MPQ7932_REGULATOR=y
@@ -7363,6 +7419,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=2048
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
CONFIG_SND_HDA_TEGRA=m
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -7484,7 +7543,9 @@ CONFIG_SND_SOC_AK5558=m
CONFIG_SND_SOC_APPLE_MCA=m
CONFIG_SND_SOC_APQ8016_SBC=m
CONFIG_SND_SOC_ARNDALE=m
+CONFIG_SND_SOC_AUDIO_IIO_AUX=m
CONFIG_SND_SOC_AW8738=m
+CONFIG_SND_SOC_AW88261=m
CONFIG_SND_SOC_AW88395=m
CONFIG_SND_SOC_BD28623=m
CONFIG_SND_SOC_BT_SCO=m
@@ -7510,6 +7571,8 @@ CONFIG_SND_SOC_CS4271_I2C=m
# CONFIG_SND_SOC_CS4271_SPI is not set
CONFIG_SND_SOC_CS42L42=m
CONFIG_SND_SOC_CS42L42_SDW=m
+CONFIG_SND_SOC_CS42L43=m
+CONFIG_SND_SOC_CS42L43_SDW=m
# CONFIG_SND_SOC_CS42L51_I2C is not set
# CONFIG_SND_SOC_CS42L52 is not set
# CONFIG_SND_SOC_CS42L56 is not set
@@ -7701,6 +7764,7 @@ CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
CONFIG_SND_SOC_ROCKCHIP_PDM=m
CONFIG_SND_SOC_ROCKCHIP_RT5645=m
CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
+CONFIG_SND_SOC_RT1017_SDCA_SDW=m
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -7846,6 +7910,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
CONFIG_SND_SOC_TLV320AIC3X_I2C=m
CONFIG_SND_SOC_TLV320AIC3X=m
CONFIG_SND_SOC_TLV320AIC3X_SPI=m
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
CONFIG_SND_SOC_TPA6130A2=m
CONFIG_SND_SOC_TS3A227E=m
@@ -7987,6 +8052,7 @@ CONFIG_SPI_BITBANG=m
CONFIG_SPI_CADENCE=m
CONFIG_SPI_CADENCE_QUADSPI=m
CONFIG_SPI_CADENCE_XSPI=m
+# CONFIG_SPI_CS42L43 is not set
# CONFIG_SPI_DEBUG is not set
CONFIG_SPI_DESIGNWARE=m
CONFIG_SPI_DLN2=m
@@ -8130,6 +8196,7 @@ CONFIG_ST_UVIS25=m
CONFIG_ST_UVIS25_SPI=m
# CONFIG_SUN20I_D1_CCU is not set
# CONFIG_SUN20I_D1_R_CCU is not set
+CONFIG_SUN20I_GPADC=m
# CONFIG_SUN20I_PPU is not set
# CONFIG_SUN4I_EMAC is not set
CONFIG_SUN50I_A100_CCU=y
@@ -8184,6 +8251,7 @@ CONFIG_SURFACE_PRO3_BUTTON=m
CONFIG_SUSPEND=y
CONFIG_SVC_I3C_MASTER=m
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_SWP_EMULATION=y
# CONFIG_SW_SYNC is not set
CONFIG_SX9310=m
@@ -8319,6 +8387,7 @@ CONFIG_TEST_CPUMASK=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
@@ -8402,6 +8471,8 @@ CONFIG_TIFM_7XX1=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+# CONFIG_TI_ICSSG_PRUETH is not set
+CONFIG_TI_ICSS_IEP=m
CONFIG_TI_K3_AM65_CPSW_NUSS=m
CONFIG_TI_K3_AM65_CPSW_SWITCHDEV=y
CONFIG_TI_K3_AM65_CPTS=m
@@ -8441,6 +8512,7 @@ CONFIG_TI_SCI_PM_DOMAINS=y
CONFIG_TI_SCI_PROTOCOL=y
# CONFIG_TI_ST is not set
CONFIG_TI_SYSCON_CLK=m
+CONFIG_TI_SYSC=y
# CONFIG_TI_TLC4541 is not set
# CONFIG_TI_TMAG5273 is not set
CONFIG_TI_TSC2046=m
@@ -8453,6 +8525,7 @@ CONFIG_TMP006=m
CONFIG_TMP117=m
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_QUOTA=y
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
CONFIG_TORTURE_TEST=m
@@ -8498,6 +8571,7 @@ CONFIG_TOUCHSCREEN_IMAGIS=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_IQS7211=m
# CONFIG_TOUCHSCREEN_MAX11801 is not set
CONFIG_TOUCHSCREEN_MCS5000=m
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -8724,6 +8798,7 @@ CONFIG_USB_CONFIGFS_EEM=y
# CONFIG_USB_CONFIGFS_F_FS is not set
CONFIG_USB_CONFIGFS_F_HID=y
# CONFIG_USB_CONFIGFS_F_LB_SS is not set
+CONFIG_USB_CONFIGFS_F_MIDI2=y
# CONFIG_USB_CONFIGFS_F_MIDI is not set
# CONFIG_USB_CONFIGFS_F_PRINTER is not set
CONFIG_USB_CONFIGFS_F_TCM=y
@@ -9118,7 +9193,9 @@ CONFIG_VFAT_FS=m
CONFIG_VFIO_AMBA=m
CONFIG_VFIO_CDX=m
CONFIG_VFIO_CONTAINER=y
+# CONFIG_VFIO_DEVICE_CDEV is not set
CONFIG_VFIO_FSL_MC=m
+CONFIG_VFIO_GROUP=y
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
CONFIG_VFIO_MDEV=m
@@ -9193,9 +9270,13 @@ CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_DS90UB913=m
+CONFIG_VIDEO_DS90UB953=m
+CONFIG_VIDEO_DS90UB960=m
# CONFIG_VIDEO_DT3155 is not set
CONFIG_VIDEO_DW100=m
CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9719=m
CONFIG_VIDEO_DW9768=m
CONFIG_VIDEO_DW9807_VCM=m
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -9569,6 +9650,7 @@ CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
# CONFIG_XEN is not set
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
+CONFIG_XEN_PRIVCMD_IRQFD=y
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_PVHVM_GUEST=y
@@ -9586,6 +9668,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config
index b831d5bcd..55b9f85a4 100644
--- a/kernel-aarch64-64k-debug-rhel.config
+++ b/kernel-aarch64-64k-debug-rhel.config
@@ -215,7 +215,6 @@ CONFIG_AMD_HSMP=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
CONFIG_AMD_PHY=m
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
# CONFIG_AMD_PTDMA is not set
# CONFIG_AMDTEE is not set
# CONFIG_AMD_XGBE_DCB is not set
@@ -249,9 +248,9 @@ CONFIG_ARCH_BCM_IPROC=y
# CONFIG_ARCH_EXYNOS is not set
CONFIG_ARCH_HISI=y
# CONFIG_ARCH_INTEL_SOCFPGA is not set
-# CONFIG_ARCH_K3 is not set
+CONFIG_ARCH_K3=y
# CONFIG_ARCH_KEEMBAY is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
+CONFIG_ARCH_LAYERSCAPE=y
# CONFIG_ARCH_LG1K is not set
# CONFIG_ARCH_MA35 is not set
# CONFIG_ARCH_MEDIATEK is not set
@@ -405,6 +404,7 @@ CONFIG_ARM_SPE_PMU=m
# CONFIG_ARM_TEGRA186_CPUFREQ is not set
CONFIG_ARM_TEGRA194_CPUFREQ=m
CONFIG_ARM_TEGRA_DEVFREQ=m
+CONFIG_ARM_TI_CPUFREQ=y
# CONFIG_AS3935 is not set
# CONFIG_AS73211 is not set
CONFIG_ASN1=y
@@ -923,6 +923,7 @@ CONFIG_CLK_IMX8QXP=y
CONFIG_CLK_IMX8ULP=y
CONFIG_CLK_IMX93=y
CONFIG_CLK_KUNIT_TEST=m
+CONFIG_CLK_LS1028A_PLLDIG=y
# CONFIG_CLK_QORIQ is not set
CONFIG_CLK_SP810=y
CONFIG_CLK_VEXPRESS_OSC=y
@@ -960,6 +961,7 @@ CONFIG_COMMAND_LINE_SIZE=4096
# CONFIG_COMMON_CLK_CS2000_CP is not set
# CONFIG_COMMON_CLK_FIXED_MMIO is not set
# CONFIG_COMMON_CLK_FSL_FLEXSPI is not set
+CONFIG_COMMON_CLK_FSL_SAI=y
CONFIG_COMMON_CLK_HI3516CV300=y
CONFIG_COMMON_CLK_HI3519=y
# CONFIG_COMMON_CLK_HI3559A is not set
@@ -981,6 +983,7 @@ CONFIG_COMMON_CLK_SCPI=m
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
CONFIG_COMMON_CLK_XGENE=y
@@ -1001,6 +1004,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1082,8 +1086,8 @@ CONFIG_CRYPTO_AES_ARM64_BS=m
CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
CONFIG_CRYPTO_AES_ARM64_CE=y
-# CONFIG_CRYPTO_AES_ARM64 is not set
CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
+CONFIG_CRYPTO_AES_ARM64=y
CONFIG_CRYPTO_AES_GCM_P10=y
# CONFIG_CRYPTO_AES_TI is not set
CONFIG_CRYPTO_AES=y
@@ -1101,6 +1105,7 @@ CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
@@ -1139,6 +1144,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_PRNG_API=y
CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=3
CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
# CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_TEST is not set
+CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
# CONFIG_CRYPTO_DEV_HISI_HPRE is not set
# CONFIG_CRYPTO_DEV_HISI_SEC2 is not set
CONFIG_CRYPTO_DEV_HISI_SEC=m
@@ -1158,6 +1164,7 @@ CONFIG_CRYPTO_DEV_OCTEONTX2_CPT=m
# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
# CONFIG_CRYPTO_DEV_QCE is not set
# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
+CONFIG_CRYPTO_DEV_SA2UL=m
# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
# CONFIG_CRYPTO_DEV_SAHARA is not set
CONFIG_CRYPTO_DEV_SP_CCP=y
@@ -1209,6 +1216,7 @@ CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_POLY1305_NEON=y
+# CONFIG_CRYPTO_POLY1305_P10 is not set
# CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
@@ -1420,6 +1428,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1442,6 +1451,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1473,6 +1483,7 @@ CONFIG_DP83867_PHY=m
# CONFIG_DP83869_PHY is not set
CONFIG_DP83TC811_PHY=m
# CONFIG_DP83TD510_PHY is not set
+CONFIG_DPAA2_CONSOLE=m
# CONFIG_DPM_WATCHDOG is not set
# CONFIG_DPOT_DAC is not set
# CONFIG_DPS310 is not set
@@ -1564,6 +1575,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MALI_DISPLAY is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1641,6 +1653,7 @@ CONFIG_DRM_SIMPLEDRM=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1782,6 +1795,7 @@ CONFIG_EDAC_DMC520=m
CONFIG_EDAC_GHES=y
CONFIG_EDAC_I10NM=m
CONFIG_EDAC_IGEN6=m
+CONFIG_EDAC_LAYERSCAPE=m
CONFIG_EDAC_LEGACY_SYSFS=y
CONFIG_EDAC_PND2=m
CONFIG_EDAC_SYNOPSYS=m
@@ -1901,6 +1915,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1989,7 +2004,15 @@ CONFIG_FSCACHE_STATS=y
CONFIG_FS_DAX=y
# CONFIG_FS_ENCRYPTION is not set
# CONFIG_FSI is not set
+# CONFIG_FSL_BMAN_TEST is not set
+CONFIG_FSL_DPAA2_ETH_DCB=y
+CONFIG_FSL_DPAA2_ETH=m
+CONFIG_FSL_DPAA2_PTP_CLOCK=m
+CONFIG_FSL_DPAA2_QDMA=m
CONFIG_FSL_DPAA2_SWITCH=m
+# CONFIG_FSL_DPAA_CHECKING is not set
+CONFIG_FSL_DPAA_ETH=m
+CONFIG_FSL_DPAA=y
# CONFIG_FSL_EDMA is not set
CONFIG_FSL_ENETC_IERB=m
CONFIG_FSL_ENETC=m
@@ -1998,10 +2021,15 @@ CONFIG_FSL_ENETC_PTP_CLOCK=m
CONFIG_FSL_ENETC_QOS=y
CONFIG_FSL_ENETC_VF=m
CONFIG_FSL_ERRATUM_A008585=y
+CONFIG_FSL_FMAN=y
CONFIG_FSL_IMX8_DDR_PMU=m
# CONFIG_FSL_IMX9_DDR_PMU is not set
+CONFIG_FSL_MC_BUS=y
+CONFIG_FSL_MC_DPIO=m
+CONFIG_FSL_MC_UAPI_SUPPORT=y
CONFIG_FSL_PQ_MDIO=m
# CONFIG_FSL_QDMA is not set
+# CONFIG_FSL_QMAN_TEST is not set
# CONFIG_FSL_RCPM is not set
CONFIG_FSL_XGMAC_MDIO=m
CONFIG_FSNOTIFY=y
@@ -2097,6 +2125,8 @@ CONFIG_GNSS=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_DAVINCI=y
+# CONFIG_GPIO_DS4520 is not set
CONFIG_GPIO_DWAPB=m
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -2125,6 +2155,7 @@ CONFIG_GPIO_MLXBF2=m
# CONFIG_GPIO_MLXBF3 is not set
# CONFIG_GPIO_MLXBF is not set
# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_MPC8XXX=y
CONFIG_GPIO_MXC=m
# CONFIG_GPIO_PCA953X_IRQ is not set
# CONFIG_GPIO_PCA953X is not set
@@ -2226,6 +2257,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2382,15 +2414,17 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
CONFIG_HW_RANDOM_CAVIUM=m
# CONFIG_HW_RANDOM_CCTRNG is not set
CONFIG_HW_RANDOM_CN10K=m
-CONFIG_HW_RANDOM_HISI=y
+CONFIG_HW_RANDOM_HISI=m
# CONFIG_HW_RANDOM_HISTB is not set
# CONFIG_HW_RANDOM_IPROC_RNG200 is not set
+CONFIG_HW_RANDOM_OMAP=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
CONFIG_HW_RANDOM_TPM=y
CONFIG_HW_RANDOM_VIRTIO=y
CONFIG_HW_RANDOM_XGENE=m
# CONFIG_HW_RANDOM_XIPHERA is not set
CONFIG_HW_RANDOM=y
+CONFIG_HWSPINLOCK_OMAP=m
# CONFIG_HWSPINLOCK_QCOM is not set
CONFIG_HWSPINLOCK=y
# CONFIG_HX711 is not set
@@ -2420,6 +2454,7 @@ CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_AMD_MP2 is not set
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_BCM_IPROC is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
@@ -2466,6 +2501,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NOMADIK is not set
# CONFIG_I2C_NVIDIA_GPU is not set
# CONFIG_I2C_OCORES is not set
+CONFIG_I2C_OMAP=m
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PCI1XXXX is not set
# CONFIG_I2C_PIIX4 is not set
@@ -2669,7 +2705,7 @@ CONFIG_INPUT_APANEL=m
# CONFIG_INPUT_ATI_REMOTE2 is not set
CONFIG_INPUT_ATLAS_BTNS=m
# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
-# CONFIG_INPUT_BBNSM_PWRKEY is not set
+CONFIG_INPUT_BBNSM_PWRKEY=m
# CONFIG_INPUT_BMA150 is not set
# CONFIG_INPUT_CM109 is not set
# CONFIG_INPUT_CMA3000 is not set
@@ -2763,6 +2799,7 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_TCC_COOLING is not set
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_VSC is not set
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
CONFIG_INTEL_XWAY_PHY=m
@@ -2797,7 +2834,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2883,6 +2920,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2959,6 +2997,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -3014,6 +3053,8 @@ CONFIG_JOLIET=y
# CONFIG_JSA1212 is not set
CONFIG_JUMP_LABEL=y
# CONFIG_K3_DMA is not set
+CONFIG_K3_RTI_WATCHDOG=m
+CONFIG_K3_THERMAL=m
CONFIG_KALLSYMS_ALL=y
CONFIG_KALLSYMS_BASE_RELATIVE=y
# CONFIG_KALLSYMS_SELFTEST is not set
@@ -3107,13 +3148,15 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD_SEV=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
# CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set
+CONFIG_KVM_PROVE_MMU=y
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
# CONFIG_KVM_XEN is not set
@@ -3186,6 +3229,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
@@ -3327,9 +3371,11 @@ CONFIG_MAILBOX=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
CONFIG_MARVELL_CN10K_DDR_PMU=m
CONFIG_MARVELL_CN10K_TAD_PMU=m
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3371,9 +3417,11 @@ CONFIG_MAX_SKB_FRAGS=17
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
# CONFIG_MDIO_BCM_IPROC is not set
@@ -3430,6 +3478,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3464,6 +3513,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3615,6 +3666,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3857,6 +3909,9 @@ CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTK_T7XX=m
CONFIG_MULTIUSER=y
+CONFIG_MUX_ADG792A=m
+# CONFIG_MUX_ADGS1408 is not set
+CONFIG_MUX_GPIO=m
# CONFIG_MVMDIO is not set
# CONFIG_MV_XOR_V2 is not set
# CONFIG_MWAVE is not set
@@ -3916,6 +3971,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4344,6 +4400,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4391,9 +4448,11 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_IMX_IIM is not set
# CONFIG_NVMEM_IMX_OCOTP_ELE is not set
CONFIG_NVMEM_IMX_OCOTP=m
+CONFIG_NVMEM_LAYERSCAPE_SFP=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
# CONFIG_NVMEM_SNVS_LPGPR is not set
@@ -4429,6 +4488,11 @@ CONFIG_OF_MDIO=y
CONFIG_OF_PMEM=m
# CONFIG_OF_UNITTEST is not set
CONFIG_OF=y
+CONFIG_OMAP2PLUS_MBOX=m
+CONFIG_OMAP_DM_TIMER=y
+# CONFIG_OMAP_GPMC is not set
+CONFIG_OMAP_MBOX_KFIFO_SIZE=256
+CONFIG_OMAP_USB2=m
# CONFIG_OMFS_FS is not set
# CONFIG_OPAL_CORE is not set
# CONFIG_OPEN_DICE is not set
@@ -4443,6 +4507,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
# CONFIG_OSF_PARTITION is not set
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+CONFIG_OVERLAY_FS_DEBUG=y
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4523,6 +4588,7 @@ CONFIG_PCC=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_AL is not set
@@ -4570,6 +4636,8 @@ CONFIG_PCI_IMX6_HOST=y
CONFIG_PCI_IMX6=y
CONFIG_PCI_IOV=y
# CONFIG_PCI_J721E_HOST is not set
+CONFIG_PCI_KEYSTONE_HOST=y
+CONFIG_PCI_LAYERSCAPE=y
# CONFIG_PCI_MESON is not set
CONFIG_PCI_MSI=y
CONFIG_PCI_P2PDMA=y
@@ -4602,6 +4670,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
CONFIG_PER_VMA_LOCK_STATS=y
# CONFIG_PHANTOM is not set
# CONFIG_PHONET is not set
+CONFIG_PHY_AM654_SERDES=m
# CONFIG_PHY_BCM_NS_USB2 is not set
# CONFIG_PHY_BCM_NS_USB3 is not set
# CONFIG_PHY_BCM_SR_PCIE is not set
@@ -4623,9 +4692,10 @@ CONFIG_PHY_FSL_IMX8MQ_USB=m
CONFIG_PHY_HI6220_USB=m
# CONFIG_PHY_HISI_INNO_USB2 is not set
# CONFIG_PHY_HISTB_COMBPHY is not set
+CONFIG_PHY_J721E_WIZ=m
# CONFIG_PHY_LAN966X_SERDES is not set
CONFIG_PHYLIB=y
-CONFIG_PHYLINK=m
+CONFIG_PHYLINK=y
# CONFIG_PHY_MAPPHONE_MDM6600 is not set
# CONFIG_PHY_MIXEL_LVDS_PHY is not set
# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
@@ -4639,6 +4709,7 @@ CONFIG_PHY_NS2_USB_DRD=y
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_PCIE2 is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
@@ -4649,6 +4720,8 @@ CONFIG_PHY_NS2_USB_DRD=y
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
CONFIG_PHY_TEGRA194_P2U=y
CONFIG_PHY_TEGRA_XUSB=m
# CONFIG_PHY_TUSB1210 is not set
@@ -4829,6 +4902,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4848,6 +4922,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_QORIQ=m
CONFIG_PTP_1588_CLOCK=y
@@ -4865,8 +4940,11 @@ CONFIG_PWM_BCM_IPROC=y
# CONFIG_PWM_IMX1 is not set
CONFIG_PWM_IMX27=m
CONFIG_PWM_IMX_TPM=m
+CONFIG_PWM_OMAP_DMTIMER=y
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM_TEGRA=y
+CONFIG_PWM_TIECAP=m
+CONFIG_PWM_TIEHRPWM=m
# CONFIG_PWM_XILINX is not set
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
@@ -4962,6 +5040,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -5006,6 +5085,7 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
@@ -5013,6 +5093,7 @@ CONFIG_REGMAP=y
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
# CONFIG_REGULATOR_ARM_SCMI is not set
+# CONFIG_REGULATOR_AW37503 is not set
CONFIG_REGULATOR_BD718XX=m
# CONFIG_REGULATOR_DA9121 is not set
# CONFIG_REGULATOR_DA9210 is not set
@@ -5036,6 +5117,7 @@ CONFIG_REGULATOR_GPIO=y
CONFIG_REGULATOR_MAX77620=y
CONFIG_REGULATOR_MAX77686=m
# CONFIG_REGULATOR_MAX77826 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8893 is not set
@@ -5054,6 +5136,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
# CONFIG_REGULATOR_RT4801 is not set
@@ -5066,6 +5149,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_RT6245 is not set
# CONFIG_REGULATOR_RTMV20 is not set
# CONFIG_REGULATOR_RTQ2134 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_RTQ6752 is not set
# CONFIG_REGULATOR_SLG51000 is not set
# CONFIG_REGULATOR_SY8106A is not set
@@ -5100,6 +5184,7 @@ CONFIG_RESET_IMX7=y
# CONFIG_RESET_QCOM_PDC is not set
# CONFIG_RESET_SCMI is not set
# CONFIG_RESET_SIMPLE is not set
+CONFIG_RESET_TI_SCI=m
# CONFIG_RESET_TI_SYSCON is not set
# CONFIG_RESET_TI_TPS380X is not set
CONFIG_RESOURCE_KUNIT_TEST=m
@@ -5109,7 +5194,6 @@ CONFIG_RETPOLINE=y
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -5203,6 +5287,7 @@ CONFIG_RTC_DRV_DS3232=m
CONFIG_RTC_DRV_EFI=y
CONFIG_RTC_DRV_EM3027=m
CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_FSL_FTM_ALARM=m
# CONFIG_RTC_DRV_FTRTC010 is not set
# CONFIG_RTC_DRV_GOLDFISH is not set
# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
@@ -5257,6 +5342,7 @@ CONFIG_RTC_DRV_RX8581=m
CONFIG_RTC_DRV_STK17TA8=m
# CONFIG_RTC_DRV_TEGRA is not set
# CONFIG_RTC_DRV_TEST is not set
+CONFIG_RTC_DRV_TI_K3=m
CONFIG_RTC_DRV_V3020=m
CONFIG_RTC_DRV_X1205=m
# CONFIG_RTC_DRV_XGENE is not set
@@ -5480,6 +5566,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5489,6 +5576,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5566,6 +5654,7 @@ CONFIG_SENSORS_G762=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
# CONFIG_SENSORS_I5K_AMB is not set
# CONFIG_SENSORS_IBMAEM is not set
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5747,6 +5836,8 @@ CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_MANY_PORTS=y
CONFIG_SERIAL_8250_MID=y
CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y
+CONFIG_SERIAL_8250_OMAP=y
CONFIG_SERIAL_8250_PCI1XXXX=y
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PERICOM=y
@@ -6065,7 +6156,9 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -6082,7 +6175,6 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -6147,6 +6239,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -6157,6 +6250,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
# CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
@@ -6276,6 +6370,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -6335,6 +6430,7 @@ CONFIG_SND_SOC_SOF_HDA_PROBES=m
# CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set
# CONFIG_SND_SOC_SOF_JASPERLAKE is not set
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
# CONFIG_SND_SOC_SOF_MERRIFIELD is not set
# CONFIG_SND_SOC_SOF_METEORLAKE is not set
# CONFIG_SND_SOC_SOF_OF is not set
@@ -6405,6 +6501,7 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_BUILD=y
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6496,7 +6593,7 @@ CONFIG_SOC_IMX8M=y
CONFIG_SOC_IMX9=m
# CONFIG_SOCIONEXT_SYNQUACER_PREITS is not set
CONFIG_SOC_TEGRA_CBB=m
-# CONFIG_SOC_TI is not set
+CONFIG_SOC_TI=y
CONFIG_SOFTLOCKUP_DETECTOR=y
CONFIG_SOFT_WATCHDOG=m
# CONFIG_SOLARIS_X86_PARTITION is not set
@@ -6536,6 +6633,7 @@ CONFIG_SPI_AMD=y
# CONFIG_SPI_CADENCE_XSPI is not set
CONFIG_SPI_DEBUG=y
# CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_FSL_DSPI=y
CONFIG_SPI_FSL_LPSPI=m
CONFIG_SPI_FSL_QUADSPI=m
# CONFIG_SPI_FSL_SPI is not set
@@ -6554,6 +6652,7 @@ CONFIG_SPI_MEM=y
# CONFIG_SPI_MXIC is not set
CONFIG_SPI_NXP_FLEXSPI=m
# CONFIG_SPI_OC_TINY is not set
+CONFIG_SPI_OMAP24XX=m
CONFIG_SPI_PCI1XXXX=m
CONFIG_SPI_PL022=m
# CONFIG_SPI_PXA2XX is not set
@@ -6655,6 +6754,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
CONFIG_SUSPEND=y
CONFIG_SVC_I3C_MASTER=m
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
# CONFIG_SX9324 is not set
@@ -6773,6 +6873,7 @@ CONFIG_TEST_FPU=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIST_SORT=m
@@ -6849,6 +6950,9 @@ CONFIG_THUNDERX2_PMU=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+CONFIG_TI_K3_RINGACC=y
+CONFIG_TI_K3_UDMA_GLUE_LAYER=y
+CONFIG_TI_K3_UDMA=y
# CONFIG_TI_LMP92064 is not set
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y
@@ -6868,7 +6972,13 @@ CONFIG_TIPC_DIAG=m
CONFIG_TIPC=m
CONFIG_TIPC_MEDIA_IB=y
CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TI_PRUSS=m
+CONFIG_TI_SCI_CLK=m
+# CONFIG_TI_SCI_CLK_PROBE_FROM_FW is not set
+CONFIG_TI_SCI_PM_DOMAINS=m
# CONFIG_TI_ST is not set
+CONFIG_TI_SYSCON_CLK=m
+CONFIG_TI_SYSC=y
# CONFIG_TI_TLC4541 is not set
# CONFIG_TI_TMAG5273 is not set
# CONFIG_TI_TSC2046 is not set
@@ -6881,6 +6991,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -6925,6 +7036,7 @@ CONFIG_TORTURE_TEST=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7089,8 +7201,10 @@ CONFIG_USB_CXACRU=m
CONFIG_USB_DEFAULT_PERSIST=y
# CONFIG_USB_DSBR is not set
# CONFIG_USB_DWC2 is not set
+CONFIG_USB_DWC3_AM62=m
CONFIG_USB_DWC3_IMX8MP=m
# CONFIG_USB_DWC3 is not set
+CONFIG_USB_DWC3_KEYSTONE=m
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_EHCI_FSL is not set
CONFIG_USB_EHCI_HCD_PLATFORM=m
@@ -7374,6 +7488,7 @@ CONFIG_VEXPRESS_CONFIG=y
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=m
# CONFIG_VFIO_AMBA is not set
+CONFIG_VFIO_FSL_MC=m
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
# CONFIG_VFIO_MDEV is not set
@@ -7438,8 +7553,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7737,6 +7856,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config
index f2b75decb..f80290dfb 100644
--- a/kernel-aarch64-64k-rhel.config
+++ b/kernel-aarch64-64k-rhel.config
@@ -215,7 +215,6 @@ CONFIG_AMD_HSMP=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
CONFIG_AMD_PHY=m
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
# CONFIG_AMD_PTDMA is not set
# CONFIG_AMDTEE is not set
# CONFIG_AMD_XGBE_DCB is not set
@@ -249,9 +248,9 @@ CONFIG_ARCH_BCM_IPROC=y
# CONFIG_ARCH_EXYNOS is not set
CONFIG_ARCH_HISI=y
# CONFIG_ARCH_INTEL_SOCFPGA is not set
-# CONFIG_ARCH_K3 is not set
+CONFIG_ARCH_K3=y
# CONFIG_ARCH_KEEMBAY is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
+CONFIG_ARCH_LAYERSCAPE=y
# CONFIG_ARCH_LG1K is not set
# CONFIG_ARCH_MA35 is not set
# CONFIG_ARCH_MEDIATEK is not set
@@ -405,6 +404,7 @@ CONFIG_ARM_SPE_PMU=m
# CONFIG_ARM_TEGRA186_CPUFREQ is not set
CONFIG_ARM_TEGRA194_CPUFREQ=m
CONFIG_ARM_TEGRA_DEVFREQ=m
+CONFIG_ARM_TI_CPUFREQ=y
# CONFIG_AS3935 is not set
# CONFIG_AS73211 is not set
CONFIG_ASN1=y
@@ -923,6 +923,7 @@ CONFIG_CLK_IMX8QXP=y
CONFIG_CLK_IMX8ULP=y
CONFIG_CLK_IMX93=y
CONFIG_CLK_KUNIT_TEST=m
+CONFIG_CLK_LS1028A_PLLDIG=y
# CONFIG_CLK_QORIQ is not set
CONFIG_CLK_SP810=y
CONFIG_CLK_VEXPRESS_OSC=y
@@ -960,6 +961,7 @@ CONFIG_COMMAND_LINE_SIZE=4096
# CONFIG_COMMON_CLK_CS2000_CP is not set
# CONFIG_COMMON_CLK_FIXED_MMIO is not set
# CONFIG_COMMON_CLK_FSL_FLEXSPI is not set
+CONFIG_COMMON_CLK_FSL_SAI=y
CONFIG_COMMON_CLK_HI3516CV300=y
CONFIG_COMMON_CLK_HI3519=y
# CONFIG_COMMON_CLK_HI3559A is not set
@@ -981,6 +983,7 @@ CONFIG_COMMON_CLK_SCPI=m
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
CONFIG_COMMON_CLK_XGENE=y
@@ -1001,6 +1004,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1082,8 +1086,8 @@ CONFIG_CRYPTO_AES_ARM64_BS=m
CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
CONFIG_CRYPTO_AES_ARM64_CE=y
-# CONFIG_CRYPTO_AES_ARM64 is not set
CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
+CONFIG_CRYPTO_AES_ARM64=y
CONFIG_CRYPTO_AES_GCM_P10=y
# CONFIG_CRYPTO_AES_TI is not set
CONFIG_CRYPTO_AES=y
@@ -1101,6 +1105,7 @@ CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
@@ -1139,6 +1144,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_PRNG_API=y
CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=3
CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
# CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_TEST is not set
+CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
# CONFIG_CRYPTO_DEV_HISI_HPRE is not set
# CONFIG_CRYPTO_DEV_HISI_SEC2 is not set
CONFIG_CRYPTO_DEV_HISI_SEC=m
@@ -1158,6 +1164,7 @@ CONFIG_CRYPTO_DEV_OCTEONTX2_CPT=m
# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
# CONFIG_CRYPTO_DEV_QCE is not set
# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
+CONFIG_CRYPTO_DEV_SA2UL=m
# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
# CONFIG_CRYPTO_DEV_SAHARA is not set
CONFIG_CRYPTO_DEV_SP_CCP=y
@@ -1209,6 +1216,7 @@ CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_POLY1305_NEON=y
+# CONFIG_CRYPTO_POLY1305_P10 is not set
# CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
@@ -1412,6 +1420,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1434,6 +1443,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1465,6 +1475,7 @@ CONFIG_DP83867_PHY=m
# CONFIG_DP83869_PHY is not set
CONFIG_DP83TC811_PHY=m
# CONFIG_DP83TD510_PHY is not set
+CONFIG_DPAA2_CONSOLE=m
# CONFIG_DPM_WATCHDOG is not set
# CONFIG_DPOT_DAC is not set
# CONFIG_DPS310 is not set
@@ -1556,6 +1567,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MALI_DISPLAY is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1633,6 +1645,7 @@ CONFIG_DRM_SIMPLEDRM=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1774,6 +1787,7 @@ CONFIG_EDAC_DMC520=m
CONFIG_EDAC_GHES=y
CONFIG_EDAC_I10NM=m
CONFIG_EDAC_IGEN6=m
+CONFIG_EDAC_LAYERSCAPE=m
CONFIG_EDAC_LEGACY_SYSFS=y
CONFIG_EDAC_PND2=m
CONFIG_EDAC_SYNOPSYS=m
@@ -1885,6 +1899,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1973,7 +1988,15 @@ CONFIG_FSCACHE_STATS=y
CONFIG_FS_DAX=y
# CONFIG_FS_ENCRYPTION is not set
# CONFIG_FSI is not set
+# CONFIG_FSL_BMAN_TEST is not set
+CONFIG_FSL_DPAA2_ETH_DCB=y
+CONFIG_FSL_DPAA2_ETH=m
+CONFIG_FSL_DPAA2_PTP_CLOCK=m
+CONFIG_FSL_DPAA2_QDMA=m
CONFIG_FSL_DPAA2_SWITCH=m
+# CONFIG_FSL_DPAA_CHECKING is not set
+CONFIG_FSL_DPAA_ETH=m
+CONFIG_FSL_DPAA=y
# CONFIG_FSL_EDMA is not set
CONFIG_FSL_ENETC_IERB=m
CONFIG_FSL_ENETC=m
@@ -1982,10 +2005,15 @@ CONFIG_FSL_ENETC_PTP_CLOCK=m
CONFIG_FSL_ENETC_QOS=y
CONFIG_FSL_ENETC_VF=m
CONFIG_FSL_ERRATUM_A008585=y
+CONFIG_FSL_FMAN=y
CONFIG_FSL_IMX8_DDR_PMU=m
# CONFIG_FSL_IMX9_DDR_PMU is not set
+CONFIG_FSL_MC_BUS=y
+CONFIG_FSL_MC_DPIO=m
+CONFIG_FSL_MC_UAPI_SUPPORT=y
CONFIG_FSL_PQ_MDIO=m
# CONFIG_FSL_QDMA is not set
+# CONFIG_FSL_QMAN_TEST is not set
# CONFIG_FSL_RCPM is not set
CONFIG_FSL_XGMAC_MDIO=m
CONFIG_FSNOTIFY=y
@@ -2081,6 +2109,8 @@ CONFIG_GNSS=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_DAVINCI=y
+# CONFIG_GPIO_DS4520 is not set
CONFIG_GPIO_DWAPB=m
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -2109,6 +2139,7 @@ CONFIG_GPIO_MLXBF2=m
# CONFIG_GPIO_MLXBF3 is not set
# CONFIG_GPIO_MLXBF is not set
# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_MPC8XXX=y
CONFIG_GPIO_MXC=m
# CONFIG_GPIO_PCA953X_IRQ is not set
# CONFIG_GPIO_PCA953X is not set
@@ -2210,6 +2241,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2366,15 +2398,17 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
CONFIG_HW_RANDOM_CAVIUM=m
# CONFIG_HW_RANDOM_CCTRNG is not set
CONFIG_HW_RANDOM_CN10K=m
-CONFIG_HW_RANDOM_HISI=y
+CONFIG_HW_RANDOM_HISI=m
# CONFIG_HW_RANDOM_HISTB is not set
# CONFIG_HW_RANDOM_IPROC_RNG200 is not set
+CONFIG_HW_RANDOM_OMAP=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
CONFIG_HW_RANDOM_TPM=y
CONFIG_HW_RANDOM_VIRTIO=y
CONFIG_HW_RANDOM_XGENE=m
# CONFIG_HW_RANDOM_XIPHERA is not set
CONFIG_HW_RANDOM=y
+CONFIG_HWSPINLOCK_OMAP=m
# CONFIG_HWSPINLOCK_QCOM is not set
CONFIG_HWSPINLOCK=y
# CONFIG_HX711 is not set
@@ -2404,6 +2438,7 @@ CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_AMD_MP2 is not set
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_BCM_IPROC is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
@@ -2450,6 +2485,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NOMADIK is not set
# CONFIG_I2C_NVIDIA_GPU is not set
# CONFIG_I2C_OCORES is not set
+CONFIG_I2C_OMAP=m
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PCI1XXXX is not set
# CONFIG_I2C_PIIX4 is not set
@@ -2653,7 +2689,7 @@ CONFIG_INPUT_APANEL=m
# CONFIG_INPUT_ATI_REMOTE2 is not set
CONFIG_INPUT_ATLAS_BTNS=m
# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
-# CONFIG_INPUT_BBNSM_PWRKEY is not set
+CONFIG_INPUT_BBNSM_PWRKEY=m
# CONFIG_INPUT_BMA150 is not set
# CONFIG_INPUT_CM109 is not set
# CONFIG_INPUT_CMA3000 is not set
@@ -2747,6 +2783,7 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_TCC_COOLING is not set
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_VSC is not set
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
CONFIG_INTEL_XWAY_PHY=m
@@ -2781,7 +2818,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2867,6 +2904,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2943,6 +2981,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -2998,6 +3037,8 @@ CONFIG_JOLIET=y
# CONFIG_JSA1212 is not set
CONFIG_JUMP_LABEL=y
# CONFIG_K3_DMA is not set
+CONFIG_K3_RTI_WATCHDOG=m
+CONFIG_K3_THERMAL=m
CONFIG_KALLSYMS_ALL=y
CONFIG_KALLSYMS_BASE_RELATIVE=y
# CONFIG_KALLSYMS_SELFTEST is not set
@@ -3086,13 +3127,15 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD_SEV=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
# CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set
+# CONFIG_KVM_PROVE_MMU is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
# CONFIG_KVM_XEN is not set
@@ -3165,6 +3208,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
@@ -3306,9 +3350,11 @@ CONFIG_MAILBOX=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
CONFIG_MARVELL_CN10K_DDR_PMU=m
CONFIG_MARVELL_CN10K_TAD_PMU=m
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3350,9 +3396,11 @@ CONFIG_MAX_SKB_FRAGS=17
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
# CONFIG_MDIO_BCM_IPROC is not set
@@ -3409,6 +3457,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3443,6 +3492,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3594,6 +3645,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3836,6 +3888,9 @@ CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTK_T7XX=m
CONFIG_MULTIUSER=y
+CONFIG_MUX_ADG792A=m
+# CONFIG_MUX_ADGS1408 is not set
+CONFIG_MUX_GPIO=m
# CONFIG_MVMDIO is not set
# CONFIG_MV_XOR_V2 is not set
# CONFIG_MWAVE is not set
@@ -3895,6 +3950,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4323,6 +4379,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4370,9 +4427,11 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_IMX_IIM is not set
# CONFIG_NVMEM_IMX_OCOTP_ELE is not set
CONFIG_NVMEM_IMX_OCOTP=m
+CONFIG_NVMEM_LAYERSCAPE_SFP=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
# CONFIG_NVMEM_SNVS_LPGPR is not set
@@ -4408,6 +4467,11 @@ CONFIG_OF_MDIO=y
CONFIG_OF_PMEM=m
# CONFIG_OF_UNITTEST is not set
CONFIG_OF=y
+CONFIG_OMAP2PLUS_MBOX=m
+CONFIG_OMAP_DM_TIMER=y
+# CONFIG_OMAP_GPMC is not set
+CONFIG_OMAP_MBOX_KFIFO_SIZE=256
+CONFIG_OMAP_USB2=m
# CONFIG_OMFS_FS is not set
# CONFIG_OPAL_CORE is not set
# CONFIG_OPEN_DICE is not set
@@ -4422,6 +4486,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
# CONFIG_OSF_PARTITION is not set
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4500,6 +4565,7 @@ CONFIG_PCC=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_AL is not set
@@ -4547,6 +4613,8 @@ CONFIG_PCI_IMX6_HOST=y
CONFIG_PCI_IMX6=y
CONFIG_PCI_IOV=y
# CONFIG_PCI_J721E_HOST is not set
+CONFIG_PCI_KEYSTONE_HOST=y
+CONFIG_PCI_LAYERSCAPE=y
# CONFIG_PCI_MESON is not set
CONFIG_PCI_MSI=y
CONFIG_PCI_P2PDMA=y
@@ -4579,6 +4647,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
CONFIG_PER_VMA_LOCK_STATS=y
# CONFIG_PHANTOM is not set
# CONFIG_PHONET is not set
+CONFIG_PHY_AM654_SERDES=m
# CONFIG_PHY_BCM_NS_USB2 is not set
# CONFIG_PHY_BCM_NS_USB3 is not set
# CONFIG_PHY_BCM_SR_PCIE is not set
@@ -4600,9 +4669,10 @@ CONFIG_PHY_FSL_IMX8MQ_USB=m
CONFIG_PHY_HI6220_USB=m
# CONFIG_PHY_HISI_INNO_USB2 is not set
# CONFIG_PHY_HISTB_COMBPHY is not set
+CONFIG_PHY_J721E_WIZ=m
# CONFIG_PHY_LAN966X_SERDES is not set
CONFIG_PHYLIB=y
-CONFIG_PHYLINK=m
+CONFIG_PHYLINK=y
# CONFIG_PHY_MAPPHONE_MDM6600 is not set
# CONFIG_PHY_MIXEL_LVDS_PHY is not set
# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
@@ -4616,6 +4686,7 @@ CONFIG_PHY_NS2_USB_DRD=y
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_PCIE2 is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
@@ -4626,6 +4697,8 @@ CONFIG_PHY_NS2_USB_DRD=y
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
CONFIG_PHY_TEGRA194_P2U=y
CONFIG_PHY_TEGRA_XUSB=m
# CONFIG_PHY_TUSB1210 is not set
@@ -4806,6 +4879,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4825,6 +4899,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_QORIQ=m
CONFIG_PTP_1588_CLOCK=y
@@ -4842,8 +4917,11 @@ CONFIG_PWM_BCM_IPROC=y
# CONFIG_PWM_IMX1 is not set
CONFIG_PWM_IMX27=m
CONFIG_PWM_IMX_TPM=m
+CONFIG_PWM_OMAP_DMTIMER=y
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM_TEGRA=y
+CONFIG_PWM_TIECAP=m
+CONFIG_PWM_TIEHRPWM=m
# CONFIG_PWM_XILINX is not set
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
@@ -4939,6 +5017,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -4983,6 +5062,7 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
@@ -4990,6 +5070,7 @@ CONFIG_REGMAP=y
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
# CONFIG_REGULATOR_ARM_SCMI is not set
+# CONFIG_REGULATOR_AW37503 is not set
CONFIG_REGULATOR_BD718XX=m
# CONFIG_REGULATOR_DA9121 is not set
# CONFIG_REGULATOR_DA9210 is not set
@@ -5013,6 +5094,7 @@ CONFIG_REGULATOR_GPIO=y
CONFIG_REGULATOR_MAX77620=y
CONFIG_REGULATOR_MAX77686=m
# CONFIG_REGULATOR_MAX77826 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8893 is not set
@@ -5031,6 +5113,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
# CONFIG_REGULATOR_RT4801 is not set
@@ -5043,6 +5126,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_RT6245 is not set
# CONFIG_REGULATOR_RTMV20 is not set
# CONFIG_REGULATOR_RTQ2134 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_RTQ6752 is not set
# CONFIG_REGULATOR_SLG51000 is not set
# CONFIG_REGULATOR_SY8106A is not set
@@ -5077,6 +5161,7 @@ CONFIG_RESET_IMX7=y
# CONFIG_RESET_QCOM_PDC is not set
# CONFIG_RESET_SCMI is not set
# CONFIG_RESET_SIMPLE is not set
+CONFIG_RESET_TI_SCI=m
# CONFIG_RESET_TI_SYSCON is not set
# CONFIG_RESET_TI_TPS380X is not set
CONFIG_RESOURCE_KUNIT_TEST=m
@@ -5086,7 +5171,6 @@ CONFIG_RETPOLINE=y
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -5180,6 +5264,7 @@ CONFIG_RTC_DRV_DS3232=m
CONFIG_RTC_DRV_EFI=y
CONFIG_RTC_DRV_EM3027=m
CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_FSL_FTM_ALARM=m
# CONFIG_RTC_DRV_FTRTC010 is not set
# CONFIG_RTC_DRV_GOLDFISH is not set
# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
@@ -5234,6 +5319,7 @@ CONFIG_RTC_DRV_RX8581=m
CONFIG_RTC_DRV_STK17TA8=m
# CONFIG_RTC_DRV_TEGRA is not set
# CONFIG_RTC_DRV_TEST is not set
+CONFIG_RTC_DRV_TI_K3=m
CONFIG_RTC_DRV_V3020=m
CONFIG_RTC_DRV_X1205=m
# CONFIG_RTC_DRV_XGENE is not set
@@ -5457,6 +5543,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5466,6 +5553,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5543,6 +5631,7 @@ CONFIG_SENSORS_G762=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
# CONFIG_SENSORS_I5K_AMB is not set
# CONFIG_SENSORS_IBMAEM is not set
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5724,6 +5813,8 @@ CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_MANY_PORTS=y
CONFIG_SERIAL_8250_MID=y
CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y
+CONFIG_SERIAL_8250_OMAP=y
CONFIG_SERIAL_8250_PCI1XXXX=y
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PERICOM=y
@@ -6041,7 +6132,9 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -6058,7 +6151,6 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -6123,6 +6215,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -6133,6 +6226,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
# CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
@@ -6252,6 +6346,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -6310,6 +6405,7 @@ CONFIG_SND_SOC_SOF_ACPI=m
# CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set
# CONFIG_SND_SOC_SOF_JASPERLAKE is not set
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
# CONFIG_SND_SOC_SOF_MERRIFIELD is not set
# CONFIG_SND_SOC_SOF_METEORLAKE is not set
# CONFIG_SND_SOC_SOF_OF is not set
@@ -6380,6 +6476,7 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6471,7 +6568,7 @@ CONFIG_SOC_IMX8M=y
CONFIG_SOC_IMX9=m
# CONFIG_SOCIONEXT_SYNQUACER_PREITS is not set
CONFIG_SOC_TEGRA_CBB=m
-# CONFIG_SOC_TI is not set
+CONFIG_SOC_TI=y
CONFIG_SOFTLOCKUP_DETECTOR=y
CONFIG_SOFT_WATCHDOG=m
# CONFIG_SOLARIS_X86_PARTITION is not set
@@ -6511,6 +6608,7 @@ CONFIG_SPI_AMD=y
# CONFIG_SPI_CADENCE_XSPI is not set
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_FSL_DSPI=y
CONFIG_SPI_FSL_LPSPI=m
CONFIG_SPI_FSL_QUADSPI=m
# CONFIG_SPI_FSL_SPI is not set
@@ -6529,6 +6627,7 @@ CONFIG_SPI_MEM=y
# CONFIG_SPI_MXIC is not set
CONFIG_SPI_NXP_FLEXSPI=m
# CONFIG_SPI_OC_TINY is not set
+CONFIG_SPI_OMAP24XX=m
CONFIG_SPI_PCI1XXXX=m
CONFIG_SPI_PL022=m
# CONFIG_SPI_PXA2XX is not set
@@ -6630,6 +6729,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
CONFIG_SUSPEND=y
CONFIG_SVC_I3C_MASTER=m
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
# CONFIG_SX9324 is not set
@@ -6748,6 +6848,7 @@ CONFIG_TEST_CPUMASK=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
@@ -6824,6 +6925,9 @@ CONFIG_THUNDERX2_PMU=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+CONFIG_TI_K3_RINGACC=y
+CONFIG_TI_K3_UDMA_GLUE_LAYER=y
+CONFIG_TI_K3_UDMA=y
# CONFIG_TI_LMP92064 is not set
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y
@@ -6843,7 +6947,13 @@ CONFIG_TIPC_DIAG=m
CONFIG_TIPC=m
CONFIG_TIPC_MEDIA_IB=y
CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TI_PRUSS=m
+CONFIG_TI_SCI_CLK=m
+# CONFIG_TI_SCI_CLK_PROBE_FROM_FW is not set
+CONFIG_TI_SCI_PM_DOMAINS=m
# CONFIG_TI_ST is not set
+CONFIG_TI_SYSCON_CLK=m
+CONFIG_TI_SYSC=y
# CONFIG_TI_TLC4541 is not set
# CONFIG_TI_TMAG5273 is not set
# CONFIG_TI_TSC2046 is not set
@@ -6856,6 +6966,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -6900,6 +7011,7 @@ CONFIG_TORTURE_TEST=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7064,8 +7176,10 @@ CONFIG_USB_CXACRU=m
CONFIG_USB_DEFAULT_PERSIST=y
# CONFIG_USB_DSBR is not set
# CONFIG_USB_DWC2 is not set
+CONFIG_USB_DWC3_AM62=m
CONFIG_USB_DWC3_IMX8MP=m
# CONFIG_USB_DWC3 is not set
+CONFIG_USB_DWC3_KEYSTONE=m
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_EHCI_FSL is not set
CONFIG_USB_EHCI_HCD_PLATFORM=m
@@ -7349,6 +7463,7 @@ CONFIG_VEXPRESS_CONFIG=y
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=m
# CONFIG_VFIO_AMBA is not set
+CONFIG_VFIO_FSL_MC=m
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
# CONFIG_VFIO_MDEV is not set
@@ -7413,8 +7528,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7712,6 +7831,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index c1b177f3c..58139abe4 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -145,6 +145,7 @@ CONFIG_AD7949=m
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
CONFIG_ADAPTEC_STARFIRE=m
+# CONFIG_ADDRESS_MASKING is not set
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -1275,6 +1276,7 @@ CONFIG_COMMON_CLK_SI5341=m
# CONFIG_COMMON_CLK_SI5351 is not set
CONFIG_COMMON_CLK_SI544=m
# CONFIG_COMMON_CLK_SI570 is not set
+CONFIG_COMMON_CLK_VC3=m
# CONFIG_COMMON_CLK_VC5 is not set
CONFIG_COMMON_CLK_VC7=m
CONFIG_COMMON_CLK_XGENE=y
@@ -1297,6 +1299,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=3
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1352,6 +1355,8 @@ CONFIG_CPU_THERMAL=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -1781,6 +1786,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
CONFIG_DMA_OF=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
@@ -1809,6 +1815,7 @@ CONFIG_DM_INIT=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=y
@@ -1943,6 +1950,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
CONFIG_DRM_LONTIUM_LT9611=m
CONFIG_DRM_LONTIUM_LT9611UXC=m
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
CONFIG_DRM_MALI_DISPLAY=m
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -2047,11 +2055,13 @@ CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
+CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m
# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
CONFIG_DRM_PANEL_TPO_TPG110=m
CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
+CONFIG_DRM_PANEL_VISIONOX_R66451=m
CONFIG_DRM_PANEL_VISIONOX_RM69299=m
CONFIG_DRM_PANEL_VISIONOX_VTDR6130=m
CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
@@ -2099,6 +2109,7 @@ CONFIG_DRM_TOSHIBA_TC358764=m
CONFIG_DRM_TOSHIBA_TC358767=m
CONFIG_DRM_TOSHIBA_TC358768=m
CONFIG_DRM_TOSHIBA_TC358775=m
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
CONFIG_DRM_V3D=m
@@ -2307,6 +2318,7 @@ CONFIG_EROFS_FS=m
CONFIG_EROFS_FS_POSIX_ACL=y
CONFIG_EROFS_FS_SECURITY=y
CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP_DEFLATE=y
CONFIG_EROFS_FS_ZIP_LZMA=y
CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
@@ -2396,6 +2408,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -2637,6 +2650,7 @@ CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
CONFIG_GPIO_DAVINCI=m
CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_DS4520=m
CONFIG_GPIO_DWAPB=m
CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_FTGPIO010 is not set
@@ -2776,6 +2790,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
CONFIG_HID_GLORIOUS=m
# CONFIG_HID_GOOGLE_HAMMER is not set
+CONFIG_HID_GOOGLE_STADIA_FF=m
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2995,6 +3010,7 @@ CONFIG_I2C_ALGOPCF=m
CONFIG_I2C_AMD_MP2=m
CONFIG_I2C_APPLE=m
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+CONFIG_I2C_ATR=m
CONFIG_I2C_BCM2835=m
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_BRCMSTB=y
@@ -3438,6 +3454,7 @@ CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
CONFIG_IOSM=m
CONFIG_IO_STRICT_DEVMEM=y
+CONFIG_IO_URING=y
CONFIG_IP5XXX_POWER=m
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -3507,6 +3524,7 @@ CONFIG_IP_PIMSM_V2=y
# CONFIG_IPQ_APSS_6018 is not set
# CONFIG_IPQ_APSS_PLL is not set
# CONFIG_IPQ_GCC_4019 is not set
+CONFIG_IPQ_GCC_5018=m
# CONFIG_IPQ_GCC_5332 is not set
# CONFIG_IPQ_GCC_6018 is not set
# CONFIG_IPQ_GCC_806X is not set
@@ -3534,6 +3552,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+CONFIG_IPU_BRIDGE=m
CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_IOAM6_LWTUNNEL=y
@@ -3611,6 +3630,7 @@ CONFIG_IR_RC6_DECODER=m
CONFIG_IR_RCMM_DECODER=m
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
CONFIG_IR_SERIAL=m
CONFIG_IR_SERIAL_TRANSMITTER=y
CONFIG_IR_SHARP_DECODER=m
@@ -3832,11 +3852,13 @@ CONFIG_KSM=y
CONFIG_KSZ884X_PCI=m
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KUSER_HELPERS=y
+CONFIG_KVM_PROVE_MMU=y
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
CONFIG_KVM_XEN=y
@@ -3890,6 +3912,7 @@ CONFIG_LEDS_CR0014114=m
# CONFIG_LEDS_DAC124S085 is not set
# CONFIG_LEDS_EL15203000 is not set
CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GROUP_MULTICOLOR=m
# CONFIG_LEDS_IS31FL319X is not set
CONFIG_LEDS_IS31FL32XX=m
# CONFIG_LEDS_KTD2692 is not set
@@ -3917,6 +3940,7 @@ CONFIG_LEDS_PCA9532_GPIO=y
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
CONFIG_LEDS_PCA963X=m
+CONFIG_LEDS_PCA995X=m
CONFIG_LEDS_PWM=m
CONFIG_LEDS_PWM_MULTICOLOR=m
CONFIG_LEDS_QCOM_FLASH=m
@@ -4069,9 +4093,11 @@ CONFIG_MAILBOX=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88Q2XXX_PHY=m
CONFIG_MARVELL_88X2222_PHY=m
CONFIG_MARVELL_CN10K_DDR_PMU=m
CONFIG_MARVELL_CN10K_TAD_PMU=m
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -4116,11 +4142,13 @@ CONFIG_MCP41010=m
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+CONFIG_MCP4728=m
# CONFIG_MCP4922 is not set
CONFIG_MCTP_SERIAL=m
# CONFIG_MCTP_TRANSPORT_I2C is not set
CONFIG_MCTP=y
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -4244,6 +4272,8 @@ CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=y
# CONFIG_MFD_CPCAP is not set
CONFIG_MFD_CROS_EC_DEV=m
+CONFIG_MFD_CS42L43_I2C=m
+CONFIG_MFD_CS42L43_SDW=m
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
@@ -4406,6 +4436,7 @@ CONFIG_MLX5_ESWITCH=y
# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -4799,6 +4830,7 @@ CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -5314,6 +5346,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -5366,6 +5399,7 @@ CONFIG_NVMEM_LAYOUT_SL28_VPD=m
CONFIG_NVMEM_MESON_EFUSE=m
CONFIG_NVMEM_MESON_MX_EFUSE=m
CONFIG_NVMEM_QCOM_QFPROM=m
+CONFIG_NVMEM_QCOM_SEC_QFPROM=m
CONFIG_NVMEM_REBOOT_MODE=m
CONFIG_NVMEM_RMEM=m
CONFIG_NVMEM_ROCKCHIP_EFUSE=m
@@ -5445,6 +5479,7 @@ CONFIG_ORINOCO_USB=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -5535,6 +5570,7 @@ CONFIG_PCC=y
CONFIG_PCI_AARDVARK=y
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_AL is not set
@@ -5617,6 +5653,7 @@ CONFIG_PCS_XPCS=m
CONFIG_PDC_ADMA=m
CONFIG_PDS_CORE=m
CONFIG_PDS_VDPA=m
+CONFIG_PDS_VFIO_PCI=m
# CONFIG_PECI is not set
CONFIG_PERCPU_STATS=y
# CONFIG_PERCPU_TEST is not set
@@ -5675,12 +5712,14 @@ CONFIG_PHY_QCOM_EUSB2_REPEATER=m
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
CONFIG_PHY_QCOM_PCIE2=m
CONFIG_PHY_QCOM_QMP_COMBO=m
CONFIG_PHY_QCOM_QMP=m
CONFIG_PHY_QCOM_QMP_PCIE_8996=m
CONFIG_PHY_QCOM_QMP_PCIE=m
CONFIG_PHY_QCOM_QMP_UFS=m
+CONFIG_PHY_QCOM_QMP_USB_LEGACY=m
CONFIG_PHY_QCOM_QMP_USB=m
CONFIG_PHY_QCOM_QUSB2=m
CONFIG_PHY_QCOM_SGMII_ETH=m
@@ -5702,6 +5741,8 @@ CONFIG_PHY_ROCKCHIP_PCIE=y
CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=m
CONFIG_PHY_ROCKCHIP_TYPEC=m
CONFIG_PHY_ROCKCHIP_USB=m
+CONFIG_PHY_RTK_RTD_USB2PHY=m
+CONFIG_PHY_RTK_RTD_USB3PHY=m
# CONFIG_PHY_SAMSUNG_USB2 is not set
CONFIG_PHY_SUN4I_USB=m
CONFIG_PHY_SUN50I_USB3=m
@@ -5719,6 +5760,7 @@ CONFIG_PID_NS=y
CONFIG_PINCONF=y
CONFIG_PINCTRL_ALDERLAKE=m
CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_AMLOGIC_C3=y
CONFIG_PINCTRL_APPLE_GPIO=m
CONFIG_PINCTRL_AS3722=y
CONFIG_PINCTRL_AXP209=m
@@ -5727,6 +5769,7 @@ CONFIG_PINCTRL_AXP209=m
# CONFIG_PINCTRL_CANNONLAKE is not set
CONFIG_PINCTRL_CEDARFORK=m
# CONFIG_PINCTRL_CHERRYVIEW is not set
+CONFIG_PINCTRL_CS42L43=m
CONFIG_PINCTRL_CY8C95X0=m
CONFIG_PINCTRL_ELKHARTLAKE=m
CONFIG_PINCTRL_EMMITSBURG=m
@@ -5804,6 +5847,7 @@ CONFIG_PINCTRL_SDM845=m
# CONFIG_PINCTRL_SDX75 is not set
CONFIG_PINCTRL_SINGLE=y
# CONFIG_PINCTRL_SM6115 is not set
+# CONFIG_PINCTRL_SM6115_LPASS_LPI is not set
# CONFIG_PINCTRL_SM6125 is not set
# CONFIG_PINCTRL_SM6350 is not set
# CONFIG_PINCTRL_SM6375 is not set
@@ -5812,6 +5856,7 @@ CONFIG_PINCTRL_SINGLE=y
# CONFIG_PINCTRL_SM8250 is not set
CONFIG_PINCTRL_SM8250_LPASS_LPI=m
# CONFIG_PINCTRL_SM8350 is not set
+CONFIG_PINCTRL_SM8350_LPASS_LPI=m
CONFIG_PINCTRL_SM8450_LPASS_LPI=m
CONFIG_PINCTRL_SM8450=m
# CONFIG_PINCTRL_SM8550 is not set
@@ -5975,6 +6020,7 @@ CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
CONFIG_PSTORE_842_COMPRESS=y
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -5996,6 +6042,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
CONFIG_PTP_1588_CLOCK_IDTCM=m
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_PTP_1588_CLOCK_QORIQ=m
@@ -6167,6 +6214,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -6228,6 +6276,7 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=y
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP_MMIO=y
@@ -6239,6 +6288,7 @@ CONFIG_REGULATOR_ACT8865=m
CONFIG_REGULATOR_ANATOP=m
CONFIG_REGULATOR_ARM_SCMI=m
CONFIG_REGULATOR_AS3722=m
+CONFIG_REGULATOR_AW37503=m
CONFIG_REGULATOR_AXP20X=m
CONFIG_REGULATOR_BD718XX=m
CONFIG_REGULATOR_BD9571MWV=m
@@ -6266,12 +6316,14 @@ CONFIG_REGULATOR_HI655X=m
# CONFIG_REGULATOR_MAX1586 is not set
# CONFIG_REGULATOR_MAX20086 is not set
CONFIG_REGULATOR_MAX20411=m
+CONFIG_REGULATOR_MAX5970=m
CONFIG_REGULATOR_MAX597X=m
CONFIG_REGULATOR_MAX77620=y
CONFIG_REGULATOR_MAX77650=m
CONFIG_REGULATOR_MAX77686=m
CONFIG_REGULATOR_MAX77802=m
# CONFIG_REGULATOR_MAX77826 is not set
+CONFIG_REGULATOR_MAX77857=m
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
CONFIG_REGULATOR_MAX8893=m
@@ -6293,6 +6345,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_PV88090 is not set
CONFIG_REGULATOR_PWM=y
CONFIG_REGULATOR_QCOM_LABIBB=m
+CONFIG_REGULATOR_QCOM_REFGEN=m
CONFIG_REGULATOR_QCOM_RPMH=y
# CONFIG_REGULATOR_QCOM_RPM is not set
CONFIG_REGULATOR_QCOM_SMD_RPM=m
@@ -6313,6 +6366,7 @@ CONFIG_REGULATOR_RT6190=m
CONFIG_REGULATOR_RT6245=m
CONFIG_REGULATOR_RTMV20=m
CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTQ2208=m
CONFIG_REGULATOR_RTQ6752=m
# CONFIG_REGULATOR_SLG51000 is not set
CONFIG_REGULATOR_SY7636A=m
@@ -6372,8 +6426,7 @@ CONFIG_RESOURCE_KUNIT_TEST=m
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-# CONFIG_RH_DISABLE_DEPRECATED is not set
-CONFIG_RH_FEDORA=y
+# CONFIG_RHEL_DIFFERENCES is not set
CONFIG_RICHTEK_RTQ6056=m
CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
@@ -6856,6 +6909,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -6933,6 +6987,7 @@ CONFIG_SENSORS_GPIO_FAN=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
CONFIG_SENSORS_HP_WMI=m
+CONFIG_SENSORS_HS3001=m
# CONFIG_SENSORS_I5K_AMB is not set
CONFIG_SENSORS_IBMAEM=m
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -7019,6 +7074,7 @@ CONFIG_SENSORS_MCP3021=m
CONFIG_SENSORS_MLXREG_FAN=m
CONFIG_SENSORS_MP2888=m
CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_MP2975_REGULATOR=y
CONFIG_SENSORS_MP5023=m
CONFIG_SENSORS_MPQ7932=m
CONFIG_SENSORS_MPQ7932_REGULATOR=y
@@ -7390,6 +7446,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=2048
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
CONFIG_SND_HDA_TEGRA=m
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -7512,7 +7571,9 @@ CONFIG_SND_SOC_AK5558=m
CONFIG_SND_SOC_APPLE_MCA=m
CONFIG_SND_SOC_APQ8016_SBC=m
CONFIG_SND_SOC_ARNDALE=m
+CONFIG_SND_SOC_AUDIO_IIO_AUX=m
CONFIG_SND_SOC_AW8738=m
+CONFIG_SND_SOC_AW88261=m
CONFIG_SND_SOC_AW88395=m
CONFIG_SND_SOC_BD28623=m
CONFIG_SND_SOC_BT_SCO=m
@@ -7538,6 +7599,8 @@ CONFIG_SND_SOC_CS4271_I2C=m
# CONFIG_SND_SOC_CS4271_SPI is not set
CONFIG_SND_SOC_CS42L42=m
CONFIG_SND_SOC_CS42L42_SDW=m
+CONFIG_SND_SOC_CS42L43=m
+CONFIG_SND_SOC_CS42L43_SDW=m
# CONFIG_SND_SOC_CS42L51_I2C is not set
# CONFIG_SND_SOC_CS42L52 is not set
# CONFIG_SND_SOC_CS42L56 is not set
@@ -7729,6 +7792,7 @@ CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
CONFIG_SND_SOC_ROCKCHIP_PDM=m
CONFIG_SND_SOC_ROCKCHIP_RT5645=m
CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
+CONFIG_SND_SOC_RT1017_SDCA_SDW=m
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -7875,6 +7939,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
CONFIG_SND_SOC_TLV320AIC3X_I2C=m
CONFIG_SND_SOC_TLV320AIC3X=m
CONFIG_SND_SOC_TLV320AIC3X_SPI=m
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
CONFIG_SND_SOC_TPA6130A2=m
CONFIG_SND_SOC_TS3A227E=m
@@ -8016,6 +8081,7 @@ CONFIG_SPI_BITBANG=m
CONFIG_SPI_CADENCE=m
CONFIG_SPI_CADENCE_QUADSPI=m
CONFIG_SPI_CADENCE_XSPI=m
+# CONFIG_SPI_CS42L43 is not set
# CONFIG_SPI_DEBUG is not set
CONFIG_SPI_DESIGNWARE=m
CONFIG_SPI_DLN2=m
@@ -8159,6 +8225,7 @@ CONFIG_ST_UVIS25=m
CONFIG_ST_UVIS25_SPI=m
# CONFIG_SUN20I_D1_CCU is not set
# CONFIG_SUN20I_D1_R_CCU is not set
+CONFIG_SUN20I_GPADC=m
# CONFIG_SUN20I_PPU is not set
# CONFIG_SUN4I_EMAC is not set
CONFIG_SUN50I_A100_CCU=y
@@ -8213,6 +8280,7 @@ CONFIG_SURFACE_PRO3_BUTTON=m
CONFIG_SUSPEND=y
CONFIG_SVC_I3C_MASTER=m
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_SWP_EMULATION=y
# CONFIG_SW_SYNC is not set
CONFIG_SX9310=m
@@ -8348,6 +8416,7 @@ CONFIG_TEST_FPU=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIST_SORT=m
@@ -8431,6 +8500,8 @@ CONFIG_TIFM_7XX1=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+# CONFIG_TI_ICSSG_PRUETH is not set
+CONFIG_TI_ICSS_IEP=m
CONFIG_TI_K3_AM65_CPSW_NUSS=m
CONFIG_TI_K3_AM65_CPSW_SWITCHDEV=y
CONFIG_TI_K3_AM65_CPTS=m
@@ -8470,6 +8541,7 @@ CONFIG_TI_SCI_PM_DOMAINS=y
CONFIG_TI_SCI_PROTOCOL=y
# CONFIG_TI_ST is not set
CONFIG_TI_SYSCON_CLK=m
+CONFIG_TI_SYSC=y
# CONFIG_TI_TLC4541 is not set
# CONFIG_TI_TMAG5273 is not set
CONFIG_TI_TSC2046=m
@@ -8482,6 +8554,7 @@ CONFIG_TMP006=m
CONFIG_TMP117=m
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_QUOTA=y
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
CONFIG_TORTURE_TEST=m
@@ -8527,6 +8600,7 @@ CONFIG_TOUCHSCREEN_IMAGIS=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_IQS7211=m
# CONFIG_TOUCHSCREEN_MAX11801 is not set
CONFIG_TOUCHSCREEN_MCS5000=m
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -8753,6 +8827,7 @@ CONFIG_USB_CONFIGFS_EEM=y
# CONFIG_USB_CONFIGFS_F_FS is not set
CONFIG_USB_CONFIGFS_F_HID=y
# CONFIG_USB_CONFIGFS_F_LB_SS is not set
+CONFIG_USB_CONFIGFS_F_MIDI2=y
# CONFIG_USB_CONFIGFS_F_MIDI is not set
# CONFIG_USB_CONFIGFS_F_PRINTER is not set
CONFIG_USB_CONFIGFS_F_TCM=y
@@ -9147,7 +9222,9 @@ CONFIG_VFAT_FS=m
CONFIG_VFIO_AMBA=m
CONFIG_VFIO_CDX=m
CONFIG_VFIO_CONTAINER=y
+# CONFIG_VFIO_DEVICE_CDEV is not set
CONFIG_VFIO_FSL_MC=m
+CONFIG_VFIO_GROUP=y
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
CONFIG_VFIO_MDEV=m
@@ -9222,9 +9299,13 @@ CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_DS90UB913=m
+CONFIG_VIDEO_DS90UB953=m
+CONFIG_VIDEO_DS90UB960=m
# CONFIG_VIDEO_DT3155 is not set
CONFIG_VIDEO_DW100=m
CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9719=m
CONFIG_VIDEO_DW9768=m
CONFIG_VIDEO_DW9807_VCM=m
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -9598,6 +9679,7 @@ CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
# CONFIG_XEN is not set
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
+CONFIG_XEN_PRIVCMD_IRQFD=y
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_PVHVM_GUEST=y
@@ -9615,6 +9697,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 5d721b9b9..73eb2ab4c 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -215,7 +215,6 @@ CONFIG_AMD_HSMP=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
CONFIG_AMD_PHY=m
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
# CONFIG_AMD_PTDMA is not set
# CONFIG_AMDTEE is not set
# CONFIG_AMD_XGBE_DCB is not set
@@ -249,9 +248,9 @@ CONFIG_ARCH_BCM_IPROC=y
# CONFIG_ARCH_EXYNOS is not set
CONFIG_ARCH_HISI=y
# CONFIG_ARCH_INTEL_SOCFPGA is not set
-# CONFIG_ARCH_K3 is not set
+CONFIG_ARCH_K3=y
# CONFIG_ARCH_KEEMBAY is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
+CONFIG_ARCH_LAYERSCAPE=y
# CONFIG_ARCH_LG1K is not set
# CONFIG_ARCH_MA35 is not set
# CONFIG_ARCH_MEDIATEK is not set
@@ -402,6 +401,7 @@ CONFIG_ARM_SPE_PMU=m
# CONFIG_ARM_TEGRA186_CPUFREQ is not set
CONFIG_ARM_TEGRA194_CPUFREQ=m
CONFIG_ARM_TEGRA_DEVFREQ=m
+CONFIG_ARM_TI_CPUFREQ=y
# CONFIG_AS3935 is not set
# CONFIG_AS73211 is not set
CONFIG_ASN1=y
@@ -920,6 +920,7 @@ CONFIG_CLK_IMX8QXP=y
CONFIG_CLK_IMX8ULP=y
CONFIG_CLK_IMX93=y
CONFIG_CLK_KUNIT_TEST=m
+CONFIG_CLK_LS1028A_PLLDIG=y
# CONFIG_CLK_QORIQ is not set
CONFIG_CLK_SP810=y
CONFIG_CLK_VEXPRESS_OSC=y
@@ -957,6 +958,7 @@ CONFIG_COMMAND_LINE_SIZE=4096
# CONFIG_COMMON_CLK_CS2000_CP is not set
# CONFIG_COMMON_CLK_FIXED_MMIO is not set
# CONFIG_COMMON_CLK_FSL_FLEXSPI is not set
+CONFIG_COMMON_CLK_FSL_SAI=y
CONFIG_COMMON_CLK_HI3516CV300=y
CONFIG_COMMON_CLK_HI3519=y
# CONFIG_COMMON_CLK_HI3559A is not set
@@ -978,6 +980,7 @@ CONFIG_COMMON_CLK_SCPI=m
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
CONFIG_COMMON_CLK_XGENE=y
@@ -998,6 +1001,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1079,8 +1083,8 @@ CONFIG_CRYPTO_AES_ARM64_BS=m
CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
CONFIG_CRYPTO_AES_ARM64_CE=y
-# CONFIG_CRYPTO_AES_ARM64 is not set
CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
+CONFIG_CRYPTO_AES_ARM64=y
CONFIG_CRYPTO_AES_GCM_P10=y
# CONFIG_CRYPTO_AES_TI is not set
CONFIG_CRYPTO_AES=y
@@ -1098,6 +1102,7 @@ CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
@@ -1136,6 +1141,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_PRNG_API=y
CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=3
CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
# CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_TEST is not set
+CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
# CONFIG_CRYPTO_DEV_HISI_HPRE is not set
# CONFIG_CRYPTO_DEV_HISI_SEC2 is not set
CONFIG_CRYPTO_DEV_HISI_SEC=m
@@ -1155,6 +1161,7 @@ CONFIG_CRYPTO_DEV_OCTEONTX2_CPT=m
# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
# CONFIG_CRYPTO_DEV_QCE is not set
# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
+CONFIG_CRYPTO_DEV_SA2UL=m
# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
# CONFIG_CRYPTO_DEV_SAHARA is not set
CONFIG_CRYPTO_DEV_SP_CCP=y
@@ -1206,6 +1213,7 @@ CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_POLY1305_NEON=y
+# CONFIG_CRYPTO_POLY1305_P10 is not set
# CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
@@ -1417,6 +1425,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1439,6 +1448,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1470,6 +1480,7 @@ CONFIG_DP83867_PHY=m
# CONFIG_DP83869_PHY is not set
CONFIG_DP83TC811_PHY=m
# CONFIG_DP83TD510_PHY is not set
+CONFIG_DPAA2_CONSOLE=m
# CONFIG_DPM_WATCHDOG is not set
# CONFIG_DPOT_DAC is not set
# CONFIG_DPS310 is not set
@@ -1561,6 +1572,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MALI_DISPLAY is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1638,6 +1650,7 @@ CONFIG_DRM_SIMPLEDRM=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1779,6 +1792,7 @@ CONFIG_EDAC_DMC520=m
CONFIG_EDAC_GHES=y
CONFIG_EDAC_I10NM=m
CONFIG_EDAC_IGEN6=m
+CONFIG_EDAC_LAYERSCAPE=m
CONFIG_EDAC_LEGACY_SYSFS=y
CONFIG_EDAC_PND2=m
CONFIG_EDAC_SYNOPSYS=m
@@ -1898,6 +1912,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1985,7 +2000,15 @@ CONFIG_FSCACHE_STATS=y
CONFIG_FS_DAX=y
# CONFIG_FS_ENCRYPTION is not set
# CONFIG_FSI is not set
+# CONFIG_FSL_BMAN_TEST is not set
+CONFIG_FSL_DPAA2_ETH_DCB=y
+CONFIG_FSL_DPAA2_ETH=m
+CONFIG_FSL_DPAA2_PTP_CLOCK=m
+CONFIG_FSL_DPAA2_QDMA=m
CONFIG_FSL_DPAA2_SWITCH=m
+# CONFIG_FSL_DPAA_CHECKING is not set
+CONFIG_FSL_DPAA_ETH=m
+CONFIG_FSL_DPAA=y
# CONFIG_FSL_EDMA is not set
CONFIG_FSL_ENETC_IERB=m
CONFIG_FSL_ENETC=m
@@ -1994,10 +2017,15 @@ CONFIG_FSL_ENETC_PTP_CLOCK=m
CONFIG_FSL_ENETC_QOS=y
CONFIG_FSL_ENETC_VF=m
CONFIG_FSL_ERRATUM_A008585=y
+CONFIG_FSL_FMAN=y
CONFIG_FSL_IMX8_DDR_PMU=m
# CONFIG_FSL_IMX9_DDR_PMU is not set
+CONFIG_FSL_MC_BUS=y
+CONFIG_FSL_MC_DPIO=m
+CONFIG_FSL_MC_UAPI_SUPPORT=y
CONFIG_FSL_PQ_MDIO=m
# CONFIG_FSL_QDMA is not set
+# CONFIG_FSL_QMAN_TEST is not set
# CONFIG_FSL_RCPM is not set
CONFIG_FSL_XGMAC_MDIO=m
CONFIG_FSNOTIFY=y
@@ -2093,6 +2121,8 @@ CONFIG_GNSS=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_DAVINCI=y
+# CONFIG_GPIO_DS4520 is not set
CONFIG_GPIO_DWAPB=m
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -2121,6 +2151,7 @@ CONFIG_GPIO_MLXBF2=m
# CONFIG_GPIO_MLXBF3 is not set
# CONFIG_GPIO_MLXBF is not set
# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_MPC8XXX=y
CONFIG_GPIO_MXC=m
# CONFIG_GPIO_PCA953X_IRQ is not set
# CONFIG_GPIO_PCA953X is not set
@@ -2222,6 +2253,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2378,15 +2410,17 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
CONFIG_HW_RANDOM_CAVIUM=m
# CONFIG_HW_RANDOM_CCTRNG is not set
CONFIG_HW_RANDOM_CN10K=m
-CONFIG_HW_RANDOM_HISI=y
+CONFIG_HW_RANDOM_HISI=m
# CONFIG_HW_RANDOM_HISTB is not set
# CONFIG_HW_RANDOM_IPROC_RNG200 is not set
+CONFIG_HW_RANDOM_OMAP=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
CONFIG_HW_RANDOM_TPM=y
CONFIG_HW_RANDOM_VIRTIO=y
CONFIG_HW_RANDOM_XGENE=m
# CONFIG_HW_RANDOM_XIPHERA is not set
CONFIG_HW_RANDOM=y
+CONFIG_HWSPINLOCK_OMAP=m
# CONFIG_HWSPINLOCK_QCOM is not set
CONFIG_HWSPINLOCK=y
# CONFIG_HX711 is not set
@@ -2416,6 +2450,7 @@ CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_AMD_MP2 is not set
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_BCM_IPROC is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
@@ -2462,6 +2497,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NOMADIK is not set
# CONFIG_I2C_NVIDIA_GPU is not set
# CONFIG_I2C_OCORES is not set
+CONFIG_I2C_OMAP=m
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PCI1XXXX is not set
# CONFIG_I2C_PIIX4 is not set
@@ -2665,7 +2701,7 @@ CONFIG_INPUT_APANEL=m
# CONFIG_INPUT_ATI_REMOTE2 is not set
CONFIG_INPUT_ATLAS_BTNS=m
# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
-# CONFIG_INPUT_BBNSM_PWRKEY is not set
+CONFIG_INPUT_BBNSM_PWRKEY=m
# CONFIG_INPUT_BMA150 is not set
# CONFIG_INPUT_CM109 is not set
# CONFIG_INPUT_CMA3000 is not set
@@ -2759,6 +2795,7 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_TCC_COOLING is not set
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_VSC is not set
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
CONFIG_INTEL_XWAY_PHY=m
@@ -2793,7 +2830,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2879,6 +2916,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2955,6 +2993,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -3010,6 +3049,8 @@ CONFIG_JOLIET=y
# CONFIG_JSA1212 is not set
CONFIG_JUMP_LABEL=y
# CONFIG_K3_DMA is not set
+CONFIG_K3_RTI_WATCHDOG=m
+CONFIG_K3_THERMAL=m
CONFIG_KALLSYMS_ALL=y
CONFIG_KALLSYMS_BASE_RELATIVE=y
# CONFIG_KALLSYMS_SELFTEST is not set
@@ -3103,13 +3144,15 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD_SEV=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
# CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set
+CONFIG_KVM_PROVE_MMU=y
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
# CONFIG_KVM_XEN is not set
@@ -3182,6 +3225,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
@@ -3323,9 +3367,11 @@ CONFIG_MAILBOX=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
CONFIG_MARVELL_CN10K_DDR_PMU=m
CONFIG_MARVELL_CN10K_TAD_PMU=m
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3367,9 +3413,11 @@ CONFIG_MAX_SKB_FRAGS=17
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
# CONFIG_MDIO_BCM_IPROC is not set
@@ -3426,6 +3474,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3460,6 +3509,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3611,6 +3662,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3853,6 +3905,9 @@ CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTK_T7XX=m
CONFIG_MULTIUSER=y
+CONFIG_MUX_ADG792A=m
+# CONFIG_MUX_ADGS1408 is not set
+CONFIG_MUX_GPIO=m
# CONFIG_MVMDIO is not set
# CONFIG_MV_XOR_V2 is not set
# CONFIG_MWAVE is not set
@@ -3912,6 +3967,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4340,6 +4396,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4387,9 +4444,11 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_IMX_IIM is not set
# CONFIG_NVMEM_IMX_OCOTP_ELE is not set
CONFIG_NVMEM_IMX_OCOTP=m
+CONFIG_NVMEM_LAYERSCAPE_SFP=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
# CONFIG_NVMEM_SNVS_LPGPR is not set
@@ -4425,6 +4484,11 @@ CONFIG_OF_MDIO=y
CONFIG_OF_PMEM=m
# CONFIG_OF_UNITTEST is not set
CONFIG_OF=y
+CONFIG_OMAP2PLUS_MBOX=m
+CONFIG_OMAP_DM_TIMER=y
+# CONFIG_OMAP_GPMC is not set
+CONFIG_OMAP_MBOX_KFIFO_SIZE=256
+CONFIG_OMAP_USB2=m
# CONFIG_OMFS_FS is not set
# CONFIG_OPAL_CORE is not set
# CONFIG_OPEN_DICE is not set
@@ -4439,6 +4503,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
# CONFIG_OSF_PARTITION is not set
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+CONFIG_OVERLAY_FS_DEBUG=y
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4519,6 +4584,7 @@ CONFIG_PCC=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_AL is not set
@@ -4566,6 +4632,8 @@ CONFIG_PCI_IMX6_HOST=y
CONFIG_PCI_IMX6=y
CONFIG_PCI_IOV=y
# CONFIG_PCI_J721E_HOST is not set
+CONFIG_PCI_KEYSTONE_HOST=y
+CONFIG_PCI_LAYERSCAPE=y
# CONFIG_PCI_MESON is not set
CONFIG_PCI_MSI=y
CONFIG_PCI_P2PDMA=y
@@ -4598,6 +4666,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
CONFIG_PER_VMA_LOCK_STATS=y
# CONFIG_PHANTOM is not set
# CONFIG_PHONET is not set
+CONFIG_PHY_AM654_SERDES=m
# CONFIG_PHY_BCM_NS_USB2 is not set
# CONFIG_PHY_BCM_NS_USB3 is not set
# CONFIG_PHY_BCM_SR_PCIE is not set
@@ -4619,9 +4688,10 @@ CONFIG_PHY_FSL_IMX8MQ_USB=m
CONFIG_PHY_HI6220_USB=m
# CONFIG_PHY_HISI_INNO_USB2 is not set
# CONFIG_PHY_HISTB_COMBPHY is not set
+CONFIG_PHY_J721E_WIZ=m
# CONFIG_PHY_LAN966X_SERDES is not set
CONFIG_PHYLIB=y
-CONFIG_PHYLINK=m
+CONFIG_PHYLINK=y
# CONFIG_PHY_MAPPHONE_MDM6600 is not set
# CONFIG_PHY_MIXEL_LVDS_PHY is not set
# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
@@ -4635,6 +4705,7 @@ CONFIG_PHY_NS2_USB_DRD=y
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_PCIE2 is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
@@ -4645,6 +4716,8 @@ CONFIG_PHY_NS2_USB_DRD=y
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
CONFIG_PHY_TEGRA194_P2U=y
CONFIG_PHY_TEGRA_XUSB=m
# CONFIG_PHY_TUSB1210 is not set
@@ -4825,6 +4898,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4844,6 +4918,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_QORIQ=m
CONFIG_PTP_1588_CLOCK=y
@@ -4861,8 +4936,11 @@ CONFIG_PWM_BCM_IPROC=y
# CONFIG_PWM_IMX1 is not set
CONFIG_PWM_IMX27=m
CONFIG_PWM_IMX_TPM=m
+CONFIG_PWM_OMAP_DMTIMER=y
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM_TEGRA=y
+CONFIG_PWM_TIECAP=m
+CONFIG_PWM_TIEHRPWM=m
# CONFIG_PWM_XILINX is not set
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
@@ -4958,6 +5036,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -5002,6 +5081,7 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
@@ -5009,6 +5089,7 @@ CONFIG_REGMAP=y
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
# CONFIG_REGULATOR_ARM_SCMI is not set
+# CONFIG_REGULATOR_AW37503 is not set
CONFIG_REGULATOR_BD718XX=m
# CONFIG_REGULATOR_DA9121 is not set
# CONFIG_REGULATOR_DA9210 is not set
@@ -5032,6 +5113,7 @@ CONFIG_REGULATOR_GPIO=y
CONFIG_REGULATOR_MAX77620=y
CONFIG_REGULATOR_MAX77686=m
# CONFIG_REGULATOR_MAX77826 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8893 is not set
@@ -5050,6 +5132,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
# CONFIG_REGULATOR_RT4801 is not set
@@ -5062,6 +5145,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_RT6245 is not set
# CONFIG_REGULATOR_RTMV20 is not set
# CONFIG_REGULATOR_RTQ2134 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_RTQ6752 is not set
# CONFIG_REGULATOR_SLG51000 is not set
# CONFIG_REGULATOR_SY8106A is not set
@@ -5096,6 +5180,7 @@ CONFIG_RESET_IMX7=y
# CONFIG_RESET_QCOM_PDC is not set
# CONFIG_RESET_SCMI is not set
# CONFIG_RESET_SIMPLE is not set
+CONFIG_RESET_TI_SCI=m
# CONFIG_RESET_TI_SYSCON is not set
# CONFIG_RESET_TI_TPS380X is not set
CONFIG_RESOURCE_KUNIT_TEST=m
@@ -5105,7 +5190,6 @@ CONFIG_RETPOLINE=y
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -5199,6 +5283,7 @@ CONFIG_RTC_DRV_DS3232=m
CONFIG_RTC_DRV_EFI=y
CONFIG_RTC_DRV_EM3027=m
CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_FSL_FTM_ALARM=m
# CONFIG_RTC_DRV_FTRTC010 is not set
# CONFIG_RTC_DRV_GOLDFISH is not set
# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
@@ -5253,6 +5338,7 @@ CONFIG_RTC_DRV_RX8581=m
CONFIG_RTC_DRV_STK17TA8=m
# CONFIG_RTC_DRV_TEGRA is not set
# CONFIG_RTC_DRV_TEST is not set
+CONFIG_RTC_DRV_TI_K3=m
CONFIG_RTC_DRV_V3020=m
CONFIG_RTC_DRV_X1205=m
# CONFIG_RTC_DRV_XGENE is not set
@@ -5476,6 +5562,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5485,6 +5572,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5562,6 +5650,7 @@ CONFIG_SENSORS_G762=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
# CONFIG_SENSORS_I5K_AMB is not set
# CONFIG_SENSORS_IBMAEM is not set
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5743,6 +5832,8 @@ CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_MANY_PORTS=y
CONFIG_SERIAL_8250_MID=y
CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y
+CONFIG_SERIAL_8250_OMAP=y
CONFIG_SERIAL_8250_PCI1XXXX=y
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PERICOM=y
@@ -6061,7 +6152,9 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -6078,7 +6171,6 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -6143,6 +6235,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -6153,6 +6246,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
# CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
@@ -6272,6 +6366,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -6331,6 +6426,7 @@ CONFIG_SND_SOC_SOF_HDA_PROBES=m
# CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set
# CONFIG_SND_SOC_SOF_JASPERLAKE is not set
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
# CONFIG_SND_SOC_SOF_MERRIFIELD is not set
# CONFIG_SND_SOC_SOF_METEORLAKE is not set
# CONFIG_SND_SOC_SOF_OF is not set
@@ -6401,6 +6497,7 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_BUILD=y
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6492,7 +6589,7 @@ CONFIG_SOC_IMX8M=y
CONFIG_SOC_IMX9=m
# CONFIG_SOCIONEXT_SYNQUACER_PREITS is not set
CONFIG_SOC_TEGRA_CBB=m
-# CONFIG_SOC_TI is not set
+CONFIG_SOC_TI=y
CONFIG_SOFTLOCKUP_DETECTOR=y
CONFIG_SOFT_WATCHDOG=m
# CONFIG_SOLARIS_X86_PARTITION is not set
@@ -6532,6 +6629,7 @@ CONFIG_SPI_AMD=y
# CONFIG_SPI_CADENCE_XSPI is not set
CONFIG_SPI_DEBUG=y
# CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_FSL_DSPI=y
CONFIG_SPI_FSL_LPSPI=m
CONFIG_SPI_FSL_QUADSPI=m
# CONFIG_SPI_FSL_SPI is not set
@@ -6550,6 +6648,7 @@ CONFIG_SPI_MEM=y
# CONFIG_SPI_MXIC is not set
CONFIG_SPI_NXP_FLEXSPI=m
# CONFIG_SPI_OC_TINY is not set
+CONFIG_SPI_OMAP24XX=m
CONFIG_SPI_PCI1XXXX=m
CONFIG_SPI_PL022=m
# CONFIG_SPI_PXA2XX is not set
@@ -6651,6 +6750,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
CONFIG_SUSPEND=y
CONFIG_SVC_I3C_MASTER=m
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
# CONFIG_SX9324 is not set
@@ -6769,6 +6869,7 @@ CONFIG_TEST_FPU=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIST_SORT=m
@@ -6845,6 +6946,9 @@ CONFIG_THUNDERX2_PMU=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+CONFIG_TI_K3_RINGACC=y
+CONFIG_TI_K3_UDMA_GLUE_LAYER=y
+CONFIG_TI_K3_UDMA=y
# CONFIG_TI_LMP92064 is not set
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y
@@ -6864,7 +6968,13 @@ CONFIG_TIPC_DIAG=m
CONFIG_TIPC=m
CONFIG_TIPC_MEDIA_IB=y
CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TI_PRUSS=m
+CONFIG_TI_SCI_CLK=m
+# CONFIG_TI_SCI_CLK_PROBE_FROM_FW is not set
+CONFIG_TI_SCI_PM_DOMAINS=m
# CONFIG_TI_ST is not set
+CONFIG_TI_SYSCON_CLK=m
+CONFIG_TI_SYSC=y
# CONFIG_TI_TLC4541 is not set
# CONFIG_TI_TMAG5273 is not set
# CONFIG_TI_TSC2046 is not set
@@ -6877,6 +6987,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -6921,6 +7032,7 @@ CONFIG_TORTURE_TEST=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7085,8 +7197,10 @@ CONFIG_USB_CXACRU=m
CONFIG_USB_DEFAULT_PERSIST=y
# CONFIG_USB_DSBR is not set
# CONFIG_USB_DWC2 is not set
+CONFIG_USB_DWC3_AM62=m
CONFIG_USB_DWC3_IMX8MP=m
# CONFIG_USB_DWC3 is not set
+CONFIG_USB_DWC3_KEYSTONE=m
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_EHCI_FSL is not set
CONFIG_USB_EHCI_HCD_PLATFORM=m
@@ -7370,6 +7484,7 @@ CONFIG_VEXPRESS_CONFIG=y
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=m
# CONFIG_VFIO_AMBA is not set
+CONFIG_VFIO_FSL_MC=m
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
# CONFIG_VFIO_MDEV is not set
@@ -7434,8 +7549,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7733,6 +7852,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index b86a050c2..767a87292 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -145,6 +145,7 @@ CONFIG_AD7949=m
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
CONFIG_ADAPTEC_STARFIRE=m
+# CONFIG_ADDRESS_MASKING is not set
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -1275,6 +1276,7 @@ CONFIG_COMMON_CLK_SI5341=m
# CONFIG_COMMON_CLK_SI5351 is not set
CONFIG_COMMON_CLK_SI544=m
# CONFIG_COMMON_CLK_SI570 is not set
+CONFIG_COMMON_CLK_VC3=m
# CONFIG_COMMON_CLK_VC5 is not set
CONFIG_COMMON_CLK_VC7=m
CONFIG_COMMON_CLK_XGENE=y
@@ -1297,6 +1299,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=3
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1352,6 +1355,8 @@ CONFIG_CPU_THERMAL=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -1772,6 +1777,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
CONFIG_DMA_OF=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
@@ -1800,6 +1806,7 @@ CONFIG_DM_INIT=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=y
@@ -1934,6 +1941,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
CONFIG_DRM_LONTIUM_LT9611=m
CONFIG_DRM_LONTIUM_LT9611UXC=m
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
CONFIG_DRM_MALI_DISPLAY=m
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -2038,11 +2046,13 @@ CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
+CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m
# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
CONFIG_DRM_PANEL_TPO_TPG110=m
CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
+CONFIG_DRM_PANEL_VISIONOX_R66451=m
CONFIG_DRM_PANEL_VISIONOX_RM69299=m
CONFIG_DRM_PANEL_VISIONOX_VTDR6130=m
CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
@@ -2090,6 +2100,7 @@ CONFIG_DRM_TOSHIBA_TC358764=m
CONFIG_DRM_TOSHIBA_TC358767=m
CONFIG_DRM_TOSHIBA_TC358768=m
CONFIG_DRM_TOSHIBA_TC358775=m
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
CONFIG_DRM_V3D=m
@@ -2298,6 +2309,7 @@ CONFIG_EROFS_FS=m
CONFIG_EROFS_FS_POSIX_ACL=y
CONFIG_EROFS_FS_SECURITY=y
CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP_DEFLATE=y
CONFIG_EROFS_FS_ZIP_LZMA=y
CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
@@ -2379,6 +2391,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -2620,6 +2633,7 @@ CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
CONFIG_GPIO_DAVINCI=m
CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_DS4520=m
CONFIG_GPIO_DWAPB=m
CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_FTGPIO010 is not set
@@ -2759,6 +2773,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
CONFIG_HID_GLORIOUS=m
# CONFIG_HID_GOOGLE_HAMMER is not set
+CONFIG_HID_GOOGLE_STADIA_FF=m
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2978,6 +2993,7 @@ CONFIG_I2C_ALGOPCF=m
CONFIG_I2C_AMD_MP2=m
CONFIG_I2C_APPLE=m
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+CONFIG_I2C_ATR=m
CONFIG_I2C_BCM2835=m
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_BRCMSTB=y
@@ -3421,6 +3437,7 @@ CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
CONFIG_IOSM=m
CONFIG_IO_STRICT_DEVMEM=y
+CONFIG_IO_URING=y
CONFIG_IP5XXX_POWER=m
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -3490,6 +3507,7 @@ CONFIG_IP_PIMSM_V2=y
# CONFIG_IPQ_APSS_6018 is not set
# CONFIG_IPQ_APSS_PLL is not set
# CONFIG_IPQ_GCC_4019 is not set
+CONFIG_IPQ_GCC_5018=m
# CONFIG_IPQ_GCC_5332 is not set
# CONFIG_IPQ_GCC_6018 is not set
# CONFIG_IPQ_GCC_806X is not set
@@ -3517,6 +3535,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+CONFIG_IPU_BRIDGE=m
CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_IOAM6_LWTUNNEL=y
@@ -3594,6 +3613,7 @@ CONFIG_IR_RC6_DECODER=m
CONFIG_IR_RCMM_DECODER=m
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
CONFIG_IR_SERIAL=m
CONFIG_IR_SERIAL_TRANSMITTER=y
CONFIG_IR_SHARP_DECODER=m
@@ -3808,11 +3828,13 @@ CONFIG_KSM=y
CONFIG_KSZ884X_PCI=m
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KUSER_HELPERS=y
+# CONFIG_KVM_PROVE_MMU is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
CONFIG_KVM_XEN=y
@@ -3866,6 +3888,7 @@ CONFIG_LEDS_CR0014114=m
# CONFIG_LEDS_DAC124S085 is not set
# CONFIG_LEDS_EL15203000 is not set
CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GROUP_MULTICOLOR=m
# CONFIG_LEDS_IS31FL319X is not set
CONFIG_LEDS_IS31FL32XX=m
# CONFIG_LEDS_KTD2692 is not set
@@ -3893,6 +3916,7 @@ CONFIG_LEDS_PCA9532_GPIO=y
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
CONFIG_LEDS_PCA963X=m
+CONFIG_LEDS_PCA995X=m
CONFIG_LEDS_PWM=m
CONFIG_LEDS_PWM_MULTICOLOR=m
CONFIG_LEDS_QCOM_FLASH=m
@@ -4045,9 +4069,11 @@ CONFIG_MAILBOX=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88Q2XXX_PHY=m
CONFIG_MARVELL_88X2222_PHY=m
CONFIG_MARVELL_CN10K_DDR_PMU=m
CONFIG_MARVELL_CN10K_TAD_PMU=m
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -4091,11 +4117,13 @@ CONFIG_MCP41010=m
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+CONFIG_MCP4728=m
# CONFIG_MCP4922 is not set
CONFIG_MCTP_SERIAL=m
# CONFIG_MCTP_TRANSPORT_I2C is not set
CONFIG_MCTP=y
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -4219,6 +4247,8 @@ CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=y
# CONFIG_MFD_CPCAP is not set
CONFIG_MFD_CROS_EC_DEV=m
+CONFIG_MFD_CS42L43_I2C=m
+CONFIG_MFD_CS42L43_SDW=m
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
@@ -4381,6 +4411,7 @@ CONFIG_MLX5_ESWITCH=y
# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -4773,6 +4804,7 @@ CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -5288,6 +5320,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -5340,6 +5373,7 @@ CONFIG_NVMEM_LAYOUT_SL28_VPD=m
CONFIG_NVMEM_MESON_EFUSE=m
CONFIG_NVMEM_MESON_MX_EFUSE=m
CONFIG_NVMEM_QCOM_QFPROM=m
+CONFIG_NVMEM_QCOM_SEC_QFPROM=m
CONFIG_NVMEM_REBOOT_MODE=m
CONFIG_NVMEM_RMEM=m
CONFIG_NVMEM_ROCKCHIP_EFUSE=m
@@ -5419,6 +5453,7 @@ CONFIG_ORINOCO_USB=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -5508,6 +5543,7 @@ CONFIG_PCC=y
CONFIG_PCI_AARDVARK=y
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_AL is not set
@@ -5590,6 +5626,7 @@ CONFIG_PCS_XPCS=m
CONFIG_PDC_ADMA=m
CONFIG_PDS_CORE=m
CONFIG_PDS_VDPA=m
+CONFIG_PDS_VFIO_PCI=m
# CONFIG_PECI is not set
# CONFIG_PERCPU_STATS is not set
# CONFIG_PERCPU_TEST is not set
@@ -5648,12 +5685,14 @@ CONFIG_PHY_QCOM_EUSB2_REPEATER=m
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
CONFIG_PHY_QCOM_PCIE2=m
CONFIG_PHY_QCOM_QMP_COMBO=m
CONFIG_PHY_QCOM_QMP=m
CONFIG_PHY_QCOM_QMP_PCIE_8996=m
CONFIG_PHY_QCOM_QMP_PCIE=m
CONFIG_PHY_QCOM_QMP_UFS=m
+CONFIG_PHY_QCOM_QMP_USB_LEGACY=m
CONFIG_PHY_QCOM_QMP_USB=m
CONFIG_PHY_QCOM_QUSB2=m
CONFIG_PHY_QCOM_SGMII_ETH=m
@@ -5675,6 +5714,8 @@ CONFIG_PHY_ROCKCHIP_PCIE=y
CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=m
CONFIG_PHY_ROCKCHIP_TYPEC=m
CONFIG_PHY_ROCKCHIP_USB=m
+CONFIG_PHY_RTK_RTD_USB2PHY=m
+CONFIG_PHY_RTK_RTD_USB3PHY=m
# CONFIG_PHY_SAMSUNG_USB2 is not set
CONFIG_PHY_SUN4I_USB=m
CONFIG_PHY_SUN50I_USB3=m
@@ -5692,6 +5733,7 @@ CONFIG_PID_NS=y
CONFIG_PINCONF=y
CONFIG_PINCTRL_ALDERLAKE=m
CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_AMLOGIC_C3=y
CONFIG_PINCTRL_APPLE_GPIO=m
CONFIG_PINCTRL_AS3722=y
CONFIG_PINCTRL_AXP209=m
@@ -5700,6 +5742,7 @@ CONFIG_PINCTRL_AXP209=m
# CONFIG_PINCTRL_CANNONLAKE is not set
CONFIG_PINCTRL_CEDARFORK=m
# CONFIG_PINCTRL_CHERRYVIEW is not set
+CONFIG_PINCTRL_CS42L43=m
CONFIG_PINCTRL_CY8C95X0=m
CONFIG_PINCTRL_ELKHARTLAKE=m
CONFIG_PINCTRL_EMMITSBURG=m
@@ -5777,6 +5820,7 @@ CONFIG_PINCTRL_SDM845=m
# CONFIG_PINCTRL_SDX75 is not set
CONFIG_PINCTRL_SINGLE=y
# CONFIG_PINCTRL_SM6115 is not set
+# CONFIG_PINCTRL_SM6115_LPASS_LPI is not set
# CONFIG_PINCTRL_SM6125 is not set
# CONFIG_PINCTRL_SM6350 is not set
# CONFIG_PINCTRL_SM6375 is not set
@@ -5785,6 +5829,7 @@ CONFIG_PINCTRL_SINGLE=y
# CONFIG_PINCTRL_SM8250 is not set
CONFIG_PINCTRL_SM8250_LPASS_LPI=m
# CONFIG_PINCTRL_SM8350 is not set
+CONFIG_PINCTRL_SM8350_LPASS_LPI=m
CONFIG_PINCTRL_SM8450_LPASS_LPI=m
CONFIG_PINCTRL_SM8450=m
# CONFIG_PINCTRL_SM8550 is not set
@@ -5948,6 +5993,7 @@ CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
CONFIG_PSTORE_842_COMPRESS=y
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -5969,6 +6015,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
CONFIG_PTP_1588_CLOCK_IDTCM=m
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_PTP_1588_CLOCK_QORIQ=m
@@ -6140,6 +6187,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -6201,6 +6249,7 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=y
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP_MMIO=y
@@ -6212,6 +6261,7 @@ CONFIG_REGULATOR_ACT8865=m
CONFIG_REGULATOR_ANATOP=m
CONFIG_REGULATOR_ARM_SCMI=m
CONFIG_REGULATOR_AS3722=m
+CONFIG_REGULATOR_AW37503=m
CONFIG_REGULATOR_AXP20X=m
CONFIG_REGULATOR_BD718XX=m
CONFIG_REGULATOR_BD9571MWV=m
@@ -6239,12 +6289,14 @@ CONFIG_REGULATOR_HI655X=m
# CONFIG_REGULATOR_MAX1586 is not set
# CONFIG_REGULATOR_MAX20086 is not set
CONFIG_REGULATOR_MAX20411=m
+CONFIG_REGULATOR_MAX5970=m
CONFIG_REGULATOR_MAX597X=m
CONFIG_REGULATOR_MAX77620=y
CONFIG_REGULATOR_MAX77650=m
CONFIG_REGULATOR_MAX77686=m
CONFIG_REGULATOR_MAX77802=m
# CONFIG_REGULATOR_MAX77826 is not set
+CONFIG_REGULATOR_MAX77857=m
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
CONFIG_REGULATOR_MAX8893=m
@@ -6266,6 +6318,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_PV88090 is not set
CONFIG_REGULATOR_PWM=y
CONFIG_REGULATOR_QCOM_LABIBB=m
+CONFIG_REGULATOR_QCOM_REFGEN=m
CONFIG_REGULATOR_QCOM_RPMH=y
# CONFIG_REGULATOR_QCOM_RPM is not set
CONFIG_REGULATOR_QCOM_SMD_RPM=m
@@ -6286,6 +6339,7 @@ CONFIG_REGULATOR_RT6190=m
CONFIG_REGULATOR_RT6245=m
CONFIG_REGULATOR_RTMV20=m
CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTQ2208=m
CONFIG_REGULATOR_RTQ6752=m
# CONFIG_REGULATOR_SLG51000 is not set
CONFIG_REGULATOR_SY7636A=m
@@ -6345,8 +6399,7 @@ CONFIG_RESOURCE_KUNIT_TEST=m
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-# CONFIG_RH_DISABLE_DEPRECATED is not set
-CONFIG_RH_FEDORA=y
+# CONFIG_RHEL_DIFFERENCES is not set
CONFIG_RICHTEK_RTQ6056=m
CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
@@ -6829,6 +6882,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -6906,6 +6960,7 @@ CONFIG_SENSORS_GPIO_FAN=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
CONFIG_SENSORS_HP_WMI=m
+CONFIG_SENSORS_HS3001=m
# CONFIG_SENSORS_I5K_AMB is not set
CONFIG_SENSORS_IBMAEM=m
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -6992,6 +7047,7 @@ CONFIG_SENSORS_MCP3021=m
CONFIG_SENSORS_MLXREG_FAN=m
CONFIG_SENSORS_MP2888=m
CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_MP2975_REGULATOR=y
CONFIG_SENSORS_MP5023=m
CONFIG_SENSORS_MPQ7932=m
CONFIG_SENSORS_MPQ7932_REGULATOR=y
@@ -7363,6 +7419,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=2048
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
CONFIG_SND_HDA_TEGRA=m
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -7484,7 +7543,9 @@ CONFIG_SND_SOC_AK5558=m
CONFIG_SND_SOC_APPLE_MCA=m
CONFIG_SND_SOC_APQ8016_SBC=m
CONFIG_SND_SOC_ARNDALE=m
+CONFIG_SND_SOC_AUDIO_IIO_AUX=m
CONFIG_SND_SOC_AW8738=m
+CONFIG_SND_SOC_AW88261=m
CONFIG_SND_SOC_AW88395=m
CONFIG_SND_SOC_BD28623=m
CONFIG_SND_SOC_BT_SCO=m
@@ -7510,6 +7571,8 @@ CONFIG_SND_SOC_CS4271_I2C=m
# CONFIG_SND_SOC_CS4271_SPI is not set
CONFIG_SND_SOC_CS42L42=m
CONFIG_SND_SOC_CS42L42_SDW=m
+CONFIG_SND_SOC_CS42L43=m
+CONFIG_SND_SOC_CS42L43_SDW=m
# CONFIG_SND_SOC_CS42L51_I2C is not set
# CONFIG_SND_SOC_CS42L52 is not set
# CONFIG_SND_SOC_CS42L56 is not set
@@ -7701,6 +7764,7 @@ CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
CONFIG_SND_SOC_ROCKCHIP_PDM=m
CONFIG_SND_SOC_ROCKCHIP_RT5645=m
CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
+CONFIG_SND_SOC_RT1017_SDCA_SDW=m
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -7846,6 +7910,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
CONFIG_SND_SOC_TLV320AIC3X_I2C=m
CONFIG_SND_SOC_TLV320AIC3X=m
CONFIG_SND_SOC_TLV320AIC3X_SPI=m
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
CONFIG_SND_SOC_TPA6130A2=m
CONFIG_SND_SOC_TS3A227E=m
@@ -7987,6 +8052,7 @@ CONFIG_SPI_BITBANG=m
CONFIG_SPI_CADENCE=m
CONFIG_SPI_CADENCE_QUADSPI=m
CONFIG_SPI_CADENCE_XSPI=m
+# CONFIG_SPI_CS42L43 is not set
# CONFIG_SPI_DEBUG is not set
CONFIG_SPI_DESIGNWARE=m
CONFIG_SPI_DLN2=m
@@ -8130,6 +8196,7 @@ CONFIG_ST_UVIS25=m
CONFIG_ST_UVIS25_SPI=m
# CONFIG_SUN20I_D1_CCU is not set
# CONFIG_SUN20I_D1_R_CCU is not set
+CONFIG_SUN20I_GPADC=m
# CONFIG_SUN20I_PPU is not set
# CONFIG_SUN4I_EMAC is not set
CONFIG_SUN50I_A100_CCU=y
@@ -8184,6 +8251,7 @@ CONFIG_SURFACE_PRO3_BUTTON=m
CONFIG_SUSPEND=y
CONFIG_SVC_I3C_MASTER=m
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_SWP_EMULATION=y
# CONFIG_SW_SYNC is not set
CONFIG_SX9310=m
@@ -8319,6 +8387,7 @@ CONFIG_TEST_CPUMASK=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
@@ -8402,6 +8471,8 @@ CONFIG_TIFM_7XX1=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+# CONFIG_TI_ICSSG_PRUETH is not set
+CONFIG_TI_ICSS_IEP=m
CONFIG_TI_K3_AM65_CPSW_NUSS=m
CONFIG_TI_K3_AM65_CPSW_SWITCHDEV=y
CONFIG_TI_K3_AM65_CPTS=m
@@ -8441,6 +8512,7 @@ CONFIG_TI_SCI_PM_DOMAINS=y
CONFIG_TI_SCI_PROTOCOL=y
# CONFIG_TI_ST is not set
CONFIG_TI_SYSCON_CLK=m
+CONFIG_TI_SYSC=y
# CONFIG_TI_TLC4541 is not set
# CONFIG_TI_TMAG5273 is not set
CONFIG_TI_TSC2046=m
@@ -8453,6 +8525,7 @@ CONFIG_TMP006=m
CONFIG_TMP117=m
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_QUOTA=y
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
CONFIG_TORTURE_TEST=m
@@ -8498,6 +8571,7 @@ CONFIG_TOUCHSCREEN_IMAGIS=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_IQS7211=m
# CONFIG_TOUCHSCREEN_MAX11801 is not set
CONFIG_TOUCHSCREEN_MCS5000=m
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -8724,6 +8798,7 @@ CONFIG_USB_CONFIGFS_EEM=y
# CONFIG_USB_CONFIGFS_F_FS is not set
CONFIG_USB_CONFIGFS_F_HID=y
# CONFIG_USB_CONFIGFS_F_LB_SS is not set
+CONFIG_USB_CONFIGFS_F_MIDI2=y
# CONFIG_USB_CONFIGFS_F_MIDI is not set
# CONFIG_USB_CONFIGFS_F_PRINTER is not set
CONFIG_USB_CONFIGFS_F_TCM=y
@@ -9118,7 +9193,9 @@ CONFIG_VFAT_FS=m
CONFIG_VFIO_AMBA=m
CONFIG_VFIO_CDX=m
CONFIG_VFIO_CONTAINER=y
+# CONFIG_VFIO_DEVICE_CDEV is not set
CONFIG_VFIO_FSL_MC=m
+CONFIG_VFIO_GROUP=y
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
CONFIG_VFIO_MDEV=m
@@ -9193,9 +9270,13 @@ CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_DS90UB913=m
+CONFIG_VIDEO_DS90UB953=m
+CONFIG_VIDEO_DS90UB960=m
# CONFIG_VIDEO_DT3155 is not set
CONFIG_VIDEO_DW100=m
CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9719=m
CONFIG_VIDEO_DW9768=m
CONFIG_VIDEO_DW9807_VCM=m
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -9569,6 +9650,7 @@ CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
# CONFIG_XEN is not set
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
+CONFIG_XEN_PRIVCMD_IRQFD=y
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_PVHVM_GUEST=y
@@ -9586,6 +9668,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 544d01fd5..03816c4bf 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -215,7 +215,6 @@ CONFIG_AMD_HSMP=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
CONFIG_AMD_PHY=m
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
# CONFIG_AMD_PTDMA is not set
# CONFIG_AMDTEE is not set
# CONFIG_AMD_XGBE_DCB is not set
@@ -249,9 +248,9 @@ CONFIG_ARCH_BCM_IPROC=y
# CONFIG_ARCH_EXYNOS is not set
CONFIG_ARCH_HISI=y
# CONFIG_ARCH_INTEL_SOCFPGA is not set
-# CONFIG_ARCH_K3 is not set
+CONFIG_ARCH_K3=y
# CONFIG_ARCH_KEEMBAY is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
+CONFIG_ARCH_LAYERSCAPE=y
# CONFIG_ARCH_LG1K is not set
# CONFIG_ARCH_MA35 is not set
# CONFIG_ARCH_MEDIATEK is not set
@@ -402,6 +401,7 @@ CONFIG_ARM_SPE_PMU=m
# CONFIG_ARM_TEGRA186_CPUFREQ is not set
CONFIG_ARM_TEGRA194_CPUFREQ=m
CONFIG_ARM_TEGRA_DEVFREQ=m
+CONFIG_ARM_TI_CPUFREQ=y
# CONFIG_AS3935 is not set
# CONFIG_AS73211 is not set
CONFIG_ASN1=y
@@ -920,6 +920,7 @@ CONFIG_CLK_IMX8QXP=y
CONFIG_CLK_IMX8ULP=y
CONFIG_CLK_IMX93=y
CONFIG_CLK_KUNIT_TEST=m
+CONFIG_CLK_LS1028A_PLLDIG=y
# CONFIG_CLK_QORIQ is not set
CONFIG_CLK_SP810=y
CONFIG_CLK_VEXPRESS_OSC=y
@@ -957,6 +958,7 @@ CONFIG_COMMAND_LINE_SIZE=4096
# CONFIG_COMMON_CLK_CS2000_CP is not set
# CONFIG_COMMON_CLK_FIXED_MMIO is not set
# CONFIG_COMMON_CLK_FSL_FLEXSPI is not set
+CONFIG_COMMON_CLK_FSL_SAI=y
CONFIG_COMMON_CLK_HI3516CV300=y
CONFIG_COMMON_CLK_HI3519=y
# CONFIG_COMMON_CLK_HI3559A is not set
@@ -978,6 +980,7 @@ CONFIG_COMMON_CLK_SCPI=m
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
CONFIG_COMMON_CLK_XGENE=y
@@ -998,6 +1001,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1079,8 +1083,8 @@ CONFIG_CRYPTO_AES_ARM64_BS=m
CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
CONFIG_CRYPTO_AES_ARM64_CE=y
-# CONFIG_CRYPTO_AES_ARM64 is not set
CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
+CONFIG_CRYPTO_AES_ARM64=y
CONFIG_CRYPTO_AES_GCM_P10=y
# CONFIG_CRYPTO_AES_TI is not set
CONFIG_CRYPTO_AES=y
@@ -1098,6 +1102,7 @@ CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
@@ -1136,6 +1141,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_PRNG_API=y
CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=3
CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
# CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_TEST is not set
+CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
# CONFIG_CRYPTO_DEV_HISI_HPRE is not set
# CONFIG_CRYPTO_DEV_HISI_SEC2 is not set
CONFIG_CRYPTO_DEV_HISI_SEC=m
@@ -1155,6 +1161,7 @@ CONFIG_CRYPTO_DEV_OCTEONTX2_CPT=m
# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
# CONFIG_CRYPTO_DEV_QCE is not set
# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
+CONFIG_CRYPTO_DEV_SA2UL=m
# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
# CONFIG_CRYPTO_DEV_SAHARA is not set
CONFIG_CRYPTO_DEV_SP_CCP=y
@@ -1206,6 +1213,7 @@ CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_POLY1305_NEON=y
+# CONFIG_CRYPTO_POLY1305_P10 is not set
# CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
@@ -1409,6 +1417,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1431,6 +1440,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1462,6 +1472,7 @@ CONFIG_DP83867_PHY=m
# CONFIG_DP83869_PHY is not set
CONFIG_DP83TC811_PHY=m
# CONFIG_DP83TD510_PHY is not set
+CONFIG_DPAA2_CONSOLE=m
# CONFIG_DPM_WATCHDOG is not set
# CONFIG_DPOT_DAC is not set
# CONFIG_DPS310 is not set
@@ -1553,6 +1564,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MALI_DISPLAY is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1630,6 +1642,7 @@ CONFIG_DRM_SIMPLEDRM=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1771,6 +1784,7 @@ CONFIG_EDAC_DMC520=m
CONFIG_EDAC_GHES=y
CONFIG_EDAC_I10NM=m
CONFIG_EDAC_IGEN6=m
+CONFIG_EDAC_LAYERSCAPE=m
CONFIG_EDAC_LEGACY_SYSFS=y
CONFIG_EDAC_PND2=m
CONFIG_EDAC_SYNOPSYS=m
@@ -1882,6 +1896,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1969,7 +1984,15 @@ CONFIG_FSCACHE_STATS=y
CONFIG_FS_DAX=y
# CONFIG_FS_ENCRYPTION is not set
# CONFIG_FSI is not set
+# CONFIG_FSL_BMAN_TEST is not set
+CONFIG_FSL_DPAA2_ETH_DCB=y
+CONFIG_FSL_DPAA2_ETH=m
+CONFIG_FSL_DPAA2_PTP_CLOCK=m
+CONFIG_FSL_DPAA2_QDMA=m
CONFIG_FSL_DPAA2_SWITCH=m
+# CONFIG_FSL_DPAA_CHECKING is not set
+CONFIG_FSL_DPAA_ETH=m
+CONFIG_FSL_DPAA=y
# CONFIG_FSL_EDMA is not set
CONFIG_FSL_ENETC_IERB=m
CONFIG_FSL_ENETC=m
@@ -1978,10 +2001,15 @@ CONFIG_FSL_ENETC_PTP_CLOCK=m
CONFIG_FSL_ENETC_QOS=y
CONFIG_FSL_ENETC_VF=m
CONFIG_FSL_ERRATUM_A008585=y
+CONFIG_FSL_FMAN=y
CONFIG_FSL_IMX8_DDR_PMU=m
# CONFIG_FSL_IMX9_DDR_PMU is not set
+CONFIG_FSL_MC_BUS=y
+CONFIG_FSL_MC_DPIO=m
+CONFIG_FSL_MC_UAPI_SUPPORT=y
CONFIG_FSL_PQ_MDIO=m
# CONFIG_FSL_QDMA is not set
+# CONFIG_FSL_QMAN_TEST is not set
# CONFIG_FSL_RCPM is not set
CONFIG_FSL_XGMAC_MDIO=m
CONFIG_FSNOTIFY=y
@@ -2077,6 +2105,8 @@ CONFIG_GNSS=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_DAVINCI=y
+# CONFIG_GPIO_DS4520 is not set
CONFIG_GPIO_DWAPB=m
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -2105,6 +2135,7 @@ CONFIG_GPIO_MLXBF2=m
# CONFIG_GPIO_MLXBF3 is not set
# CONFIG_GPIO_MLXBF is not set
# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_MPC8XXX=y
CONFIG_GPIO_MXC=m
# CONFIG_GPIO_PCA953X_IRQ is not set
# CONFIG_GPIO_PCA953X is not set
@@ -2206,6 +2237,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2362,15 +2394,17 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
CONFIG_HW_RANDOM_CAVIUM=m
# CONFIG_HW_RANDOM_CCTRNG is not set
CONFIG_HW_RANDOM_CN10K=m
-CONFIG_HW_RANDOM_HISI=y
+CONFIG_HW_RANDOM_HISI=m
# CONFIG_HW_RANDOM_HISTB is not set
# CONFIG_HW_RANDOM_IPROC_RNG200 is not set
+CONFIG_HW_RANDOM_OMAP=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
CONFIG_HW_RANDOM_TPM=y
CONFIG_HW_RANDOM_VIRTIO=y
CONFIG_HW_RANDOM_XGENE=m
# CONFIG_HW_RANDOM_XIPHERA is not set
CONFIG_HW_RANDOM=y
+CONFIG_HWSPINLOCK_OMAP=m
# CONFIG_HWSPINLOCK_QCOM is not set
CONFIG_HWSPINLOCK=y
# CONFIG_HX711 is not set
@@ -2400,6 +2434,7 @@ CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_AMD_MP2 is not set
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_BCM_IPROC is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
@@ -2446,6 +2481,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NOMADIK is not set
# CONFIG_I2C_NVIDIA_GPU is not set
# CONFIG_I2C_OCORES is not set
+CONFIG_I2C_OMAP=m
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PCI1XXXX is not set
# CONFIG_I2C_PIIX4 is not set
@@ -2649,7 +2685,7 @@ CONFIG_INPUT_APANEL=m
# CONFIG_INPUT_ATI_REMOTE2 is not set
CONFIG_INPUT_ATLAS_BTNS=m
# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
-# CONFIG_INPUT_BBNSM_PWRKEY is not set
+CONFIG_INPUT_BBNSM_PWRKEY=m
# CONFIG_INPUT_BMA150 is not set
# CONFIG_INPUT_CM109 is not set
# CONFIG_INPUT_CMA3000 is not set
@@ -2743,6 +2779,7 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_TCC_COOLING is not set
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_VSC is not set
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
CONFIG_INTEL_XWAY_PHY=m
@@ -2777,7 +2814,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2863,6 +2900,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2939,6 +2977,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -2994,6 +3033,8 @@ CONFIG_JOLIET=y
# CONFIG_JSA1212 is not set
CONFIG_JUMP_LABEL=y
# CONFIG_K3_DMA is not set
+CONFIG_K3_RTI_WATCHDOG=m
+CONFIG_K3_THERMAL=m
CONFIG_KALLSYMS_ALL=y
CONFIG_KALLSYMS_BASE_RELATIVE=y
# CONFIG_KALLSYMS_SELFTEST is not set
@@ -3082,13 +3123,15 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD_SEV=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
# CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set
+# CONFIG_KVM_PROVE_MMU is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
# CONFIG_KVM_XEN is not set
@@ -3161,6 +3204,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
@@ -3302,9 +3346,11 @@ CONFIG_MAILBOX=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
CONFIG_MARVELL_CN10K_DDR_PMU=m
CONFIG_MARVELL_CN10K_TAD_PMU=m
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3346,9 +3392,11 @@ CONFIG_MAX_SKB_FRAGS=17
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
# CONFIG_MDIO_BCM_IPROC is not set
@@ -3405,6 +3453,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3439,6 +3488,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3590,6 +3641,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3832,6 +3884,9 @@ CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTK_T7XX=m
CONFIG_MULTIUSER=y
+CONFIG_MUX_ADG792A=m
+# CONFIG_MUX_ADGS1408 is not set
+CONFIG_MUX_GPIO=m
# CONFIG_MVMDIO is not set
# CONFIG_MV_XOR_V2 is not set
# CONFIG_MWAVE is not set
@@ -3891,6 +3946,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4319,6 +4375,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4366,9 +4423,11 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_IMX_IIM is not set
# CONFIG_NVMEM_IMX_OCOTP_ELE is not set
CONFIG_NVMEM_IMX_OCOTP=m
+CONFIG_NVMEM_LAYERSCAPE_SFP=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
# CONFIG_NVMEM_SNVS_LPGPR is not set
@@ -4404,6 +4463,11 @@ CONFIG_OF_MDIO=y
CONFIG_OF_PMEM=m
# CONFIG_OF_UNITTEST is not set
CONFIG_OF=y
+CONFIG_OMAP2PLUS_MBOX=m
+CONFIG_OMAP_DM_TIMER=y
+# CONFIG_OMAP_GPMC is not set
+CONFIG_OMAP_MBOX_KFIFO_SIZE=256
+CONFIG_OMAP_USB2=m
# CONFIG_OMFS_FS is not set
# CONFIG_OPAL_CORE is not set
# CONFIG_OPEN_DICE is not set
@@ -4418,6 +4482,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
# CONFIG_OSF_PARTITION is not set
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4496,6 +4561,7 @@ CONFIG_PCC=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_AL is not set
@@ -4543,6 +4609,8 @@ CONFIG_PCI_IMX6_HOST=y
CONFIG_PCI_IMX6=y
CONFIG_PCI_IOV=y
# CONFIG_PCI_J721E_HOST is not set
+CONFIG_PCI_KEYSTONE_HOST=y
+CONFIG_PCI_LAYERSCAPE=y
# CONFIG_PCI_MESON is not set
CONFIG_PCI_MSI=y
CONFIG_PCI_P2PDMA=y
@@ -4575,6 +4643,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
CONFIG_PER_VMA_LOCK_STATS=y
# CONFIG_PHANTOM is not set
# CONFIG_PHONET is not set
+CONFIG_PHY_AM654_SERDES=m
# CONFIG_PHY_BCM_NS_USB2 is not set
# CONFIG_PHY_BCM_NS_USB3 is not set
# CONFIG_PHY_BCM_SR_PCIE is not set
@@ -4596,9 +4665,10 @@ CONFIG_PHY_FSL_IMX8MQ_USB=m
CONFIG_PHY_HI6220_USB=m
# CONFIG_PHY_HISI_INNO_USB2 is not set
# CONFIG_PHY_HISTB_COMBPHY is not set
+CONFIG_PHY_J721E_WIZ=m
# CONFIG_PHY_LAN966X_SERDES is not set
CONFIG_PHYLIB=y
-CONFIG_PHYLINK=m
+CONFIG_PHYLINK=y
# CONFIG_PHY_MAPPHONE_MDM6600 is not set
# CONFIG_PHY_MIXEL_LVDS_PHY is not set
# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
@@ -4612,6 +4682,7 @@ CONFIG_PHY_NS2_USB_DRD=y
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_PCIE2 is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
@@ -4622,6 +4693,8 @@ CONFIG_PHY_NS2_USB_DRD=y
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
CONFIG_PHY_TEGRA194_P2U=y
CONFIG_PHY_TEGRA_XUSB=m
# CONFIG_PHY_TUSB1210 is not set
@@ -4802,6 +4875,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4821,6 +4895,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_QORIQ=m
CONFIG_PTP_1588_CLOCK=y
@@ -4838,8 +4913,11 @@ CONFIG_PWM_BCM_IPROC=y
# CONFIG_PWM_IMX1 is not set
CONFIG_PWM_IMX27=m
CONFIG_PWM_IMX_TPM=m
+CONFIG_PWM_OMAP_DMTIMER=y
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM_TEGRA=y
+CONFIG_PWM_TIECAP=m
+CONFIG_PWM_TIEHRPWM=m
# CONFIG_PWM_XILINX is not set
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
@@ -4935,6 +5013,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -4979,6 +5058,7 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
@@ -4986,6 +5066,7 @@ CONFIG_REGMAP=y
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
# CONFIG_REGULATOR_ARM_SCMI is not set
+# CONFIG_REGULATOR_AW37503 is not set
CONFIG_REGULATOR_BD718XX=m
# CONFIG_REGULATOR_DA9121 is not set
# CONFIG_REGULATOR_DA9210 is not set
@@ -5009,6 +5090,7 @@ CONFIG_REGULATOR_GPIO=y
CONFIG_REGULATOR_MAX77620=y
CONFIG_REGULATOR_MAX77686=m
# CONFIG_REGULATOR_MAX77826 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8893 is not set
@@ -5027,6 +5109,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
# CONFIG_REGULATOR_RT4801 is not set
@@ -5039,6 +5122,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_RT6245 is not set
# CONFIG_REGULATOR_RTMV20 is not set
# CONFIG_REGULATOR_RTQ2134 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_RTQ6752 is not set
# CONFIG_REGULATOR_SLG51000 is not set
# CONFIG_REGULATOR_SY8106A is not set
@@ -5073,6 +5157,7 @@ CONFIG_RESET_IMX7=y
# CONFIG_RESET_QCOM_PDC is not set
# CONFIG_RESET_SCMI is not set
# CONFIG_RESET_SIMPLE is not set
+CONFIG_RESET_TI_SCI=m
# CONFIG_RESET_TI_SYSCON is not set
# CONFIG_RESET_TI_TPS380X is not set
CONFIG_RESOURCE_KUNIT_TEST=m
@@ -5082,7 +5167,6 @@ CONFIG_RETPOLINE=y
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -5176,6 +5260,7 @@ CONFIG_RTC_DRV_DS3232=m
CONFIG_RTC_DRV_EFI=y
CONFIG_RTC_DRV_EM3027=m
CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_FSL_FTM_ALARM=m
# CONFIG_RTC_DRV_FTRTC010 is not set
# CONFIG_RTC_DRV_GOLDFISH is not set
# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
@@ -5230,6 +5315,7 @@ CONFIG_RTC_DRV_RX8581=m
CONFIG_RTC_DRV_STK17TA8=m
# CONFIG_RTC_DRV_TEGRA is not set
# CONFIG_RTC_DRV_TEST is not set
+CONFIG_RTC_DRV_TI_K3=m
CONFIG_RTC_DRV_V3020=m
CONFIG_RTC_DRV_X1205=m
# CONFIG_RTC_DRV_XGENE is not set
@@ -5453,6 +5539,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5462,6 +5549,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5539,6 +5627,7 @@ CONFIG_SENSORS_G762=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
# CONFIG_SENSORS_I5K_AMB is not set
# CONFIG_SENSORS_IBMAEM is not set
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5720,6 +5809,8 @@ CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_MANY_PORTS=y
CONFIG_SERIAL_8250_MID=y
CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y
+CONFIG_SERIAL_8250_OMAP=y
CONFIG_SERIAL_8250_PCI1XXXX=y
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PERICOM=y
@@ -6037,7 +6128,9 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -6054,7 +6147,6 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -6119,6 +6211,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -6129,6 +6222,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
# CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
@@ -6248,6 +6342,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -6306,6 +6401,7 @@ CONFIG_SND_SOC_SOF_ACPI=m
# CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set
# CONFIG_SND_SOC_SOF_JASPERLAKE is not set
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
# CONFIG_SND_SOC_SOF_MERRIFIELD is not set
# CONFIG_SND_SOC_SOF_METEORLAKE is not set
# CONFIG_SND_SOC_SOF_OF is not set
@@ -6376,6 +6472,7 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6467,7 +6564,7 @@ CONFIG_SOC_IMX8M=y
CONFIG_SOC_IMX9=m
# CONFIG_SOCIONEXT_SYNQUACER_PREITS is not set
CONFIG_SOC_TEGRA_CBB=m
-# CONFIG_SOC_TI is not set
+CONFIG_SOC_TI=y
CONFIG_SOFTLOCKUP_DETECTOR=y
CONFIG_SOFT_WATCHDOG=m
# CONFIG_SOLARIS_X86_PARTITION is not set
@@ -6507,6 +6604,7 @@ CONFIG_SPI_AMD=y
# CONFIG_SPI_CADENCE_XSPI is not set
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_FSL_DSPI=y
CONFIG_SPI_FSL_LPSPI=m
CONFIG_SPI_FSL_QUADSPI=m
# CONFIG_SPI_FSL_SPI is not set
@@ -6525,6 +6623,7 @@ CONFIG_SPI_MEM=y
# CONFIG_SPI_MXIC is not set
CONFIG_SPI_NXP_FLEXSPI=m
# CONFIG_SPI_OC_TINY is not set
+CONFIG_SPI_OMAP24XX=m
CONFIG_SPI_PCI1XXXX=m
CONFIG_SPI_PL022=m
# CONFIG_SPI_PXA2XX is not set
@@ -6626,6 +6725,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
CONFIG_SUSPEND=y
CONFIG_SVC_I3C_MASTER=m
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
# CONFIG_SX9324 is not set
@@ -6744,6 +6844,7 @@ CONFIG_TEST_CPUMASK=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
@@ -6820,6 +6921,9 @@ CONFIG_THUNDERX2_PMU=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+CONFIG_TI_K3_RINGACC=y
+CONFIG_TI_K3_UDMA_GLUE_LAYER=y
+CONFIG_TI_K3_UDMA=y
# CONFIG_TI_LMP92064 is not set
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y
@@ -6839,7 +6943,13 @@ CONFIG_TIPC_DIAG=m
CONFIG_TIPC=m
CONFIG_TIPC_MEDIA_IB=y
CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TI_PRUSS=m
+CONFIG_TI_SCI_CLK=m
+# CONFIG_TI_SCI_CLK_PROBE_FROM_FW is not set
+CONFIG_TI_SCI_PM_DOMAINS=m
# CONFIG_TI_ST is not set
+CONFIG_TI_SYSCON_CLK=m
+CONFIG_TI_SYSC=y
# CONFIG_TI_TLC4541 is not set
# CONFIG_TI_TMAG5273 is not set
# CONFIG_TI_TSC2046 is not set
@@ -6852,6 +6962,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -6896,6 +7007,7 @@ CONFIG_TORTURE_TEST=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7060,8 +7172,10 @@ CONFIG_USB_CXACRU=m
CONFIG_USB_DEFAULT_PERSIST=y
# CONFIG_USB_DSBR is not set
# CONFIG_USB_DWC2 is not set
+CONFIG_USB_DWC3_AM62=m
CONFIG_USB_DWC3_IMX8MP=m
# CONFIG_USB_DWC3 is not set
+CONFIG_USB_DWC3_KEYSTONE=m
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_EHCI_FSL is not set
CONFIG_USB_EHCI_HCD_PLATFORM=m
@@ -7345,6 +7459,7 @@ CONFIG_VEXPRESS_CONFIG=y
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=m
# CONFIG_VFIO_AMBA is not set
+CONFIG_VFIO_FSL_MC=m
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
# CONFIG_VFIO_MDEV is not set
@@ -7409,8 +7524,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7708,6 +7827,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config
index 15b5751d7..150d43325 100644
--- a/kernel-aarch64-rt-debug-rhel.config
+++ b/kernel-aarch64-rt-debug-rhel.config
@@ -215,7 +215,6 @@ CONFIG_AMD_HSMP=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
CONFIG_AMD_PHY=m
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
# CONFIG_AMD_PTDMA is not set
# CONFIG_AMDTEE is not set
# CONFIG_AMD_XGBE_DCB is not set
@@ -249,9 +248,9 @@ CONFIG_ARCH_BCM_IPROC=y
# CONFIG_ARCH_EXYNOS is not set
CONFIG_ARCH_HISI=y
# CONFIG_ARCH_INTEL_SOCFPGA is not set
-# CONFIG_ARCH_K3 is not set
+CONFIG_ARCH_K3=y
# CONFIG_ARCH_KEEMBAY is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
+CONFIG_ARCH_LAYERSCAPE=y
# CONFIG_ARCH_LG1K is not set
# CONFIG_ARCH_MA35 is not set
# CONFIG_ARCH_MEDIATEK is not set
@@ -402,6 +401,7 @@ CONFIG_ARM_SPE_PMU=m
# CONFIG_ARM_TEGRA186_CPUFREQ is not set
CONFIG_ARM_TEGRA194_CPUFREQ=m
CONFIG_ARM_TEGRA_DEVFREQ=m
+CONFIG_ARM_TI_CPUFREQ=y
# CONFIG_AS3935 is not set
# CONFIG_AS73211 is not set
CONFIG_ASN1=y
@@ -920,6 +920,7 @@ CONFIG_CLK_IMX8QXP=y
CONFIG_CLK_IMX8ULP=y
CONFIG_CLK_IMX93=y
CONFIG_CLK_KUNIT_TEST=m
+CONFIG_CLK_LS1028A_PLLDIG=y
# CONFIG_CLK_QORIQ is not set
CONFIG_CLK_SP810=y
CONFIG_CLK_VEXPRESS_OSC=y
@@ -957,6 +958,7 @@ CONFIG_COMMAND_LINE_SIZE=4096
# CONFIG_COMMON_CLK_CS2000_CP is not set
# CONFIG_COMMON_CLK_FIXED_MMIO is not set
# CONFIG_COMMON_CLK_FSL_FLEXSPI is not set
+CONFIG_COMMON_CLK_FSL_SAI=y
CONFIG_COMMON_CLK_HI3516CV300=y
CONFIG_COMMON_CLK_HI3519=y
# CONFIG_COMMON_CLK_HI3559A is not set
@@ -978,6 +980,7 @@ CONFIG_COMMON_CLK_SCPI=m
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
CONFIG_COMMON_CLK_XGENE=y
@@ -998,6 +1001,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1080,8 +1084,8 @@ CONFIG_CRYPTO_AES_ARM64_BS=m
CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
CONFIG_CRYPTO_AES_ARM64_CE=y
-# CONFIG_CRYPTO_AES_ARM64 is not set
CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
+CONFIG_CRYPTO_AES_ARM64=y
CONFIG_CRYPTO_AES_GCM_P10=y
# CONFIG_CRYPTO_AES_TI is not set
CONFIG_CRYPTO_AES=y
@@ -1099,6 +1103,7 @@ CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
@@ -1137,6 +1142,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_PRNG_API=y
CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=3
CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
# CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_TEST is not set
+CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
# CONFIG_CRYPTO_DEV_HISI_HPRE is not set
# CONFIG_CRYPTO_DEV_HISI_SEC2 is not set
CONFIG_CRYPTO_DEV_HISI_SEC=m
@@ -1156,6 +1162,7 @@ CONFIG_CRYPTO_DEV_OCTEONTX2_CPT=m
# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
# CONFIG_CRYPTO_DEV_QCE is not set
# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
+CONFIG_CRYPTO_DEV_SA2UL=m
# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
# CONFIG_CRYPTO_DEV_SAHARA is not set
CONFIG_CRYPTO_DEV_SP_CCP=y
@@ -1207,6 +1214,7 @@ CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_POLY1305_NEON=y
+# CONFIG_CRYPTO_POLY1305_P10 is not set
# CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
@@ -1419,6 +1427,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1441,6 +1450,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1472,6 +1482,7 @@ CONFIG_DP83867_PHY=m
# CONFIG_DP83869_PHY is not set
CONFIG_DP83TC811_PHY=m
# CONFIG_DP83TD510_PHY is not set
+CONFIG_DPAA2_CONSOLE=m
# CONFIG_DPM_WATCHDOG is not set
# CONFIG_DPOT_DAC is not set
# CONFIG_DPS310 is not set
@@ -1563,6 +1574,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MALI_DISPLAY is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1640,6 +1652,7 @@ CONFIG_DRM_SIMPLEDRM=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1817,6 +1830,7 @@ CONFIG_EDAC_DMC520=m
CONFIG_EDAC_GHES=y
CONFIG_EDAC_I10NM=m
CONFIG_EDAC_IGEN6=m
+CONFIG_EDAC_LAYERSCAPE=m
CONFIG_EDAC_LEGACY_SYSFS=y
CONFIG_EDAC_PND2=m
CONFIG_EDAC_SYNOPSYS=m
@@ -1936,6 +1950,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -2023,7 +2038,15 @@ CONFIG_FSCACHE_STATS=y
CONFIG_FS_DAX=y
# CONFIG_FS_ENCRYPTION is not set
# CONFIG_FSI is not set
+# CONFIG_FSL_BMAN_TEST is not set
+CONFIG_FSL_DPAA2_ETH_DCB=y
+CONFIG_FSL_DPAA2_ETH=m
+CONFIG_FSL_DPAA2_PTP_CLOCK=m
+CONFIG_FSL_DPAA2_QDMA=m
CONFIG_FSL_DPAA2_SWITCH=m
+# CONFIG_FSL_DPAA_CHECKING is not set
+CONFIG_FSL_DPAA_ETH=m
+CONFIG_FSL_DPAA=y
# CONFIG_FSL_EDMA is not set
CONFIG_FSL_ENETC_IERB=m
CONFIG_FSL_ENETC=m
@@ -2032,10 +2055,15 @@ CONFIG_FSL_ENETC_PTP_CLOCK=m
CONFIG_FSL_ENETC_QOS=y
CONFIG_FSL_ENETC_VF=m
CONFIG_FSL_ERRATUM_A008585=y
+CONFIG_FSL_FMAN=y
CONFIG_FSL_IMX8_DDR_PMU=m
# CONFIG_FSL_IMX9_DDR_PMU is not set
+CONFIG_FSL_MC_BUS=y
+CONFIG_FSL_MC_DPIO=m
+CONFIG_FSL_MC_UAPI_SUPPORT=y
CONFIG_FSL_PQ_MDIO=m
# CONFIG_FSL_QDMA is not set
+# CONFIG_FSL_QMAN_TEST is not set
# CONFIG_FSL_RCPM is not set
CONFIG_FSL_XGMAC_MDIO=m
CONFIG_FSNOTIFY=y
@@ -2132,6 +2160,8 @@ CONFIG_GNSS=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_DAVINCI=y
+# CONFIG_GPIO_DS4520 is not set
CONFIG_GPIO_DWAPB=m
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -2160,6 +2190,7 @@ CONFIG_GPIO_MLXBF2=m
# CONFIG_GPIO_MLXBF3 is not set
# CONFIG_GPIO_MLXBF is not set
# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_MPC8XXX=y
CONFIG_GPIO_MXC=m
# CONFIG_GPIO_PCA953X_IRQ is not set
# CONFIG_GPIO_PCA953X is not set
@@ -2262,6 +2293,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2418,15 +2450,17 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
CONFIG_HW_RANDOM_CAVIUM=m
# CONFIG_HW_RANDOM_CCTRNG is not set
CONFIG_HW_RANDOM_CN10K=m
-CONFIG_HW_RANDOM_HISI=y
+CONFIG_HW_RANDOM_HISI=m
# CONFIG_HW_RANDOM_HISTB is not set
# CONFIG_HW_RANDOM_IPROC_RNG200 is not set
+CONFIG_HW_RANDOM_OMAP=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
CONFIG_HW_RANDOM_TPM=y
CONFIG_HW_RANDOM_VIRTIO=y
CONFIG_HW_RANDOM_XGENE=m
# CONFIG_HW_RANDOM_XIPHERA is not set
CONFIG_HW_RANDOM=y
+CONFIG_HWSPINLOCK_OMAP=m
# CONFIG_HWSPINLOCK_QCOM is not set
CONFIG_HWSPINLOCK=y
# CONFIG_HX711 is not set
@@ -2456,6 +2490,7 @@ CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_AMD_MP2 is not set
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_BCM_IPROC is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
@@ -2502,6 +2537,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NOMADIK is not set
# CONFIG_I2C_NVIDIA_GPU is not set
# CONFIG_I2C_OCORES is not set
+CONFIG_I2C_OMAP=m
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PCI1XXXX is not set
# CONFIG_I2C_PIIX4 is not set
@@ -2705,7 +2741,7 @@ CONFIG_INPUT_APANEL=m
# CONFIG_INPUT_ATI_REMOTE2 is not set
CONFIG_INPUT_ATLAS_BTNS=m
# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
-# CONFIG_INPUT_BBNSM_PWRKEY is not set
+CONFIG_INPUT_BBNSM_PWRKEY=m
# CONFIG_INPUT_BMA150 is not set
# CONFIG_INPUT_CM109 is not set
# CONFIG_INPUT_CMA3000 is not set
@@ -2799,6 +2835,7 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_TCC_COOLING is not set
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_VSC is not set
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
CONFIG_INTEL_XWAY_PHY=m
@@ -2833,7 +2870,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2919,6 +2956,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2995,6 +3033,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -3050,6 +3089,8 @@ CONFIG_JOLIET=y
# CONFIG_JSA1212 is not set
CONFIG_JUMP_LABEL=y
# CONFIG_K3_DMA is not set
+CONFIG_K3_RTI_WATCHDOG=m
+CONFIG_K3_THERMAL=m
CONFIG_KALLSYMS_ALL=y
CONFIG_KALLSYMS_BASE_RELATIVE=y
# CONFIG_KALLSYMS_SELFTEST is not set
@@ -3143,13 +3184,15 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD_SEV=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
# CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set
+CONFIG_KVM_PROVE_MMU=y
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
# CONFIG_KVM_XEN is not set
@@ -3222,6 +3265,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
@@ -3363,9 +3407,11 @@ CONFIG_MAILBOX=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
CONFIG_MARVELL_CN10K_DDR_PMU=m
CONFIG_MARVELL_CN10K_TAD_PMU=m
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3407,9 +3453,11 @@ CONFIG_MAX_SKB_FRAGS=17
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
# CONFIG_MDIO_BCM_IPROC is not set
@@ -3471,6 +3519,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3505,6 +3554,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3656,6 +3707,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3898,6 +3950,9 @@ CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTK_T7XX=m
CONFIG_MULTIUSER=y
+CONFIG_MUX_ADG792A=m
+# CONFIG_MUX_ADGS1408 is not set
+CONFIG_MUX_GPIO=m
# CONFIG_MVMDIO is not set
# CONFIG_MV_XOR_V2 is not set
# CONFIG_MWAVE is not set
@@ -3957,6 +4012,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4385,6 +4441,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4432,9 +4489,11 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_IMX_IIM is not set
# CONFIG_NVMEM_IMX_OCOTP_ELE is not set
CONFIG_NVMEM_IMX_OCOTP=m
+CONFIG_NVMEM_LAYERSCAPE_SFP=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
# CONFIG_NVMEM_SNVS_LPGPR is not set
@@ -4470,6 +4529,11 @@ CONFIG_OF_MDIO=y
CONFIG_OF_PMEM=m
# CONFIG_OF_UNITTEST is not set
CONFIG_OF=y
+CONFIG_OMAP2PLUS_MBOX=m
+CONFIG_OMAP_DM_TIMER=y
+# CONFIG_OMAP_GPMC is not set
+CONFIG_OMAP_MBOX_KFIFO_SIZE=256
+CONFIG_OMAP_USB2=m
# CONFIG_OMFS_FS is not set
# CONFIG_OPAL_CORE is not set
# CONFIG_OPEN_DICE is not set
@@ -4484,6 +4548,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
# CONFIG_OSF_PARTITION is not set
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+CONFIG_OVERLAY_FS_DEBUG=y
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4564,6 +4629,7 @@ CONFIG_PCC=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_AL is not set
@@ -4611,6 +4677,8 @@ CONFIG_PCI_IMX6_HOST=y
CONFIG_PCI_IMX6=y
CONFIG_PCI_IOV=y
# CONFIG_PCI_J721E_HOST is not set
+CONFIG_PCI_KEYSTONE_HOST=y
+CONFIG_PCI_LAYERSCAPE=y
# CONFIG_PCI_MESON is not set
CONFIG_PCI_MSI=y
CONFIG_PCI_P2PDMA=y
@@ -4643,6 +4711,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
CONFIG_PER_VMA_LOCK_STATS=y
# CONFIG_PHANTOM is not set
# CONFIG_PHONET is not set
+CONFIG_PHY_AM654_SERDES=m
# CONFIG_PHY_BCM_NS_USB2 is not set
# CONFIG_PHY_BCM_NS_USB3 is not set
# CONFIG_PHY_BCM_SR_PCIE is not set
@@ -4664,9 +4733,10 @@ CONFIG_PHY_FSL_IMX8MQ_USB=m
CONFIG_PHY_HI6220_USB=m
# CONFIG_PHY_HISI_INNO_USB2 is not set
# CONFIG_PHY_HISTB_COMBPHY is not set
+CONFIG_PHY_J721E_WIZ=m
# CONFIG_PHY_LAN966X_SERDES is not set
CONFIG_PHYLIB=y
-CONFIG_PHYLINK=m
+CONFIG_PHYLINK=y
# CONFIG_PHY_MAPPHONE_MDM6600 is not set
# CONFIG_PHY_MIXEL_LVDS_PHY is not set
# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
@@ -4680,6 +4750,7 @@ CONFIG_PHY_NS2_USB_DRD=y
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_PCIE2 is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
@@ -4690,6 +4761,8 @@ CONFIG_PHY_NS2_USB_DRD=y
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
CONFIG_PHY_TEGRA194_P2U=y
CONFIG_PHY_TEGRA_XUSB=m
# CONFIG_PHY_TUSB1210 is not set
@@ -4874,6 +4947,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4893,6 +4967,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_QORIQ=m
CONFIG_PTP_1588_CLOCK=y
@@ -4910,8 +4985,11 @@ CONFIG_PWM_BCM_IPROC=y
# CONFIG_PWM_IMX1 is not set
CONFIG_PWM_IMX27=m
CONFIG_PWM_IMX_TPM=m
+CONFIG_PWM_OMAP_DMTIMER=y
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM_TEGRA=y
+CONFIG_PWM_TIECAP=m
+CONFIG_PWM_TIEHRPWM=m
# CONFIG_PWM_XILINX is not set
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
@@ -5007,6 +5085,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -5054,6 +5133,7 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
@@ -5061,6 +5141,7 @@ CONFIG_REGMAP=y
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
# CONFIG_REGULATOR_ARM_SCMI is not set
+# CONFIG_REGULATOR_AW37503 is not set
CONFIG_REGULATOR_BD718XX=m
# CONFIG_REGULATOR_DA9121 is not set
# CONFIG_REGULATOR_DA9210 is not set
@@ -5084,6 +5165,7 @@ CONFIG_REGULATOR_GPIO=y
CONFIG_REGULATOR_MAX77620=y
CONFIG_REGULATOR_MAX77686=m
# CONFIG_REGULATOR_MAX77826 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8893 is not set
@@ -5102,6 +5184,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
# CONFIG_REGULATOR_RT4801 is not set
@@ -5114,6 +5197,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_RT6245 is not set
# CONFIG_REGULATOR_RTMV20 is not set
# CONFIG_REGULATOR_RTQ2134 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_RTQ6752 is not set
# CONFIG_REGULATOR_SLG51000 is not set
# CONFIG_REGULATOR_SY8106A is not set
@@ -5148,6 +5232,7 @@ CONFIG_RESET_IMX7=y
# CONFIG_RESET_QCOM_PDC is not set
# CONFIG_RESET_SCMI is not set
# CONFIG_RESET_SIMPLE is not set
+CONFIG_RESET_TI_SCI=m
# CONFIG_RESET_TI_SYSCON is not set
# CONFIG_RESET_TI_TPS380X is not set
CONFIG_RESOURCE_KUNIT_TEST=m
@@ -5157,7 +5242,6 @@ CONFIG_RETPOLINE=y
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -5251,6 +5335,7 @@ CONFIG_RTC_DRV_DS3232=m
CONFIG_RTC_DRV_EFI=y
CONFIG_RTC_DRV_EM3027=m
CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_FSL_FTM_ALARM=m
# CONFIG_RTC_DRV_FTRTC010 is not set
# CONFIG_RTC_DRV_GOLDFISH is not set
# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
@@ -5305,6 +5390,7 @@ CONFIG_RTC_DRV_RX8581=m
CONFIG_RTC_DRV_STK17TA8=m
# CONFIG_RTC_DRV_TEGRA is not set
# CONFIG_RTC_DRV_TEST is not set
+CONFIG_RTC_DRV_TI_K3=m
CONFIG_RTC_DRV_V3020=m
CONFIG_RTC_DRV_X1205=m
# CONFIG_RTC_DRV_XGENE is not set
@@ -5528,6 +5614,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5537,6 +5624,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5614,6 +5702,7 @@ CONFIG_SENSORS_G762=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
# CONFIG_SENSORS_I5K_AMB is not set
# CONFIG_SENSORS_IBMAEM is not set
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5795,6 +5884,8 @@ CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_MANY_PORTS=y
CONFIG_SERIAL_8250_MID=y
CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y
+CONFIG_SERIAL_8250_OMAP=y
CONFIG_SERIAL_8250_PCI1XXXX=y
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PERICOM=y
@@ -6115,7 +6206,9 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -6132,7 +6225,6 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -6197,6 +6289,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -6207,6 +6300,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
# CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
@@ -6326,6 +6420,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -6385,6 +6480,7 @@ CONFIG_SND_SOC_SOF_HDA_PROBES=m
# CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set
# CONFIG_SND_SOC_SOF_JASPERLAKE is not set
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
# CONFIG_SND_SOC_SOF_MERRIFIELD is not set
# CONFIG_SND_SOC_SOF_METEORLAKE is not set
# CONFIG_SND_SOC_SOF_OF is not set
@@ -6455,6 +6551,7 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_BUILD=y
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6546,7 +6643,7 @@ CONFIG_SOC_IMX8M=y
CONFIG_SOC_IMX9=m
# CONFIG_SOCIONEXT_SYNQUACER_PREITS is not set
CONFIG_SOC_TEGRA_CBB=m
-# CONFIG_SOC_TI is not set
+CONFIG_SOC_TI=y
CONFIG_SOFTLOCKUP_DETECTOR=y
CONFIG_SOFT_WATCHDOG=m
# CONFIG_SOLARIS_X86_PARTITION is not set
@@ -6586,6 +6683,7 @@ CONFIG_SPI_AMD=y
# CONFIG_SPI_CADENCE_XSPI is not set
CONFIG_SPI_DEBUG=y
# CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_FSL_DSPI=y
CONFIG_SPI_FSL_LPSPI=m
CONFIG_SPI_FSL_QUADSPI=m
# CONFIG_SPI_FSL_SPI is not set
@@ -6604,6 +6702,7 @@ CONFIG_SPI_MEM=y
# CONFIG_SPI_MXIC is not set
CONFIG_SPI_NXP_FLEXSPI=m
# CONFIG_SPI_OC_TINY is not set
+CONFIG_SPI_OMAP24XX=m
CONFIG_SPI_PCI1XXXX=m
CONFIG_SPI_PL022=m
# CONFIG_SPI_PXA2XX is not set
@@ -6705,6 +6804,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
CONFIG_SUSPEND=y
CONFIG_SVC_I3C_MASTER=m
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
# CONFIG_SX9324 is not set
@@ -6823,6 +6923,7 @@ CONFIG_TEST_FPU=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIST_SORT=m
@@ -6899,6 +7000,9 @@ CONFIG_THUNDERX2_PMU=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+CONFIG_TI_K3_RINGACC=y
+CONFIG_TI_K3_UDMA_GLUE_LAYER=y
+CONFIG_TI_K3_UDMA=y
# CONFIG_TI_LMP92064 is not set
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y
@@ -6918,7 +7022,13 @@ CONFIG_TIPC_DIAG=m
CONFIG_TIPC=m
CONFIG_TIPC_MEDIA_IB=y
CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TI_PRUSS=m
+CONFIG_TI_SCI_CLK=m
+# CONFIG_TI_SCI_CLK_PROBE_FROM_FW is not set
+CONFIG_TI_SCI_PM_DOMAINS=m
# CONFIG_TI_ST is not set
+CONFIG_TI_SYSCON_CLK=m
+CONFIG_TI_SYSC=y
# CONFIG_TI_TLC4541 is not set
# CONFIG_TI_TMAG5273 is not set
# CONFIG_TI_TSC2046 is not set
@@ -6931,6 +7041,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -6975,6 +7086,7 @@ CONFIG_TORTURE_TEST=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7140,8 +7252,10 @@ CONFIG_USB_CXACRU=m
CONFIG_USB_DEFAULT_PERSIST=y
# CONFIG_USB_DSBR is not set
# CONFIG_USB_DWC2 is not set
+CONFIG_USB_DWC3_AM62=m
CONFIG_USB_DWC3_IMX8MP=m
# CONFIG_USB_DWC3 is not set
+CONFIG_USB_DWC3_KEYSTONE=m
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_EHCI_FSL is not set
CONFIG_USB_EHCI_HCD_PLATFORM=m
@@ -7425,6 +7539,7 @@ CONFIG_VEXPRESS_CONFIG=y
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=m
# CONFIG_VFIO_AMBA is not set
+CONFIG_VFIO_FSL_MC=m
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
# CONFIG_VFIO_MDEV is not set
@@ -7489,8 +7604,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7789,6 +7908,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config
index 89b2369d1..2f0ffefc4 100644
--- a/kernel-aarch64-rt-rhel.config
+++ b/kernel-aarch64-rt-rhel.config
@@ -215,7 +215,6 @@ CONFIG_AMD_HSMP=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
CONFIG_AMD_PHY=m
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
# CONFIG_AMD_PTDMA is not set
# CONFIG_AMDTEE is not set
# CONFIG_AMD_XGBE_DCB is not set
@@ -249,9 +248,9 @@ CONFIG_ARCH_BCM_IPROC=y
# CONFIG_ARCH_EXYNOS is not set
CONFIG_ARCH_HISI=y
# CONFIG_ARCH_INTEL_SOCFPGA is not set
-# CONFIG_ARCH_K3 is not set
+CONFIG_ARCH_K3=y
# CONFIG_ARCH_KEEMBAY is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
+CONFIG_ARCH_LAYERSCAPE=y
# CONFIG_ARCH_LG1K is not set
# CONFIG_ARCH_MA35 is not set
# CONFIG_ARCH_MEDIATEK is not set
@@ -402,6 +401,7 @@ CONFIG_ARM_SPE_PMU=m
# CONFIG_ARM_TEGRA186_CPUFREQ is not set
CONFIG_ARM_TEGRA194_CPUFREQ=m
CONFIG_ARM_TEGRA_DEVFREQ=m
+CONFIG_ARM_TI_CPUFREQ=y
# CONFIG_AS3935 is not set
# CONFIG_AS73211 is not set
CONFIG_ASN1=y
@@ -920,6 +920,7 @@ CONFIG_CLK_IMX8QXP=y
CONFIG_CLK_IMX8ULP=y
CONFIG_CLK_IMX93=y
CONFIG_CLK_KUNIT_TEST=m
+CONFIG_CLK_LS1028A_PLLDIG=y
# CONFIG_CLK_QORIQ is not set
CONFIG_CLK_SP810=y
CONFIG_CLK_VEXPRESS_OSC=y
@@ -957,6 +958,7 @@ CONFIG_COMMAND_LINE_SIZE=4096
# CONFIG_COMMON_CLK_CS2000_CP is not set
# CONFIG_COMMON_CLK_FIXED_MMIO is not set
# CONFIG_COMMON_CLK_FSL_FLEXSPI is not set
+CONFIG_COMMON_CLK_FSL_SAI=y
CONFIG_COMMON_CLK_HI3516CV300=y
CONFIG_COMMON_CLK_HI3519=y
# CONFIG_COMMON_CLK_HI3559A is not set
@@ -978,6 +980,7 @@ CONFIG_COMMON_CLK_SCPI=m
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
CONFIG_COMMON_CLK_XGENE=y
@@ -998,6 +1001,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1080,8 +1084,8 @@ CONFIG_CRYPTO_AES_ARM64_BS=m
CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
CONFIG_CRYPTO_AES_ARM64_CE=y
-# CONFIG_CRYPTO_AES_ARM64 is not set
CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
+CONFIG_CRYPTO_AES_ARM64=y
CONFIG_CRYPTO_AES_GCM_P10=y
# CONFIG_CRYPTO_AES_TI is not set
CONFIG_CRYPTO_AES=y
@@ -1099,6 +1103,7 @@ CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
@@ -1137,6 +1142,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_PRNG_API=y
CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=3
CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
# CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_TEST is not set
+CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
# CONFIG_CRYPTO_DEV_HISI_HPRE is not set
# CONFIG_CRYPTO_DEV_HISI_SEC2 is not set
CONFIG_CRYPTO_DEV_HISI_SEC=m
@@ -1156,6 +1162,7 @@ CONFIG_CRYPTO_DEV_OCTEONTX2_CPT=m
# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
# CONFIG_CRYPTO_DEV_QCE is not set
# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
+CONFIG_CRYPTO_DEV_SA2UL=m
# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
# CONFIG_CRYPTO_DEV_SAHARA is not set
CONFIG_CRYPTO_DEV_SP_CCP=y
@@ -1207,6 +1214,7 @@ CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_POLY1305_NEON=y
+# CONFIG_CRYPTO_POLY1305_P10 is not set
# CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
@@ -1411,6 +1419,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1433,6 +1442,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1464,6 +1474,7 @@ CONFIG_DP83867_PHY=m
# CONFIG_DP83869_PHY is not set
CONFIG_DP83TC811_PHY=m
# CONFIG_DP83TD510_PHY is not set
+CONFIG_DPAA2_CONSOLE=m
# CONFIG_DPM_WATCHDOG is not set
# CONFIG_DPOT_DAC is not set
# CONFIG_DPS310 is not set
@@ -1555,6 +1566,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MALI_DISPLAY is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1632,6 +1644,7 @@ CONFIG_DRM_SIMPLEDRM=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1809,6 +1822,7 @@ CONFIG_EDAC_DMC520=m
CONFIG_EDAC_GHES=y
CONFIG_EDAC_I10NM=m
CONFIG_EDAC_IGEN6=m
+CONFIG_EDAC_LAYERSCAPE=m
CONFIG_EDAC_LEGACY_SYSFS=y
CONFIG_EDAC_PND2=m
CONFIG_EDAC_SYNOPSYS=m
@@ -1920,6 +1934,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -2007,7 +2022,15 @@ CONFIG_FSCACHE_STATS=y
CONFIG_FS_DAX=y
# CONFIG_FS_ENCRYPTION is not set
# CONFIG_FSI is not set
+# CONFIG_FSL_BMAN_TEST is not set
+CONFIG_FSL_DPAA2_ETH_DCB=y
+CONFIG_FSL_DPAA2_ETH=m
+CONFIG_FSL_DPAA2_PTP_CLOCK=m
+CONFIG_FSL_DPAA2_QDMA=m
CONFIG_FSL_DPAA2_SWITCH=m
+# CONFIG_FSL_DPAA_CHECKING is not set
+CONFIG_FSL_DPAA_ETH=m
+CONFIG_FSL_DPAA=y
# CONFIG_FSL_EDMA is not set
CONFIG_FSL_ENETC_IERB=m
CONFIG_FSL_ENETC=m
@@ -2016,10 +2039,15 @@ CONFIG_FSL_ENETC_PTP_CLOCK=m
CONFIG_FSL_ENETC_QOS=y
CONFIG_FSL_ENETC_VF=m
CONFIG_FSL_ERRATUM_A008585=y
+CONFIG_FSL_FMAN=y
CONFIG_FSL_IMX8_DDR_PMU=m
# CONFIG_FSL_IMX9_DDR_PMU is not set
+CONFIG_FSL_MC_BUS=y
+CONFIG_FSL_MC_DPIO=m
+CONFIG_FSL_MC_UAPI_SUPPORT=y
CONFIG_FSL_PQ_MDIO=m
# CONFIG_FSL_QDMA is not set
+# CONFIG_FSL_QMAN_TEST is not set
# CONFIG_FSL_RCPM is not set
CONFIG_FSL_XGMAC_MDIO=m
CONFIG_FSNOTIFY=y
@@ -2116,6 +2144,8 @@ CONFIG_GNSS=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_DAVINCI=y
+# CONFIG_GPIO_DS4520 is not set
CONFIG_GPIO_DWAPB=m
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -2144,6 +2174,7 @@ CONFIG_GPIO_MLXBF2=m
# CONFIG_GPIO_MLXBF3 is not set
# CONFIG_GPIO_MLXBF is not set
# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_MPC8XXX=y
CONFIG_GPIO_MXC=m
# CONFIG_GPIO_PCA953X_IRQ is not set
# CONFIG_GPIO_PCA953X is not set
@@ -2246,6 +2277,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2402,15 +2434,17 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
CONFIG_HW_RANDOM_CAVIUM=m
# CONFIG_HW_RANDOM_CCTRNG is not set
CONFIG_HW_RANDOM_CN10K=m
-CONFIG_HW_RANDOM_HISI=y
+CONFIG_HW_RANDOM_HISI=m
# CONFIG_HW_RANDOM_HISTB is not set
# CONFIG_HW_RANDOM_IPROC_RNG200 is not set
+CONFIG_HW_RANDOM_OMAP=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
CONFIG_HW_RANDOM_TPM=y
CONFIG_HW_RANDOM_VIRTIO=y
CONFIG_HW_RANDOM_XGENE=m
# CONFIG_HW_RANDOM_XIPHERA is not set
CONFIG_HW_RANDOM=y
+CONFIG_HWSPINLOCK_OMAP=m
# CONFIG_HWSPINLOCK_QCOM is not set
CONFIG_HWSPINLOCK=y
# CONFIG_HX711 is not set
@@ -2440,6 +2474,7 @@ CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_AMD_MP2 is not set
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_BCM_IPROC is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
@@ -2486,6 +2521,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NOMADIK is not set
# CONFIG_I2C_NVIDIA_GPU is not set
# CONFIG_I2C_OCORES is not set
+CONFIG_I2C_OMAP=m
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PCI1XXXX is not set
# CONFIG_I2C_PIIX4 is not set
@@ -2689,7 +2725,7 @@ CONFIG_INPUT_APANEL=m
# CONFIG_INPUT_ATI_REMOTE2 is not set
CONFIG_INPUT_ATLAS_BTNS=m
# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
-# CONFIG_INPUT_BBNSM_PWRKEY is not set
+CONFIG_INPUT_BBNSM_PWRKEY=m
# CONFIG_INPUT_BMA150 is not set
# CONFIG_INPUT_CM109 is not set
# CONFIG_INPUT_CMA3000 is not set
@@ -2783,6 +2819,7 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_TCC_COOLING is not set
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_VSC is not set
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
CONFIG_INTEL_XWAY_PHY=m
@@ -2817,7 +2854,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2903,6 +2940,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2979,6 +3017,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -3034,6 +3073,8 @@ CONFIG_JOLIET=y
# CONFIG_JSA1212 is not set
CONFIG_JUMP_LABEL=y
# CONFIG_K3_DMA is not set
+CONFIG_K3_RTI_WATCHDOG=m
+CONFIG_K3_THERMAL=m
CONFIG_KALLSYMS_ALL=y
CONFIG_KALLSYMS_BASE_RELATIVE=y
# CONFIG_KALLSYMS_SELFTEST is not set
@@ -3122,13 +3163,15 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD_SEV=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
# CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set
+# CONFIG_KVM_PROVE_MMU is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
# CONFIG_KVM_XEN is not set
@@ -3201,6 +3244,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
@@ -3342,9 +3386,11 @@ CONFIG_MAILBOX=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
CONFIG_MARVELL_CN10K_DDR_PMU=m
CONFIG_MARVELL_CN10K_TAD_PMU=m
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3386,9 +3432,11 @@ CONFIG_MAX_SKB_FRAGS=17
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
# CONFIG_MDIO_BCM_IPROC is not set
@@ -3450,6 +3498,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3484,6 +3533,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3635,6 +3686,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3877,6 +3929,9 @@ CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTK_T7XX=m
CONFIG_MULTIUSER=y
+CONFIG_MUX_ADG792A=m
+# CONFIG_MUX_ADGS1408 is not set
+CONFIG_MUX_GPIO=m
# CONFIG_MVMDIO is not set
# CONFIG_MV_XOR_V2 is not set
# CONFIG_MWAVE is not set
@@ -3936,6 +3991,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4364,6 +4420,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4411,9 +4468,11 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_IMX_IIM is not set
# CONFIG_NVMEM_IMX_OCOTP_ELE is not set
CONFIG_NVMEM_IMX_OCOTP=m
+CONFIG_NVMEM_LAYERSCAPE_SFP=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
# CONFIG_NVMEM_SNVS_LPGPR is not set
@@ -4449,6 +4508,11 @@ CONFIG_OF_MDIO=y
CONFIG_OF_PMEM=m
# CONFIG_OF_UNITTEST is not set
CONFIG_OF=y
+CONFIG_OMAP2PLUS_MBOX=m
+CONFIG_OMAP_DM_TIMER=y
+# CONFIG_OMAP_GPMC is not set
+CONFIG_OMAP_MBOX_KFIFO_SIZE=256
+CONFIG_OMAP_USB2=m
# CONFIG_OMFS_FS is not set
# CONFIG_OPAL_CORE is not set
# CONFIG_OPEN_DICE is not set
@@ -4463,6 +4527,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
# CONFIG_OSF_PARTITION is not set
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4541,6 +4606,7 @@ CONFIG_PCC=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_AL is not set
@@ -4588,6 +4654,8 @@ CONFIG_PCI_IMX6_HOST=y
CONFIG_PCI_IMX6=y
CONFIG_PCI_IOV=y
# CONFIG_PCI_J721E_HOST is not set
+CONFIG_PCI_KEYSTONE_HOST=y
+CONFIG_PCI_LAYERSCAPE=y
# CONFIG_PCI_MESON is not set
CONFIG_PCI_MSI=y
CONFIG_PCI_P2PDMA=y
@@ -4620,6 +4688,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
CONFIG_PER_VMA_LOCK_STATS=y
# CONFIG_PHANTOM is not set
# CONFIG_PHONET is not set
+CONFIG_PHY_AM654_SERDES=m
# CONFIG_PHY_BCM_NS_USB2 is not set
# CONFIG_PHY_BCM_NS_USB3 is not set
# CONFIG_PHY_BCM_SR_PCIE is not set
@@ -4641,9 +4710,10 @@ CONFIG_PHY_FSL_IMX8MQ_USB=m
CONFIG_PHY_HI6220_USB=m
# CONFIG_PHY_HISI_INNO_USB2 is not set
# CONFIG_PHY_HISTB_COMBPHY is not set
+CONFIG_PHY_J721E_WIZ=m
# CONFIG_PHY_LAN966X_SERDES is not set
CONFIG_PHYLIB=y
-CONFIG_PHYLINK=m
+CONFIG_PHYLINK=y
# CONFIG_PHY_MAPPHONE_MDM6600 is not set
# CONFIG_PHY_MIXEL_LVDS_PHY is not set
# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
@@ -4657,6 +4727,7 @@ CONFIG_PHY_NS2_USB_DRD=y
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_PCIE2 is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
@@ -4667,6 +4738,8 @@ CONFIG_PHY_NS2_USB_DRD=y
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
CONFIG_PHY_TEGRA194_P2U=y
CONFIG_PHY_TEGRA_XUSB=m
# CONFIG_PHY_TUSB1210 is not set
@@ -4851,6 +4924,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4870,6 +4944,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_QORIQ=m
CONFIG_PTP_1588_CLOCK=y
@@ -4887,8 +4962,11 @@ CONFIG_PWM_BCM_IPROC=y
# CONFIG_PWM_IMX1 is not set
CONFIG_PWM_IMX27=m
CONFIG_PWM_IMX_TPM=m
+CONFIG_PWM_OMAP_DMTIMER=y
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM_TEGRA=y
+CONFIG_PWM_TIECAP=m
+CONFIG_PWM_TIEHRPWM=m
# CONFIG_PWM_XILINX is not set
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
@@ -4984,6 +5062,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -5031,6 +5110,7 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
@@ -5038,6 +5118,7 @@ CONFIG_REGMAP=y
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
# CONFIG_REGULATOR_ARM_SCMI is not set
+# CONFIG_REGULATOR_AW37503 is not set
CONFIG_REGULATOR_BD718XX=m
# CONFIG_REGULATOR_DA9121 is not set
# CONFIG_REGULATOR_DA9210 is not set
@@ -5061,6 +5142,7 @@ CONFIG_REGULATOR_GPIO=y
CONFIG_REGULATOR_MAX77620=y
CONFIG_REGULATOR_MAX77686=m
# CONFIG_REGULATOR_MAX77826 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8893 is not set
@@ -5079,6 +5161,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
# CONFIG_REGULATOR_RT4801 is not set
@@ -5091,6 +5174,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_RT6245 is not set
# CONFIG_REGULATOR_RTMV20 is not set
# CONFIG_REGULATOR_RTQ2134 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_RTQ6752 is not set
# CONFIG_REGULATOR_SLG51000 is not set
# CONFIG_REGULATOR_SY8106A is not set
@@ -5125,6 +5209,7 @@ CONFIG_RESET_IMX7=y
# CONFIG_RESET_QCOM_PDC is not set
# CONFIG_RESET_SCMI is not set
# CONFIG_RESET_SIMPLE is not set
+CONFIG_RESET_TI_SCI=m
# CONFIG_RESET_TI_SYSCON is not set
# CONFIG_RESET_TI_TPS380X is not set
CONFIG_RESOURCE_KUNIT_TEST=m
@@ -5134,7 +5219,6 @@ CONFIG_RETPOLINE=y
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -5228,6 +5312,7 @@ CONFIG_RTC_DRV_DS3232=m
CONFIG_RTC_DRV_EFI=y
CONFIG_RTC_DRV_EM3027=m
CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_FSL_FTM_ALARM=m
# CONFIG_RTC_DRV_FTRTC010 is not set
# CONFIG_RTC_DRV_GOLDFISH is not set
# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
@@ -5282,6 +5367,7 @@ CONFIG_RTC_DRV_RX8581=m
CONFIG_RTC_DRV_STK17TA8=m
# CONFIG_RTC_DRV_TEGRA is not set
# CONFIG_RTC_DRV_TEST is not set
+CONFIG_RTC_DRV_TI_K3=m
CONFIG_RTC_DRV_V3020=m
CONFIG_RTC_DRV_X1205=m
# CONFIG_RTC_DRV_XGENE is not set
@@ -5505,6 +5591,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5514,6 +5601,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5591,6 +5679,7 @@ CONFIG_SENSORS_G762=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
# CONFIG_SENSORS_I5K_AMB is not set
# CONFIG_SENSORS_IBMAEM is not set
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5772,6 +5861,8 @@ CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_MANY_PORTS=y
CONFIG_SERIAL_8250_MID=y
CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y
+CONFIG_SERIAL_8250_OMAP=y
CONFIG_SERIAL_8250_PCI1XXXX=y
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PERICOM=y
@@ -6091,7 +6182,9 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -6108,7 +6201,6 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -6173,6 +6265,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -6183,6 +6276,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
# CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
@@ -6302,6 +6396,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -6360,6 +6455,7 @@ CONFIG_SND_SOC_SOF_ACPI=m
# CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set
# CONFIG_SND_SOC_SOF_JASPERLAKE is not set
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
# CONFIG_SND_SOC_SOF_MERRIFIELD is not set
# CONFIG_SND_SOC_SOF_METEORLAKE is not set
# CONFIG_SND_SOC_SOF_OF is not set
@@ -6430,6 +6526,7 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6521,7 +6618,7 @@ CONFIG_SOC_IMX8M=y
CONFIG_SOC_IMX9=m
# CONFIG_SOCIONEXT_SYNQUACER_PREITS is not set
CONFIG_SOC_TEGRA_CBB=m
-# CONFIG_SOC_TI is not set
+CONFIG_SOC_TI=y
CONFIG_SOFTLOCKUP_DETECTOR=y
CONFIG_SOFT_WATCHDOG=m
# CONFIG_SOLARIS_X86_PARTITION is not set
@@ -6561,6 +6658,7 @@ CONFIG_SPI_AMD=y
# CONFIG_SPI_CADENCE_XSPI is not set
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_FSL_DSPI=y
CONFIG_SPI_FSL_LPSPI=m
CONFIG_SPI_FSL_QUADSPI=m
# CONFIG_SPI_FSL_SPI is not set
@@ -6579,6 +6677,7 @@ CONFIG_SPI_MEM=y
# CONFIG_SPI_MXIC is not set
CONFIG_SPI_NXP_FLEXSPI=m
# CONFIG_SPI_OC_TINY is not set
+CONFIG_SPI_OMAP24XX=m
CONFIG_SPI_PCI1XXXX=m
CONFIG_SPI_PL022=m
# CONFIG_SPI_PXA2XX is not set
@@ -6680,6 +6779,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
CONFIG_SUSPEND=y
CONFIG_SVC_I3C_MASTER=m
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
# CONFIG_SX9324 is not set
@@ -6798,6 +6898,7 @@ CONFIG_TEST_CPUMASK=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
@@ -6874,6 +6975,9 @@ CONFIG_THUNDERX2_PMU=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+CONFIG_TI_K3_RINGACC=y
+CONFIG_TI_K3_UDMA_GLUE_LAYER=y
+CONFIG_TI_K3_UDMA=y
# CONFIG_TI_LMP92064 is not set
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y
@@ -6893,7 +6997,13 @@ CONFIG_TIPC_DIAG=m
CONFIG_TIPC=m
CONFIG_TIPC_MEDIA_IB=y
CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TI_PRUSS=m
+CONFIG_TI_SCI_CLK=m
+# CONFIG_TI_SCI_CLK_PROBE_FROM_FW is not set
+CONFIG_TI_SCI_PM_DOMAINS=m
# CONFIG_TI_ST is not set
+CONFIG_TI_SYSCON_CLK=m
+CONFIG_TI_SYSC=y
# CONFIG_TI_TLC4541 is not set
# CONFIG_TI_TMAG5273 is not set
# CONFIG_TI_TSC2046 is not set
@@ -6906,6 +7016,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -6950,6 +7061,7 @@ CONFIG_TORTURE_TEST=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7115,8 +7227,10 @@ CONFIG_USB_CXACRU=m
CONFIG_USB_DEFAULT_PERSIST=y
# CONFIG_USB_DSBR is not set
# CONFIG_USB_DWC2 is not set
+CONFIG_USB_DWC3_AM62=m
CONFIG_USB_DWC3_IMX8MP=m
# CONFIG_USB_DWC3 is not set
+CONFIG_USB_DWC3_KEYSTONE=m
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_EHCI_FSL is not set
CONFIG_USB_EHCI_HCD_PLATFORM=m
@@ -7400,6 +7514,7 @@ CONFIG_VEXPRESS_CONFIG=y
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=m
# CONFIG_VFIO_AMBA is not set
+CONFIG_VFIO_FSL_MC=m
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
# CONFIG_VFIO_MDEV is not set
@@ -7464,8 +7579,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7764,6 +7883,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index b6dce9017..f8ce74b42 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -136,6 +136,7 @@ CONFIG_AD7949=m
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
CONFIG_ADAPTEC_STARFIRE=m
+# CONFIG_ADDRESS_MASKING is not set
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -952,6 +953,7 @@ CONFIG_COMMON_CLK_SI521XX=y
# CONFIG_COMMON_CLK_SI5351 is not set
CONFIG_COMMON_CLK_SI544=m
# CONFIG_COMMON_CLK_SI570 is not set
+CONFIG_COMMON_CLK_VC3=m
# CONFIG_COMMON_CLK_VC5 is not set
CONFIG_COMMON_CLK_VC7=m
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -968,6 +970,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=3
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1007,6 +1010,8 @@ CONFIG_CPUSETS=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -1056,6 +1061,7 @@ CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32C_VPMSUM=m
@@ -1144,6 +1150,7 @@ CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
+# CONFIG_CRYPTO_POLY1305_P10 is not set
CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y
@@ -1353,6 +1360,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1377,6 +1385,7 @@ CONFIG_DM_INIT=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=y
@@ -1488,6 +1497,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
CONFIG_DRM_LONTIUM_LT9611UXC=m
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
CONFIG_DRM_MGAG200=m
@@ -1574,11 +1584,13 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
+CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m
# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
# CONFIG_DRM_PANEL_TPO_TPG110 is not set
# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+CONFIG_DRM_PANEL_VISIONOX_R66451=m
CONFIG_DRM_PANEL_VISIONOX_RM69299=m
# CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set
CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
@@ -1615,6 +1627,7 @@ CONFIG_DRM_TOSHIBA_TC358764=m
# CONFIG_DRM_TOSHIBA_TC358767 is not set
CONFIG_DRM_TOSHIBA_TC358768=m
CONFIG_DRM_TOSHIBA_TC358775=m
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1797,6 +1810,7 @@ CONFIG_EROFS_FS=m
CONFIG_EROFS_FS_POSIX_ACL=y
CONFIG_EROFS_FS_SECURITY=y
CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP_DEFLATE=y
CONFIG_EROFS_FS_ZIP_LZMA=y
CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
@@ -1884,6 +1898,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1996,6 +2011,7 @@ CONFIG_FSI=m
CONFIG_FSI_MASTER_ASPEED=m
CONFIG_FSI_MASTER_GPIO=m
CONFIG_FSI_MASTER_HUB=m
+# CONFIG_FSI_MASTER_I2CR is not set
# CONFIG_FSI_NEW_DEV_NODE is not set
CONFIG_FSI_OCC=m
CONFIG_FSI_SBEFIFO=m
@@ -2105,6 +2121,7 @@ CONFIG_GPIO_CADENCE=m
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_DS4520=m
# CONFIG_GPIO_DWAPB is not set
CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_FTGPIO010 is not set
@@ -2219,6 +2236,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
CONFIG_HID_GLORIOUS=m
# CONFIG_HID_GOOGLE_HAMMER is not set
+CONFIG_HID_GOOGLE_STADIA_FF=m
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2413,6 +2431,7 @@ CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_AMD8111 is not set
CONFIG_I2C_AMD_MP2=m
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+CONFIG_I2C_ATR=m
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
@@ -2767,6 +2786,7 @@ CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
CONFIG_IOSM=m
CONFIG_IO_STRICT_DEVMEM=y
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2855,6 +2875,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+CONFIG_IPU_BRIDGE=m
CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_IOAM6_LWTUNNEL=y
@@ -2931,6 +2952,7 @@ CONFIG_IR_RC6_DECODER=m
CONFIG_IR_RCMM_DECODER=m
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
CONFIG_IR_SERIAL=m
CONFIG_IR_SERIAL_TRANSMITTER=y
CONFIG_IR_SHARP_DECODER=m
@@ -3134,7 +3156,7 @@ CONFIG_KSM=y
CONFIG_KSZ884X_PCI=m
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
@@ -3146,6 +3168,7 @@ CONFIG_KVM_BOOK3S_HV_NESTED_PMU_WORKAROUND=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
# CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set
CONFIG_KVM_GUEST=y
+CONFIG_KVM_PROVE_MMU=y
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
CONFIG_KVM_XEN=y
@@ -3199,6 +3222,7 @@ CONFIG_LEDS_CR0014114=m
# CONFIG_LEDS_DAC124S085 is not set
# CONFIG_LEDS_EL15203000 is not set
CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GROUP_MULTICOLOR=m
# CONFIG_LEDS_IS31FL319X is not set
CONFIG_LEDS_IS31FL32XX=m
# CONFIG_LEDS_KTD2692 is not set
@@ -3226,6 +3250,7 @@ CONFIG_LEDS_PCA9532_GPIO=y
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+CONFIG_LEDS_PCA995X=m
CONFIG_LEDS_POWERNV=m
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_PWM_MULTICOLOR=m
@@ -3378,6 +3403,7 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88Q2XXX_PHY=m
CONFIG_MARVELL_88X2222_PHY=m
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
@@ -3421,11 +3447,13 @@ CONFIG_MCP41010=m
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+CONFIG_MCP4728=m
# CONFIG_MCP4922 is not set
CONFIG_MCTP_SERIAL=m
# CONFIG_MCTP_TRANSPORT_I2C is not set
CONFIG_MCTP=y
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3524,6 +3552,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=m
# CONFIG_MFD_CPCAP is not set
+CONFIG_MFD_CS42L43_I2C=m
+CONFIG_MFD_CS42L43_SDW=m
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
@@ -3675,6 +3705,7 @@ CONFIG_MLX5_ESWITCH=y
# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -4002,6 +4033,7 @@ CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4513,6 +4545,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4605,6 +4638,7 @@ CONFIG_ORINOCO_USB=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4690,6 +4724,7 @@ CONFIG_PATA_WINBOND=m
# CONFIG_PCH_GBE is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -4745,6 +4780,7 @@ CONFIG_PCS_XPCS=m
CONFIG_PDC_ADMA=m
CONFIG_PDS_CORE=m
CONFIG_PDS_VDPA=m
+CONFIG_PDS_VFIO_PCI=m
# CONFIG_PECI is not set
CONFIG_PERCPU_STATS=y
# CONFIG_PERCPU_TEST is not set
@@ -4782,6 +4818,8 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+CONFIG_PHY_RTK_RTD_USB2PHY=m
+CONFIG_PHY_RTK_RTD_USB3PHY=m
# CONFIG_PHY_TUSB1210 is not set
# CONFIG_PI433 is not set
CONFIG_PID_NS=y
@@ -4789,6 +4827,7 @@ CONFIG_PID_NS=y
CONFIG_PINCTRL_ALDERLAKE=m
# CONFIG_PINCTRL_CANNONLAKE is not set
CONFIG_PINCTRL_CEDARFORK=m
+CONFIG_PINCTRL_CS42L43=m
CONFIG_PINCTRL_CY8C95X0=m
CONFIG_PINCTRL_ELKHARTLAKE=m
CONFIG_PINCTRL_EMMITSBURG=m
@@ -4816,6 +4855,7 @@ CONFIG_PINCTRL_RK805=m
# CONFIG_PINCTRL_SM8150 is not set
# CONFIG_PINCTRL_SM8250 is not set
# CONFIG_PINCTRL_SM8350 is not set
+CONFIG_PINCTRL_SM8350_LPASS_LPI=m
# CONFIG_PINCTRL_SM8450 is not set
# CONFIG_PINCTRL_STMFX is not set
# CONFIG_PINCTRL_SUN4I_A10 is not set
@@ -5002,6 +5042,7 @@ CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
CONFIG_PSTORE_842_COMPRESS=y
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -5023,6 +5064,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
CONFIG_PTP_1588_CLOCK_IDTCM=m
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_PTP_1588_CLOCK=y
@@ -5104,6 +5146,7 @@ CONFIG_RANDOM32_SELFTEST=y
CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -5163,12 +5206,14 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=y
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
+CONFIG_REGULATOR_AW37503=m
CONFIG_REGULATOR_BD9571MWV=m
# CONFIG_REGULATOR_DA9121 is not set
# CONFIG_REGULATOR_DA9210 is not set
@@ -5189,9 +5234,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_MAX1586 is not set
# CONFIG_REGULATOR_MAX20086 is not set
CONFIG_REGULATOR_MAX20411=m
+CONFIG_REGULATOR_MAX5970=m
CONFIG_REGULATOR_MAX597X=m
CONFIG_REGULATOR_MAX77650=m
# CONFIG_REGULATOR_MAX77826 is not set
+CONFIG_REGULATOR_MAX77857=m
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
CONFIG_REGULATOR_MAX8893=m
@@ -5224,6 +5271,7 @@ CONFIG_REGULATOR_RT6190=m
CONFIG_REGULATOR_RT6245=m
CONFIG_REGULATOR_RTMV20=m
CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTQ2208=m
CONFIG_REGULATOR_RTQ6752=m
# CONFIG_REGULATOR_SLG51000 is not set
CONFIG_REGULATOR_SY7636A=m
@@ -5269,8 +5317,7 @@ CONFIG_RESOURCE_KUNIT_TEST=m
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-# CONFIG_RH_DISABLE_DEPRECATED is not set
-CONFIG_RH_FEDORA=y
+# CONFIG_RHEL_DIFFERENCES is not set
CONFIG_RICHTEK_RTQ6056=m
CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
@@ -5678,6 +5725,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5753,6 +5801,7 @@ CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
CONFIG_SENSORS_HP_WMI=m
+CONFIG_SENSORS_HS3001=m
# CONFIG_SENSORS_I5K_AMB is not set
CONFIG_SENSORS_IBMAEM=m
CONFIG_SENSORS_IBM_CFFPS=m
@@ -5840,6 +5889,7 @@ CONFIG_SENSORS_MCP3021=m
CONFIG_SENSORS_MLXREG_FAN=m
CONFIG_SENSORS_MP2888=m
CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_MP2975_REGULATOR=y
CONFIG_SENSORS_MP5023=m
CONFIG_SENSORS_MPQ7932=m
CONFIG_SENSORS_MPQ7932_REGULATOR=y
@@ -6148,6 +6198,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=2048
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
# CONFIG_SND_HDA_TEGRA is not set
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -6261,7 +6314,9 @@ CONFIG_SND_SOC_AK5558=m
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+CONFIG_SND_SOC_AUDIO_IIO_AUX=m
CONFIG_SND_SOC_AW8738=m
+CONFIG_SND_SOC_AW88261=m
CONFIG_SND_SOC_AW88395=m
CONFIG_SND_SOC_BD28623=m
CONFIG_SND_SOC_BT_SCO=m
@@ -6278,7 +6333,6 @@ CONFIG_SND_SOC_CS35L36=m
CONFIG_SND_SOC_CS35L45_I2C=m
CONFIG_SND_SOC_CS35L45_SPI=m
CONFIG_SND_SOC_CS35L56_I2C=m
-CONFIG_SND_SOC_CS35L56_SDW=m
CONFIG_SND_SOC_CS35L56_SPI=m
CONFIG_SND_SOC_CS4234=m
# CONFIG_SND_SOC_CS4265 is not set
@@ -6287,6 +6341,8 @@ CONFIG_SND_SOC_CS4234=m
# CONFIG_SND_SOC_CS4271_SPI is not set
CONFIG_SND_SOC_CS42L42=m
CONFIG_SND_SOC_CS42L42_SDW=m
+CONFIG_SND_SOC_CS42L43=m
+CONFIG_SND_SOC_CS42L43_SDW=m
# CONFIG_SND_SOC_CS42L51_I2C is not set
# CONFIG_SND_SOC_CS42L52 is not set
# CONFIG_SND_SOC_CS42L56 is not set
@@ -6472,6 +6528,7 @@ CONFIG_SND_SOC_RL6231=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+CONFIG_SND_SOC_RT1017_SDCA_SDW=m
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -6603,6 +6660,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6730,6 +6788,7 @@ CONFIG_SPI_AX88796C=m
# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_CADENCE_QUADSPI is not set
# CONFIG_SPI_CADENCE_XSPI is not set
+# CONFIG_SPI_CS42L43 is not set
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
CONFIG_SPI_DLN2=m
@@ -6861,6 +6920,7 @@ CONFIG_SUSPEND_FREEZER=y
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_SWIOTLB=y
# CONFIG_SW_SYNC is not set
CONFIG_SX9310=m
@@ -6971,6 +7031,7 @@ CONFIG_TEST_FPU=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIST_SORT=m
@@ -7046,6 +7107,8 @@ CONFIG_TIFM_7XX1=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+# CONFIG_TI_ICSSG_PRUETH is not set
+CONFIG_TI_ICSS_IEP=m
CONFIG_TI_LMP92064=m
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y
@@ -7078,6 +7141,7 @@ CONFIG_TLS=m
CONFIG_TMP117=m
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_QUOTA=y
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -7124,6 +7188,7 @@ CONFIG_TOUCHSCREEN_IMAGIS=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_IQS7211=m
# CONFIG_TOUCHSCREEN_MAX11801 is not set
CONFIG_TOUCHSCREEN_MCS5000=m
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7322,6 +7387,7 @@ CONFIG_USB_CHIPIDEA_IMX=m
# CONFIG_USB_CHIPIDEA is not set
CONFIG_USB_CHIPIDEA_MSM=m
CONFIG_USB_CHIPIDEA_PCI=m
+CONFIG_USB_CONFIGFS_F_MIDI2=y
# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
# CONFIG_USB_CONN_GPIO is not set
CONFIG_USB_CXACRU=m
@@ -7658,6 +7724,8 @@ CONFIG_VETH=m
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=m
CONFIG_VFIO_CONTAINER=y
+# CONFIG_VFIO_DEVICE_CDEV is not set
+CONFIG_VFIO_GROUP=y
# CONFIG_VFIO_IOMMU_TYPE1 is not set
CONFIG_VFIO=m
CONFIG_VFIO_MDEV=m
@@ -7726,8 +7794,12 @@ CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_DS90UB913=m
+CONFIG_VIDEO_DS90UB953=m
+CONFIG_VIDEO_DS90UB960=m
# CONFIG_VIDEO_DT3155 is not set
CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9719=m
CONFIG_VIDEO_DW9768=m
CONFIG_VIDEO_DW9807_VCM=m
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -8067,6 +8139,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
+CONFIG_XEN_PRIVCMD_IRQFD=y
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_PVHVM_GUEST=y
@@ -8084,6 +8157,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 0fdc7a988..515b48780 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -206,7 +206,6 @@ CONFIG_AMD_HSMP=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
CONFIG_AMD_PHY=m
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
# CONFIG_AMD_PTDMA is not set
# CONFIG_AMDTEE is not set
# CONFIG_AMIGA_PARTITION is not set
@@ -812,6 +811,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -829,6 +829,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -911,6 +912,7 @@ CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
@@ -1000,6 +1002,7 @@ CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
+# CONFIG_CRYPTO_POLY1305_P10 is not set
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y
@@ -1206,6 +1209,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1228,6 +1232,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1348,6 +1353,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MALI_DISPLAY is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1421,6 +1427,7 @@ CONFIG_DRM_SIMPLEDRM=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1669,6 +1676,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1855,6 +1863,7 @@ CONFIG_GNSS=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+# CONFIG_GPIO_DS4520 is not set
# CONFIG_GPIO_DWAPB is not set
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -1975,6 +1984,7 @@ CONFIG_HID_GENERIC=y
# CONFIG_HID_GFRM is not set
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
# CONFIG_HID_GT683R is not set
CONFIG_HID_GYRATION=m
@@ -2126,7 +2136,6 @@ CONFIG_HWPOISON_INJECT=m
CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
# CONFIG_HW_RANDOM_BA431 is not set
# CONFIG_HW_RANDOM_CCTRNG is not set
-CONFIG_HW_RANDOM_HISI=y
# CONFIG_HW_RANDOM_HISTB is not set
CONFIG_HW_RANDOM_POWERNV=m
CONFIG_HW_RANDOM_PSERIES=m
@@ -2163,6 +2172,7 @@ CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_AMD_MP2 is not set
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
@@ -2478,6 +2488,7 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_TCC_COOLING is not set
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_VSC is not set
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
CONFIG_INTEL_XWAY_PHY=m
@@ -2507,7 +2518,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2594,6 +2605,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2671,6 +2683,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -2816,10 +2829,11 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD_SEV=y
CONFIG_KVM_BOOK3S_64_HV=m
CONFIG_KVM_BOOK3S_64=m
@@ -2830,6 +2844,7 @@ CONFIG_KVM_BOOK3S_HV_NESTED_PMU_WORKAROUND=y
# CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set
CONFIG_KVM_BOOK3S_PR_POSSIBLE=y
CONFIG_KVM_GUEST=y
+CONFIG_KVM_PROVE_MMU=y
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
# CONFIG_KVM_XEN is not set
@@ -2903,6 +2918,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
CONFIG_LEDS_POWERNV=m
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
@@ -3045,7 +3061,9 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3085,9 +3103,11 @@ CONFIG_MAX_SKB_FRAGS=17
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3141,6 +3161,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3175,6 +3196,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3321,6 +3344,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3604,6 +3628,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4024,6 +4049,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4070,6 +4096,7 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
CONFIG_NVMEM_SYSFS=y
@@ -4114,6 +4141,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+CONFIG_OVERLAY_FS_DEBUG=y
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4190,6 +4218,7 @@ CONFIG_PATA_PLATFORM=m
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -4281,6 +4310,7 @@ CONFIG_PHYLIB=y
# CONFIG_PHY_QCOM_EUSB2_REPEATER is not set
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
# CONFIG_PHY_QCOM_SGMII_ETH is not set
@@ -4290,6 +4320,8 @@ CONFIG_PHYLIB=y
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
CONFIG_PHYSICAL_ALIGN=0x200000
# CONFIG_PHY_TUSB1210 is not set
# CONFIG_PI433 is not set
@@ -4487,6 +4519,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4505,6 +4538,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK=y
# CONFIG_PUNIT_ATOM_DEBUG is not set
@@ -4599,6 +4633,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -4643,12 +4678,14 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
+# CONFIG_REGULATOR_AW37503 is not set
# CONFIG_REGULATOR_DA9210 is not set
# CONFIG_REGULATOR_DA9211 is not set
# CONFIG_REGULATOR_DEBUG is not set
@@ -4665,6 +4702,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_LTC3589 is not set
# CONFIG_REGULATOR_LTC3676 is not set
# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8952 is not set
@@ -4677,9 +4715,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RT4803 is not set
# CONFIG_REGULATOR_RT5739 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_SY8106A is not set
# CONFIG_REGULATOR_TPS51632 is not set
# CONFIG_REGULATOR_TPS62360 is not set
@@ -4713,7 +4753,6 @@ CONFIG_RETPOLINE=y
# CONFIG_RFKILL_GPIO is not set
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -5081,6 +5120,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5090,6 +5130,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5165,6 +5206,7 @@ CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
# CONFIG_SENSORS_I5K_AMB is not set
CONFIG_SENSORS_IBMAEM=m
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5655,7 +5697,9 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -5672,7 +5716,6 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -5737,6 +5780,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -5747,6 +5791,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
# CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
@@ -5866,6 +5911,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -5925,6 +5971,7 @@ CONFIG_SND_SOC_SOF_HDA_PROBES=m
# CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set
# CONFIG_SND_SOC_SOF_JASPERLAKE is not set
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
# CONFIG_SND_SOC_SOF_MERRIFIELD is not set
# CONFIG_SND_SOC_SOF_METEORLAKE is not set
# CONFIG_SND_SOC_SOF_OF is not set
@@ -5995,6 +6042,7 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_BUILD=y
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6217,6 +6265,7 @@ CONFIG_SUSPEND_FREEZER=y
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
# CONFIG_SX9324 is not set
@@ -6323,6 +6372,7 @@ CONFIG_TEST_FPU=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIST_SORT=m
@@ -6428,6 +6478,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -6473,6 +6524,7 @@ CONFIG_TORTURE_TEST=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -6976,8 +7028,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7275,6 +7331,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index a30f566e8..47ffcd797 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -136,6 +136,7 @@ CONFIG_AD7949=m
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
CONFIG_ADAPTEC_STARFIRE=m
+# CONFIG_ADDRESS_MASKING is not set
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -950,6 +951,7 @@ CONFIG_COMMON_CLK_SI521XX=y
# CONFIG_COMMON_CLK_SI5351 is not set
CONFIG_COMMON_CLK_SI544=m
# CONFIG_COMMON_CLK_SI570 is not set
+CONFIG_COMMON_CLK_VC3=m
# CONFIG_COMMON_CLK_VC5 is not set
CONFIG_COMMON_CLK_VC7=m
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -966,6 +968,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=3
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1005,6 +1008,8 @@ CONFIG_CPUSETS=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -1054,6 +1059,7 @@ CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32C_VPMSUM=m
@@ -1142,6 +1148,7 @@ CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
+# CONFIG_CRYPTO_POLY1305_P10 is not set
CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y
@@ -1342,6 +1349,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1366,6 +1374,7 @@ CONFIG_DM_INIT=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=y
@@ -1477,6 +1486,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
CONFIG_DRM_LONTIUM_LT9611UXC=m
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
CONFIG_DRM_MGAG200=m
@@ -1563,11 +1573,13 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
+CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m
# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
# CONFIG_DRM_PANEL_TPO_TPG110 is not set
# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+CONFIG_DRM_PANEL_VISIONOX_R66451=m
CONFIG_DRM_PANEL_VISIONOX_RM69299=m
# CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set
CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
@@ -1604,6 +1616,7 @@ CONFIG_DRM_TOSHIBA_TC358764=m
# CONFIG_DRM_TOSHIBA_TC358767 is not set
CONFIG_DRM_TOSHIBA_TC358768=m
CONFIG_DRM_TOSHIBA_TC358775=m
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1786,6 +1799,7 @@ CONFIG_EROFS_FS=m
CONFIG_EROFS_FS_POSIX_ACL=y
CONFIG_EROFS_FS_SECURITY=y
CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP_DEFLATE=y
CONFIG_EROFS_FS_ZIP_LZMA=y
CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
@@ -1865,6 +1879,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1977,6 +1992,7 @@ CONFIG_FSI=m
CONFIG_FSI_MASTER_ASPEED=m
CONFIG_FSI_MASTER_GPIO=m
CONFIG_FSI_MASTER_HUB=m
+# CONFIG_FSI_MASTER_I2CR is not set
# CONFIG_FSI_NEW_DEV_NODE is not set
CONFIG_FSI_OCC=m
CONFIG_FSI_SBEFIFO=m
@@ -2086,6 +2102,7 @@ CONFIG_GPIO_CADENCE=m
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_DS4520=m
# CONFIG_GPIO_DWAPB is not set
CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_FTGPIO010 is not set
@@ -2200,6 +2217,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
CONFIG_HID_GLORIOUS=m
# CONFIG_HID_GOOGLE_HAMMER is not set
+CONFIG_HID_GOOGLE_STADIA_FF=m
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2394,6 +2412,7 @@ CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_AMD8111 is not set
CONFIG_I2C_AMD_MP2=m
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+CONFIG_I2C_ATR=m
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
@@ -2747,6 +2766,7 @@ CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
CONFIG_IOSM=m
CONFIG_IO_STRICT_DEVMEM=y
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2835,6 +2855,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+CONFIG_IPU_BRIDGE=m
CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_IOAM6_LWTUNNEL=y
@@ -2911,6 +2932,7 @@ CONFIG_IR_RC6_DECODER=m
CONFIG_IR_RCMM_DECODER=m
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
CONFIG_IR_SERIAL=m
CONFIG_IR_SERIAL_TRANSMITTER=y
CONFIG_IR_SHARP_DECODER=m
@@ -3108,7 +3130,7 @@ CONFIG_KSM=y
CONFIG_KSZ884X_PCI=m
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
@@ -3120,6 +3142,7 @@ CONFIG_KVM_BOOK3S_HV_NESTED_PMU_WORKAROUND=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
# CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set
CONFIG_KVM_GUEST=y
+# CONFIG_KVM_PROVE_MMU is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
CONFIG_KVM_XEN=y
@@ -3173,6 +3196,7 @@ CONFIG_LEDS_CR0014114=m
# CONFIG_LEDS_DAC124S085 is not set
# CONFIG_LEDS_EL15203000 is not set
CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GROUP_MULTICOLOR=m
# CONFIG_LEDS_IS31FL319X is not set
CONFIG_LEDS_IS31FL32XX=m
# CONFIG_LEDS_KTD2692 is not set
@@ -3200,6 +3224,7 @@ CONFIG_LEDS_PCA9532_GPIO=y
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+CONFIG_LEDS_PCA995X=m
CONFIG_LEDS_POWERNV=m
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_PWM_MULTICOLOR=m
@@ -3352,6 +3377,7 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88Q2XXX_PHY=m
CONFIG_MARVELL_88X2222_PHY=m
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
@@ -3394,11 +3420,13 @@ CONFIG_MCP41010=m
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+CONFIG_MCP4728=m
# CONFIG_MCP4922 is not set
CONFIG_MCTP_SERIAL=m
# CONFIG_MCTP_TRANSPORT_I2C is not set
CONFIG_MCTP=y
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3497,6 +3525,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=m
# CONFIG_MFD_CPCAP is not set
+CONFIG_MFD_CS42L43_I2C=m
+CONFIG_MFD_CS42L43_SDW=m
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
@@ -3648,6 +3678,7 @@ CONFIG_MLX5_ESWITCH=y
# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3974,6 +4005,7 @@ CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4485,6 +4517,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4577,6 +4610,7 @@ CONFIG_ORINOCO_USB=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4661,6 +4695,7 @@ CONFIG_PATA_WINBOND=m
# CONFIG_PCH_GBE is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -4716,6 +4751,7 @@ CONFIG_PCS_XPCS=m
CONFIG_PDC_ADMA=m
CONFIG_PDS_CORE=m
CONFIG_PDS_VDPA=m
+CONFIG_PDS_VFIO_PCI=m
# CONFIG_PECI is not set
# CONFIG_PERCPU_STATS is not set
# CONFIG_PERCPU_TEST is not set
@@ -4753,6 +4789,8 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+CONFIG_PHY_RTK_RTD_USB2PHY=m
+CONFIG_PHY_RTK_RTD_USB3PHY=m
# CONFIG_PHY_TUSB1210 is not set
# CONFIG_PI433 is not set
CONFIG_PID_NS=y
@@ -4760,6 +4798,7 @@ CONFIG_PID_NS=y
CONFIG_PINCTRL_ALDERLAKE=m
# CONFIG_PINCTRL_CANNONLAKE is not set
CONFIG_PINCTRL_CEDARFORK=m
+CONFIG_PINCTRL_CS42L43=m
CONFIG_PINCTRL_CY8C95X0=m
CONFIG_PINCTRL_ELKHARTLAKE=m
CONFIG_PINCTRL_EMMITSBURG=m
@@ -4787,6 +4826,7 @@ CONFIG_PINCTRL_RK805=m
# CONFIG_PINCTRL_SM8150 is not set
# CONFIG_PINCTRL_SM8250 is not set
# CONFIG_PINCTRL_SM8350 is not set
+CONFIG_PINCTRL_SM8350_LPASS_LPI=m
# CONFIG_PINCTRL_SM8450 is not set
# CONFIG_PINCTRL_STMFX is not set
# CONFIG_PINCTRL_SUN4I_A10 is not set
@@ -4973,6 +5013,7 @@ CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
CONFIG_PSTORE_842_COMPRESS=y
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4994,6 +5035,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
CONFIG_PTP_1588_CLOCK_IDTCM=m
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_PTP_1588_CLOCK=y
@@ -5075,6 +5117,7 @@ CONFIG_RAID_ATTRS=m
CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -5134,12 +5177,14 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=y
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
+CONFIG_REGULATOR_AW37503=m
CONFIG_REGULATOR_BD9571MWV=m
# CONFIG_REGULATOR_DA9121 is not set
# CONFIG_REGULATOR_DA9210 is not set
@@ -5160,9 +5205,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_MAX1586 is not set
# CONFIG_REGULATOR_MAX20086 is not set
CONFIG_REGULATOR_MAX20411=m
+CONFIG_REGULATOR_MAX5970=m
CONFIG_REGULATOR_MAX597X=m
CONFIG_REGULATOR_MAX77650=m
# CONFIG_REGULATOR_MAX77826 is not set
+CONFIG_REGULATOR_MAX77857=m
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
CONFIG_REGULATOR_MAX8893=m
@@ -5195,6 +5242,7 @@ CONFIG_REGULATOR_RT6190=m
CONFIG_REGULATOR_RT6245=m
CONFIG_REGULATOR_RTMV20=m
CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTQ2208=m
CONFIG_REGULATOR_RTQ6752=m
# CONFIG_REGULATOR_SLG51000 is not set
CONFIG_REGULATOR_SY7636A=m
@@ -5240,8 +5288,7 @@ CONFIG_RESOURCE_KUNIT_TEST=m
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-# CONFIG_RH_DISABLE_DEPRECATED is not set
-CONFIG_RH_FEDORA=y
+# CONFIG_RHEL_DIFFERENCES is not set
CONFIG_RICHTEK_RTQ6056=m
CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
@@ -5649,6 +5696,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5724,6 +5772,7 @@ CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
CONFIG_SENSORS_HP_WMI=m
+CONFIG_SENSORS_HS3001=m
# CONFIG_SENSORS_I5K_AMB is not set
CONFIG_SENSORS_IBMAEM=m
CONFIG_SENSORS_IBM_CFFPS=m
@@ -5811,6 +5860,7 @@ CONFIG_SENSORS_MCP3021=m
CONFIG_SENSORS_MLXREG_FAN=m
CONFIG_SENSORS_MP2888=m
CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_MP2975_REGULATOR=y
CONFIG_SENSORS_MP5023=m
CONFIG_SENSORS_MPQ7932=m
CONFIG_SENSORS_MPQ7932_REGULATOR=y
@@ -6119,6 +6169,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=2048
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
# CONFIG_SND_HDA_TEGRA is not set
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -6231,7 +6284,9 @@ CONFIG_SND_SOC_AK5558=m
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+CONFIG_SND_SOC_AUDIO_IIO_AUX=m
CONFIG_SND_SOC_AW8738=m
+CONFIG_SND_SOC_AW88261=m
CONFIG_SND_SOC_AW88395=m
CONFIG_SND_SOC_BD28623=m
CONFIG_SND_SOC_BT_SCO=m
@@ -6248,7 +6303,6 @@ CONFIG_SND_SOC_CS35L36=m
CONFIG_SND_SOC_CS35L45_I2C=m
CONFIG_SND_SOC_CS35L45_SPI=m
CONFIG_SND_SOC_CS35L56_I2C=m
-CONFIG_SND_SOC_CS35L56_SDW=m
CONFIG_SND_SOC_CS35L56_SPI=m
CONFIG_SND_SOC_CS4234=m
# CONFIG_SND_SOC_CS4265 is not set
@@ -6257,6 +6311,8 @@ CONFIG_SND_SOC_CS4234=m
# CONFIG_SND_SOC_CS4271_SPI is not set
CONFIG_SND_SOC_CS42L42=m
CONFIG_SND_SOC_CS42L42_SDW=m
+CONFIG_SND_SOC_CS42L43=m
+CONFIG_SND_SOC_CS42L43_SDW=m
# CONFIG_SND_SOC_CS42L51_I2C is not set
# CONFIG_SND_SOC_CS42L52 is not set
# CONFIG_SND_SOC_CS42L56 is not set
@@ -6442,6 +6498,7 @@ CONFIG_SND_SOC_RL6231=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+CONFIG_SND_SOC_RT1017_SDCA_SDW=m
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -6572,6 +6629,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6699,6 +6757,7 @@ CONFIG_SPI_AX88796C=m
# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_CADENCE_QUADSPI is not set
# CONFIG_SPI_CADENCE_XSPI is not set
+# CONFIG_SPI_CS42L43 is not set
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
CONFIG_SPI_DLN2=m
@@ -6830,6 +6889,7 @@ CONFIG_SUSPEND_FREEZER=y
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_SWIOTLB=y
# CONFIG_SW_SYNC is not set
CONFIG_SX9310=m
@@ -6940,6 +7000,7 @@ CONFIG_TEST_CPUMASK=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
@@ -7015,6 +7076,8 @@ CONFIG_TIFM_7XX1=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+# CONFIG_TI_ICSSG_PRUETH is not set
+CONFIG_TI_ICSS_IEP=m
CONFIG_TI_LMP92064=m
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y
@@ -7047,6 +7110,7 @@ CONFIG_TLS=m
CONFIG_TMP117=m
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_QUOTA=y
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -7093,6 +7157,7 @@ CONFIG_TOUCHSCREEN_IMAGIS=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_IQS7211=m
# CONFIG_TOUCHSCREEN_MAX11801 is not set
CONFIG_TOUCHSCREEN_MCS5000=m
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7291,6 +7356,7 @@ CONFIG_USB_CHIPIDEA_IMX=m
# CONFIG_USB_CHIPIDEA is not set
CONFIG_USB_CHIPIDEA_MSM=m
CONFIG_USB_CHIPIDEA_PCI=m
+CONFIG_USB_CONFIGFS_F_MIDI2=y
# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
# CONFIG_USB_CONN_GPIO is not set
CONFIG_USB_CXACRU=m
@@ -7627,6 +7693,8 @@ CONFIG_VETH=m
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=m
CONFIG_VFIO_CONTAINER=y
+# CONFIG_VFIO_DEVICE_CDEV is not set
+CONFIG_VFIO_GROUP=y
# CONFIG_VFIO_IOMMU_TYPE1 is not set
CONFIG_VFIO=m
CONFIG_VFIO_MDEV=m
@@ -7695,8 +7763,12 @@ CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_DS90UB913=m
+CONFIG_VIDEO_DS90UB953=m
+CONFIG_VIDEO_DS90UB960=m
# CONFIG_VIDEO_DT3155 is not set
CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9719=m
CONFIG_VIDEO_DW9768=m
CONFIG_VIDEO_DW9807_VCM=m
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -8036,6 +8108,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
+CONFIG_XEN_PRIVCMD_IRQFD=y
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_PVHVM_GUEST=y
@@ -8053,6 +8126,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index ced577211..f258bbae2 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -206,7 +206,6 @@ CONFIG_AMD_HSMP=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
CONFIG_AMD_PHY=m
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
# CONFIG_AMD_PTDMA is not set
# CONFIG_AMDTEE is not set
# CONFIG_AMIGA_PARTITION is not set
@@ -812,6 +811,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -829,6 +829,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -911,6 +912,7 @@ CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
@@ -1000,6 +1002,7 @@ CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
+# CONFIG_CRYPTO_POLY1305_P10 is not set
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y
@@ -1198,6 +1201,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1220,6 +1224,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1340,6 +1345,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MALI_DISPLAY is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1413,6 +1419,7 @@ CONFIG_DRM_SIMPLEDRM=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1653,6 +1660,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1839,6 +1847,7 @@ CONFIG_GNSS=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+# CONFIG_GPIO_DS4520 is not set
# CONFIG_GPIO_DWAPB is not set
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -1959,6 +1968,7 @@ CONFIG_HID_GENERIC=y
# CONFIG_HID_GFRM is not set
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
# CONFIG_HID_GT683R is not set
CONFIG_HID_GYRATION=m
@@ -2110,7 +2120,6 @@ CONFIG_HWPOISON_INJECT=m
CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
# CONFIG_HW_RANDOM_BA431 is not set
# CONFIG_HW_RANDOM_CCTRNG is not set
-CONFIG_HW_RANDOM_HISI=y
# CONFIG_HW_RANDOM_HISTB is not set
CONFIG_HW_RANDOM_POWERNV=m
CONFIG_HW_RANDOM_PSERIES=m
@@ -2147,6 +2156,7 @@ CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_AMD_MP2 is not set
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
@@ -2462,6 +2472,7 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_TCC_COOLING is not set
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_VSC is not set
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
CONFIG_INTEL_XWAY_PHY=m
@@ -2491,7 +2502,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2578,6 +2589,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2655,6 +2667,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -2796,10 +2809,11 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD_SEV=y
CONFIG_KVM_BOOK3S_64_HV=m
CONFIG_KVM_BOOK3S_64=m
@@ -2810,6 +2824,7 @@ CONFIG_KVM_BOOK3S_HV_NESTED_PMU_WORKAROUND=y
# CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set
CONFIG_KVM_BOOK3S_PR_POSSIBLE=y
CONFIG_KVM_GUEST=y
+# CONFIG_KVM_PROVE_MMU is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
# CONFIG_KVM_XEN is not set
@@ -2883,6 +2898,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
CONFIG_LEDS_POWERNV=m
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
@@ -3025,7 +3041,9 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3065,9 +3083,11 @@ CONFIG_MAX_SKB_FRAGS=17
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3121,6 +3141,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3155,6 +3176,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3301,6 +3324,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3584,6 +3608,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4004,6 +4029,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4050,6 +4076,7 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
CONFIG_NVMEM_SYSFS=y
@@ -4094,6 +4121,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4169,6 +4197,7 @@ CONFIG_PATA_PLATFORM=m
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -4260,6 +4289,7 @@ CONFIG_PHYLIB=y
# CONFIG_PHY_QCOM_EUSB2_REPEATER is not set
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
# CONFIG_PHY_QCOM_SGMII_ETH is not set
@@ -4269,6 +4299,8 @@ CONFIG_PHYLIB=y
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
CONFIG_PHYSICAL_ALIGN=0x200000
# CONFIG_PHY_TUSB1210 is not set
# CONFIG_PI433 is not set
@@ -4466,6 +4498,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4484,6 +4517,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK=y
# CONFIG_PUNIT_ATOM_DEBUG is not set
@@ -4578,6 +4612,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -4622,12 +4657,14 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
+# CONFIG_REGULATOR_AW37503 is not set
# CONFIG_REGULATOR_DA9210 is not set
# CONFIG_REGULATOR_DA9211 is not set
# CONFIG_REGULATOR_DEBUG is not set
@@ -4644,6 +4681,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_LTC3589 is not set
# CONFIG_REGULATOR_LTC3676 is not set
# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8952 is not set
@@ -4656,9 +4694,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RT4803 is not set
# CONFIG_REGULATOR_RT5739 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_SY8106A is not set
# CONFIG_REGULATOR_TPS51632 is not set
# CONFIG_REGULATOR_TPS62360 is not set
@@ -4692,7 +4732,6 @@ CONFIG_RETPOLINE=y
# CONFIG_RFKILL_GPIO is not set
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -5060,6 +5099,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5069,6 +5109,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5144,6 +5185,7 @@ CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
# CONFIG_SENSORS_I5K_AMB is not set
CONFIG_SENSORS_IBMAEM=m
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5633,7 +5675,9 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -5650,7 +5694,6 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -5715,6 +5758,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -5725,6 +5769,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
# CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
@@ -5844,6 +5889,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -5902,6 +5948,7 @@ CONFIG_SND_SOC_SOF_ACPI=m
# CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set
# CONFIG_SND_SOC_SOF_JASPERLAKE is not set
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
# CONFIG_SND_SOC_SOF_MERRIFIELD is not set
# CONFIG_SND_SOC_SOF_METEORLAKE is not set
# CONFIG_SND_SOC_SOF_OF is not set
@@ -5972,6 +6019,7 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6194,6 +6242,7 @@ CONFIG_SUSPEND_FREEZER=y
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
# CONFIG_SX9324 is not set
@@ -6300,6 +6349,7 @@ CONFIG_TEST_CPUMASK=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
@@ -6405,6 +6455,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -6450,6 +6501,7 @@ CONFIG_TORTURE_TEST=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -6953,8 +7005,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7252,6 +7308,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index c45d4b9b2..e81f2cafe 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -137,6 +137,7 @@ CONFIG_AD7949=m
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
CONFIG_ADAPTEC_STARFIRE=m
+# CONFIG_ADDRESS_MASKING is not set
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -806,6 +807,7 @@ CONFIG_CEPH_FS_SECURITY_LABEL=y
CONFIG_CEPH_LIB=m
CONFIG_CEPH_LIB_PRETTYDEBUG=y
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+CONFIG_CERT_STORE=y
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
@@ -957,6 +959,7 @@ CONFIG_COMMON_CLK_SI521XX=y
# CONFIG_COMMON_CLK_SI5351 is not set
CONFIG_COMMON_CLK_SI544=m
# CONFIG_COMMON_CLK_SI570 is not set
+CONFIG_COMMON_CLK_VC3=m
# CONFIG_COMMON_CLK_VC5 is not set
CONFIG_COMMON_CLK_VC7=m
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -973,6 +976,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=3
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1012,6 +1016,8 @@ CONFIG_CPUSETS=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -1359,6 +1365,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1383,6 +1390,7 @@ CONFIG_DM_INIT=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=y
@@ -1494,6 +1502,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
CONFIG_DRM_LONTIUM_LT9611UXC=m
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
# CONFIG_DRM_MGAG200 is not set
@@ -1579,11 +1588,13 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
+CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m
# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
# CONFIG_DRM_PANEL_TPO_TPG110 is not set
# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+CONFIG_DRM_PANEL_VISIONOX_R66451=m
CONFIG_DRM_PANEL_VISIONOX_RM69299=m
# CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set
CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
@@ -1620,6 +1631,7 @@ CONFIG_DRM_TOSHIBA_TC358764=m
# CONFIG_DRM_TOSHIBA_TC358767 is not set
CONFIG_DRM_TOSHIBA_TC358768=m
CONFIG_DRM_TOSHIBA_TC358775=m
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1798,6 +1810,7 @@ CONFIG_EROFS_FS=m
CONFIG_EROFS_FS_POSIX_ACL=y
CONFIG_EROFS_FS_SECURITY=y
CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP_DEFLATE=y
CONFIG_EROFS_FS_ZIP_LZMA=y
CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
@@ -1887,6 +1900,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -2098,6 +2112,7 @@ CONFIG_GPIO_CADENCE=m
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_DS4520=m
# CONFIG_GPIO_DWAPB is not set
CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_FTGPIO010 is not set
@@ -2210,6 +2225,7 @@ CONFIG_HID_GENERIC=m
CONFIG_HID_GFRM=m
CONFIG_HID_GLORIOUS=m
# CONFIG_HID_GOOGLE_HAMMER is not set
+CONFIG_HID_GOOGLE_STADIA_FF=m
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2394,6 +2410,7 @@ CONFIG_I2C_ALGOBIT=m
# CONFIG_I2C_AMD8111 is not set
CONFIG_I2C_AMD_MP2=m
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+CONFIG_I2C_ATR=m
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
# CONFIG_I2C_CHARDEV is not set
@@ -2740,6 +2757,7 @@ CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
CONFIG_IOSM=m
CONFIG_IO_STRICT_DEVMEM=y
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2827,6 +2845,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+CONFIG_IPU_BRIDGE=m
CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_IOAM6_LWTUNNEL=y
@@ -2902,6 +2921,7 @@ CONFIG_IR_RC6_DECODER=m
CONFIG_IR_RCMM_DECODER=m
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
CONFIG_IR_SERIAL=m
CONFIG_IR_SERIAL_TRANSMITTER=y
CONFIG_IR_SHARP_DECODER=m
@@ -3108,11 +3128,12 @@ CONFIG_KSM=y
CONFIG_KSZ884X_PCI=m
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
CONFIG_KVM=m
+CONFIG_KVM_PROVE_MMU=y
# CONFIG_KVM_S390_UCONTROL is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
@@ -3165,6 +3186,7 @@ CONFIG_LEDS_CR0014114=m
# CONFIG_LEDS_DAC124S085 is not set
# CONFIG_LEDS_EL15203000 is not set
CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GROUP_MULTICOLOR=m
# CONFIG_LEDS_IS31FL319X is not set
CONFIG_LEDS_IS31FL32XX=m
# CONFIG_LEDS_KTD2692 is not set
@@ -3192,6 +3214,7 @@ CONFIG_LEDS_PCA9532_GPIO=y
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+CONFIG_LEDS_PCA995X=m
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_PWM_MULTICOLOR=m
CONFIG_LEDS_QCOM_FLASH=m
@@ -3351,6 +3374,7 @@ CONFIG_MARCH_Z13=y
# CONFIG_MARCH_Z990 is not set
# CONFIG_MARCH_ZEC12 is not set
CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88Q2XXX_PHY=m
CONFIG_MARVELL_88X2222_PHY=m
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
@@ -3395,11 +3419,13 @@ CONFIG_MCP41010=m
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+CONFIG_MCP4728=m
# CONFIG_MCP4922 is not set
CONFIG_MCTP_SERIAL=m
# CONFIG_MCTP_TRANSPORT_I2C is not set
CONFIG_MCTP=y
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3498,6 +3524,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BD9571MWV is not set
CONFIG_MFD_CORE=m
# CONFIG_MFD_CPCAP is not set
+CONFIG_MFD_CS42L43_I2C=m
+CONFIG_MFD_CS42L43_SDW=m
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
@@ -3649,6 +3677,7 @@ CONFIG_MLX5_ESWITCH=y
# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3973,6 +4002,7 @@ CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4484,6 +4514,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4570,6 +4601,7 @@ CONFIG_ORINOCO_USB=m
# CONFIG_OSF_PARTITION is not set
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4654,6 +4686,7 @@ CONFIG_PATA_WINBOND=m
# CONFIG_PCH_GBE is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -4710,6 +4743,7 @@ CONFIG_PCS_XPCS=m
CONFIG_PDC_ADMA=m
CONFIG_PDS_CORE=m
CONFIG_PDS_VDPA=m
+CONFIG_PDS_VFIO_PCI=m
# CONFIG_PECI is not set
CONFIG_PERCPU_STATS=y
# CONFIG_PERCPU_TEST is not set
@@ -4748,6 +4782,8 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+CONFIG_PHY_RTK_RTD_USB2PHY=m
+CONFIG_PHY_RTK_RTD_USB3PHY=m
# CONFIG_PHY_TUSB1210 is not set
# CONFIG_PI433 is not set
CONFIG_PID_NS=y
@@ -4755,6 +4791,7 @@ CONFIG_PID_NS=y
CONFIG_PINCTRL_ALDERLAKE=m
# CONFIG_PINCTRL_CANNONLAKE is not set
CONFIG_PINCTRL_CEDARFORK=m
+CONFIG_PINCTRL_CS42L43=m
CONFIG_PINCTRL_CY8C95X0=m
CONFIG_PINCTRL_ELKHARTLAKE=m
CONFIG_PINCTRL_EMMITSBURG=m
@@ -4782,6 +4819,7 @@ CONFIG_PINCTRL_RK805=m
# CONFIG_PINCTRL_SM8150 is not set
# CONFIG_PINCTRL_SM8250 is not set
# CONFIG_PINCTRL_SM8350 is not set
+CONFIG_PINCTRL_SM8350_LPASS_LPI=m
# CONFIG_PINCTRL_SM8450 is not set
# CONFIG_PINCTRL_STMFX is not set
# CONFIG_PINCTRL_SUN4I_A10 is not set
@@ -4920,6 +4958,7 @@ CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
CONFIG_PSTORE_842_COMPRESS=y
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4941,6 +4980,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
CONFIG_PTP_1588_CLOCK_IDTCM=m
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_PTP_1588_CLOCK=y
@@ -5028,6 +5068,7 @@ CONFIG_RANDOMIZE_BASE=y
CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -5087,12 +5128,14 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=y
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_I2C=m
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
+CONFIG_REGULATOR_AW37503=m
CONFIG_REGULATOR_BD9571MWV=m
# CONFIG_REGULATOR_DA9121 is not set
# CONFIG_REGULATOR_DA9210 is not set
@@ -5113,9 +5156,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_MAX1586 is not set
# CONFIG_REGULATOR_MAX20086 is not set
CONFIG_REGULATOR_MAX20411=m
+CONFIG_REGULATOR_MAX5970=m
CONFIG_REGULATOR_MAX597X=m
CONFIG_REGULATOR_MAX77650=m
# CONFIG_REGULATOR_MAX77826 is not set
+CONFIG_REGULATOR_MAX77857=m
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
CONFIG_REGULATOR_MAX8893=m
@@ -5148,6 +5193,7 @@ CONFIG_REGULATOR_RT6190=m
CONFIG_REGULATOR_RT6245=m
CONFIG_REGULATOR_RTMV20=m
CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTQ2208=m
CONFIG_REGULATOR_RTQ6752=m
# CONFIG_REGULATOR_SLG51000 is not set
CONFIG_REGULATOR_SY7636A=m
@@ -5194,8 +5240,7 @@ CONFIG_RESOURCE_KUNIT_TEST=m
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
# CONFIG_RFKILL is not set
-# CONFIG_RH_DISABLE_DEPRECATED is not set
-CONFIG_RH_FEDORA=y
+# CONFIG_RHEL_DIFFERENCES is not set
CONFIG_RICHTEK_RTQ6056=m
CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
@@ -5418,10 +5463,9 @@ CONFIG_RV=y
CONFIG_RXKAD=y
# CONFIG_RXPERF is not set
CONFIG_S2IO=m
-CONFIG_S390_AP_IOMMU=y
-CONFIG_S390_CCW_IOMMU=y
CONFIG_S390_GUEST=y
CONFIG_S390_HYPFS_FS=y
+CONFIG_S390_HYPFS=y
# CONFIG_S390_KPROBES_SANITY_TEST is not set
# CONFIG_S390_MODULES_SANITY_TEST is not set
CONFIG_S390_PRNG=m
@@ -5613,6 +5657,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5688,6 +5733,7 @@ CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
CONFIG_SENSORS_HP_WMI=m
+CONFIG_SENSORS_HS3001=m
# CONFIG_SENSORS_I5K_AMB is not set
CONFIG_SENSORS_IBMAEM=m
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5774,6 +5820,7 @@ CONFIG_SENSORS_MCP3021=m
CONFIG_SENSORS_MLXREG_FAN=m
CONFIG_SENSORS_MP2888=m
CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_MP2975_REGULATOR=y
CONFIG_SENSORS_MP5023=m
CONFIG_SENSORS_MPQ7932=m
CONFIG_SENSORS_MPQ7932_REGULATOR=y
@@ -6081,6 +6128,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=2048
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
# CONFIG_SND_HDA_TEGRA is not set
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -6194,7 +6244,9 @@ CONFIG_SND_SOC_AK5558=m
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+CONFIG_SND_SOC_AUDIO_IIO_AUX=m
CONFIG_SND_SOC_AW8738=m
+CONFIG_SND_SOC_AW88261=m
CONFIG_SND_SOC_AW88395=m
CONFIG_SND_SOC_BD28623=m
CONFIG_SND_SOC_BT_SCO=m
@@ -6211,7 +6263,6 @@ CONFIG_SND_SOC_CS35L36=m
CONFIG_SND_SOC_CS35L45_I2C=m
CONFIG_SND_SOC_CS35L45_SPI=m
CONFIG_SND_SOC_CS35L56_I2C=m
-CONFIG_SND_SOC_CS35L56_SDW=m
CONFIG_SND_SOC_CS35L56_SPI=m
CONFIG_SND_SOC_CS4234=m
# CONFIG_SND_SOC_CS4265 is not set
@@ -6220,6 +6271,8 @@ CONFIG_SND_SOC_CS4234=m
# CONFIG_SND_SOC_CS4271_SPI is not set
CONFIG_SND_SOC_CS42L42=m
CONFIG_SND_SOC_CS42L42_SDW=m
+CONFIG_SND_SOC_CS42L43=m
+CONFIG_SND_SOC_CS42L43_SDW=m
# CONFIG_SND_SOC_CS42L51_I2C is not set
# CONFIG_SND_SOC_CS42L52 is not set
# CONFIG_SND_SOC_CS42L56 is not set
@@ -6405,6 +6458,7 @@ CONFIG_SND_SOC_RL6231=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+CONFIG_SND_SOC_RT1017_SDCA_SDW=m
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -6536,6 +6590,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6660,6 +6715,7 @@ CONFIG_SPI_AX88796C=m
# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_CADENCE_QUADSPI is not set
# CONFIG_SPI_CADENCE_XSPI is not set
+# CONFIG_SPI_CS42L43 is not set
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
CONFIG_SPI_DLN2=m
@@ -6790,6 +6846,7 @@ CONFIG_SURFACE_PRO3_BUTTON=m
# CONFIG_SUSPEND is not set
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
# CONFIG_SW_SYNC is not set
CONFIG_SX9310=m
CONFIG_SX9324=m
@@ -6900,6 +6957,7 @@ CONFIG_TEST_FPU=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIST_SORT=m
@@ -6974,6 +7032,8 @@ CONFIG_TIFM_7XX1=m
# CONFIG_TIFM_CORE is not set
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+# CONFIG_TI_ICSSG_PRUETH is not set
+CONFIG_TI_ICSS_IEP=m
CONFIG_TI_LMP92064=m
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y
@@ -7006,6 +7066,7 @@ CONFIG_TLS=m
CONFIG_TMP117=m
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_QUOTA=y
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
CONFIG_TN3215_CONSOLE=y
@@ -7057,6 +7118,7 @@ CONFIG_TOUCHSCREEN_IMAGIS=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_IQS7211=m
# CONFIG_TOUCHSCREEN_MAX11801 is not set
CONFIG_TOUCHSCREEN_MCS5000=m
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7264,6 +7326,7 @@ CONFIG_USB_CHIPIDEA_IMX=m
# CONFIG_USB_CHIPIDEA is not set
CONFIG_USB_CHIPIDEA_MSM=m
CONFIG_USB_CHIPIDEA_PCI=m
+CONFIG_USB_CONFIGFS_F_MIDI2=y
# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
# CONFIG_USB_CONN_GPIO is not set
CONFIG_USB_CXACRU=m
@@ -7598,6 +7661,8 @@ CONFIG_VFAT_FS=m
CONFIG_VFIO_AP=m
CONFIG_VFIO_CCW=m
CONFIG_VFIO_CONTAINER=y
+# CONFIG_VFIO_DEVICE_CDEV is not set
+CONFIG_VFIO_GROUP=y
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
CONFIG_VFIO_MDEV=m
@@ -7666,8 +7731,12 @@ CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_DS90UB913=m
+CONFIG_VIDEO_DS90UB953=m
+CONFIG_VIDEO_DS90UB960=m
# CONFIG_VIDEO_DT3155 is not set
CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9719=m
CONFIG_VIDEO_DW9768=m
CONFIG_VIDEO_DW9807_VCM=m
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -8008,6 +8077,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
+CONFIG_XEN_PRIVCMD_IRQFD=y
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_PVHVM_GUEST=y
@@ -8025,6 +8095,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index cb49b8ce8..1f00593df 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -203,7 +203,6 @@ CONFIG_AMD_HSMP=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
# CONFIG_AMD_PHY is not set
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
# CONFIG_AMD_PTDMA is not set
# CONFIG_AMDTEE is not set
# CONFIG_AMIGA_PARTITION is not set
@@ -677,6 +676,7 @@ CONFIG_CEPH_FS_SECURITY_LABEL=y
CONFIG_CEPH_LIB=m
CONFIG_CEPH_LIB_PRETTYDEBUG=y
CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
+CONFIG_CERT_STORE=y
# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
CONFIG_CFG80211_CRDA_SUPPORT=y
CONFIG_CFG80211_DEBUGFS=y
@@ -812,6 +812,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -829,6 +830,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -910,6 +912,7 @@ CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA_S390=y
CONFIG_CRYPTO_CMAC=y
@@ -997,6 +1000,7 @@ CONFIG_CRYPTO_PAES_S390=m
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
+# CONFIG_CRYPTO_POLY1305_P10 is not set
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y
@@ -1211,6 +1215,7 @@ CONFIG_DMADEVICES_VDEBUG=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1233,6 +1238,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1353,6 +1359,7 @@ CONFIG_DRM_KUNIT_TEST=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
CONFIG_DRM=m
# CONFIG_DRM_MALI_DISPLAY is not set
@@ -1427,6 +1434,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1675,6 +1683,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1857,6 +1866,7 @@ CONFIG_GNSS=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+# CONFIG_GPIO_DS4520 is not set
# CONFIG_GPIO_DWAPB is not set
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -1976,6 +1986,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2119,7 +2130,6 @@ CONFIG_HWPOISON_INJECT=m
CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
# CONFIG_HW_RANDOM_BA431 is not set
# CONFIG_HW_RANDOM_CCTRNG is not set
-CONFIG_HW_RANDOM_HISI=y
# CONFIG_HW_RANDOM_HISTB is not set
CONFIG_HW_RANDOM_S390=y
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
@@ -2155,6 +2165,7 @@ CONFIG_I2C_ALGOBIT=m
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_AMD_MP2 is not set
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
# CONFIG_I2C_CHARDEV is not set
@@ -2464,6 +2475,7 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_TCC_COOLING is not set
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_VSC is not set
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
CONFIG_INTEL_XWAY_PHY=m
@@ -2492,7 +2504,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2578,6 +2590,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2654,6 +2667,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -2801,14 +2815,16 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD_SEV=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
# CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set
CONFIG_KVM=m
+CONFIG_KVM_PROVE_MMU=y
# CONFIG_KVM_S390_UCONTROL is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
@@ -2881,6 +2897,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
@@ -3030,7 +3047,9 @@ CONFIG_MARCH_Z14=y
# CONFIG_MARCH_Z990 is not set
# CONFIG_MARCH_ZEC12 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
+CONFIG_MARVELL_GTI_WDT=y
# CONFIG_MARVELL_PHY is not set
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3071,9 +3090,11 @@ CONFIG_MAX_SKB_FRAGS=17
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3125,6 +3146,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3159,6 +3181,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3305,6 +3329,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3586,6 +3611,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4006,6 +4032,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4052,6 +4079,7 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
CONFIG_NVMEM_SYSFS=y
@@ -4095,6 +4123,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
# CONFIG_OSF_PARTITION is not set
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+CONFIG_OVERLAY_FS_DEBUG=y
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4170,6 +4199,7 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
CONFIG_PCI_DEBUG=y
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -4263,6 +4293,7 @@ CONFIG_PHY_BCM_SR_USB=m
# CONFIG_PHY_QCOM_EUSB2_REPEATER is not set
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
# CONFIG_PHY_QCOM_SGMII_ETH is not set
@@ -4272,6 +4303,8 @@ CONFIG_PHY_BCM_SR_USB=m
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
# CONFIG_PHY_TUSB1210 is not set
# CONFIG_PI433 is not set
CONFIG_PID_NS=y
@@ -4423,6 +4456,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4441,6 +4475,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK=y
# CONFIG_PUNIT_ATOM_DEBUG is not set
@@ -4540,6 +4575,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -4584,12 +4620,14 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
# CONFIG_REALTEK_PHY is not set
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
# CONFIG_REGMAP is not set
CONFIG_REGMAP_KUNIT=m
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
+# CONFIG_REGULATOR_AW37503 is not set
# CONFIG_REGULATOR_DA9210 is not set
# CONFIG_REGULATOR_DA9211 is not set
# CONFIG_REGULATOR_DEBUG is not set
@@ -4606,6 +4644,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_LTC3589 is not set
# CONFIG_REGULATOR_LTC3676 is not set
# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8952 is not set
@@ -4618,9 +4657,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RT4803 is not set
# CONFIG_REGULATOR_RT5739 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_SY8106A is not set
# CONFIG_REGULATOR_TPS51632 is not set
# CONFIG_REGULATOR_TPS62360 is not set
@@ -4653,7 +4694,6 @@ CONFIG_RETPOLINE=y
# CONFIG_RFKILL_GPIO is not set
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -4856,10 +4896,9 @@ CONFIG_RV_REACT_PRINTK=y
CONFIG_RV=y
CONFIG_RXKAD=y
CONFIG_RXPERF=m
-CONFIG_S390_AP_IOMMU=y
-CONFIG_S390_CCW_IOMMU=y
CONFIG_S390_GUEST=y
CONFIG_S390_HYPFS_FS=y
+CONFIG_S390_HYPFS=y
# CONFIG_S390_KPROBES_SANITY_TEST is not set
# CONFIG_S390_MODULES_SANITY_TEST is not set
CONFIG_S390_PRNG=m
@@ -5063,6 +5102,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5072,6 +5112,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5147,6 +5188,7 @@ CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
# CONFIG_SENSORS_I5K_AMB is not set
CONFIG_SENSORS_IBMAEM=m
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5630,7 +5672,9 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -5647,7 +5691,6 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -5712,6 +5755,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -5722,6 +5766,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
# CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
@@ -5841,6 +5886,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -5900,6 +5946,7 @@ CONFIG_SND_SOC_SOF_HDA_PROBES=m
# CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set
# CONFIG_SND_SOC_SOF_JASPERLAKE is not set
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
# CONFIG_SND_SOC_SOF_MERRIFIELD is not set
# CONFIG_SND_SOC_SOF_METEORLAKE is not set
# CONFIG_SND_SOC_SOF_OF is not set
@@ -5970,6 +6017,7 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_BUILD=y
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6190,6 +6238,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
# CONFIG_SX9324 is not set
@@ -6295,6 +6344,7 @@ CONFIG_TEST_FPU=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIST_SORT=m
@@ -6399,6 +6449,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
CONFIG_TN3215_CONSOLE=y
@@ -6449,6 +6500,7 @@ CONFIG_TORTURE_TEST=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -6960,8 +7012,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7260,6 +7316,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 2d562738d..9a0fd13e9 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -137,6 +137,7 @@ CONFIG_AD7949=m
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
CONFIG_ADAPTEC_STARFIRE=m
+# CONFIG_ADDRESS_MASKING is not set
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -804,6 +805,7 @@ CONFIG_CEPH_FS_SECURITY_LABEL=y
CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+CONFIG_CERT_STORE=y
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
@@ -955,6 +957,7 @@ CONFIG_COMMON_CLK_SI521XX=y
# CONFIG_COMMON_CLK_SI5351 is not set
CONFIG_COMMON_CLK_SI544=m
# CONFIG_COMMON_CLK_SI570 is not set
+CONFIG_COMMON_CLK_VC3=m
# CONFIG_COMMON_CLK_VC5 is not set
CONFIG_COMMON_CLK_VC7=m
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -971,6 +974,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=3
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1010,6 +1014,8 @@ CONFIG_CPUSETS=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -1348,6 +1354,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1372,6 +1379,7 @@ CONFIG_DM_INIT=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=y
@@ -1483,6 +1491,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
CONFIG_DRM_LONTIUM_LT9611UXC=m
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
# CONFIG_DRM_MGAG200 is not set
@@ -1568,11 +1577,13 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
+CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m
# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
# CONFIG_DRM_PANEL_TPO_TPG110 is not set
# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+CONFIG_DRM_PANEL_VISIONOX_R66451=m
CONFIG_DRM_PANEL_VISIONOX_RM69299=m
# CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set
CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
@@ -1609,6 +1620,7 @@ CONFIG_DRM_TOSHIBA_TC358764=m
# CONFIG_DRM_TOSHIBA_TC358767 is not set
CONFIG_DRM_TOSHIBA_TC358768=m
CONFIG_DRM_TOSHIBA_TC358775=m
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1787,6 +1799,7 @@ CONFIG_EROFS_FS=m
CONFIG_EROFS_FS_POSIX_ACL=y
CONFIG_EROFS_FS_SECURITY=y
CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP_DEFLATE=y
CONFIG_EROFS_FS_ZIP_LZMA=y
CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
@@ -1868,6 +1881,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -2079,6 +2093,7 @@ CONFIG_GPIO_CADENCE=m
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_DS4520=m
# CONFIG_GPIO_DWAPB is not set
CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_FTGPIO010 is not set
@@ -2191,6 +2206,7 @@ CONFIG_HID_GENERIC=m
CONFIG_HID_GFRM=m
CONFIG_HID_GLORIOUS=m
# CONFIG_HID_GOOGLE_HAMMER is not set
+CONFIG_HID_GOOGLE_STADIA_FF=m
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2375,6 +2391,7 @@ CONFIG_I2C_ALGOBIT=m
# CONFIG_I2C_AMD8111 is not set
CONFIG_I2C_AMD_MP2=m
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+CONFIG_I2C_ATR=m
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
# CONFIG_I2C_CHARDEV is not set
@@ -2720,6 +2737,7 @@ CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
CONFIG_IOSM=m
CONFIG_IO_STRICT_DEVMEM=y
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2807,6 +2825,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+CONFIG_IPU_BRIDGE=m
CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_IOAM6_LWTUNNEL=y
@@ -2882,6 +2901,7 @@ CONFIG_IR_RC6_DECODER=m
CONFIG_IR_RCMM_DECODER=m
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
CONFIG_IR_SERIAL=m
CONFIG_IR_SERIAL_TRANSMITTER=y
CONFIG_IR_SHARP_DECODER=m
@@ -3082,11 +3102,12 @@ CONFIG_KSM=y
CONFIG_KSZ884X_PCI=m
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
CONFIG_KVM=m
+# CONFIG_KVM_PROVE_MMU is not set
# CONFIG_KVM_S390_UCONTROL is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
@@ -3139,6 +3160,7 @@ CONFIG_LEDS_CR0014114=m
# CONFIG_LEDS_DAC124S085 is not set
# CONFIG_LEDS_EL15203000 is not set
CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GROUP_MULTICOLOR=m
# CONFIG_LEDS_IS31FL319X is not set
CONFIG_LEDS_IS31FL32XX=m
# CONFIG_LEDS_KTD2692 is not set
@@ -3166,6 +3188,7 @@ CONFIG_LEDS_PCA9532_GPIO=y
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+CONFIG_LEDS_PCA995X=m
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_PWM_MULTICOLOR=m
CONFIG_LEDS_QCOM_FLASH=m
@@ -3325,6 +3348,7 @@ CONFIG_MARCH_Z13=y
# CONFIG_MARCH_Z990 is not set
# CONFIG_MARCH_ZEC12 is not set
CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88Q2XXX_PHY=m
CONFIG_MARVELL_88X2222_PHY=m
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
@@ -3368,11 +3392,13 @@ CONFIG_MCP41010=m
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+CONFIG_MCP4728=m
# CONFIG_MCP4922 is not set
CONFIG_MCTP_SERIAL=m
# CONFIG_MCTP_TRANSPORT_I2C is not set
CONFIG_MCTP=y
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3471,6 +3497,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BD9571MWV is not set
CONFIG_MFD_CORE=m
# CONFIG_MFD_CPCAP is not set
+CONFIG_MFD_CS42L43_I2C=m
+CONFIG_MFD_CS42L43_SDW=m
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
@@ -3622,6 +3650,7 @@ CONFIG_MLX5_ESWITCH=y
# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3945,6 +3974,7 @@ CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4456,6 +4486,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4542,6 +4573,7 @@ CONFIG_ORINOCO_USB=m
# CONFIG_OSF_PARTITION is not set
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4625,6 +4657,7 @@ CONFIG_PATA_WINBOND=m
# CONFIG_PCH_GBE is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -4681,6 +4714,7 @@ CONFIG_PCS_XPCS=m
CONFIG_PDC_ADMA=m
CONFIG_PDS_CORE=m
CONFIG_PDS_VDPA=m
+CONFIG_PDS_VFIO_PCI=m
# CONFIG_PECI is not set
# CONFIG_PERCPU_STATS is not set
# CONFIG_PERCPU_TEST is not set
@@ -4719,6 +4753,8 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+CONFIG_PHY_RTK_RTD_USB2PHY=m
+CONFIG_PHY_RTK_RTD_USB3PHY=m
# CONFIG_PHY_TUSB1210 is not set
# CONFIG_PI433 is not set
CONFIG_PID_NS=y
@@ -4726,6 +4762,7 @@ CONFIG_PID_NS=y
CONFIG_PINCTRL_ALDERLAKE=m
# CONFIG_PINCTRL_CANNONLAKE is not set
CONFIG_PINCTRL_CEDARFORK=m
+CONFIG_PINCTRL_CS42L43=m
CONFIG_PINCTRL_CY8C95X0=m
CONFIG_PINCTRL_ELKHARTLAKE=m
CONFIG_PINCTRL_EMMITSBURG=m
@@ -4753,6 +4790,7 @@ CONFIG_PINCTRL_RK805=m
# CONFIG_PINCTRL_SM8150 is not set
# CONFIG_PINCTRL_SM8250 is not set
# CONFIG_PINCTRL_SM8350 is not set
+CONFIG_PINCTRL_SM8350_LPASS_LPI=m
# CONFIG_PINCTRL_SM8450 is not set
# CONFIG_PINCTRL_STMFX is not set
# CONFIG_PINCTRL_SUN4I_A10 is not set
@@ -4891,6 +4929,7 @@ CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
CONFIG_PSTORE_842_COMPRESS=y
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4912,6 +4951,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
CONFIG_PTP_1588_CLOCK_IDTCM=m
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_PTP_1588_CLOCK=y
@@ -4999,6 +5039,7 @@ CONFIG_RANDOMIZE_BASE=y
CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -5058,12 +5099,14 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=y
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_I2C=m
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
+CONFIG_REGULATOR_AW37503=m
CONFIG_REGULATOR_BD9571MWV=m
# CONFIG_REGULATOR_DA9121 is not set
# CONFIG_REGULATOR_DA9210 is not set
@@ -5084,9 +5127,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_MAX1586 is not set
# CONFIG_REGULATOR_MAX20086 is not set
CONFIG_REGULATOR_MAX20411=m
+CONFIG_REGULATOR_MAX5970=m
CONFIG_REGULATOR_MAX597X=m
CONFIG_REGULATOR_MAX77650=m
# CONFIG_REGULATOR_MAX77826 is not set
+CONFIG_REGULATOR_MAX77857=m
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
CONFIG_REGULATOR_MAX8893=m
@@ -5119,6 +5164,7 @@ CONFIG_REGULATOR_RT6190=m
CONFIG_REGULATOR_RT6245=m
CONFIG_REGULATOR_RTMV20=m
CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTQ2208=m
CONFIG_REGULATOR_RTQ6752=m
# CONFIG_REGULATOR_SLG51000 is not set
CONFIG_REGULATOR_SY7636A=m
@@ -5165,8 +5211,7 @@ CONFIG_RESOURCE_KUNIT_TEST=m
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
# CONFIG_RFKILL is not set
-# CONFIG_RH_DISABLE_DEPRECATED is not set
-CONFIG_RH_FEDORA=y
+# CONFIG_RHEL_DIFFERENCES is not set
CONFIG_RICHTEK_RTQ6056=m
CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
@@ -5389,10 +5434,9 @@ CONFIG_RV=y
CONFIG_RXKAD=y
# CONFIG_RXPERF is not set
CONFIG_S2IO=m
-CONFIG_S390_AP_IOMMU=y
-CONFIG_S390_CCW_IOMMU=y
CONFIG_S390_GUEST=y
CONFIG_S390_HYPFS_FS=y
+CONFIG_S390_HYPFS=y
# CONFIG_S390_KPROBES_SANITY_TEST is not set
# CONFIG_S390_MODULES_SANITY_TEST is not set
CONFIG_S390_PRNG=m
@@ -5584,6 +5628,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5659,6 +5704,7 @@ CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
CONFIG_SENSORS_HP_WMI=m
+CONFIG_SENSORS_HS3001=m
# CONFIG_SENSORS_I5K_AMB is not set
CONFIG_SENSORS_IBMAEM=m
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5745,6 +5791,7 @@ CONFIG_SENSORS_MCP3021=m
CONFIG_SENSORS_MLXREG_FAN=m
CONFIG_SENSORS_MP2888=m
CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_MP2975_REGULATOR=y
CONFIG_SENSORS_MP5023=m
CONFIG_SENSORS_MPQ7932=m
CONFIG_SENSORS_MPQ7932_REGULATOR=y
@@ -6052,6 +6099,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=2048
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
# CONFIG_SND_HDA_TEGRA is not set
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -6164,7 +6214,9 @@ CONFIG_SND_SOC_AK5558=m
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+CONFIG_SND_SOC_AUDIO_IIO_AUX=m
CONFIG_SND_SOC_AW8738=m
+CONFIG_SND_SOC_AW88261=m
CONFIG_SND_SOC_AW88395=m
CONFIG_SND_SOC_BD28623=m
CONFIG_SND_SOC_BT_SCO=m
@@ -6181,7 +6233,6 @@ CONFIG_SND_SOC_CS35L36=m
CONFIG_SND_SOC_CS35L45_I2C=m
CONFIG_SND_SOC_CS35L45_SPI=m
CONFIG_SND_SOC_CS35L56_I2C=m
-CONFIG_SND_SOC_CS35L56_SDW=m
CONFIG_SND_SOC_CS35L56_SPI=m
CONFIG_SND_SOC_CS4234=m
# CONFIG_SND_SOC_CS4265 is not set
@@ -6190,6 +6241,8 @@ CONFIG_SND_SOC_CS4234=m
# CONFIG_SND_SOC_CS4271_SPI is not set
CONFIG_SND_SOC_CS42L42=m
CONFIG_SND_SOC_CS42L42_SDW=m
+CONFIG_SND_SOC_CS42L43=m
+CONFIG_SND_SOC_CS42L43_SDW=m
# CONFIG_SND_SOC_CS42L51_I2C is not set
# CONFIG_SND_SOC_CS42L52 is not set
# CONFIG_SND_SOC_CS42L56 is not set
@@ -6375,6 +6428,7 @@ CONFIG_SND_SOC_RL6231=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+CONFIG_SND_SOC_RT1017_SDCA_SDW=m
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -6505,6 +6559,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6629,6 +6684,7 @@ CONFIG_SPI_AX88796C=m
# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_CADENCE_QUADSPI is not set
# CONFIG_SPI_CADENCE_XSPI is not set
+# CONFIG_SPI_CS42L43 is not set
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
CONFIG_SPI_DLN2=m
@@ -6759,6 +6815,7 @@ CONFIG_SURFACE_PRO3_BUTTON=m
# CONFIG_SUSPEND is not set
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
# CONFIG_SW_SYNC is not set
CONFIG_SX9310=m
CONFIG_SX9324=m
@@ -6869,6 +6926,7 @@ CONFIG_TEST_CPUMASK=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
@@ -6943,6 +7001,8 @@ CONFIG_TIFM_7XX1=m
# CONFIG_TIFM_CORE is not set
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+# CONFIG_TI_ICSSG_PRUETH is not set
+CONFIG_TI_ICSS_IEP=m
CONFIG_TI_LMP92064=m
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y
@@ -6975,6 +7035,7 @@ CONFIG_TLS=m
CONFIG_TMP117=m
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_QUOTA=y
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
CONFIG_TN3215_CONSOLE=y
@@ -7026,6 +7087,7 @@ CONFIG_TOUCHSCREEN_IMAGIS=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_IQS7211=m
# CONFIG_TOUCHSCREEN_MAX11801 is not set
CONFIG_TOUCHSCREEN_MCS5000=m
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7233,6 +7295,7 @@ CONFIG_USB_CHIPIDEA_IMX=m
# CONFIG_USB_CHIPIDEA is not set
CONFIG_USB_CHIPIDEA_MSM=m
CONFIG_USB_CHIPIDEA_PCI=m
+CONFIG_USB_CONFIGFS_F_MIDI2=y
# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
# CONFIG_USB_CONN_GPIO is not set
CONFIG_USB_CXACRU=m
@@ -7567,6 +7630,8 @@ CONFIG_VFAT_FS=m
CONFIG_VFIO_AP=m
CONFIG_VFIO_CCW=m
CONFIG_VFIO_CONTAINER=y
+# CONFIG_VFIO_DEVICE_CDEV is not set
+CONFIG_VFIO_GROUP=y
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
CONFIG_VFIO_MDEV=m
@@ -7635,8 +7700,12 @@ CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_DS90UB913=m
+CONFIG_VIDEO_DS90UB953=m
+CONFIG_VIDEO_DS90UB960=m
# CONFIG_VIDEO_DT3155 is not set
CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9719=m
CONFIG_VIDEO_DW9768=m
CONFIG_VIDEO_DW9807_VCM=m
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7977,6 +8046,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
+CONFIG_XEN_PRIVCMD_IRQFD=y
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_PVHVM_GUEST=y
@@ -7994,6 +8064,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index cd0ad6206..bf4e52866 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -203,7 +203,6 @@ CONFIG_AMD_HSMP=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
# CONFIG_AMD_PHY is not set
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
# CONFIG_AMD_PTDMA is not set
# CONFIG_AMDTEE is not set
# CONFIG_AMIGA_PARTITION is not set
@@ -677,6 +676,7 @@ CONFIG_CEPH_FS_SECURITY_LABEL=y
CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
+CONFIG_CERT_STORE=y
# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
CONFIG_CFG80211_CRDA_SUPPORT=y
# CONFIG_CFG80211_DEBUGFS is not set
@@ -812,6 +812,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -829,6 +830,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -910,6 +912,7 @@ CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA_S390=y
CONFIG_CRYPTO_CMAC=y
@@ -997,6 +1000,7 @@ CONFIG_CRYPTO_PAES_S390=m
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
+# CONFIG_CRYPTO_POLY1305_P10 is not set
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y
@@ -1203,6 +1207,7 @@ CONFIG_DMABUF_MOVE_NOTIFY=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1225,6 +1230,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1345,6 +1351,7 @@ CONFIG_DRM_KUNIT_TEST=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
CONFIG_DRM=m
# CONFIG_DRM_MALI_DISPLAY is not set
@@ -1419,6 +1426,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1659,6 +1667,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1841,6 +1850,7 @@ CONFIG_GNSS=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+# CONFIG_GPIO_DS4520 is not set
# CONFIG_GPIO_DWAPB is not set
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -1960,6 +1970,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2103,7 +2114,6 @@ CONFIG_HWPOISON_INJECT=m
CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
# CONFIG_HW_RANDOM_BA431 is not set
# CONFIG_HW_RANDOM_CCTRNG is not set
-CONFIG_HW_RANDOM_HISI=y
# CONFIG_HW_RANDOM_HISTB is not set
CONFIG_HW_RANDOM_S390=y
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
@@ -2139,6 +2149,7 @@ CONFIG_I2C_ALGOBIT=m
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_AMD_MP2 is not set
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
# CONFIG_I2C_CHARDEV is not set
@@ -2448,6 +2459,7 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_TCC_COOLING is not set
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_VSC is not set
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
CONFIG_INTEL_XWAY_PHY=m
@@ -2476,7 +2488,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2562,6 +2574,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2638,6 +2651,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -2781,14 +2795,16 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD_SEV=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
# CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set
CONFIG_KVM=m
+# CONFIG_KVM_PROVE_MMU is not set
# CONFIG_KVM_S390_UCONTROL is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
@@ -2861,6 +2877,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
@@ -3010,7 +3027,9 @@ CONFIG_MARCH_Z14=y
# CONFIG_MARCH_Z990 is not set
# CONFIG_MARCH_ZEC12 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
+CONFIG_MARVELL_GTI_WDT=y
# CONFIG_MARVELL_PHY is not set
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3051,9 +3070,11 @@ CONFIG_MAX_SKB_FRAGS=17
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3105,6 +3126,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3139,6 +3161,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3285,6 +3309,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3566,6 +3591,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -3986,6 +4012,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4032,6 +4059,7 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
CONFIG_NVMEM_SYSFS=y
@@ -4075,6 +4103,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
# CONFIG_OSF_PARTITION is not set
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4149,6 +4178,7 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -4242,6 +4272,7 @@ CONFIG_PHY_BCM_SR_USB=m
# CONFIG_PHY_QCOM_EUSB2_REPEATER is not set
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
# CONFIG_PHY_QCOM_SGMII_ETH is not set
@@ -4251,6 +4282,8 @@ CONFIG_PHY_BCM_SR_USB=m
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
# CONFIG_PHY_TUSB1210 is not set
# CONFIG_PI433 is not set
CONFIG_PID_NS=y
@@ -4402,6 +4435,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4420,6 +4454,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK=y
# CONFIG_PUNIT_ATOM_DEBUG is not set
@@ -4519,6 +4554,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -4563,12 +4599,14 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
# CONFIG_REALTEK_PHY is not set
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
# CONFIG_REGMAP is not set
CONFIG_REGMAP_KUNIT=m
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
+# CONFIG_REGULATOR_AW37503 is not set
# CONFIG_REGULATOR_DA9210 is not set
# CONFIG_REGULATOR_DA9211 is not set
# CONFIG_REGULATOR_DEBUG is not set
@@ -4585,6 +4623,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_LTC3589 is not set
# CONFIG_REGULATOR_LTC3676 is not set
# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8952 is not set
@@ -4597,9 +4636,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RT4803 is not set
# CONFIG_REGULATOR_RT5739 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_SY8106A is not set
# CONFIG_REGULATOR_TPS51632 is not set
# CONFIG_REGULATOR_TPS62360 is not set
@@ -4632,7 +4673,6 @@ CONFIG_RETPOLINE=y
# CONFIG_RFKILL_GPIO is not set
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -4835,10 +4875,9 @@ CONFIG_RV_REACT_PRINTK=y
CONFIG_RV=y
CONFIG_RXKAD=y
CONFIG_RXPERF=m
-CONFIG_S390_AP_IOMMU=y
-CONFIG_S390_CCW_IOMMU=y
CONFIG_S390_GUEST=y
CONFIG_S390_HYPFS_FS=y
+CONFIG_S390_HYPFS=y
# CONFIG_S390_KPROBES_SANITY_TEST is not set
# CONFIG_S390_MODULES_SANITY_TEST is not set
CONFIG_S390_PRNG=m
@@ -5042,6 +5081,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5051,6 +5091,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5126,6 +5167,7 @@ CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
# CONFIG_SENSORS_I5K_AMB is not set
CONFIG_SENSORS_IBMAEM=m
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5608,7 +5650,9 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -5625,7 +5669,6 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -5690,6 +5733,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -5700,6 +5744,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
# CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
@@ -5819,6 +5864,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -5877,6 +5923,7 @@ CONFIG_SND_SOC_SOF_ACPI=m
# CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set
# CONFIG_SND_SOC_SOF_JASPERLAKE is not set
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
# CONFIG_SND_SOC_SOF_MERRIFIELD is not set
# CONFIG_SND_SOC_SOF_METEORLAKE is not set
# CONFIG_SND_SOC_SOF_OF is not set
@@ -5947,6 +5994,7 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6167,6 +6215,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
# CONFIG_SX9324 is not set
@@ -6272,6 +6321,7 @@ CONFIG_TEST_CPUMASK=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
@@ -6376,6 +6426,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
CONFIG_TN3215_CONSOLE=y
@@ -6426,6 +6477,7 @@ CONFIG_TORTURE_TEST=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -6937,8 +6989,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7237,6 +7293,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 6e8f10a5e..2d5a1cce5 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -203,7 +203,6 @@ CONFIG_AMD_HSMP=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
# CONFIG_AMD_PHY is not set
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
# CONFIG_AMD_PTDMA is not set
# CONFIG_AMDTEE is not set
# CONFIG_AMIGA_PARTITION is not set
@@ -679,6 +678,7 @@ CONFIG_CEPH_FS_SECURITY_LABEL=y
CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
+CONFIG_CERT_STORE=y
# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
CONFIG_CFG80211_CRDA_SUPPORT=y
# CONFIG_CFG80211_DEBUGFS is not set
@@ -814,6 +814,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -831,6 +832,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=y
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -911,6 +913,7 @@ CONFIG_CRYPTO_CAST6=y
CONFIG_CRYPTO_CBC=y
# CONFIG_CRYPTO_CCM is not set
CONFIG_CRYPTO_CFB=y
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=y
CONFIG_CRYPTO_CHACHA20=y
CONFIG_CRYPTO_CHACHA_S390=y
@@ -998,6 +1001,7 @@ CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PAES_S390=m
CONFIG_CRYPTO_PCBC=y
CONFIG_CRYPTO_PCRYPT=y
+# CONFIG_CRYPTO_POLY1305_P10 is not set
CONFIG_CRYPTO_POLY1305=y
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=y
@@ -1205,6 +1209,7 @@ CONFIG_DMABUF_MOVE_NOTIFY=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1227,6 +1232,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1347,6 +1353,7 @@ CONFIG_DRM_KUNIT_TEST=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
CONFIG_DRM=m
# CONFIG_DRM_MALI_DISPLAY is not set
@@ -1421,6 +1428,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1662,6 +1670,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1847,6 +1856,7 @@ CONFIG_GLOB=y
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+# CONFIG_GPIO_DS4520 is not set
# CONFIG_GPIO_DWAPB is not set
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -1966,6 +1976,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2110,7 +2121,6 @@ CONFIG_HWPOISON_INJECT=m
CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
# CONFIG_HW_RANDOM_BA431 is not set
# CONFIG_HW_RANDOM_CCTRNG is not set
-CONFIG_HW_RANDOM_HISI=y
# CONFIG_HW_RANDOM_HISTB is not set
CONFIG_HW_RANDOM_S390=y
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
@@ -2146,6 +2156,7 @@ CONFIG_I2C_ALGOBIT=m
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_AMD_MP2 is not set
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
# CONFIG_I2C_CHARDEV is not set
@@ -2456,6 +2467,7 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_TCC_COOLING is not set
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_VSC is not set
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
CONFIG_INTEL_XWAY_PHY=m
@@ -2484,7 +2496,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2570,6 +2582,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2646,6 +2659,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -2790,14 +2804,16 @@ CONFIG_KPROBES=y
# CONFIG_KSM is not set
# CONFIG_KUNIT_ALL_TESTS is not set
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
# CONFIG_KUNIT is not set
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD_SEV=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
# CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set
# CONFIG_KVM is not set
+# CONFIG_KVM_PROVE_MMU is not set
# CONFIG_KVM_S390_UCONTROL is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
@@ -2870,6 +2886,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
@@ -3020,7 +3037,9 @@ CONFIG_MARCH_Z14=y
# CONFIG_MARCH_Z990 is not set
# CONFIG_MARCH_ZEC12 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
+CONFIG_MARVELL_GTI_WDT=y
# CONFIG_MARVELL_PHY is not set
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3061,9 +3080,11 @@ CONFIG_MAX_SKB_FRAGS=17
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3115,6 +3136,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
# CONFIG_MEMORY_HOTPLUG is not set
@@ -3149,6 +3171,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3295,6 +3319,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3576,6 +3601,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -3999,6 +4025,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
# CONFIG_NMI_CHECK_CPU is not set
# CONFIG_NOA1305 is not set
@@ -4044,6 +4071,7 @@ CONFIG_NVME_AUTH=y
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
CONFIG_NVMEM_SYSFS=y
@@ -4087,6 +4115,7 @@ CONFIG_OPENVSWITCH_GENEVE=m
# CONFIG_OSF_PARTITION is not set
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
# CONFIG_OVERLAY_FS is not set
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4161,6 +4190,7 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -4254,6 +4284,7 @@ CONFIG_PHY_BCM_SR_USB=m
# CONFIG_PHY_QCOM_EUSB2_REPEATER is not set
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
# CONFIG_PHY_QCOM_SGMII_ETH is not set
@@ -4263,6 +4294,8 @@ CONFIG_PHY_BCM_SR_USB=m
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
# CONFIG_PHY_TUSB1210 is not set
# CONFIG_PI433 is not set
CONFIG_PID_NS=y
@@ -4415,6 +4448,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4433,6 +4467,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK=y
# CONFIG_PUNIT_ATOM_DEBUG is not set
@@ -4532,6 +4567,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -4576,12 +4612,14 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
# CONFIG_REALTEK_PHY is not set
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
# CONFIG_REGMAP is not set
CONFIG_REGMAP_KUNIT=m
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
+# CONFIG_REGULATOR_AW37503 is not set
# CONFIG_REGULATOR_DA9210 is not set
# CONFIG_REGULATOR_DA9211 is not set
# CONFIG_REGULATOR_DEBUG is not set
@@ -4598,6 +4636,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_LTC3589 is not set
# CONFIG_REGULATOR_LTC3676 is not set
# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8952 is not set
@@ -4610,9 +4649,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RT4803 is not set
# CONFIG_REGULATOR_RT5739 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_SY8106A is not set
# CONFIG_REGULATOR_TPS51632 is not set
# CONFIG_REGULATOR_TPS62360 is not set
@@ -4645,7 +4686,6 @@ CONFIG_RETPOLINE=y
# CONFIG_RFKILL_GPIO is not set
CONFIG_RFKILL_INPUT=y
# CONFIG_RFKILL is not set
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -4849,10 +4889,9 @@ CONFIG_RV_REACT_PRINTK=y
CONFIG_RV=y
CONFIG_RXKAD=y
CONFIG_RXPERF=m
-CONFIG_S390_AP_IOMMU=y
-CONFIG_S390_CCW_IOMMU=y
# CONFIG_S390_GUEST is not set
# CONFIG_S390_HYPFS_FS is not set
+CONFIG_S390_HYPFS=y
# CONFIG_S390_KPROBES_SANITY_TEST is not set
# CONFIG_S390_MODULES_SANITY_TEST is not set
CONFIG_S390_PRNG=y
@@ -5060,6 +5099,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5068,6 +5108,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_SMACK is not set
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5143,6 +5184,7 @@ CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
# CONFIG_SENSORS_I5K_AMB is not set
CONFIG_SENSORS_IBMAEM=m
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5625,7 +5667,9 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -5642,7 +5686,6 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -5707,6 +5750,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -5717,6 +5761,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
# CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
@@ -5836,6 +5881,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -5894,6 +5940,7 @@ CONFIG_SND_SOC_SOF_ACPI=m
# CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set
# CONFIG_SND_SOC_SOF_JASPERLAKE is not set
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
# CONFIG_SND_SOC_SOF_MERRIFIELD is not set
# CONFIG_SND_SOC_SOF_METEORLAKE is not set
# CONFIG_SND_SOC_SOF_OF is not set
@@ -5964,6 +6011,7 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6187,6 +6235,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SUSPEND=y
# CONFIG_SWAP is not set
+# CONFIG_SWIOTLB_DYNAMIC is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
# CONFIG_SX9324 is not set
@@ -6294,6 +6343,7 @@ CONFIG_TEST_CPUMASK=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
@@ -6399,6 +6449,7 @@ CONFIG_TLS=m
CONFIG_TMPFS_INODE64=y
# CONFIG_TMPFS is not set
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TN3215_CONSOLE=y
CONFIG_TN3215=y
@@ -6448,6 +6499,7 @@ CONFIG_TN3270=y
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -6960,8 +7012,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7260,6 +7316,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
# CONFIG_XFS_FS is not set
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index d2ca299c0..f8b8c8916 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -154,7 +154,7 @@ CONFIG_AD7949=m
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
CONFIG_ADAPTEC_STARFIRE=m
-# CONFIG_ADDRESS_MASKING is not set
+CONFIG_ADDRESS_MASKING=y
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -1021,6 +1021,7 @@ CONFIG_COMMON_CLK_SI521XX=y
CONFIG_COMMON_CLK_SI544=m
# CONFIG_COMMON_CLK_SI570 is not set
CONFIG_COMMON_CLK_TPS68470=m
+CONFIG_COMMON_CLK_VC3=m
# CONFIG_COMMON_CLK_VC5 is not set
CONFIG_COMMON_CLK_VC7=m
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -1038,6 +1039,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=3
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1082,6 +1084,8 @@ CONFIG_CPU_UNRET_ENTRY=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -1486,6 +1490,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1510,6 +1515,7 @@ CONFIG_DM_INIT=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=y
@@ -1634,6 +1640,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
CONFIG_DRM_LONTIUM_LT9611UXC=m
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
CONFIG_DRM_MGAG200=m
@@ -1719,11 +1726,13 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
+CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m
# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
# CONFIG_DRM_PANEL_TPO_TPG110 is not set
# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+CONFIG_DRM_PANEL_VISIONOX_R66451=m
CONFIG_DRM_PANEL_VISIONOX_RM69299=m
# CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set
CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
@@ -1760,6 +1769,7 @@ CONFIG_DRM_TOSHIBA_TC358764=m
# CONFIG_DRM_TOSHIBA_TC358767 is not set
CONFIG_DRM_TOSHIBA_TC358768=m
CONFIG_DRM_TOSHIBA_TC358775=m
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
CONFIG_DRM_VBOXVIDEO=m
@@ -1973,6 +1983,7 @@ CONFIG_EROFS_FS=m
CONFIG_EROFS_FS_POSIX_ACL=y
CONFIG_EROFS_FS_SECURITY=y
CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP_DEFLATE=y
CONFIG_EROFS_FS_ZIP_LZMA=y
CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
@@ -2064,6 +2075,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -2293,6 +2305,7 @@ CONFIG_GPIO_CDEV=y
CONFIG_GPIO_CRYSTAL_COVE=y
# CONFIG_GPIO_CS5535 is not set
CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_DS4520=m
# CONFIG_GPIO_DWAPB is not set
CONFIG_GPIO_ELKHARTLAKE=m
CONFIG_GPIO_EXAR=m
@@ -2416,6 +2429,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
CONFIG_HID_GLORIOUS=m
# CONFIG_HID_GOOGLE_HAMMER is not set
+CONFIG_HID_GOOGLE_STADIA_FF=m
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2541,6 +2555,7 @@ CONFIG_HOTPLUG_PCI=y
# CONFIG_HP03 is not set
# CONFIG_HP206C is not set
CONFIG_HP_ACCEL=m
+CONFIG_HP_BIOSCFG=m
# CONFIG_HPET_MMAP is not set
CONFIG_HPET_TIMER=y
CONFIG_HPET=y
@@ -2615,6 +2630,7 @@ CONFIG_I2C_AMD756_S4882=m
CONFIG_I2C_AMD8111=m
CONFIG_I2C_AMD_MP2=m
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+CONFIG_I2C_ATR=m
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
@@ -3032,6 +3048,7 @@ CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_INTEL_TXT=y
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
CONFIG_INTEL_VBTN=m
+CONFIG_INTEL_VSC=m
CONFIG_INTEL_VSEC=m
CONFIG_INTEL_WMI_SBL_FW_UPDATE=m
CONFIG_INTEL_WMI_THUNDERBOLT=m
@@ -3062,6 +3079,7 @@ CONFIG_IOSCHED_BFQ=y
CONFIG_IOSF_MBI=y
CONFIG_IOSM=m
CONFIG_IO_STRICT_DEVMEM=y
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -3149,6 +3167,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+CONFIG_IPU_BRIDGE=m
CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_IOAM6_LWTUNNEL=y
@@ -3226,6 +3245,7 @@ CONFIG_IR_RC6_DECODER=m
CONFIG_IR_RCMM_DECODER=m
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
CONFIG_IR_SERIAL=m
CONFIG_IR_SERIAL_TRANSMITTER=y
CONFIG_IR_SHARP_DECODER=m
@@ -3438,7 +3458,7 @@ CONFIG_KSM=y
CONFIG_KSZ884X_PCI=m
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
@@ -3448,6 +3468,7 @@ CONFIG_KVM_GUEST=y
CONFIG_KVM_INTEL=m
CONFIG_KVM=m
CONFIG_KVM_MMU_AUDIT=y
+CONFIG_KVM_PROVE_MMU=y
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
CONFIG_KVM_XEN=y
@@ -3500,6 +3521,7 @@ CONFIG_LEDS_CR0014114=m
# CONFIG_LEDS_DAC124S085 is not set
# CONFIG_LEDS_EL15203000 is not set
CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GROUP_MULTICOLOR=m
CONFIG_LEDS_INTEL_SS4200=m
# CONFIG_LEDS_IS31FL319X is not set
CONFIG_LEDS_IS31FL32XX=m
@@ -3528,6 +3550,7 @@ CONFIG_LEDS_PCA9532_GPIO=y
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+CONFIG_LEDS_PCA995X=m
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_PWM_MULTICOLOR=m
CONFIG_LEDS_QCOM_FLASH=m
@@ -3683,6 +3706,7 @@ CONFIG_MANA_INFINIBAND=m
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88Q2XXX_PHY=m
CONFIG_MARVELL_88X2222_PHY=m
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
@@ -3726,11 +3750,13 @@ CONFIG_MCP41010=m
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+CONFIG_MCP4728=m
# CONFIG_MCP4922 is not set
CONFIG_MCTP_SERIAL=m
# CONFIG_MCTP_TRANSPORT_I2C is not set
CONFIG_MCTP=y
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3830,6 +3856,8 @@ CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=y
# CONFIG_MFD_CPCAP is not set
CONFIG_MFD_CROS_EC_DEV=m
+CONFIG_MFD_CS42L43_I2C=m
+CONFIG_MFD_CS42L43_SDW=m
# CONFIG_MFD_CS47L24 is not set
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
@@ -3996,6 +4024,7 @@ CONFIG_MLX5_ESWITCH=y
# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -4332,6 +4361,7 @@ CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4847,6 +4877,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4946,6 +4977,7 @@ CONFIG_ORINOCO_USB=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -5049,6 +5081,7 @@ CONFIG_PCH_PHUB=m
CONFIG_PCI_BIOS=y
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -5120,6 +5153,7 @@ CONFIG_PD6729=m
CONFIG_PDC_ADMA=m
CONFIG_PDS_CORE=m
CONFIG_PDS_VDPA=m
+CONFIG_PDS_VFIO_PCI=m
CONFIG_PEAQ_WMI=m
# CONFIG_PECI is not set
CONFIG_PERCPU_STATS=y
@@ -5165,6 +5199,8 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+CONFIG_PHY_RTK_RTD_USB2PHY=m
+CONFIG_PHY_RTK_RTD_USB3PHY=m
CONFIG_PHYSICAL_ALIGN=0x1000000
CONFIG_PHYSICAL_START=0x1000000
# CONFIG_PHY_TUSB1210 is not set
@@ -5178,6 +5214,7 @@ CONFIG_PINCTRL_BROXTON=m
CONFIG_PINCTRL_CANNONLAKE=m
CONFIG_PINCTRL_CEDARFORK=m
CONFIG_PINCTRL_CHERRYVIEW=y
+CONFIG_PINCTRL_CS42L43=m
CONFIG_PINCTRL_CY8C95X0=m
CONFIG_PINCTRL_DENVERTON=m
CONFIG_PINCTRL_ELKHARTLAKE=m
@@ -5209,6 +5246,7 @@ CONFIG_PINCTRL_RK805=m
# CONFIG_PINCTRL_SM8150 is not set
# CONFIG_PINCTRL_SM8250 is not set
# CONFIG_PINCTRL_SM8350 is not set
+CONFIG_PINCTRL_SM8350_LPASS_LPI=m
# CONFIG_PINCTRL_SM8450 is not set
# CONFIG_PINCTRL_STMFX is not set
# CONFIG_PINCTRL_SUN4I_A10 is not set
@@ -5356,6 +5394,7 @@ CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
CONFIG_PSTORE_842_COMPRESS=y
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -5377,6 +5416,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
CONFIG_PTP_1588_CLOCK_IDTCM=m
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_PTP_1588_CLOCK_VMW=m
@@ -5468,6 +5508,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -5529,6 +5570,7 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=y
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
@@ -5537,6 +5579,7 @@ CONFIG_REGMAP=y
# CONFIG_REGULATOR_AD5398 is not set
CONFIG_REGULATOR_ARIZONA_LDO1=m
CONFIG_REGULATOR_ARIZONA_MICSUPP=m
+CONFIG_REGULATOR_AW37503=m
# CONFIG_REGULATOR_AXP20X is not set
# CONFIG_REGULATOR_BD9571MWV is not set
# CONFIG_REGULATOR_DA9121 is not set
@@ -5558,9 +5601,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_MAX1586 is not set
# CONFIG_REGULATOR_MAX20086 is not set
CONFIG_REGULATOR_MAX20411=m
+CONFIG_REGULATOR_MAX5970=m
CONFIG_REGULATOR_MAX597X=m
CONFIG_REGULATOR_MAX77650=m
# CONFIG_REGULATOR_MAX77826 is not set
+CONFIG_REGULATOR_MAX77857=m
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
CONFIG_REGULATOR_MAX8893=m
@@ -5593,6 +5638,7 @@ CONFIG_REGULATOR_RT6190=m
CONFIG_REGULATOR_RT6245=m
CONFIG_REGULATOR_RTMV20=m
CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTQ2208=m
CONFIG_REGULATOR_RTQ6752=m
# CONFIG_REGULATOR_SLG51000 is not set
CONFIG_REGULATOR_SY7636A=m
@@ -5641,8 +5687,7 @@ CONFIG_RETPOLINE=y
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-# CONFIG_RH_DISABLE_DEPRECATED is not set
-CONFIG_RH_FEDORA=y
+# CONFIG_RHEL_DIFFERENCES is not set
CONFIG_RICHTEK_RTQ6056=m
CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
@@ -6051,6 +6096,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -6060,6 +6106,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+CONFIG_SEL3350_PLATFORM=m
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -6137,6 +6184,7 @@ CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
CONFIG_SENSORS_HP_WMI=m
+CONFIG_SENSORS_HS3001=m
CONFIG_SENSORS_I5500=m
CONFIG_SENSORS_I5K_AMB=m
CONFIG_SENSORS_IBMAEM=m
@@ -6226,6 +6274,7 @@ CONFIG_SENSORS_MCP3021=m
CONFIG_SENSORS_MLXREG_FAN=m
CONFIG_SENSORS_MP2888=m
CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_MP2975_REGULATOR=y
CONFIG_SENSORS_MP5023=m
CONFIG_SENSORS_MPQ7932=m
CONFIG_SENSORS_MPQ7932_REGULATOR=y
@@ -6553,6 +6602,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=0
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
# CONFIG_SND_HDA_TEGRA is not set
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -6668,7 +6720,9 @@ CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
CONFIG_SND_SOC_AMD_YC_MACH=m
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+CONFIG_SND_SOC_AUDIO_IIO_AUX=m
CONFIG_SND_SOC_AW8738=m
+CONFIG_SND_SOC_AW88261=m
CONFIG_SND_SOC_AW88395=m
CONFIG_SND_SOC_BD28623=m
CONFIG_SND_SOC_BT_SCO=m
@@ -6694,6 +6748,8 @@ CONFIG_SND_SOC_CS4234=m
# CONFIG_SND_SOC_CS4271_SPI is not set
CONFIG_SND_SOC_CS42L42=m
CONFIG_SND_SOC_CS42L42_SDW=m
+CONFIG_SND_SOC_CS42L43=m
+CONFIG_SND_SOC_CS42L43_SDW=m
# CONFIG_SND_SOC_CS42L51_I2C is not set
# CONFIG_SND_SOC_CS42L52 is not set
# CONFIG_SND_SOC_CS42L56 is not set
@@ -6751,6 +6807,7 @@ CONFIG_SND_SOC_IDT821034=m
CONFIG_SND_SOC_INTEL_AVS=m
CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219=m
CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336=m
CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO=m
CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST=m
CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A=m
@@ -6761,6 +6818,7 @@ CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE=m
CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=m
CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=m
CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663=m
CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682=m
CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567=m
CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
@@ -6881,6 +6939,7 @@ CONFIG_SND_SOC_RL6231=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+CONFIG_SND_SOC_RT1017_SDCA_SDW=m
CONFIG_SND_SOC_RT1308=m
CONFIG_SND_SOC_RT1308_SDW=m
CONFIG_SND_SOC_RT1316_SDW=m
@@ -6922,6 +6981,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE=m
CONFIG_SND_SOC_SOF_AMD_REMBRANDT=m
CONFIG_SND_SOC_SOF_AMD_RENOIR=m
CONFIG_SND_SOC_SOF_AMD_TOPLEVEL=m
+CONFIG_SND_SOC_SOF_AMD_VANGOGH=m
CONFIG_SND_SOC_SOF_APOLLOLAKE=m
CONFIG_SND_SOC_SOF_BAYTRAIL=m
CONFIG_SND_SOC_SOF_BROADWELL=m
@@ -6942,6 +7002,7 @@ CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
CONFIG_SND_SOC_SOF_JASPERLAKE=m
CONFIG_SND_SOC_SOF_KABYLAKE=m
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
CONFIG_SND_SOC_SOF_MERRIFIELD=m
CONFIG_SND_SOC_SOF_METEORLAKE=m
# CONFIG_SND_SOC_SOF_MT8195 is not set
@@ -7014,6 +7075,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
CONFIG_SND_SOC_TS3A227E=m
@@ -7147,6 +7209,7 @@ CONFIG_SPI_AX88796C=m
# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_CADENCE_QUADSPI is not set
# CONFIG_SPI_CADENCE_XSPI is not set
+# CONFIG_SPI_CS42L43 is not set
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
CONFIG_SPI_DLN2=m
@@ -7288,6 +7351,7 @@ CONFIG_SURFACE_PRO3_BUTTON=m
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_SWIOTLB=y
# CONFIG_SW_SYNC is not set
CONFIG_SX9310=m
@@ -7398,6 +7462,7 @@ CONFIG_TEST_FPU=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIST_SORT=m
@@ -7479,6 +7544,8 @@ CONFIG_TIFM_7XX1=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+# CONFIG_TI_ICSSG_PRUETH is not set
+CONFIG_TI_ICSS_IEP=m
CONFIG_TI_LMP92064=m
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y
@@ -7511,6 +7578,7 @@ CONFIG_TLS=m
CONFIG_TMP117=m
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_QUOTA=y
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
CONFIG_TOPSTAR_LAPTOP=m
@@ -7560,6 +7628,7 @@ CONFIG_TOUCHSCREEN_IMAGIS=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
CONFIG_TOUCHSCREEN_INEXIO=m
CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_IQS7211=m
# CONFIG_TOUCHSCREEN_MAX11801 is not set
CONFIG_TOUCHSCREEN_MCS5000=m
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7761,6 +7830,7 @@ CONFIG_USB_CHIPIDEA_IMX=m
# CONFIG_USB_CHIPIDEA is not set
CONFIG_USB_CHIPIDEA_MSM=m
CONFIG_USB_CHIPIDEA_PCI=m
+CONFIG_USB_CONFIGFS_F_MIDI2=y
# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
# CONFIG_USB_CONN_GPIO is not set
CONFIG_USB_CXACRU=m
@@ -7773,9 +7843,11 @@ CONFIG_USB_DSBR=m
# CONFIG_USB_DWC2_PERIPHERAL is not set
# CONFIG_USB_DWC3_GADGET is not set
# CONFIG_USB_DWC3_HAPS is not set
-# CONFIG_USB_DWC3_HOST is not set
-# CONFIG_USB_DWC3 is not set
+CONFIG_USB_DWC3_HOST=y
+CONFIG_USB_DWC3=m
# CONFIG_USB_DWC3_OF_SIMPLE is not set
+CONFIG_USB_DWC3_PCI=m
+# CONFIG_USB_DWC3_ULPI is not set
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_EHCI_FSL is not set
# CONFIG_USB_EHCI_HCD_PLATFORM is not set
@@ -8100,6 +8172,8 @@ CONFIG_VETH=m
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=m
CONFIG_VFIO_CONTAINER=y
+# CONFIG_VFIO_DEVICE_CDEV is not set
+CONFIG_VFIO_GROUP=y
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
CONFIG_VFIO_MDEV=m
@@ -8172,8 +8246,12 @@ CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_DS90UB913=m
+CONFIG_VIDEO_DS90UB953=m
+CONFIG_VIDEO_DS90UB960=m
# CONFIG_VIDEO_DT3155 is not set
CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9719=m
CONFIG_VIDEO_DW9768=m
CONFIG_VIDEO_DW9807_VCM=m
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -8571,6 +8649,7 @@ CONFIG_X86_SGX_KVM=y
CONFIG_X86_SGX=y
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
CONFIG_X86_UMIP=y
+CONFIG_X86_USER_SHADOW_STACK=y
CONFIG_X86_UV=y
# CONFIG_X86_VERBOSE_BOOTUP is not set
# CONFIG_X86_VSMP is not set
@@ -8603,6 +8682,7 @@ CONFIG_XEN_NETDEV_BACKEND=m
CONFIG_XEN_NETDEV_FRONTEND=m
CONFIG_XEN_PCIDEV_BACKEND=m
CONFIG_XEN_PCIDEV_FRONTEND=m
+CONFIG_XEN_PRIVCMD_IRQFD=y
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_BACKEND is not set
# CONFIG_XEN_PVCALLS_FRONTEND is not set
@@ -8633,6 +8713,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index e41338652..b6814ad60 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -134,7 +134,7 @@ CONFIG_ACPI=y
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
-# CONFIG_ADDRESS_MASKING is not set
+CONFIG_ADDRESS_MASKING=y
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -225,7 +225,8 @@ CONFIG_AMD_MEM_ENCRYPT=y
CONFIG_AMD_NUMA=y
CONFIG_AMD_PHY=m
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
+CONFIG_AMD_PMF_DEBUG=y
+CONFIG_AMD_PMF=m
CONFIG_AMD_PTDMA=m
CONFIG_AMD_SFH_HID=m
# CONFIG_AMDTEE is not set
@@ -842,6 +843,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -860,6 +862,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -906,6 +909,8 @@ CONFIG_CPU_UNRET_ENTRY=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -958,6 +963,7 @@ CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA20_X86_64=y
CONFIG_CRYPTO_CMAC=y
@@ -1054,6 +1060,7 @@ CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
+# CONFIG_CRYPTO_POLY1305_P10 is not set
CONFIG_CRYPTO_POLY1305_X86_64=y
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
@@ -1288,6 +1295,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1310,6 +1318,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1435,6 +1444,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MALI_DISPLAY is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1508,6 +1518,7 @@ CONFIG_DRM_SIMPLEDRM=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1781,6 +1792,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1970,6 +1982,7 @@ CONFIG_GPIO_AMDPT=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+# CONFIG_GPIO_DS4520 is not set
# CONFIG_GPIO_DWAPB is not set
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -2092,6 +2105,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2256,7 +2270,6 @@ CONFIG_HW_RANDOM_AMD=m
CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
# CONFIG_HW_RANDOM_BA431 is not set
# CONFIG_HW_RANDOM_CCTRNG is not set
-CONFIG_HW_RANDOM_HISI=y
# CONFIG_HW_RANDOM_HISTB is not set
CONFIG_HW_RANDOM_INTEL=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -2294,6 +2307,7 @@ CONFIG_I2C_AMD756_S4882=m
CONFIG_I2C_AMD8111=m
# CONFIG_I2C_AMD_MP2 is not set
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
@@ -2653,6 +2667,7 @@ CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_INTEL_TXT=y
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
CONFIG_INTEL_VBTN=m
+# CONFIG_INTEL_VSC is not set
CONFIG_INTEL_VSEC=m
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
@@ -2684,7 +2699,7 @@ CONFIG_IOSCHED_BFQ=y
CONFIG_IOSF_MBI=y
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2770,6 +2785,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2847,6 +2863,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -2994,10 +3011,11 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD=m
CONFIG_KVM_AMD_SEV=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
@@ -3006,6 +3024,7 @@ CONFIG_KVM_GUEST=y
CONFIG_KVM_INTEL=m
CONFIG_KVM=m
CONFIG_KVM_MMU_AUDIT=y
+CONFIG_KVM_PROVE_MMU=y
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
# CONFIG_KVM_XEN is not set
@@ -3076,6 +3095,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
@@ -3219,7 +3239,9 @@ CONFIG_MANA_INFINIBAND=m
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3261,9 +3283,11 @@ CONFIG_MAXSMP=y
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3315,6 +3339,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3349,6 +3374,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3504,6 +3531,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3794,6 +3822,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4213,6 +4242,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4262,6 +4292,7 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
CONFIG_NVMEM_SYSFS=y
@@ -4306,6 +4337,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+CONFIG_OVERLAY_FS_DEBUG=y
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4391,6 +4423,7 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -4490,6 +4523,7 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_EUSB2_REPEATER is not set
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
# CONFIG_PHY_QCOM_SGMII_ETH is not set
@@ -4499,6 +4533,8 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
CONFIG_PHYSICAL_ALIGN=0x200000
CONFIG_PHYSICAL_START=0x1000000
# CONFIG_PHY_TUSB1210 is not set
@@ -4667,6 +4703,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4685,6 +4722,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_VMW=m
CONFIG_PTP_1588_CLOCK=y
@@ -4783,6 +4821,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -4827,12 +4866,14 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
+# CONFIG_REGULATOR_AW37503 is not set
# CONFIG_REGULATOR_DA9210 is not set
# CONFIG_REGULATOR_DA9211 is not set
# CONFIG_REGULATOR_DEBUG is not set
@@ -4849,6 +4890,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_LTC3589 is not set
# CONFIG_REGULATOR_LTC3676 is not set
# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8952 is not set
@@ -4861,9 +4903,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RT4803 is not set
# CONFIG_REGULATOR_RT5739 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_SY8106A is not set
# CONFIG_REGULATOR_TPS51632 is not set
# CONFIG_REGULATOR_TPS62360 is not set
@@ -4897,7 +4941,6 @@ CONFIG_RETPOLINE=y
# CONFIG_RFKILL_GPIO is not set
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -5291,6 +5334,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5300,6 +5344,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5377,6 +5422,7 @@ CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
CONFIG_SENSORS_I5500=m
CONFIG_SENSORS_I5K_AMB=m
CONFIG_SENSORS_IBMAEM=m
@@ -5761,6 +5807,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=0
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
# CONFIG_SND_HDA_TEGRA is not set
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -5872,7 +5921,9 @@ CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
CONFIG_SND_SOC_AMD_YC_MACH=m
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -5889,7 +5940,7 @@ CONFIG_SND_SOC_CS35L41_SPI=m
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
+CONFIG_SND_SOC_CS35L56_SDW=m
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -5954,6 +6005,7 @@ CONFIG_SND_SOC_HDAC_HDMI=m
CONFIG_SND_SOC_INTEL_AVS=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -5964,6 +6016,7 @@ CONFIG_SND_SOC_INTEL_AVS=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
@@ -6084,6 +6137,7 @@ CONFIG_SND_SOC_RL6231=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
CONFIG_SND_SOC_RT1308=m
CONFIG_SND_SOC_RT1308_SDW=m
CONFIG_SND_SOC_RT1316_SDW=m
@@ -6144,6 +6198,7 @@ CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
CONFIG_SND_SOC_SOF_JASPERLAKE=m
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
CONFIG_SND_SOC_SOF_MERRIFIELD=m
CONFIG_SND_SOC_SOF_METEORLAKE=m
# CONFIG_SND_SOC_SOF_OF is not set
@@ -6214,6 +6269,7 @@ CONFIG_SND_SOC_SSM4567=m
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_BUILD=y
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
CONFIG_SND_SOC_TS3A227E=m
@@ -6453,6 +6509,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_SWIOTLB=y
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
@@ -6558,6 +6615,7 @@ CONFIG_TEST_FPU=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIST_SORT=m
@@ -6669,6 +6727,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -6717,6 +6776,7 @@ CONFIG_TOUCHSCREEN_ELO=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7223,8 +7283,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7554,6 +7618,7 @@ CONFIG_X86_SGX_KVM=y
CONFIG_X86_SGX=y
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
CONFIG_X86_UMIP=y
+CONFIG_X86_USER_SHADOW_STACK=y
CONFIG_X86_UV=y
# CONFIG_X86_VERBOSE_BOOTUP is not set
# CONFIG_X86_VSMP is not set
@@ -7603,6 +7668,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index fbdf8ee7e..6ef39288b 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -154,7 +154,7 @@ CONFIG_AD7949=m
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
CONFIG_ADAPTEC_STARFIRE=m
-# CONFIG_ADDRESS_MASKING is not set
+CONFIG_ADDRESS_MASKING=y
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -1019,6 +1019,7 @@ CONFIG_COMMON_CLK_SI521XX=y
CONFIG_COMMON_CLK_SI544=m
# CONFIG_COMMON_CLK_SI570 is not set
CONFIG_COMMON_CLK_TPS68470=m
+CONFIG_COMMON_CLK_VC3=m
# CONFIG_COMMON_CLK_VC5 is not set
CONFIG_COMMON_CLK_VC7=m
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -1036,6 +1037,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=3
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1080,6 +1082,8 @@ CONFIG_CPU_UNRET_ENTRY=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -1475,6 +1479,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1499,6 +1504,7 @@ CONFIG_DM_INIT=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=y
@@ -1623,6 +1629,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
CONFIG_DRM_LONTIUM_LT9611UXC=m
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
CONFIG_DRM_MGAG200=m
@@ -1708,11 +1715,13 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
+CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m
# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
# CONFIG_DRM_PANEL_TPO_TPG110 is not set
# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+CONFIG_DRM_PANEL_VISIONOX_R66451=m
CONFIG_DRM_PANEL_VISIONOX_RM69299=m
# CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set
CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
@@ -1749,6 +1758,7 @@ CONFIG_DRM_TOSHIBA_TC358764=m
# CONFIG_DRM_TOSHIBA_TC358767 is not set
CONFIG_DRM_TOSHIBA_TC358768=m
CONFIG_DRM_TOSHIBA_TC358775=m
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
CONFIG_DRM_VBOXVIDEO=m
@@ -1962,6 +1972,7 @@ CONFIG_EROFS_FS=m
CONFIG_EROFS_FS_POSIX_ACL=y
CONFIG_EROFS_FS_SECURITY=y
CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP_DEFLATE=y
CONFIG_EROFS_FS_ZIP_LZMA=y
CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
@@ -2045,6 +2056,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -2274,6 +2286,7 @@ CONFIG_GPIO_CDEV=y
CONFIG_GPIO_CRYSTAL_COVE=y
# CONFIG_GPIO_CS5535 is not set
CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_DS4520=m
# CONFIG_GPIO_DWAPB is not set
CONFIG_GPIO_ELKHARTLAKE=m
CONFIG_GPIO_EXAR=m
@@ -2397,6 +2410,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
CONFIG_HID_GLORIOUS=m
# CONFIG_HID_GOOGLE_HAMMER is not set
+CONFIG_HID_GOOGLE_STADIA_FF=m
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2522,6 +2536,7 @@ CONFIG_HOTPLUG_PCI=y
# CONFIG_HP03 is not set
# CONFIG_HP206C is not set
CONFIG_HP_ACCEL=m
+CONFIG_HP_BIOSCFG=m
# CONFIG_HPET_MMAP is not set
CONFIG_HPET_TIMER=y
CONFIG_HPET=y
@@ -2596,6 +2611,7 @@ CONFIG_I2C_AMD756_S4882=m
CONFIG_I2C_AMD8111=m
CONFIG_I2C_AMD_MP2=m
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+CONFIG_I2C_ATR=m
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
@@ -3012,6 +3028,7 @@ CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_INTEL_TXT=y
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
CONFIG_INTEL_VBTN=m
+CONFIG_INTEL_VSC=m
CONFIG_INTEL_VSEC=m
CONFIG_INTEL_WMI_SBL_FW_UPDATE=m
CONFIG_INTEL_WMI_THUNDERBOLT=m
@@ -3042,6 +3059,7 @@ CONFIG_IOSCHED_BFQ=y
CONFIG_IOSF_MBI=y
CONFIG_IOSM=m
CONFIG_IO_STRICT_DEVMEM=y
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -3129,6 +3147,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+CONFIG_IPU_BRIDGE=m
CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_IOAM6_LWTUNNEL=y
@@ -3206,6 +3225,7 @@ CONFIG_IR_RC6_DECODER=m
CONFIG_IR_RCMM_DECODER=m
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
CONFIG_IR_SERIAL=m
CONFIG_IR_SERIAL_TRANSMITTER=y
CONFIG_IR_SHARP_DECODER=m
@@ -3412,7 +3432,7 @@ CONFIG_KSM=y
CONFIG_KSZ884X_PCI=m
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
@@ -3422,6 +3442,7 @@ CONFIG_KVM_GUEST=y
CONFIG_KVM_INTEL=m
CONFIG_KVM=m
CONFIG_KVM_MMU_AUDIT=y
+# CONFIG_KVM_PROVE_MMU is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
CONFIG_KVM_XEN=y
@@ -3474,6 +3495,7 @@ CONFIG_LEDS_CR0014114=m
# CONFIG_LEDS_DAC124S085 is not set
# CONFIG_LEDS_EL15203000 is not set
CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GROUP_MULTICOLOR=m
CONFIG_LEDS_INTEL_SS4200=m
# CONFIG_LEDS_IS31FL319X is not set
CONFIG_LEDS_IS31FL32XX=m
@@ -3502,6 +3524,7 @@ CONFIG_LEDS_PCA9532_GPIO=y
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+CONFIG_LEDS_PCA995X=m
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_PWM_MULTICOLOR=m
CONFIG_LEDS_QCOM_FLASH=m
@@ -3657,6 +3680,7 @@ CONFIG_MANA_INFINIBAND=m
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88Q2XXX_PHY=m
CONFIG_MARVELL_88X2222_PHY=m
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
@@ -3700,11 +3724,13 @@ CONFIG_MCP41010=m
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+CONFIG_MCP4728=m
# CONFIG_MCP4922 is not set
CONFIG_MCTP_SERIAL=m
# CONFIG_MCTP_TRANSPORT_I2C is not set
CONFIG_MCTP=y
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3804,6 +3830,8 @@ CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=y
# CONFIG_MFD_CPCAP is not set
CONFIG_MFD_CROS_EC_DEV=m
+CONFIG_MFD_CS42L43_I2C=m
+CONFIG_MFD_CS42L43_SDW=m
# CONFIG_MFD_CS47L24 is not set
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
@@ -3970,6 +3998,7 @@ CONFIG_MLX5_ESWITCH=y
# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -4306,6 +4335,7 @@ CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4821,6 +4851,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4920,6 +4951,7 @@ CONFIG_ORINOCO_USB=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -5022,6 +5054,7 @@ CONFIG_PCH_PHUB=m
CONFIG_PCI_BIOS=y
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -5093,6 +5126,7 @@ CONFIG_PD6729=m
CONFIG_PDC_ADMA=m
CONFIG_PDS_CORE=m
CONFIG_PDS_VDPA=m
+CONFIG_PDS_VFIO_PCI=m
CONFIG_PEAQ_WMI=m
# CONFIG_PECI is not set
# CONFIG_PERCPU_STATS is not set
@@ -5138,6 +5172,8 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+CONFIG_PHY_RTK_RTD_USB2PHY=m
+CONFIG_PHY_RTK_RTD_USB3PHY=m
CONFIG_PHYSICAL_ALIGN=0x1000000
CONFIG_PHYSICAL_START=0x1000000
# CONFIG_PHY_TUSB1210 is not set
@@ -5151,6 +5187,7 @@ CONFIG_PINCTRL_BROXTON=m
CONFIG_PINCTRL_CANNONLAKE=m
CONFIG_PINCTRL_CEDARFORK=m
CONFIG_PINCTRL_CHERRYVIEW=y
+CONFIG_PINCTRL_CS42L43=m
CONFIG_PINCTRL_CY8C95X0=m
CONFIG_PINCTRL_DENVERTON=m
CONFIG_PINCTRL_ELKHARTLAKE=m
@@ -5182,6 +5219,7 @@ CONFIG_PINCTRL_RK805=m
# CONFIG_PINCTRL_SM8150 is not set
# CONFIG_PINCTRL_SM8250 is not set
# CONFIG_PINCTRL_SM8350 is not set
+CONFIG_PINCTRL_SM8350_LPASS_LPI=m
# CONFIG_PINCTRL_SM8450 is not set
# CONFIG_PINCTRL_STMFX is not set
# CONFIG_PINCTRL_SUN4I_A10 is not set
@@ -5328,6 +5366,7 @@ CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
CONFIG_PSTORE_842_COMPRESS=y
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -5349,6 +5388,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
CONFIG_PTP_1588_CLOCK_IDTCM=m
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_PTP_1588_CLOCK_VMW=m
@@ -5440,6 +5480,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -5501,6 +5542,7 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=y
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
@@ -5509,6 +5551,7 @@ CONFIG_REGMAP=y
# CONFIG_REGULATOR_AD5398 is not set
CONFIG_REGULATOR_ARIZONA_LDO1=m
CONFIG_REGULATOR_ARIZONA_MICSUPP=m
+CONFIG_REGULATOR_AW37503=m
# CONFIG_REGULATOR_AXP20X is not set
# CONFIG_REGULATOR_BD9571MWV is not set
# CONFIG_REGULATOR_DA9121 is not set
@@ -5530,9 +5573,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_MAX1586 is not set
# CONFIG_REGULATOR_MAX20086 is not set
CONFIG_REGULATOR_MAX20411=m
+CONFIG_REGULATOR_MAX5970=m
CONFIG_REGULATOR_MAX597X=m
CONFIG_REGULATOR_MAX77650=m
# CONFIG_REGULATOR_MAX77826 is not set
+CONFIG_REGULATOR_MAX77857=m
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
CONFIG_REGULATOR_MAX8893=m
@@ -5565,6 +5610,7 @@ CONFIG_REGULATOR_RT6190=m
CONFIG_REGULATOR_RT6245=m
CONFIG_REGULATOR_RTMV20=m
CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTQ2208=m
CONFIG_REGULATOR_RTQ6752=m
# CONFIG_REGULATOR_SLG51000 is not set
CONFIG_REGULATOR_SY7636A=m
@@ -5613,8 +5659,7 @@ CONFIG_RETPOLINE=y
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-# CONFIG_RH_DISABLE_DEPRECATED is not set
-CONFIG_RH_FEDORA=y
+# CONFIG_RHEL_DIFFERENCES is not set
CONFIG_RICHTEK_RTQ6056=m
CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
@@ -6023,6 +6068,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -6032,6 +6078,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+CONFIG_SEL3350_PLATFORM=m
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -6109,6 +6156,7 @@ CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
CONFIG_SENSORS_HP_WMI=m
+CONFIG_SENSORS_HS3001=m
CONFIG_SENSORS_I5500=m
CONFIG_SENSORS_I5K_AMB=m
CONFIG_SENSORS_IBMAEM=m
@@ -6198,6 +6246,7 @@ CONFIG_SENSORS_MCP3021=m
CONFIG_SENSORS_MLXREG_FAN=m
CONFIG_SENSORS_MP2888=m
CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_MP2975_REGULATOR=y
CONFIG_SENSORS_MP5023=m
CONFIG_SENSORS_MPQ7932=m
CONFIG_SENSORS_MPQ7932_REGULATOR=y
@@ -6525,6 +6574,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=0
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
# CONFIG_SND_HDA_TEGRA is not set
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -6639,7 +6691,9 @@ CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
CONFIG_SND_SOC_AMD_YC_MACH=m
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+CONFIG_SND_SOC_AUDIO_IIO_AUX=m
CONFIG_SND_SOC_AW8738=m
+CONFIG_SND_SOC_AW88261=m
CONFIG_SND_SOC_AW88395=m
CONFIG_SND_SOC_BD28623=m
CONFIG_SND_SOC_BT_SCO=m
@@ -6665,6 +6719,8 @@ CONFIG_SND_SOC_CS4234=m
# CONFIG_SND_SOC_CS4271_SPI is not set
CONFIG_SND_SOC_CS42L42=m
CONFIG_SND_SOC_CS42L42_SDW=m
+CONFIG_SND_SOC_CS42L43=m
+CONFIG_SND_SOC_CS42L43_SDW=m
# CONFIG_SND_SOC_CS42L51_I2C is not set
# CONFIG_SND_SOC_CS42L52 is not set
# CONFIG_SND_SOC_CS42L56 is not set
@@ -6722,6 +6778,7 @@ CONFIG_SND_SOC_IDT821034=m
CONFIG_SND_SOC_INTEL_AVS=m
CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219=m
CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336=m
CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO=m
CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST=m
CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A=m
@@ -6732,6 +6789,7 @@ CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE=m
CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=m
CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=m
CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663=m
CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682=m
CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567=m
CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
@@ -6852,6 +6910,7 @@ CONFIG_SND_SOC_RL6231=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+CONFIG_SND_SOC_RT1017_SDCA_SDW=m
CONFIG_SND_SOC_RT1308=m
CONFIG_SND_SOC_RT1308_SDW=m
CONFIG_SND_SOC_RT1316_SDW=m
@@ -6893,6 +6952,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE=m
CONFIG_SND_SOC_SOF_AMD_REMBRANDT=m
CONFIG_SND_SOC_SOF_AMD_RENOIR=m
CONFIG_SND_SOC_SOF_AMD_TOPLEVEL=m
+CONFIG_SND_SOC_SOF_AMD_VANGOGH=m
CONFIG_SND_SOC_SOF_APOLLOLAKE=m
CONFIG_SND_SOC_SOF_BAYTRAIL=m
CONFIG_SND_SOC_SOF_BROADWELL=m
@@ -6912,6 +6972,7 @@ CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
CONFIG_SND_SOC_SOF_JASPERLAKE=m
CONFIG_SND_SOC_SOF_KABYLAKE=m
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
CONFIG_SND_SOC_SOF_MERRIFIELD=m
CONFIG_SND_SOC_SOF_METEORLAKE=m
# CONFIG_SND_SOC_SOF_MT8195 is not set
@@ -6984,6 +7045,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
CONFIG_SND_SOC_TS3A227E=m
@@ -7117,6 +7179,7 @@ CONFIG_SPI_AX88796C=m
# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_CADENCE_QUADSPI is not set
# CONFIG_SPI_CADENCE_XSPI is not set
+# CONFIG_SPI_CS42L43 is not set
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
CONFIG_SPI_DLN2=m
@@ -7258,6 +7321,7 @@ CONFIG_SURFACE_PRO3_BUTTON=m
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_SWIOTLB=y
# CONFIG_SW_SYNC is not set
CONFIG_SX9310=m
@@ -7368,6 +7432,7 @@ CONFIG_TEST_CPUMASK=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
@@ -7449,6 +7514,8 @@ CONFIG_TIFM_7XX1=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+# CONFIG_TI_ICSSG_PRUETH is not set
+CONFIG_TI_ICSS_IEP=m
CONFIG_TI_LMP92064=m
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y
@@ -7481,6 +7548,7 @@ CONFIG_TLS=m
CONFIG_TMP117=m
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_QUOTA=y
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
CONFIG_TOPSTAR_LAPTOP=m
@@ -7530,6 +7598,7 @@ CONFIG_TOUCHSCREEN_IMAGIS=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
CONFIG_TOUCHSCREEN_INEXIO=m
CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_IQS7211=m
# CONFIG_TOUCHSCREEN_MAX11801 is not set
CONFIG_TOUCHSCREEN_MCS5000=m
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7731,6 +7800,7 @@ CONFIG_USB_CHIPIDEA_IMX=m
# CONFIG_USB_CHIPIDEA is not set
CONFIG_USB_CHIPIDEA_MSM=m
CONFIG_USB_CHIPIDEA_PCI=m
+CONFIG_USB_CONFIGFS_F_MIDI2=y
# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
# CONFIG_USB_CONN_GPIO is not set
CONFIG_USB_CXACRU=m
@@ -7743,9 +7813,11 @@ CONFIG_USB_DSBR=m
# CONFIG_USB_DWC2_PERIPHERAL is not set
# CONFIG_USB_DWC3_GADGET is not set
# CONFIG_USB_DWC3_HAPS is not set
-# CONFIG_USB_DWC3_HOST is not set
-# CONFIG_USB_DWC3 is not set
+CONFIG_USB_DWC3_HOST=y
+CONFIG_USB_DWC3=m
# CONFIG_USB_DWC3_OF_SIMPLE is not set
+CONFIG_USB_DWC3_PCI=m
+# CONFIG_USB_DWC3_ULPI is not set
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_EHCI_FSL is not set
# CONFIG_USB_EHCI_HCD_PLATFORM is not set
@@ -8070,6 +8142,8 @@ CONFIG_VETH=m
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=m
CONFIG_VFIO_CONTAINER=y
+# CONFIG_VFIO_DEVICE_CDEV is not set
+CONFIG_VFIO_GROUP=y
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
CONFIG_VFIO_MDEV=m
@@ -8142,8 +8216,12 @@ CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_DS90UB913=m
+CONFIG_VIDEO_DS90UB953=m
+CONFIG_VIDEO_DS90UB960=m
# CONFIG_VIDEO_DT3155 is not set
CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9719=m
CONFIG_VIDEO_DW9768=m
CONFIG_VIDEO_DW9807_VCM=m
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -8541,6 +8619,7 @@ CONFIG_X86_SGX_KVM=y
CONFIG_X86_SGX=y
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
CONFIG_X86_UMIP=y
+CONFIG_X86_USER_SHADOW_STACK=y
CONFIG_X86_UV=y
# CONFIG_X86_VERBOSE_BOOTUP is not set
# CONFIG_X86_VSMP is not set
@@ -8573,6 +8652,7 @@ CONFIG_XEN_NETDEV_BACKEND=m
CONFIG_XEN_NETDEV_FRONTEND=m
CONFIG_XEN_PCIDEV_BACKEND=m
CONFIG_XEN_PCIDEV_FRONTEND=m
+CONFIG_XEN_PRIVCMD_IRQFD=y
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_BACKEND is not set
# CONFIG_XEN_PVCALLS_FRONTEND is not set
@@ -8603,6 +8683,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index db1d427e9..38a7bec5b 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -134,7 +134,7 @@ CONFIG_ACPI=y
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
-# CONFIG_ADDRESS_MASKING is not set
+CONFIG_ADDRESS_MASKING=y
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -225,7 +225,8 @@ CONFIG_AMD_MEM_ENCRYPT=y
CONFIG_AMD_NUMA=y
CONFIG_AMD_PHY=m
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
+# CONFIG_AMD_PMF_DEBUG is not set
+CONFIG_AMD_PMF=m
CONFIG_AMD_PTDMA=m
CONFIG_AMD_SFH_HID=m
# CONFIG_AMDTEE is not set
@@ -842,6 +843,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -860,6 +862,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -906,6 +909,8 @@ CONFIG_CPU_UNRET_ENTRY=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -958,6 +963,7 @@ CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA20_X86_64=y
CONFIG_CRYPTO_CMAC=y
@@ -1054,6 +1060,7 @@ CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
+# CONFIG_CRYPTO_POLY1305_P10 is not set
CONFIG_CRYPTO_POLY1305_X86_64=y
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
@@ -1280,6 +1287,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1302,6 +1310,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1427,6 +1436,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MALI_DISPLAY is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1500,6 +1510,7 @@ CONFIG_DRM_SIMPLEDRM=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1765,6 +1776,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1954,6 +1966,7 @@ CONFIG_GPIO_AMDPT=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+# CONFIG_GPIO_DS4520 is not set
# CONFIG_GPIO_DWAPB is not set
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -2076,6 +2089,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2240,7 +2254,6 @@ CONFIG_HW_RANDOM_AMD=m
CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
# CONFIG_HW_RANDOM_BA431 is not set
# CONFIG_HW_RANDOM_CCTRNG is not set
-CONFIG_HW_RANDOM_HISI=y
# CONFIG_HW_RANDOM_HISTB is not set
CONFIG_HW_RANDOM_INTEL=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -2278,6 +2291,7 @@ CONFIG_I2C_AMD756_S4882=m
CONFIG_I2C_AMD8111=m
# CONFIG_I2C_AMD_MP2 is not set
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
@@ -2637,6 +2651,7 @@ CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_INTEL_TXT=y
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
CONFIG_INTEL_VBTN=m
+# CONFIG_INTEL_VSC is not set
CONFIG_INTEL_VSEC=m
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
@@ -2668,7 +2683,7 @@ CONFIG_IOSCHED_BFQ=y
CONFIG_IOSF_MBI=y
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2754,6 +2769,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2831,6 +2847,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -2974,10 +2991,11 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD=m
CONFIG_KVM_AMD_SEV=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
@@ -2986,6 +3004,7 @@ CONFIG_KVM_GUEST=y
CONFIG_KVM_INTEL=m
CONFIG_KVM=m
CONFIG_KVM_MMU_AUDIT=y
+# CONFIG_KVM_PROVE_MMU is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
# CONFIG_KVM_XEN is not set
@@ -3056,6 +3075,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
@@ -3199,7 +3219,9 @@ CONFIG_MANA_INFINIBAND=m
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3241,9 +3263,11 @@ CONFIG_MAXSMP=y
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3295,6 +3319,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3329,6 +3354,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3484,6 +3511,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3774,6 +3802,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4193,6 +4222,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4242,6 +4272,7 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
CONFIG_NVMEM_SYSFS=y
@@ -4286,6 +4317,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4370,6 +4402,7 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -4469,6 +4502,7 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_EUSB2_REPEATER is not set
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
# CONFIG_PHY_QCOM_SGMII_ETH is not set
@@ -4478,6 +4512,8 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
CONFIG_PHYSICAL_ALIGN=0x200000
CONFIG_PHYSICAL_START=0x1000000
# CONFIG_PHY_TUSB1210 is not set
@@ -4645,6 +4681,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4663,6 +4700,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_VMW=m
CONFIG_PTP_1588_CLOCK=y
@@ -4761,6 +4799,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -4805,12 +4844,14 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
+# CONFIG_REGULATOR_AW37503 is not set
# CONFIG_REGULATOR_DA9210 is not set
# CONFIG_REGULATOR_DA9211 is not set
# CONFIG_REGULATOR_DEBUG is not set
@@ -4827,6 +4868,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_LTC3589 is not set
# CONFIG_REGULATOR_LTC3676 is not set
# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8952 is not set
@@ -4839,9 +4881,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RT4803 is not set
# CONFIG_REGULATOR_RT5739 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_SY8106A is not set
# CONFIG_REGULATOR_TPS51632 is not set
# CONFIG_REGULATOR_TPS62360 is not set
@@ -4875,7 +4919,6 @@ CONFIG_RETPOLINE=y
# CONFIG_RFKILL_GPIO is not set
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -5269,6 +5312,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5278,6 +5322,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5355,6 +5400,7 @@ CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
CONFIG_SENSORS_I5500=m
CONFIG_SENSORS_I5K_AMB=m
CONFIG_SENSORS_IBMAEM=m
@@ -5739,6 +5785,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=0
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
# CONFIG_SND_HDA_TEGRA is not set
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -5849,7 +5898,9 @@ CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
CONFIG_SND_SOC_AMD_YC_MACH=m
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -5866,7 +5917,7 @@ CONFIG_SND_SOC_CS35L41_SPI=m
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
+CONFIG_SND_SOC_CS35L56_SDW=m
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -5931,6 +5982,7 @@ CONFIG_SND_SOC_HDAC_HDMI=m
CONFIG_SND_SOC_INTEL_AVS=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -5941,6 +5993,7 @@ CONFIG_SND_SOC_INTEL_AVS=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
@@ -6061,6 +6114,7 @@ CONFIG_SND_SOC_RL6231=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
CONFIG_SND_SOC_RT1308=m
CONFIG_SND_SOC_RT1308_SDW=m
CONFIG_SND_SOC_RT1316_SDW=m
@@ -6120,6 +6174,7 @@ CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
CONFIG_SND_SOC_SOF_JASPERLAKE=m
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
CONFIG_SND_SOC_SOF_MERRIFIELD=m
CONFIG_SND_SOC_SOF_METEORLAKE=m
# CONFIG_SND_SOC_SOF_OF is not set
@@ -6190,6 +6245,7 @@ CONFIG_SND_SOC_SSM4567=m
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
CONFIG_SND_SOC_TS3A227E=m
@@ -6429,6 +6485,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_SWIOTLB=y
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
@@ -6534,6 +6591,7 @@ CONFIG_TEST_CPUMASK=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
@@ -6645,6 +6703,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -6693,6 +6752,7 @@ CONFIG_TOUCHSCREEN_ELO=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7199,8 +7259,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7530,6 +7594,7 @@ CONFIG_X86_SGX_KVM=y
CONFIG_X86_SGX=y
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
CONFIG_X86_UMIP=y
+CONFIG_X86_USER_SHADOW_STACK=y
CONFIG_X86_UV=y
# CONFIG_X86_VERBOSE_BOOTUP is not set
# CONFIG_X86_VSMP is not set
@@ -7579,6 +7644,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config
index 36ee1a82a..bf34f743f 100644
--- a/kernel-x86_64-rt-debug-rhel.config
+++ b/kernel-x86_64-rt-debug-rhel.config
@@ -134,7 +134,7 @@ CONFIG_ACPI=y
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
-# CONFIG_ADDRESS_MASKING is not set
+CONFIG_ADDRESS_MASKING=y
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -225,7 +225,8 @@ CONFIG_AMD_MEM_ENCRYPT=y
CONFIG_AMD_NUMA=y
CONFIG_AMD_PHY=m
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
+CONFIG_AMD_PMF_DEBUG=y
+CONFIG_AMD_PMF=m
CONFIG_AMD_PTDMA=m
CONFIG_AMD_SFH_HID=m
# CONFIG_AMDTEE is not set
@@ -842,6 +843,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -860,6 +862,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -907,6 +910,8 @@ CONFIG_CRAMFS_BLOCKDEV=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -959,6 +964,7 @@ CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA20_X86_64=y
CONFIG_CRYPTO_CMAC=y
@@ -1055,6 +1061,7 @@ CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
+# CONFIG_CRYPTO_POLY1305_P10 is not set
CONFIG_CRYPTO_POLY1305_X86_64=y
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
@@ -1290,6 +1297,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1312,6 +1320,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1437,6 +1446,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MALI_DISPLAY is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1510,6 +1520,7 @@ CONFIG_DRM_SIMPLEDRM=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1819,6 +1830,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -2009,6 +2021,7 @@ CONFIG_GPIO_AMDPT=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+# CONFIG_GPIO_DS4520 is not set
# CONFIG_GPIO_DWAPB is not set
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -2132,6 +2145,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2296,7 +2310,6 @@ CONFIG_HW_RANDOM_AMD=m
CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
# CONFIG_HW_RANDOM_BA431 is not set
# CONFIG_HW_RANDOM_CCTRNG is not set
-CONFIG_HW_RANDOM_HISI=y
# CONFIG_HW_RANDOM_HISTB is not set
CONFIG_HW_RANDOM_INTEL=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -2334,6 +2347,7 @@ CONFIG_I2C_AMD756_S4882=m
CONFIG_I2C_AMD8111=m
# CONFIG_I2C_AMD_MP2 is not set
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
@@ -2693,6 +2707,7 @@ CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_INTEL_TXT=y
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
CONFIG_INTEL_VBTN=m
+# CONFIG_INTEL_VSC is not set
CONFIG_INTEL_VSEC=m
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
@@ -2724,7 +2739,7 @@ CONFIG_IOSCHED_BFQ=y
CONFIG_IOSF_MBI=y
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2810,6 +2825,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2887,6 +2903,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -3034,10 +3051,11 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD=m
CONFIG_KVM_AMD_SEV=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
@@ -3046,6 +3064,7 @@ CONFIG_KVM_GUEST=y
CONFIG_KVM_INTEL=m
CONFIG_KVM=m
CONFIG_KVM_MMU_AUDIT=y
+CONFIG_KVM_PROVE_MMU=y
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
# CONFIG_KVM_XEN is not set
@@ -3116,6 +3135,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
@@ -3259,7 +3279,9 @@ CONFIG_MANA_INFINIBAND=m
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3301,9 +3323,11 @@ CONFIG_MAXSMP=y
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3360,6 +3384,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3394,6 +3419,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3549,6 +3576,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3839,6 +3867,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4258,6 +4287,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4307,6 +4337,7 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
CONFIG_NVMEM_SYSFS=y
@@ -4351,6 +4382,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+CONFIG_OVERLAY_FS_DEBUG=y
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4436,6 +4468,7 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -4535,6 +4568,7 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_EUSB2_REPEATER is not set
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
# CONFIG_PHY_QCOM_SGMII_ETH is not set
@@ -4544,6 +4578,8 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
CONFIG_PHYSICAL_ALIGN=0x200000
CONFIG_PHYSICAL_START=0x1000000
# CONFIG_PHY_TUSB1210 is not set
@@ -4716,6 +4752,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4734,6 +4771,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_VMW=m
CONFIG_PTP_1588_CLOCK=y
@@ -4832,6 +4870,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -4879,12 +4918,14 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
+# CONFIG_REGULATOR_AW37503 is not set
# CONFIG_REGULATOR_DA9210 is not set
# CONFIG_REGULATOR_DA9211 is not set
# CONFIG_REGULATOR_DEBUG is not set
@@ -4901,6 +4942,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_LTC3589 is not set
# CONFIG_REGULATOR_LTC3676 is not set
# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8952 is not set
@@ -4913,9 +4955,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RT4803 is not set
# CONFIG_REGULATOR_RT5739 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_SY8106A is not set
# CONFIG_REGULATOR_TPS51632 is not set
# CONFIG_REGULATOR_TPS62360 is not set
@@ -4949,7 +4993,6 @@ CONFIG_RETPOLINE=y
# CONFIG_RFKILL_GPIO is not set
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -5343,6 +5386,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5352,6 +5396,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5429,6 +5474,7 @@ CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
CONFIG_SENSORS_I5500=m
CONFIG_SENSORS_I5K_AMB=m
CONFIG_SENSORS_IBMAEM=m
@@ -5815,6 +5861,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=0
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
# CONFIG_SND_HDA_TEGRA is not set
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -5926,7 +5975,9 @@ CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
CONFIG_SND_SOC_AMD_YC_MACH=m
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -5943,7 +5994,7 @@ CONFIG_SND_SOC_CS35L41_SPI=m
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
+CONFIG_SND_SOC_CS35L56_SDW=m
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -6008,6 +6059,7 @@ CONFIG_SND_SOC_HDAC_HDMI=m
CONFIG_SND_SOC_INTEL_AVS=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -6018,6 +6070,7 @@ CONFIG_SND_SOC_INTEL_AVS=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
@@ -6138,6 +6191,7 @@ CONFIG_SND_SOC_RL6231=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
CONFIG_SND_SOC_RT1308=m
CONFIG_SND_SOC_RT1308_SDW=m
CONFIG_SND_SOC_RT1316_SDW=m
@@ -6198,6 +6252,7 @@ CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
CONFIG_SND_SOC_SOF_JASPERLAKE=m
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
CONFIG_SND_SOC_SOF_MERRIFIELD=m
CONFIG_SND_SOC_SOF_METEORLAKE=m
# CONFIG_SND_SOC_SOF_OF is not set
@@ -6268,6 +6323,7 @@ CONFIG_SND_SOC_SSM4567=m
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_BUILD=y
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
CONFIG_SND_SOC_TS3A227E=m
@@ -6507,6 +6563,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_SWIOTLB=y
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
@@ -6612,6 +6669,7 @@ CONFIG_TEST_FPU=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIST_SORT=m
@@ -6723,6 +6781,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -6771,6 +6830,7 @@ CONFIG_TOUCHSCREEN_ELO=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7278,8 +7338,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7611,6 +7675,7 @@ CONFIG_X86_SGX=y
CONFIG_X86_SMAP=y
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
CONFIG_X86_UMIP=y
+CONFIG_X86_USER_SHADOW_STACK=y
CONFIG_X86_UV=y
# CONFIG_X86_VERBOSE_BOOTUP is not set
# CONFIG_X86_VSMP is not set
@@ -7660,6 +7725,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config
index aabc4f32f..9547b32b8 100644
--- a/kernel-x86_64-rt-rhel.config
+++ b/kernel-x86_64-rt-rhel.config
@@ -134,7 +134,7 @@ CONFIG_ACPI=y
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
-# CONFIG_ADDRESS_MASKING is not set
+CONFIG_ADDRESS_MASKING=y
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -225,7 +225,8 @@ CONFIG_AMD_MEM_ENCRYPT=y
CONFIG_AMD_NUMA=y
CONFIG_AMD_PHY=m
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
+# CONFIG_AMD_PMF_DEBUG is not set
+CONFIG_AMD_PMF=m
CONFIG_AMD_PTDMA=m
CONFIG_AMD_SFH_HID=m
# CONFIG_AMDTEE is not set
@@ -842,6 +843,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -860,6 +862,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -907,6 +910,8 @@ CONFIG_CRAMFS_BLOCKDEV=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -959,6 +964,7 @@ CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA20_X86_64=y
CONFIG_CRYPTO_CMAC=y
@@ -1055,6 +1061,7 @@ CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
+# CONFIG_CRYPTO_POLY1305_P10 is not set
CONFIG_CRYPTO_POLY1305_X86_64=y
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
@@ -1282,6 +1289,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1304,6 +1312,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1429,6 +1438,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MALI_DISPLAY is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1502,6 +1512,7 @@ CONFIG_DRM_SIMPLEDRM=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1803,6 +1814,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1993,6 +2005,7 @@ CONFIG_GPIO_AMDPT=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+# CONFIG_GPIO_DS4520 is not set
# CONFIG_GPIO_DWAPB is not set
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -2116,6 +2129,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2280,7 +2294,6 @@ CONFIG_HW_RANDOM_AMD=m
CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
# CONFIG_HW_RANDOM_BA431 is not set
# CONFIG_HW_RANDOM_CCTRNG is not set
-CONFIG_HW_RANDOM_HISI=y
# CONFIG_HW_RANDOM_HISTB is not set
CONFIG_HW_RANDOM_INTEL=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -2318,6 +2331,7 @@ CONFIG_I2C_AMD756_S4882=m
CONFIG_I2C_AMD8111=m
# CONFIG_I2C_AMD_MP2 is not set
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
@@ -2677,6 +2691,7 @@ CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_INTEL_TXT=y
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
CONFIG_INTEL_VBTN=m
+# CONFIG_INTEL_VSC is not set
CONFIG_INTEL_VSEC=m
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
@@ -2708,7 +2723,7 @@ CONFIG_IOSCHED_BFQ=y
CONFIG_IOSF_MBI=y
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2794,6 +2809,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2871,6 +2887,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -3014,10 +3031,11 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD=m
CONFIG_KVM_AMD_SEV=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
@@ -3026,6 +3044,7 @@ CONFIG_KVM_GUEST=y
CONFIG_KVM_INTEL=m
CONFIG_KVM=m
CONFIG_KVM_MMU_AUDIT=y
+# CONFIG_KVM_PROVE_MMU is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
# CONFIG_KVM_XEN is not set
@@ -3096,6 +3115,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
@@ -3239,7 +3259,9 @@ CONFIG_MANA_INFINIBAND=m
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3281,9 +3303,11 @@ CONFIG_MAXSMP=y
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3340,6 +3364,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3374,6 +3399,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3529,6 +3556,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3819,6 +3847,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4238,6 +4267,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4287,6 +4317,7 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
CONFIG_NVMEM_SYSFS=y
@@ -4331,6 +4362,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4415,6 +4447,7 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -4514,6 +4547,7 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_EUSB2_REPEATER is not set
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
# CONFIG_PHY_QCOM_SGMII_ETH is not set
@@ -4523,6 +4557,8 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
CONFIG_PHYSICAL_ALIGN=0x200000
CONFIG_PHYSICAL_START=0x1000000
# CONFIG_PHY_TUSB1210 is not set
@@ -4694,6 +4730,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4712,6 +4749,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_VMW=m
CONFIG_PTP_1588_CLOCK=y
@@ -4810,6 +4848,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -4857,12 +4896,14 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
+# CONFIG_REGULATOR_AW37503 is not set
# CONFIG_REGULATOR_DA9210 is not set
# CONFIG_REGULATOR_DA9211 is not set
# CONFIG_REGULATOR_DEBUG is not set
@@ -4879,6 +4920,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_LTC3589 is not set
# CONFIG_REGULATOR_LTC3676 is not set
# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8952 is not set
@@ -4891,9 +4933,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RT4803 is not set
# CONFIG_REGULATOR_RT5739 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_SY8106A is not set
# CONFIG_REGULATOR_TPS51632 is not set
# CONFIG_REGULATOR_TPS62360 is not set
@@ -4927,7 +4971,6 @@ CONFIG_RETPOLINE=y
# CONFIG_RFKILL_GPIO is not set
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -5321,6 +5364,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5330,6 +5374,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5407,6 +5452,7 @@ CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
CONFIG_SENSORS_I5500=m
CONFIG_SENSORS_I5K_AMB=m
CONFIG_SENSORS_IBMAEM=m
@@ -5793,6 +5839,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=0
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
# CONFIG_SND_HDA_TEGRA is not set
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -5903,7 +5952,9 @@ CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
CONFIG_SND_SOC_AMD_YC_MACH=m
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -5920,7 +5971,7 @@ CONFIG_SND_SOC_CS35L41_SPI=m
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
+CONFIG_SND_SOC_CS35L56_SDW=m
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -5985,6 +6036,7 @@ CONFIG_SND_SOC_HDAC_HDMI=m
CONFIG_SND_SOC_INTEL_AVS=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -5995,6 +6047,7 @@ CONFIG_SND_SOC_INTEL_AVS=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
@@ -6115,6 +6168,7 @@ CONFIG_SND_SOC_RL6231=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
CONFIG_SND_SOC_RT1308=m
CONFIG_SND_SOC_RT1308_SDW=m
CONFIG_SND_SOC_RT1316_SDW=m
@@ -6174,6 +6228,7 @@ CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
CONFIG_SND_SOC_SOF_JASPERLAKE=m
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
CONFIG_SND_SOC_SOF_MERRIFIELD=m
CONFIG_SND_SOC_SOF_METEORLAKE=m
# CONFIG_SND_SOC_SOF_OF is not set
@@ -6244,6 +6299,7 @@ CONFIG_SND_SOC_SSM4567=m
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
CONFIG_SND_SOC_TS3A227E=m
@@ -6483,6 +6539,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_SWIOTLB=y
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
@@ -6588,6 +6645,7 @@ CONFIG_TEST_CPUMASK=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
@@ -6699,6 +6757,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -6747,6 +6806,7 @@ CONFIG_TOUCHSCREEN_ELO=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7254,8 +7314,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7587,6 +7651,7 @@ CONFIG_X86_SGX=y
CONFIG_X86_SMAP=y
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
CONFIG_X86_UMIP=y
+CONFIG_X86_USER_SHADOW_STACK=y
CONFIG_X86_UV=y
# CONFIG_X86_VERBOSE_BOOTUP is not set
# CONFIG_X86_VSMP is not set
@@ -7636,6 +7701,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel.spec b/kernel.spec
index a49702799..67e084831 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -160,18 +160,18 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
# define buildid .local
-%define specrpmversion 6.5.12
-%define specversion 6.5.12
-%define patchversion 6.5
-%define pkgrelease 200
+%define specrpmversion 6.6.2
+%define specversion 6.6.2
+%define patchversion 6.6
+%define pkgrelease 101
%define kversion 6
-%define tarfile_release 6.5.12
+%define tarfile_release 6.6.2
# This is needed to do merge window version magic
-%define patchlevel 5
+%define patchlevel 6
# This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 200%{?buildid}%{?dist}
+%define specrelease 101%{?buildid}%{?dist}
# This defines the kabi tarball version
-%define kabiversion 6.5.12
+%define kabiversion 6.6.2
# If this variable is set to 1, a bpf selftests build failure will cause a
# fatal kernel package build error
@@ -187,25 +187,30 @@ Summary: The Linux kernel
# should not be exported to RPM provides
%global __provides_exclude_from ^%{_libexecdir}/kselftests
-# The following build options are enabled by default, but may become disabled
-# by later architecture-specific checks. These can also be disabled by using
-# --without <opt> in the rpmbuild command, or by forcing these values to 0.
+# The following build options are (mostly) enabled by default, but may become
+# enabled/disabled by later architecture-specific checks.
+# Where disabled by default, they can be enabled by using --with <opt> in the
+# rpmbuild command, or by forcing these values to 1.
+# Where enabled by default, they can be disabled by using --without <opt> in
+# the rpmbuild command, or by forcing these values to 0.
#
# standard kernel
%define with_up %{?_without_up: 0} %{?!_without_up: 1}
+# build the base variants
+%define with_base %{?_without_base: 0} %{?!_without_base: 1}
# build also debug variants
%define with_debug %{?_without_debug: 0} %{?!_without_debug: 1}
# kernel-zfcpdump (s390 specific kernel for zfcpdump)
%define with_zfcpdump %{?_without_zfcpdump: 0} %{?!_without_zfcpdump: 1}
# kernel-16k (aarch64 kernel with 16K page_size)
-%define with_arm64_16k %{?_without_arm64_16k: 0} %{?!_without_arm64_16k: 1}
+%define with_arm64_16k %{?_with_arm64_16k: 1} %{?!_with_arm64_16k: 0}
# kernel-64k (aarch64 kernel with 64K page_size)
%define with_arm64_64k %{?_without_arm64_64k: 0} %{?!_without_arm64_64k: 1}
# kernel-rt (x86_64 and aarch64 only PREEMPT_RT enabled kernel)
%define with_realtime %{?_with_realtime: 1} %{?!_with_realtime: 0}
# Supported variants
-# (base) with_debug with_gcov
+# with_base with_debug with_gcov
# up X X X
# zfcpdump X X
# arm64_16k X X X
@@ -298,16 +303,11 @@ 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
%endif
-# No arm64-16k flavor for now
-%define with_arm64_16k 0
-
%if %{with_verbose}
%define make_opts V=1
%else
@@ -399,6 +399,7 @@ Summary: The Linux kernel
# if requested, only build debug kernel
%if %{with_dbgonly}
+%define with_base 0
%define with_vdso_install 0
%define with_perf 0
%define with_tools 0
@@ -445,9 +446,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
@@ -469,6 +470,8 @@ Summary: The Linux kernel
%endif
%endif
+%define all_configs %{name}-%{specrpmversion}-*.config
+
# don't build noarch kernels or headers (duh)
%ifarch noarch
%define with_up 0
@@ -480,7 +483,6 @@ Summary: The Linux kernel
%define with_bpftool 0
%define with_selftests 0
%define with_debug 0
-%define all_arch_configs %{name}-%{specrpmversion}-*.config
%endif
# sparse blows up on ppc
@@ -509,13 +511,11 @@ Summary: The Linux kernel
%ifarch i686
%define asmarch x86
%define hdrarch i386
-%define all_arch_configs %{name}-%{specrpmversion}-i?86*.config
%define kernel_image arch/x86/boot/bzImage
%endif
%ifarch x86_64
%define asmarch x86
-%define all_arch_configs %{name}-%{specrpmversion}-x86_64*.config
%define kernel_image arch/x86/boot/bzImage
%endif
@@ -526,19 +526,16 @@ Summary: The Linux kernel
%define kernel_image vmlinux
%define kernel_image_elf 1
%define use_vdso 0
-%define all_arch_configs %{name}-%{specrpmversion}-ppc64le*.config
%endif
%ifarch s390x
%define asmarch s390
%define hdrarch s390
-%define all_arch_configs %{name}-%{specrpmversion}-s390x.config
%define kernel_image arch/s390/boot/bzImage
%define vmlinux_decompressor arch/s390/boot/vmlinux
%endif
%ifarch aarch64
-%define all_arch_configs %{name}-%{specrpmversion}-aarch64*.config
%define asmarch arm64
%define hdrarch arm64
%define make_target vmlinuz.efi
@@ -606,22 +603,22 @@ Summary: The Linux kernel
%endif
# short-hand for "are we building base/non-debug variants of ...?"
-%if %{with_up} && !%{with_dbgonly}
+%if %{with_up} && %{with_base}
%define with_up_base 1
%else
%define with_up_base 0
%endif
-%if %{with_realtime} && !%{with_dbgonly}
+%if %{with_realtime} && %{with_base}
%define with_realtime_base 1
%else
%define with_realtime_base 0
%endif
-%if %{with_arm64_16k} && !%{with_dbgonly}
+%if %{with_arm64_16k} && %{with_base}
%define with_arm64_16k_base 1
%else
%define with_arm64_16k_base 0
%endif
-%if %{with_arm64_64k} && !%{with_dbgonly}
+%if %{with_arm64_64k} && %{with_base}
%define with_arm64_64k_base 1
%else
%define with_arm64_64k_base 0
@@ -636,7 +633,7 @@ Summary: The Linux kernel
Name: %{package_name}
-License: GPLv2 and Redistributable, no modification permitted
+License: ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-2-Clause) AND ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-3-Clause) AND ((GPL-2.0-only WITH Linux-syscall-note) OR CDDL-1.0) AND ((GPL-2.0-only WITH Linux-syscall-note) OR Linux-OpenIB) AND ((GPL-2.0-only WITH Linux-syscall-note) OR MIT) AND ((GPL-2.0-or-later WITH Linux-syscall-note) OR BSD-3-Clause) AND ((GPL-2.0-or-later WITH Linux-syscall-note) OR MIT) AND BSD-2-Clause AND BSD-3-Clause AND BSD-3-Clause-Clear AND GFDL-1.1-no-invariants-or-later AND GPL-1.0-or-later AND (GPL-1.0-or-later OR BSD-3-Clause) AND (GPL-1.0-or-later WITH Linux-syscall-note) AND GPL-2.0-only AND (GPL-2.0-only OR Apache-2.0) AND (GPL-2.0-only OR BSD-2-Clause) AND (GPL-2.0-only OR BSD-3-Clause) AND (GPL-2.0-only OR CDDL-1.0) AND (GPL-2.0-only OR GFDL-1.1-no-invariants-or-later) AND (GPL-2.0-only OR GFDL-1.2-no-invariants-only) AND (GPL-2.0-only WITH Linux-syscall-note) AND GPL-2.0-or-later AND (GPL-2.0-or-later OR BSD-2-Clause) AND (GPL-2.0-or-later OR BSD-3-Clause) AND (GPL-2.0-or-later OR CC-BY-4.0) AND (GPL-2.0-or-later WITH GCC-exception-2.0) AND (GPL-2.0-or-later WITH Linux-syscall-note) AND ISC AND LGPL-2.0-or-later AND (LGPL-2.0-or-later OR BSD-2-Clause) AND (LGPL-2.0-or-later WITH Linux-syscall-note) AND LGPL-2.1-only AND (LGPL-2.1-only OR BSD-2-Clause) AND (LGPL-2.1-only WITH Linux-syscall-note) AND LGPL-2.1-or-later AND (LGPL-2.1-or-later WITH Linux-syscall-note) AND (Linux-OpenIB OR GPL-2.0-only) AND (Linux-OpenIB OR GPL-2.0-only OR BSD-2-Clause) AND Linux-man-pages-copyleft AND MIT AND (MIT OR Apache-2.0) AND (MIT OR GPL-2.0-only) AND (MIT OR GPL-2.0-or-later) AND (MIT OR LGPL-2.1-only) AND (MPL-1.1 OR GPL-2.0-only) AND (X11 OR GPL-2.0-only) AND (X11 OR GPL-2.0-or-later) AND Zlib AND (copyleft-next-0.3.1 OR GPL-2.0-or-later)
URL: https://www.kernel.org/
Version: %{specrpmversion}
Release: %{pkg_release}
@@ -665,7 +662,6 @@ BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex, gcc-c++
BuildRequires: net-tools, hostname, bc, elfutils-devel
BuildRequires: dwarves
BuildRequires: python3-devel
-BuildRequires: gcc-plugin-devel
BuildRequires: kernel-rpm-macros
# glibc-static is required for a consistent build environment (specifically
# CONFIG_CC_CAN_LINK_STATIC=y).
@@ -789,7 +785,7 @@ BuildRequires: binutils
BuildRequires: lvm2
BuildRequires: systemd-boot-unsigned
# For systemd-stub and systemd-pcrphase
-BuildRequires: systemd-udev
+BuildRequires: systemd-udev >= 252-1
# For TPM operations in UKI initramfs
BuildRequires: tpm2-tools
%endif
@@ -912,7 +908,14 @@ Source65: filter-s390x.sh.fedora
Source66: filter-modules.sh.fedora
%endif
-Source75: partial-kgcov-snip.config
+Source70: partial-kgcov-snip.config
+Source71: partial-kgcov-debug-snip.config
+Source72: partial-clang-snip.config
+Source73: partial-clang-debug-snip.config
+Source74: partial-clang_lto-x86_64-snip.config
+Source75: partial-clang_lto-x86_64-debug-snip.config
+Source76: partial-clang_lto-aarch64-snip.config
+Source77: partial-clang_lto-aarch64-debug-snip.config
Source80: generate_all_configs.sh
Source81: process_configs.sh
@@ -940,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
@@ -1070,7 +1073,6 @@ Epoch: %{gemini}
%endif
Summary: Performance monitoring for the Linux kernel
Requires: bzip2
-License: GPLv2
%description -n perf
This package contains the perf tool, which enables performance monitoring
of the Linux kernel.
@@ -1120,7 +1122,6 @@ This package provides debug information for the perf python bindings.
%if %{with_tools}
%package -n %{package_name}-tools
Summary: Assortment of tools for the Linux kernel
-License: GPLv2
%ifarch %{cpupowerarchs}
Provides: cpupowerutils = 1:009-0.6.p1
Obsoletes: cpupowerutils < 1:009-0.6.p1
@@ -1138,14 +1139,12 @@ and the supporting documentation.
%package -n %{package_name}-tools-libs
Summary: Libraries for the kernels-tools
-License: GPLv2
%description -n %{package_name}-tools-libs
This package contains the libraries built from the tools/ directory
from the kernel source.
%package -n %{package_name}-tools-libs-devel
Summary: Assortment of tools for the Linux kernel
-License: GPLv2
Requires: %{package_name}-tools = %{version}-%{release}
%ifarch %{cpupowerarchs}
Provides: cpupowerutils-devel = 1:009-0.6.p1
@@ -1184,7 +1183,6 @@ and root causes of unexpected results.
%package -n rv
Summary: RV: Runtime Verification
-License: GPLv2
%description -n rv
Runtime Verification (RV) is a lightweight (yet rigorous) method that
complements classical exhaustive verification techniques (such as model
@@ -1202,7 +1200,6 @@ analysing the logical and timing behavior of Linux.
%package -n bpftool
Summary: Inspection and simple manipulation of eBPF programs and maps
-License: GPLv2
Version: %{bpftoolversion}
%description -n bpftool
This package contains the bpftool, which allows inspection and simple
@@ -1230,7 +1227,6 @@ This package provides debug information for the bpftool package.
%package selftests-internal
Summary: Kernel samples and selftests
-License: GPLv2
Requires: binutils, bpftool, iproute-tc, nmap-ncat, python3, fuse-libs
%description selftests-internal
Kernel sample programs and selftests.
@@ -1513,7 +1509,7 @@ Provides: installonlypkg(kernel)\
Provides: kernel-%{?1:%{1}-}uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
Requires(pre): %{kernel_prereq}\
-Requires(pre): systemd\
+Requires(pre): systemd >= 254-1\
%endif\
%endif\
%if %{with_gcov}\
@@ -1775,30 +1771,56 @@ cp $RPM_SOURCE_DIR/%{name}-*.config .
cp %{SOURCE80} .
# merge.py
cp %{SOURCE3000} .
-# kernel-local
-cp %{SOURCE3001} .
+# kernel-local - rename and copy for partial snippet config process
+cp %{SOURCE3001} partial-kernel-local-snip.config
+cp %{SOURCE3001} partial-kernel-local-debug-snip.config
FLAVOR=%{primary_target} SPECPACKAGE_NAME=%{name} SPECVERSION=%{specversion} SPECRPMVERSION=%{specrpmversion} ./generate_all_configs.sh %{debugbuildsenabled}
-# Merge in any user-provided local config option changes
-%ifnarch %nobuildarches
-for i in %{all_arch_configs}
-do
- mv $i $i.tmp
- ./merge.py %{SOURCE3001} $i.tmp > $i
+# Collect custom defined config options
+PARTIAL_CONFIGS=""
%if %{with_gcov}
- echo "Merging with gcov options"
- cat %{SOURCE75}
- mv $i $i.tmp
- ./merge.py %{SOURCE75} $i.tmp > $i
+PARTIAL_CONFIGS="$PARTIAL_CONFIGS %{SOURCE70} %{SOURCE71}"
%endif
- rm $i.tmp
-done
+%if %{with toolchain_clang}
+PARTIAL_CONFIGS="$PARTIAL_CONFIGS %{SOURCE72} %{SOURCE73}"
%endif
-
%if %{with clang_lto}
-for i in *aarch64*.config *x86_64*.config; do
- sed -i 's/# CONFIG_LTO_CLANG_THIN is not set/CONFIG_LTO_CLANG_THIN=y/' $i
- sed -i 's/CONFIG_LTO_NONE=y/# CONFIG_LTO_NONE is not set/' $i
+PARTIAL_CONFIGS="$PARTIAL_CONFIGS %{SOURCE74} %{SOURCE75} %{SOURCE76} %{SOURCE77}"
+%endif
+PARTIAL_CONFIGS="$PARTIAL_CONFIGS partial-kernel-local-snip.config partial-kernel-local-debug-snip.config"
+
+GetArch()
+{
+ case "$1" in
+ *aarch64*) echo "aarch64" ;;
+ *ppc64le*) echo "ppc64le" ;;
+ *s390x*) echo "s390x" ;;
+ *x86_64*) echo "x86_64" ;;
+ # no arch, apply everywhere
+ *) echo "" ;;
+ esac
+}
+
+# Merge in any user-provided local config option changes
+%ifnarch %nobuildarches
+for i in %{all_configs}
+do
+ kern_arch="$(GetArch $i)"
+ kern_debug="$(echo $i | grep -q debug && echo "debug" || echo "")"
+
+ for j in $PARTIAL_CONFIGS
+ do
+ part_arch="$(GetArch $j)"
+ part_debug="$(echo $j | grep -q debug && echo "debug" || echo "")"
+
+ # empty arch means apply to all arches
+ if [ "$part_arch" == "" -o "$part_arch" == "$kern_arch" ] && [ "$part_debug" == "$kern_debug" ]
+ then
+ mv $i $i.tmp
+ ./merge.py $j $i.tmp > $i
+ fi
+ done
+ rm -f $i.tmp
done
%endif
@@ -2150,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
@@ -2169,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
@@ -2724,12 +2746,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}
@@ -2797,33 +2821,16 @@ find Documentation -type d | xargs chmod u+w
#
# Don't sign modules for the zfcpdump variant as it is monolithic.
-# TODO - this needs to be fixed in same way as we have it in c9s
%define __modsign_install_post \
if [ "%{signmodules}" -eq "1" ]; then \
- if [ "%{with_up_base}" -ne "0" ]; then \
- %{modsign_cmd} certs/signing_key.pem.sign certs/signing_key.x509.sign $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/ \
- fi \
- if [ "%{with_up}" -ne "0" ] && [ "%{with_debug}" -ne "0" ]; then \
- %{modsign_cmd} certs/signing_key.pem.sign+debug certs/signing_key.x509.sign+debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+debug/ \
- fi \
- if [ "%{with_realtime_base}" -ne "0" ]; then \
- %{modsign_cmd} certs/signing_key.pem.sign+rt certs/signing_key.x509.sign+rt $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+rt/ \
- fi \
- if [ "%{with_realtime}" -ne "0" ] && [ "%{with_debug}" -ne "0" ]; then \
- %{modsign_cmd} certs/signing_key.pem.sign+rt-debug certs/signing_key.x509.sign+rt-debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+rt-debug/ \
- fi \
- if [ "%{with_arm64_16k_base}" -ne "0" ]; then \
- %{modsign_cmd} certs/signing_key.pem.sign+16k certs/signing_key.x509.sign+16k $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+16k/ \
- fi \
- if [ "%{with_arm64_16k}" -ne "0" ] && [ "%{with_debug}" -ne "0" ]; then \
- %{modsign_cmd} certs/signing_key.pem.sign+16k-debug certs/signing_key.x509.sign+16k-debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+16k-debug/ \
- fi \
- if [ "%{with_arm64_64k_base}" -ne "0" ]; then \
- %{modsign_cmd} certs/signing_key.pem.sign+64k certs/signing_key.x509.sign+64k $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+64k/ \
- fi \
- if [ "%{with_arm64_64k}" -ne "0" ] && [ "%{with_debug}" -ne "0" ]; then \
- %{modsign_cmd} certs/signing_key.pem.sign+64k-debug certs/signing_key.x509.sign+64k-debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+64k-debug/ \
- fi \
+ echo "Signing kernel modules ..." \
+ modules_dirs="$(shopt -s nullglob; echo $RPM_BUILD_ROOT/lib/modules/%{KVERREL}*)" \
+ for modules_dir in $modules_dirs; do \
+ variant_suffix="${modules_dir#$RPM_BUILD_ROOT/lib/modules/%{KVERREL}}" \
+ [ "$variant_suffix" == "+zfcpdump" ] && continue \
+ echo "Signing modules for %{KVERREL}${variant_suffix}" \
+ %{modsign_cmd} certs/signing_key.pem.sign${variant_suffix} certs/signing_key.x509.sign${variant_suffix} $modules_dir/ \
+ done \
fi \
if [ "%{zipmodules}" -eq "1" ]; then \
echo "Compressing kernel modules ..." \
@@ -2932,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
@@ -3471,7 +3478,7 @@ fi\
%ifarch %{cpupowerarchs}
%files -n %{package_name}-tools-libs
-%{_libdir}/libcpupower.so.0
+%{_libdir}/libcpupower.so.1
%{_libdir}/libcpupower.so.0.0.1
%files -n %{package_name}-tools-libs-devel
@@ -3702,210 +3709,336 @@ fi\
#
#
%changelog
-* Mon Nov 20 2023 Augusto Caringi <acaringi(a)redhat.com> [6.5.12-0]
+* Wed Nov 22 2023 Justin M. Forbes <jforbes(a)fedoraproject.org> [6.6.2-101]
+- Turn on USB_DWC3 for Fedora (rhbz 2250955) (Justin M. Forbes)
+- Revert "netfilter: nf_tables: remove catchall element in GC sync path" (Justin M. Forbes)
+- More BugsFixed (Justin M. Forbes)
+- netfilter: nf_tables: remove catchall element in GC sync path (Pablo Neira Ayuso)
+- frop the build number back to 200 for fedora-srpm.sh (Justin M. Forbes)
+- ACPI: video: Use acpi_device_fix_up_power_children() (Hans de Goede)
+- ACPI: PM: Add acpi_device_fix_up_power_children() function (Hans de Goede)
+
+* Mon Nov 20 2023 Justin M. Forbes <jforbes(a)fedoraproject.org> [6.6.2-0]
- Add bug for AMD ACPI alarm (Justin M. Forbes)
- rtc: cmos: Use ACPI alarm for non-Intel x86 systems too (Mario Limonciello)
-- Linux v6.5.12
-
-* Wed Nov 08 2023 Augusto Caringi <acaringi(a)redhat.com> [6.5.11-0]
-- Linux v6.5.11
+- Add bluetooth fixes to BugsFixed (Justin M. Forbes)
+- Drop F37 from release targets as it will not rebase to 6.6 (Justin M. Forbes)
+- Linux v6.6.2
-* Thu Nov 02 2023 Justin M. Forbes <jforbes(a)fedoraproject.org> [6.5.10-0]
-- Linux v6.5.10
-
-* Wed Oct 25 2023 Augusto Caringi <acaringi(a)redhat.com> [6.5.9-0]
+* Wed Nov 08 2023 Justin M. Forbes <jforbes(a)fedoraproject.org> [6.6.1-0]
+- drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set (Javier Martinez Canillas)
+- Added required files for rebase (Augusto Caringi)
+- Reset RHEL_RELEASE for rebase (Justin M. Forbes)
+- [Scheduled job] Catch config mismatches early during upstream merge (Don Zickus)
+- redhat/self-test: Update data for KABI xz change (Prarit Bhargava)
+- redhat/scripts: Switch KABI tarballs to xz (Prarit Bhargava)
+- redhat/kernel.spec.template: Switch KABI compression to xz (Prarit Bhargava)
+- redhat: self-test: Use a more complete SRPM file suffix (Andrew Halaney)
+- redhat: makefile: remove stray rpmbuild --without (Eric Chanudet)
+- Linux v6.6.1
+
+* Mon Oct 30 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-61]
+- Linux v6.6.0
+
+* Sun Oct 29 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc7.2af9b20dbb39.60]
+- Linux v6.6.0-0.rc7.2af9b20dbb39
+
+* Sat Oct 28 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc7.56567a20b22b.59]
+- Consolidate configs into common for 6.6 (Justin M. Forbes)
+- Linux v6.6.0-0.rc7.56567a20b22b
+
+* Fri Oct 27 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc7.750b95887e56.58]
+- Linux v6.6.0-0.rc7.750b95887e56
+
+* Thu Oct 26 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc7.611da07b89fd.57]
- Updated Fedora configs (Justin M. Forbes)
-- Add UFSHCD bug to BugsFixed (Justin M. Forbes)
- Turn on UFSHCD for Fedora x86 (Justin M. Forbes)
+- Linux v6.6.0-0.rc7.611da07b89fd
+
+* Wed Oct 25 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc7.4f82870119a4.56]
- redhat: configs: generic: x86: Disable CONFIG_VIDEO_OV01A10 for x86 platform (Hans de Goede)
-- Linux v6.5.9
+- Linux v6.6.0-0.rc7.4f82870119a4
+
+* Tue Oct 24 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc7.d88520ad73b7.55]
+- redhat: remove pending-rhel CONFIG_XFS_ASSERT_FATAL file (Patrick Talbert)
+- New configs in fs/xfs (Fedora Kernel Team)
+- crypto: rng - Override drivers/char/random in FIPS mode (Herbert Xu)
+- random: Add hook to override device reads and getrandom(2) (Herbert Xu)
+- Linux v6.6.0-0.rc7.d88520ad73b7
+
+* Mon Oct 23 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc7.54]
+- Linux v6.6.0-0.rc7
+
+* Sun Oct 22 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc6.1acfd2bd3f0d.53]
+- Linux v6.6.0-0.rc6.1acfd2bd3f0d
+
+* Sat Oct 21 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc6.9c5d00cb7b6b.52]
+- Linux v6.6.0-0.rc6.9c5d00cb7b6b
+
+* Fri Oct 20 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc6.ce55c22ec8b2.51]
+- redhat/configs: share CONFIG_ARM64_ERRATUM_2966298 between rhel and fedora (Mark Salter)
+- configs: Remove S390 IOMMU config options that no longer exist (Jerry Snitselaar)
+- redhat: docs: clarify where bugs and issues are created (Scott Weaver)
+- redhat/scripts/rh-dist-git.sh does not take any arguments: fix error message (Denys Vlasenko)
+- Add target_branch for gen_config_patches.sh (Don Zickus)
+- Linux v6.6.0-0.rc6.ce55c22ec8b2
+
+* Thu Oct 19 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc6.dd72f9c7e512.50]
+- Linux v6.6.0-0.rc6.dd72f9c7e512
+
+* Wed Oct 18 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc6.06dc10eae55b.49]
+- Linux v6.6.0-0.rc6.06dc10eae55b
+
+* Tue Oct 17 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc6.213f891525c2.48]
+- redhat: disable kunit by default (Nico Pache)
+- redhat/configs: enable the AMD_PMF driver for RHEL (David Arcari)
+- Make CONFIG_ADDRESS_MASKING consistent between fedora and rhel (Chris von Recklinghausen)
+- CI: add ark-latest baseline job to tag cki-gating for successful pipelines (Michael Hofmann)
+- CI: provide child pipelines for CKI container image gating (Michael Hofmann)
+- CI: allow to run as child pipeline (Michael Hofmann)
+- CI: provide descriptive pipeline name for scheduled pipelines (Michael Hofmann)
+- CI: use job templates for variant variables (Michael Hofmann)
+- redhat/kernel.spec.template: simplify __modsign_install_post (Jan Stancek)
+- Linux v6.6.0-0.rc6.213f891525c2
+
+* Mon Oct 16 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc6.47]
+- Linux v6.6.0-0.rc6
+
+* Sun Oct 15 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc5.9a3dad63edbe.46]
+- Fedora filter updates after configs (Justin M. Forbes)
+- Fedora configs for 6.6 (Justin M. Forbes)
+- Linux v6.6.0-0.rc5.9a3dad63edbe
+
+* Sat Oct 14 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc5.727fb8376504.45]
+- Linux v6.6.0-0.rc5.727fb8376504
+
+* Fri Oct 13 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc5.10a6e5feccb8.44]
+- Linux v6.6.0-0.rc5.10a6e5feccb8
+
+* Thu Oct 12 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc5.401644852d0b.43]
+- Linux v6.6.0-0.rc5.401644852d0b
+
+* Wed Oct 11 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc5.1c8b86a3799f.42]
+- Linux v6.6.0-0.rc5.1c8b86a3799f
+
+* Tue Oct 10 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc5.41]
+- redhat/configs: Freescale Layerscape SoC family (Steve Best)
+- Add clang MR/baseline pipelines (Michael Hofmann)
+
+* Mon Oct 09 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc5.40]
+- CI: Remove unused kpet_tree_family (Nikolai Kondrashov)
+- Linux v6.6.0-0.rc5
+
+* Sun Oct 08 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc4.b9ddbb0cde2a.39]
+- Linux v6.6.0-0.rc4.b9ddbb0cde2a
+
+* Sat Oct 07 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc4.82714078aee4.38]
+- Linux v6.6.0-0.rc4.82714078aee4
+
+* Fri Oct 06 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc4.b78b18fb8ee1.37]
+- Add clang config framework (Don Zickus)
+- Apply partial snippet configs to all configs (Don Zickus)
+- Remove unpackaged kgcov config files (Don Zickus)
+- redhat/configs: enable missing Kconfig options for Qualcomm RideSX4 (Brian Masney)
+- enable CONFIG_ADDRESS_MASKING for x86_64 (Chris von Recklinghausen)
+- Linux v6.6.0-0.rc4.b78b18fb8ee1
-* Fri Oct 20 2023 Augusto Caringi <acaringi(a)redhat.com> [6.5.8-0]
-- Linux v6.5.8
+* Thu Oct 05 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc4.3006adf3be79.36]
+- Linux v6.6.0-0.rc4.3006adf3be79
-* Tue Oct 10 2023 Augusto Caringi <acaringi(a)redhat.com> [6.5.7-0]
-- common: aarch64: enable CONFIG_ARM64_ERRATUM_2966298 (Augusto Caringi)
-- Linux v6.5.7
+* Wed Oct 04 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc4.cbf3a2cb156a.35]
+- Linux v6.6.0-0.rc4.cbf3a2cb156a
-* Fri Oct 06 2023 Augusto Caringi <acaringi(a)redhat.com> [6.5.6-0]
-- power: supply: core: Use blocking_notifier_call_chain to avoid RCU complaint (Kai-Heng Feng)
-- Revert "Add linux-next specific files for 20231004" (Justin M. Forbes)
-- redhat/configs: enable missing Kconfig options for Qualcomm RideSX4 (Brian Masney)
-- add a couple of CVEs to BugsFixed (Justin M. Forbes)
-- Add another F39 FE bug to BugsFixed (Justin M. Forbes)
-- Add linux-next specific files for 20231004 (Stephen Rothwell)
+* Tue Oct 03 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc4.ce36c8b14987.34]
- common: aarch64: enable NXP Flex SPI (Peter Robinson)
+- Linux v6.6.0-0.rc4.ce36c8b14987
+
+* Mon Oct 02 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc4.33]
+- Linux v6.6.0-0.rc4
+
+* Sun Oct 01 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc3.e402b08634b3.32]
+- Linux v6.6.0-0.rc3.e402b08634b3
+
+* Sat Sep 30 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc3.9f3ebbef746f.31]
- fedora: Switch TI_SCI_CLK and TI_SCI_PM_DOMAINS symbols to built-in (Javier Martinez Canillas)
-- Add bug for amdgpu to BugsFixed for 6.5.6 (Justin M. Forbes)
-- drm/amdgpu: set completion status as preempted for the resubmission (Jiadong Zhu)
-- Add CVE-2023-42756 to BugsFixed for 6.5.6 (Justin M. Forbes)
-- Linux v6.5.6
-
-* Sat Sep 23 2023 Justin M. Forbes <jforbes(a)fedoraproject.org> [6.5.5-0]
-- iommu/apple-dart: Handle DMA_FQ domains in attach_dev() (Hector Martin)
-- Note fix for atomic locking in BugsFixed (Justin M. Forbes)
-- locking/atomic: scripts: fix fallback ifdeffery (Mark Rutland)
+- Linux v6.6.0-0.rc3.9f3ebbef746f
+
+* Fri Sep 29 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc3.9ed22ae6be81.30]
+- Linux v6.6.0-0.rc3.9ed22ae6be81
+
+* Thu Sep 28 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc3.633b47cb009d.29]
+- Linux v6.6.0-0.rc3.633b47cb009d
+
+* Wed Sep 27 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc3.0e945134b680.28]
+- kernel.spec: adjust build option comment (Michael Hofmann)
+- kernel.spec: allow to enable arm64_16k variant (Michael Hofmann)
+- gitlab-ci: enable build-only pipelines for Rawhide/16k/aarch64 (Michael Hofmann)
+- kernel.spec.template: Fix --without bpftool (Prarit Bhargava)
+- redhat/configs: NXP BBNSM Power Key Driver (Steve Best)
+- redhat/self-test: Update data for cross compile fields (Prarit Bhargava)
+- redhat/Makefile.cross: Add message for disabled subpackages (Prarit Bhargava)
+- redhat/Makefile.cross: Update cross targets with disabled subpackages (Prarit Bhargava)
+- Linux v6.6.0-0.rc3.0e945134b680
+
+* Tue Sep 26 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc3.27]
+- Remove XFS_ASSERT_FATAL from pending-fedora (Justin M. Forbes)
+
+* Mon Sep 25 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc3.26]
+- Change default pending for XFS_ONLINE_SCRUB_STATSas it now selects XFS_DEBUG (Justin M. Forbes)
+- Linux v6.6.0-0.rc3
+
+* Sun Sep 24 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc2.3aba70aed91f.25]
+- Linux v6.6.0-0.rc2.3aba70aed91f
+
+* Sat Sep 23 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc2.d90b0276af8f.24]
+- Linux v6.6.0-0.rc2.d90b0276af8f
+
+* Fri Sep 22 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc2.27bbf45eae9c.23]
+- gitlab-ci: use --with debug/base to select kernel variants (Michael Hofmann)
+- kernel.spec: add rpmbuild --without base option (Michael Hofmann)
+- Linux v6.6.0-0.rc2.27bbf45eae9c
+
+* Thu Sep 21 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc2.42dc814987c1.22]
- redhat: spec: Fix typo for kernel_variant_preun for 16k-debug flavor (Neal Gompa)
-- Fix installreq for UKI (Justin M. Forbes)
-- Add btrfs bug to BugsFixed for 6.5.5 (Justin M. Forbes)
-- btrfs: adjust overcommit logic when very close to full (Josef Bacik)
-- btrfs: properly report 0 avail for very full file systems (Josef Bacik)
-- Linux v6.5.5
-
-* Tue Sep 19 2023 Justin M. Forbes <jforbes(a)fedoraproject.org> [6.5.4-0]
-- Add F38 and F37 as release targets (Justin M. Forbes)
-- Add NFS bug fix for 6.5.4 (Justin M. Forbes)
-- selinux: fix handling of empty opts in selinux_fs_context_submount() (Ondrej Mosnacek)
+- Linux v6.6.0-0.rc2.42dc814987c1
+
+* Tue Sep 19 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc2.2cf0f7156238.21]
+- Linux v6.6.0-0.rc2.2cf0f7156238
+
+* Mon Sep 18 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc2.20]
+- Linux v6.6.0-0.rc2
+
+* Sun Sep 17 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc1.f0b0d403eabb.19]
+- Linux v6.6.0-0.rc1.f0b0d403eabb
+
+* Sat Sep 16 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc1.57d88e8a5974.18]
+- Linux v6.6.0-0.rc1.57d88e8a5974
+
+* Fri Sep 15 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc1.9fdfb15a3dbf.17]
- Turn off appletalk for fedora (Justin M. Forbes)
-- Linux v6.5.4
+- Linux v6.6.0-0.rc1.9fdfb15a3dbf
-* Wed Sep 13 2023 Justin M. Forbes <jforbes(a)fedoraproject.org> [6.5.3-0]
-- Revert "misc: rtsx: judge ASPM Mode to set PETXCFG Reg" (Justin M. Forbes)
-- Config updates for 6.5.3 (Justin M. Forbes)
-- Fix up buildReqs for UKI (Justin M. Forbes)
-- Linux v6.5.3
+* Thu Sep 14 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc1.aed8aee11130.16]
+- Linux v6.6.0-0.rc1.aed8aee11130
-* Wed Sep 06 2023 Justin M. Forbes <jforbes(a)fedoraproject.org> [6.5.2-0]
-- Move squashfs to kernel-modules-core (Justin M. Forbes)
-- Add TPM bug to BugsFixed (Justin M. Forbes)
-- tpm: Enable hwrng only for Pluton on AMD CPUs (Jarkko Sakkinen)
-- Linux v6.5.2
+* Wed Sep 13 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc1.3669558bdf35.15]
+- Linux v6.6.0-0.rc1.3669558bdf35
+
+* Tue Sep 12 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc1.14]
+- New configs in drivers/media (Fedora Kernel Team)
+- redhat/docs: Add a mention of bugzilla for bugs (Prarit Bhargava)
+- Fix the fixup of Fedora release (Don Zickus)
-* Sat Sep 02 2023 Justin M. Forbes <jforbes(a)fedoraproject.org> [6.5.1-0]
-- erofs: ensure that the post-EOF tails are all zeroed (Gao Xiang)
-- Add bug to BugsFixed (Justin M. Forbes)
+* Mon Sep 11 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc1.13]
+- Linux v6.6.0-0.rc1
+
+* Sun Sep 10 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc0.535a265d7f0d.12]
+- Linux v6.6.0-0.rc0.535a265d7f0d
+
+* Sat Sep 09 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc0.6099776f9f26.11]
+- Linux v6.6.0-0.rc0.6099776f9f26
+
+* Fri Sep 08 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc0.a48fa7efaf11.10]
+- Linux v6.6.0-0.rc0.a48fa7efaf11
+
+* Thu Sep 07 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc0.7ba2090ca64e.9]
+- Fix Fedora release scheduled job (Don Zickus)
+- Move squashfs to kernel-modules-core (Justin M. Forbes)
+- redhat: Explicitly disable CONFIG_COPS (Vitaly Kuznetsov)
+- redhat: Add dist-check-licenses target (Vitaly Kuznetsov)
+- redhat: Introduce "Verify SPDX-License-Identifier tags" selftest (Vitaly Kuznetsov)
+- redhat: Use kspdx-tool output for the License: field (Vitaly Kuznetsov)
+- Linux v6.6.0-0.rc0.7ba2090ca64e
+
+* Wed Sep 06 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc0.65d6e954e378.8]
+- Rename pipeline repo branch and DW tree names (Michael Hofmann)
+- Adjust comments that refer to ARK in a Rawhide context (Michael Hofmann)
+- Rename variable names starting with ark- to rawhide- (Michael Hofmann)
+- Rename trigger-ark to trigger-rawhide (Michael Hofmann)
+- Fix up config mismatches for Fedora (Justin M. Forbes)
+- Linux v6.6.0-0.rc0.65d6e954e378
+
+* Tue Sep 05 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc0.3f86ed6ec0b3.7]
+- redhat/configs: Texas Instruments Inc. K3 multicore SoC architecture (Steve Best)
+- Linux v6.6.0-0.rc0.3f86ed6ec0b3
+
+* Mon Sep 04 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc0.708283abf896.6]
+- Linux v6.6.0-0.rc0.708283abf896
+
+* Sun Sep 03 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc0.92901222f83d.5]
+- Flip CONFIG_VIDEO_V4L2_SUBDEV_API in pending RHEL due to mismatch (Justin M. Forbes)
+- Linux v6.6.0-0.rc0.92901222f83d
+
+* Sat Sep 02 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc0.0468be89b3fa.4]
+- CONFIG_HW_RANDOM_HISI: move to common and set to m (Scott Weaver)
- Turn off CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE for Fedora s390x (Justin M. Forbes)
-- drm/msm/a690: Switch to a660_gmu.bin (Rob Clark)
-- drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set (Javier Martinez Canillas)
-- Turn E1000 back on (Justin M. Forbes)
-- Set up variables and scripts for Fedora stable (Justin M. Forbes)
-- Update self-test data (Justin M. Forbes)
+- Linux v6.6.0-0.rc0.0468be89b3fa
+
+* Fri Sep 01 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc0.99d99825fc07.3.eln130]
+- Disable tests for ELN realtime pipelines (Michael Hofmann)
+- New configs in mm/Kconfig (Fedora Kernel Team)
+- Flip CONFIG_SND_SOC_CS35L56_SDW to m and clean up (Justin M. Forbes)
+- Add drm_exec_test to mod-internal.list (Thorsten Leemhuis)
+- Add new pending entry for CONFIG_SND_SOC_CS35L56_SDW to fix mismatch (Justin M. Forbes)
+- Linux v6.6.0-0.rc0.99d99825fc07
+
+* Thu Aug 31 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc0.b97d64c72259.2.eln130]
+- Fix tarball creation logic (Don Zickus)
+- redhat: bump libcpupower soname to match upstream (Patrick Talbert)
+- Turn on MEMFD_CREATE in pending as it is selected by CONFIG_TMPFS (Justin M. Forbes)
+- Linux v6.6.0-0.rc0.b97d64c72259
+
+* Wed Aug 30 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc0.6c1b980a7e79.1.eln130]
+- redhat: drop unneeded build-time dependency gcc-plugin-devel (Coiby Xu)
+- Reset RHEL release and trim changelog after rebase (Justin M. Forbes)
+- Linux v6.6.0-0.rc0.6c1b980a7e79
+
+* Tue Aug 29 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc0.1c59d383390f.59.eln130]
- all: x86: move wayward x86 specific config home (Peter Robinson)
- all: de-dupe non standard config options (Peter Robinson)
- all: x86: clean up microcode loading options (Peter Robinson)
- common: remove unnessary CONFIG_SND_MESON_AXG* (Peter Robinson)
-- Linux v6.5.1
-
-* Mon Aug 28 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-58.eln130]
- redhat: Fix UKI install with systemd >= 254 (Vitaly Kuznetsov)
- redhat: Use named parameters for kernel_variant_posttrans()/kernel_variant_preun() (Vitaly Kuznetsov)
-
-* Mon Aug 28 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-57.eln130]
-- Linux v6.5.0
-
-* Sun Aug 27 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc7.28f20a19294d.56.eln130]
-- Linux v6.5.0-0.rc7.28f20a19294d
-
-* Sat Aug 26 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc7.7d2f353b2682.55.eln130]
- redhat/kernel.spec.template: update compression variables to support zstd (Brian Masney)
-- Linux v6.5.0-0.rc7.7d2f353b2682
-
-* Fri Aug 25 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc7.4f9e7fabf864.54.eln130]
-- Linux v6.5.0-0.rc7.4f9e7fabf864
-
-* Thu Aug 24 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc7.93f5de5f648d.53.eln130]
- Consolidate configs to common for 6.5 (Justin M. Forbes)
- Remove unused config entry for Fedora (Justin M. Forbes)
-- Linux v6.5.0-0.rc7.93f5de5f648d
-
-* Wed Aug 23 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc7.89bf6209cad6.52.eln130]
- redhat/self-test: Remove rpmlint test (Prarit Bhargava)
- Remove the armv7 config directory from Fedora again (Justin M. Forbes)
- Enable CONFIG_EXPERT for both RHEL and Fedora (Justin M. Forbes)
-- Linux v6.5.0-0.rc7.89bf6209cad6
-
-* Tue Aug 22 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc7.f7757129e3de.51.eln130]
- redhat/configs: Enable CONFIG_DEVICE_PRIVATE on aarch64 (David Hildenbrand) [2231407]
- redhat/configs: disable CONFIG_ROCKCHIP_ERRATUM_3588001 for RHEL (Mark Salter)
- redhat: shellcheck fixes (Prarit Bhargava)
-
-* Mon Aug 21 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc7.f7757129e3de.50.el130]
-- Linux v6.5.0-0.rc7.f7757129e3de
-
-* Sun Aug 20 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc6.b320441c04c9.49.el130]
-- Linux v6.5.0-0.rc6.b320441c04c9
-
-* Sat Aug 19 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc6.4e7ffde6984a.48.el130]
-- Linux v6.5.0-0.rc6.4e7ffde6984a
-
-* Fri Aug 18 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc6.0e8860d2125f.47.el130]
- redhat/configs: enable tegra114 SPI (Mark Salter)
-- Linux v6.5.0-0.rc6.0e8860d2125f
-
-* Thu Aug 17 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc6.4853c74bd7ab.46.el130]
- all: properly cleanup firewire once and for all (Peter Robinson)
- Fix up filters for Fedora (Justin M. Forbes)
-
-* Wed Aug 16 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc6.4853c74bd7ab.45.el130]
- New configs in arch/x86 (Fedora Kernel Team)
- Add an armv7 directory back for the Fedora configs (Justin M. Forbes)
- Fedora 6.5 config updates (Justin M. Forbes)
- Turn off DMABUF_SYSFS_STATS (Justin M. Forbes)
-- Linux v6.5.0-0.rc6.4853c74bd7ab
-
-* Tue Aug 15 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc6.91aa6c412d7f.44.el130]
- CI: rawhide_release: switch to using script to push (Don Zickus)
- redhat/self-test: Update self-test data (Prarit Bhargava)
- redhat/scripts/cross-compile: Update download_cross.sh (Prarit Bhargava)
- redhat/Makefile.cross: Remove ARCH selection code (Prarit Bhargava)
- redhat/Makefile.cross: Update script (Prarit Bhargava)
- Fix interruptible non MR jobs (Michael Hofmann)
-- Linux v6.5.0-0.rc6.91aa6c412d7f
-
-* Mon Aug 14 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc6.43.el127]
-- Linux v6.5.0-0.rc6
-
-* Sun Aug 13 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc5.a785fd28d31f.42.el127]
- all: run evaluate_configs to de-dupe merged aarch64 (Peter Robinson)
- all: arm: merge the arm and arm/aarch64 (Peter Robinson)
- fedora: remove ARMv7 AKA armhfp configurations (Peter Robinson)
- fedora: remove ARMv7 AKA armhfp support (Peter Robinson)
-- Linux v6.5.0-0.rc5.a785fd28d31f
-
-* Sat Aug 12 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc5.f8de32cc060b.41.el127]
-- Linux v6.5.0-0.rc5.f8de32cc060b
-
-* Fri Aug 11 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc5.25aa0bebba72.40.el127]
- redhat/configs: enable CONFIG_VIRTIO_MEM on aarch64 (David Hildenbrand) [2044155]
- redhat/configs: enable CONFIG_MEMORY_HOTREMOVE aarch64 (David Hildenbrand) [2062054]
- redhat: Add arm64-16k kernel flavor scaffold for 16K page-size'd AArch64 (Neal Gompa)
- fedora: enable i3c on aarch64 (Peter Robinson)
-- Linux v6.5.0-0.rc5.25aa0bebba72
-
-* Thu Aug 10 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc5.374a7f47bf40.39.el127]
- redhat/configs: Remove `CONFIG_HZ_1000 is not set` for aarch64 (Enric Balletbo i Serra)
-- Linux v6.5.0-0.rc5.374a7f47bf40
-
-* Wed Aug 09 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc5.13b937206866.38.el127]
- redhat/configs: turn on the framework for SPI NOR for ARM (Steve Best)
- configs: add new ChromeOS UART driver (Mark Langsdorf)
- configs: add new ChromeOS Human Presence Sensor (Mark Langsdorf)
- redhat/configs: Enable CONFIG_NVIDIA_WMI_EC_BACKLIGHT for both Fedora and RHEL (Kate Hsuan)
-- Linux v6.5.0-0.rc5.13b937206866
-
-* Tue Aug 08 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc5.14f9643dc90a.37.el127]
- redhat/configs: Texas Instruments INA3221 driver (Steve Best)
-- Linux v6.5.0-0.rc5.14f9643dc90a
-
-* Mon Aug 07 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc5.36.el127]
-- Linux v6.5.0-0.rc5
-
-* Sun Aug 06 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc4.f0ab9f34e59e.35.el127]
-- Linux v6.5.0-0.rc4.f0ab9f34e59e
-
-* Sat Aug 05 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc4.024ff300db33.34.el127]
- arm: i.MX: Some minor NXP i.MX cleanups (Peter Robinson)
-- Linux v6.5.0-0.rc4.024ff300db33
-
-* Fri Aug 04 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc4.c1a515d3c027.33.el127]
-- Linux v6.5.0-0.rc4.c1a515d3c027
-
-* Thu Aug 03 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc4.ec351c8f2e62.32.el127]
- Description: Set config for Tegra234 pinctrl driver (Joel Slebodnick)
- Update RPM Scriptlet for kernel-install Changes (Jonathan Steffan)
-- Linux v6.5.0-0.rc4.ec351c8f2e62
-
-* Wed Aug 02 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc4.31.el127]
- [CI] add exit 0 to the end of CI scripts (Don Zickus)
- redhat: configs: Disable CONFIG_CRYPTO_STATS since performance issue for storage (Kate Hsuan) [2227793]
- Remove obsolete variable from gitlab-ci.yml (Ondrej Kinst)
@@ -3917,89 +4050,33 @@ fi\
- CI: ark-create-release: Add a robust check if nothing changed (Don Zickus)
- CI: Remove legacy tag check cruft (Don Zickus)
- CI: Introduce simple environment script (Don Zickus)
-
-* Mon Jul 31 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc4.30.el127]
-- Linux v6.5.0-0.rc4
-
-* Sun Jul 30 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc3.d31e3792919e.29.el127]
-- Linux v6.5.0-0.rc3.d31e3792919e
-
-* Sat Jul 29 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc3.ffabf7c73176.28.el127]
-- Linux v6.5.0-0.rc3.ffabf7c73176
-
-* Fri Jul 28 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc3.57012c57536f.27.el127]
-- Linux v6.5.0-0.rc3.57012c57536f
-
-* Thu Jul 27 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc3.0a8db05b571a.26.el127]
- redhat/configs: Disable FIREWIRE for RHEL (Prarit Bhargava)
-- Linux v6.5.0-0.rc3.0a8db05b571a
-
-* Wed Jul 26 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc3.18b44bc5a672.25.el127]
- redhat/scripts/rh-dist-git.sh: print list of uploaded files (Denys Vlasenko)
- redhat/scripts/expand_srpm.sh: add missing function, robustify (Denys Vlasenko)
- redhat: Enable HSR and PRP (Felix Maurer)
-- Linux v6.5.0-0.rc3.18b44bc5a672
-
-* Tue Jul 25 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc3.0b5547c51827.24.el127]
- redhat/scripts/rh-dist-git.sh: fix outdated message and comment (Denys Vlasenko)
- redhat/configs: Disable CONFIG_I8K (Prarit Bhargava)
- Make sure posttrans script doesn't fail if restorecon is not installed (Daan De Meyer)
-- Linux v6.5.0-0.rc3.0b5547c51827
-
-* Mon Jul 24 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc3.23.el127]
-- Linux v6.5.0-0.rc3
-
-* Sun Jul 23 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc2.c2782531397f.22.el127]
-- Linux v6.5.0-0.rc2.c2782531397f
-
-* Sat Jul 22 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc2.d192f5382581.21.el127]
- Update filters for new config items (Justin M. Forbes)
- More Fedora 6.5 configs (Justin M. Forbes)
-- Linux v6.5.0-0.rc2.d192f5382581
-
-* Fri Jul 21 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc2.f7e3a1bafdea.20.el127]
- redhat/configs: disable pre-UVC cameras for RHEL on aarch64 (Dean Nelson)
- redhat/configs: enable CONFIG_MEDIA_SUPPORT for RHEL on aarch64 (Dean Nelson)
-- Linux v6.5.0-0.rc2.f7e3a1bafdea
-
-* Thu Jul 20 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc2.bfa3037d8280.19.el127]
- move ownership of /lib/modules/<ver>/ to kernel-core (Thorsten Leemhuis)
- Let kernel-modules-core own the files depmod generates. (Thorsten Leemhuis)
- redhat: configs: Enable CONFIG_TYPEC_STUSB160X for rhel on aarch64 (Desnes Nunes)
- Add filters for ptp_dfl_tod on Fedora (Justin M. Forbes)
-- Linux v6.5.0-0.rc2.bfa3037d8280
-
-* Wed Jul 19 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc2.ccff6d117d8d.18.el127]
- Fedora 6.5 configs part 1 (Justin M. Forbes)
- fedora: enable CONFIG_ZYNQMP_IPI_MBOX as a builtin in pending-fedora (Patrick Talbert)
- fedora: arm: some minor updates (Peter Robinson)
- fedora: bluetooth: enable AOSP extensions (Peter Robinson)
-- Linux v6.5.0-0.rc2.ccff6d117d8d
-
-* Mon Jul 17 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc2.17.el127]
-- Linux v6.5.0-0.rc2
-
-* Sun Jul 16 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc1.831fe284d827.16.el127]
- fedora: wifi: tweak ZYDAS WiFI config options (Peter Robinson)
-- Linux v6.5.0-0.rc1.831fe284d827
-
-* Sat Jul 15 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc1.b6e6cc1f78c7.15.el127]
- scsi: sd: Add "probe_type" module parameter to allow synchronous probing (Ewan D. Milne) [2140017]
- redhat/configs: allow IMA to use MOK keys (Coiby Xu)
-- Linux v6.5.0-0.rc1.b6e6cc1f78c7
-
-* Fri Jul 14 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc1.4b810bf037e5.14.el127]
-- Linux v6.5.0-0.rc1.4b810bf037e5
-
-* Thu Jul 13 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc1.eb26cbb1a754.13.el127]
- Simplify documentation jobs (Michael Hofmann)
- Auto-cancel pipelines only on MRs (Michael Hofmann)
- CI: Call script directly (Don Zickus)
- CI: Remove stale TAG and Makefile cruft (Don Zickus)
- CI: Move os-build tracking to common area (Don Zickus)
-- Linux v6.5.0-0.rc1.eb26cbb1a754
-
-* Tue Jul 11 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc1.3f01e9fed845.12.el127]
- redhat: use the eln builder for daily jobs (Patrick Talbert)
- redhat: set CONFIG_XILINX_WINDOW_WATCHDOG as disabled in pending (Patrick Talbert)
- Add baseline ARK/ELN pipelines (Michael Hofmann)
@@ -4016,22 +4093,10 @@ fi\
- Change pathfix.py to %%py3_shebang_fix (Justin M. Forbes)
- Turn on NET_VENDOR_QUALCOMM for Fedora to enable rmnet (Justin M. Forbes)
- redhat: add intel-m10-bmc-hwmon to filter-modules singlemods list (Patrick Talbert)
-- Linux v6.5.0-0.rc1.3f01e9fed845
-
-* Thu Jul 06 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc0.c17414a273b8.11]
- fedira: enable pending-fedora CONFIG_CPUFREQ_DT_PLATDEV as a module (Patrick Talbert)
-- Linux v6.5.0-0.rc0.c17414a273b8
-
-* Wed Jul 05 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc0.d528014517f2.10]
- redhat: fix the 'eln BUILD_TARGET' self-test (Patrick Talbert)
- redhat: update the self-test-data (Patrick Talbert)
- redhat: remove trailing space in dist-dump-variables output (Patrick Talbert)
-- Linux v6.5.0-0.rc0.d528014517f2
-
-* Tue Jul 04 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc0.24be4d0b46bb.9]
-- Linux v6.5.0-0.rc0.24be4d0b46bb
-
-* Mon Jul 03 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc0.a901a3568fd2.8]
- Allow ELN pipelines failures (Michael Hofmann)
- Enable cs-like CI (Michael Hofmann)
- Allow to auto-cancel redundant pipelines (Michael Hofmann)
@@ -4041,20 +4106,8 @@ fi\
- redhat: allow dbgonly cross builds (Jan Stancek)
- redhat/configs: Clean up x86-64 call depth tracking configs (Waiman Long)
- redhat: move SND configs from pending-rhel to rhel (Patrick Talbert)
-- Linux v6.5.0-0.rc0.a901a3568fd2
-
-* Sun Jul 02 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc0.995b406c7e97.7]
-- Linux v6.5.0-0.rc0.995b406c7e97
-
-* Sat Jul 01 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc0.a507db1d8fdc.6]
- Fix up armv7 configs for Fedora (Justin M. Forbes)
- redhat: Set pending-rhel x86 values for various SND configs (Patrick Talbert)
-- Linux v6.5.0-0.rc0.a507db1d8fdc
-
-* Fri Jun 30 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc0.e55e5df193d2.5]
-- Linux v6.5.0-0.rc0.e55e5df193d2
-
-* Fri Jun 30 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc0.3a8a670eeeaa.4]
- redhat: update self-test data (Patrick Talbert)
- redhat: ignore SPECBPFTOOLVERSION/bpftoolversion in self-test create-data.sh (Patrick Talbert)
- fedora/rhel: Move I2C_DESIGNWARE_PLATFORM, I2C_SLAVE, & GPIOLIB from pending (Patrick Talbert)
@@ -4062,25 +4115,15 @@ fi\
- fedora: Enable CONFIG_SPI_SLAVE (Patrick Talbert)
- fedora/rhel: enable I2C_DESIGNWARE_PLATFORM, I2C_SLAVE, and GPIOLIB (Patrick Talbert)
- fedora: Enable CONFIG_SPI_SLAVE in fedora-pending (Patrick Talbert)
-
-* Thu Jun 29 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc0.3a8a670eeeaa.3]
- redhat: remove extra + (plus) from meta package Requires definitions (Patrick Talbert)
-- Linux v6.5.0-0.rc0.3a8a670eeeaa
-
-* Wed Jun 28 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc0.6aeadf7896bf.2]
- Add intel-m10-bmc-hwmon to singlemods (Thorsten Leemhuis)
- Add hid-uclogic-test to mod-internal.list (Thorsten Leemhuis)
- Add checksum_kunit.ko to mod-internal.list (Thorsten Leemhuis)
- Add strcat_kunit to mod-internal.list (Thorsten Leemhuis)
- Add input_test to mod-intenal.list (Thorsten Leemhuis)
-- Linux v6.5.0-0.rc0.6aeadf7896bf
-
-* Wed Jun 28 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc0.1ef6663a587b.1]
- Revert "Remove EXPERT from ARCH_FORCE_MAX_ORDER for aarch64" (Justin M. Forbes)
- Reset the release number and dedup the changelog after rebase (Justin M. Forbes)
- Fix up rebase issue with CONFIG_ARCH_FORCE_MAX_ORDER (Justin M. Forbes)
-
-* Tue Jun 27 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc0.1ef6663a587b.60]
- redhat/kernel.spec.template: Disable 'extracting debug info' messages (Prarit Bhargava)
- kernel/rh_messages.c: Another gcc12 warning on redundant NULL test (Florian Weimer) [2216678]
- redhat: fix signing for realtime and arm64_64k non-debug variants (Jan Stancek)
@@ -4114,7 +4157,6 @@ fi\
- redhat: do not package *.mod.c generated files (Denys Vlasenko)
- ALSA configuration changes for ARK/RHEL 9.3 (Jaroslav Kysela)
- spec: remove resolve_btfids from kernel-devel (Viktor Malik)
-- tools/resolve_btfids: Fix setting HOSTCFLAGS (Viktor Malik)
- Fix typo in filter-modules (Justin M. Forbes)
- redhat/configs: Enable CONFIG_INIT_STACK_ALL_ZERO for RHEL (Josh Poimboeuf)
- Remove CONFIG_ARCH_FORCE_MAX_ORDER for aarch64 (Justin M. Forbes)
@@ -5972,8 +6014,7 @@ fi\
- [initial commit] Add scripts (Laura Abbott)
- [initial commit] Add configs (Laura Abbott)
- [initial commit] Add Makefiles (Laura Abbott)
-- Linux v6.5.0-0.rc0.1ef6663a587b
-
+- Linux v6.6.0-0.rc0.1c59d383390f
###
# The following Emacs magic makes C-c C-e use UTC dates.
diff --git a/mod-internal.list b/mod-internal.list
index f4c669201..1d535d836 100644
--- a/mod-internal.list
+++ b/mod-internal.list
@@ -12,6 +12,7 @@ drm_cmdline_parser_test
drm_connector_test
drm_damage_helper_test
drm_dp_mst_helper_test
+drm_exec_test
drm_format_helper_test
drm_format_test
drm_framebuffer_test
diff --git a/partial-clang-debug-snip.config b/partial-clang-debug-snip.config
new file mode 100644
index 000000000..19fa1520e
--- /dev/null
+++ b/partial-clang-debug-snip.config
@@ -0,0 +1,3 @@
+# clang
+CONFIG_KASAN_STACK=y
+# CONFIG_KMSAN is not set
diff --git a/partial-clang-snip.config b/partial-clang-snip.config
new file mode 100644
index 000000000..841c19dcb
--- /dev/null
+++ b/partial-clang-snip.config
@@ -0,0 +1,3 @@
+# clang
+# CONFIG_KASAN_STACK is not set
+# CONFIG_KMSAN is not set
diff --git a/partial-clang_lto-aarch64-debug-snip.config b/partial-clang_lto-aarch64-debug-snip.config
new file mode 100644
index 000000000..0178f37de
--- /dev/null
+++ b/partial-clang_lto-aarch64-debug-snip.config
@@ -0,0 +1,3 @@
+# clang_lto
+CONFIG_KASAN_STACK=y
+# CONFIG_KMSAN is not set
diff --git a/partial-clang_lto-aarch64-snip.config b/partial-clang_lto-aarch64-snip.config
new file mode 100644
index 000000000..9e30765c4
--- /dev/null
+++ b/partial-clang_lto-aarch64-snip.config
@@ -0,0 +1,5 @@
+# clang_lto
+# CONFIG_KASAN_STACK is not set
+# CONFIG_KMSAN is not set
+CONFIG_LTO_CLANG_THIN=y
+# CONFIG_LTO_NONE is not set
diff --git a/partial-clang_lto-x86_64-debug-snip.config b/partial-clang_lto-x86_64-debug-snip.config
new file mode 100644
index 000000000..0178f37de
--- /dev/null
+++ b/partial-clang_lto-x86_64-debug-snip.config
@@ -0,0 +1,3 @@
+# clang_lto
+CONFIG_KASAN_STACK=y
+# CONFIG_KMSAN is not set
diff --git a/partial-clang_lto-x86_64-snip.config b/partial-clang_lto-x86_64-snip.config
new file mode 100644
index 000000000..9e30765c4
--- /dev/null
+++ b/partial-clang_lto-x86_64-snip.config
@@ -0,0 +1,5 @@
+# clang_lto
+# CONFIG_KASAN_STACK is not set
+# CONFIG_KMSAN is not set
+CONFIG_LTO_CLANG_THIN=y
+# CONFIG_LTO_NONE is not set
diff --git a/partial-kgcov-debug-snip.config b/partial-kgcov-debug-snip.config
new file mode 100644
index 000000000..fb373597e
--- /dev/null
+++ b/partial-kgcov-debug-snip.config
@@ -0,0 +1,4 @@
+# kgcov
+CONFIG_GCOV_KERNEL=y
+CONFIG_GCOV_PROFILE_ALL=y
+# CONFIG_GCOV_PROFILE_FTRACE is not set
diff --git a/patch-6.5-redhat.patch b/patch-6.6-redhat.patch
similarity index 72%
rename from patch-6.5-redhat.patch
rename to patch-6.6-redhat.patch
index cb273af5e..50b6ea994 100644
--- a/patch-6.5-redhat.patch
+++ b/patch-6.6-redhat.patch
@@ -1,47 +1,47 @@
- Makefile | 12 ++
+ Makefile | 20 ++-
arch/s390/include/asm/ipl.h | 1 +
arch/s390/kernel/ipl.c | 5 +
arch/s390/kernel/setup.c | 4 +
- arch/x86/kernel/setup.c | 22 ++--
- drivers/acpi/apei/hest.c | 8 ++
- drivers/acpi/irq.c | 17 ++-
+ arch/x86/kernel/setup.c | 22 ++-
+ drivers/acpi/acpi_video.c | 2 +-
+ drivers/acpi/apei/hest.c | 8 +
+ drivers/acpi/device_pm.c | 13 ++
+ drivers/acpi/irq.c | 17 +-
drivers/acpi/scan.c | 9 ++
drivers/ata/libahci.c | 18 +++
- drivers/char/ipmi/ipmi_dmi.c | 15 +++
- drivers/char/ipmi/ipmi_msghandler.c | 16 ++-
+ drivers/char/ipmi/ipmi_dmi.c | 15 ++
+ drivers/char/ipmi/ipmi_msghandler.c | 16 +-
drivers/firmware/efi/Makefile | 1 +
- drivers/firmware/efi/efi.c | 124 +++++++++++++++------
- drivers/firmware/efi/secureboot.c | 38 +++++++
+ drivers/firmware/efi/efi.c | 124 +++++++++++----
+ drivers/firmware/efi/secureboot.c | 38 +++++
drivers/firmware/sysfb.c | 18 ++-
- drivers/hid/hid-rmi.c | 66 -----------
- drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 ++++
- drivers/input/rmi4/rmi_driver.c | 124 ++++++++++++---------
- drivers/iommu/iommu.c | 22 ++++
- drivers/misc/cardreader/rts5228.c | 6 +
- drivers/misc/cardreader/rts5260.c | 6 +
- drivers/misc/cardreader/rts5261.c | 6 +
- drivers/nvme/host/core.c | 22 +++-
- drivers/nvme/host/multipath.c | 19 ++--
- drivers/nvme/host/nvme.h | 4 +
- drivers/pci/quirks.c | 24 ++++
+ drivers/hid/hid-rmi.c | 66 --------
+ drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 +++
+ drivers/input/rmi4/rmi_driver.c | 124 +++++++++------
+ drivers/iommu/iommu.c | 22 +++
+ drivers/pci/quirks.c | 24 +++
drivers/rtc/rtc-cmos.c | 18 ++-
drivers/scsi/sd.c | 10 ++
- drivers/usb/core/hub.c | 7 ++
- fs/btrfs/space-info.c | 17 +++
- include/linux/efi.h | 22 ++--
+ drivers/usb/core/hub.c | 7 +
+ include/acpi/acpi_bus.h | 1 +
+ include/linux/efi.h | 22 ++-
include/linux/lsm_hook_defs.h | 2 +
+ include/linux/module.h | 1 +
+ include/linux/rh_kabi.h | 172 +++++++++++++++++++++
include/linux/rmi.h | 1 +
include/linux/security.h | 5 +
+ kernel/module/main.c | 2 +
kernel/module/signing.c | 9 +-
+ scripts/mod/modpost.c | 8 +
scripts/tags.sh | 2 +
security/integrity/platform_certs/load_uefi.c | 6 +-
- security/lockdown/Kconfig | 13 +++
+ security/lockdown/Kconfig | 13 ++
security/lockdown/lockdown.c | 1 +
security/security.c | 12 ++
- 40 files changed, 561 insertions(+), 190 deletions(-)
+ 40 files changed, 696 insertions(+), 182 deletions(-)
diff --git a/Makefile b/Makefile
-index a6e152146028..af6bab938da2 100644
+index 03c52108af62..66048c4637d1 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -63,6 +63,21 @@ index a6e152146028..af6bab938da2 100644
# We are using a recursive build, so we need to do a little thinking
# to get the ordering right.
#
+@@ -1250,7 +1262,13 @@ define filechk_version.h
+ ((c) > 255 ? 255 : (c)))'; \
+ echo \#define LINUX_VERSION_MAJOR $(VERSION); \
+ echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \
+- echo \#define LINUX_VERSION_SUBLEVEL $(SUBLEVEL)
++ echo \#define LINUX_VERSION_SUBLEVEL $(SUBLEVEL); \
++ echo '#define RHEL_MAJOR $(RHEL_MAJOR)'; \
++ echo '#define RHEL_MINOR $(RHEL_MINOR)'; \
++ echo '#define RHEL_RELEASE_VERSION(a,b) (((a) << 8) + (b))'; \
++ echo '#define RHEL_RELEASE_CODE \
++ $(shell expr $(RHEL_MAJOR) \* 256 + $(RHEL_MINOR))'; \
++ echo '#define RHEL_RELEASE "$(RHEL_RELEASE)"'
+ endef
+
+ $(version_h): PATCHLEVEL := $(or $(PATCHLEVEL), 0)
diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h
index b0d00032479d..afb9544fb007 100644
--- a/arch/s390/include/asm/ipl.h
@@ -76,10 +91,10 @@ index b0d00032479d..afb9544fb007 100644
/*
* DIAG 308 support
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
-index dfcb2b563e2b..29e3f1b4bd00 100644
+index 05e51666db03..454a33b77878 100644
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
-@@ -2535,3 +2535,8 @@ int ipl_report_free(struct ipl_report *report)
+@@ -2519,3 +2519,8 @@ int ipl_report_free(struct ipl_report *report)
}
#endif
@@ -89,7 +104,7 @@ index dfcb2b563e2b..29e3f1b4bd00 100644
+ return !!ipl_secure_flag;
+}
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
-index 00d76448319d..e679d13303e3 100644
+index de6ad0fb2328..5cc2758be027 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -49,6 +49,7 @@
@@ -111,7 +126,7 @@ index 00d76448319d..e679d13303e3 100644
/* boot_command_line has been already set up in early.c */
*cmdline_p = boot_command_line;
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index aa0df37c1fe7..04f1de50e058 100644
+index b098b1fa2470..a159419e60df 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -21,6 +21,7 @@
@@ -122,7 +137,7 @@ index aa0df37c1fe7..04f1de50e058 100644
#include <linux/usb/xhci-dbgp.h>
#include <linux/static_call.h>
#include <linux/swiotlb.h>
-@@ -1027,6 +1028,13 @@ void __init setup_arch(char **cmdline_p)
+@@ -1028,6 +1029,13 @@ void __init setup_arch(char **cmdline_p)
if (efi_enabled(EFI_BOOT))
efi_init();
@@ -136,7 +151,7 @@ index aa0df37c1fe7..04f1de50e058 100644
reserve_ibft_region();
dmi_setup();
-@@ -1188,19 +1196,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -1189,19 +1197,7 @@ void __init setup_arch(char **cmdline_p)
/* Allocate bigger log buffer */
setup_log_buf(1);
@@ -157,6 +172,19 @@ index aa0df37c1fe7..04f1de50e058 100644
reserve_initrd();
+diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c
+index b411948594ff..4e868454b38d 100644
+--- a/drivers/acpi/acpi_video.c
++++ b/drivers/acpi/acpi_video.c
+@@ -2031,7 +2031,7 @@ static int acpi_video_bus_add(struct acpi_device *device)
+ * HP ZBook Fury 16 G10 requires ACPI video's child devices have _PS0
+ * evaluated to have functional panel brightness control.
+ */
+- acpi_device_fix_up_power_extended(device);
++ acpi_device_fix_up_power_children(device);
+
+ pr_info("%s [%s] (multi-head: %s rom: %s post: %s)\n",
+ ACPI_VIDEO_DEVICE_NAME, acpi_device_bid(device),
diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
index 6aef1ee5e1bd..8f146b1b4972 100644
--- a/drivers/acpi/apei/hest.c
@@ -176,6 +204,30 @@ index 6aef1ee5e1bd..8f146b1b4972 100644
hest_hdr = (struct acpi_hest_header *)(hest_tab + 1);
for (i = 0; i < hest_tab->error_source_count; i++) {
len = hest_esrc_len(hest_hdr);
+diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
+index f007116a8427..3b4d048c4941 100644
+--- a/drivers/acpi/device_pm.c
++++ b/drivers/acpi/device_pm.c
+@@ -397,6 +397,19 @@ void acpi_device_fix_up_power_extended(struct acpi_device *adev)
+ }
+ EXPORT_SYMBOL_GPL(acpi_device_fix_up_power_extended);
+
++/**
++ * acpi_device_fix_up_power_children - Force a device's children into D0.
++ * @adev: Parent device object whose children's power state is to be fixed up.
++ *
++ * Call acpi_device_fix_up_power() for @adev's children so long as they
++ * are reported as present and enabled.
++ */
++void acpi_device_fix_up_power_children(struct acpi_device *adev)
++{
++ acpi_dev_for_each_child(adev, fix_up_power_if_applicable, NULL);
++}
++EXPORT_SYMBOL_GPL(acpi_device_fix_up_power_children);
++
+ int acpi_device_update_power(struct acpi_device *device, int *state_p)
+ {
+ int state;
diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c
index 1687483ff319..390b67f19181 100644
--- a/drivers/acpi/irq.c
@@ -220,10 +272,10 @@ index 1687483ff319..390b67f19181 100644
return ctx.rc;
}
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
-index 87e385542576..7e9de6e3eb9f 100644
+index 691d4b7686ee..433ff7d8a844 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
-@@ -1749,6 +1749,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
+@@ -1752,6 +1752,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
if (!acpi_match_device_ids(device, ignore_serial_bus_ids))
return false;
@@ -240,7 +292,7 @@ index 87e385542576..7e9de6e3eb9f 100644
acpi_dev_get_resources(device, &resource_list,
acpi_check_serial_bus_slave,
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
-index a6212f6d3796..1bd84617d751 100644
+index f1263364fa97..24ac410f4366 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -729,6 +729,24 @@ int ahci_stop_engine(struct ata_port *ap)
@@ -342,7 +394,7 @@ index e489fefd23da..f2dfae764fb5 100644
obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o
obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
-index 9cfac61812f6..a8462d3bd33c 100644
+index 1974f0ad32ba..6ba6391494ec 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -32,6 +32,7 @@
@@ -353,7 +405,7 @@ index 9cfac61812f6..a8462d3bd33c 100644
#include <asm/early_ioremap.h>
-@@ -957,40 +958,101 @@ int efi_mem_type(unsigned long phys_addr)
+@@ -983,40 +984,101 @@ int efi_mem_type(unsigned long phys_addr)
}
#endif
@@ -669,10 +721,10 @@ index 84e7ba5314d3..efc96776f761 100644
data->xport.ops = &hid_rmi_ops;
diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c
-index 7e307022303a..c68d7da67148 100644
+index 77b0271ce6eb..96f60c139c4a 100644
--- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
-@@ -9,6 +9,7 @@
+@@ -10,6 +10,7 @@
#include <linux/init.h>
#include <linux/types.h>
#include <linux/device.h>
@@ -680,7 +732,7 @@ index 7e307022303a..c68d7da67148 100644
#include <linux/io.h>
#include <linux/err.h>
#include <linux/fs.h>
-@@ -2265,6 +2266,16 @@ static const struct amba_id etm4_ids[] = {
+@@ -2303,6 +2304,16 @@ static const struct amba_id etm4_ids[] = {
{},
};
@@ -697,7 +749,7 @@ index 7e307022303a..c68d7da67148 100644
MODULE_DEVICE_TABLE(amba, etm4_ids);
static struct amba_driver etm4x_amba_driver = {
-@@ -2298,6 +2309,11 @@ static int __init etm4x_init(void)
+@@ -2372,6 +2383,11 @@ static int __init etm4x_init(void)
{
int ret;
@@ -709,7 +761,7 @@ index 7e307022303a..c68d7da67148 100644
ret = etm4_pm_setup();
/* etm4_pm_setup() does its own cleanup - exit on error */
-@@ -2324,6 +2340,9 @@ static int __init etm4x_init(void)
+@@ -2398,6 +2414,9 @@ static int __init etm4x_init(void)
static void __exit etm4x_exit(void)
{
@@ -912,7 +964,7 @@ index 258d5fe3d395..f7298e3dc8f3 100644
if (data->f01_container->dev.driver) {
/* Driver already bound, so enable ATTN now. */
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
-index cabeb5bd3e41..25ef4e9cc34a 100644
+index c146378c7d03..f9e8d35eaccc 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -8,6 +8,7 @@
@@ -923,7 +975,7 @@ index cabeb5bd3e41..25ef4e9cc34a 100644
#include <linux/kernel.h>
#include <linux/bits.h>
#include <linux/bug.h>
-@@ -2819,6 +2820,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat)
+@@ -2931,6 +2932,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat)
}
EXPORT_SYMBOL_GPL(iommu_dev_disable_feature);
@@ -951,198 +1003,11 @@ index cabeb5bd3e41..25ef4e9cc34a 100644
/**
* iommu_setup_default_domain - Set the default_domain for the group
* @group: Group to change
-diff --git a/drivers/misc/cardreader/rts5228.c b/drivers/misc/cardreader/rts5228.c
-index 0c7f10bcf6f1..4ca9da411ebb 100644
---- a/drivers/misc/cardreader/rts5228.c
-+++ b/drivers/misc/cardreader/rts5228.c
-@@ -400,6 +400,12 @@ static void rts5228_init_from_cfg(struct rtsx_pcr *pcr)
- if (option->ltr_enabled)
- rtsx_set_ltr_latency(pcr, option->ltr_active_latency);
- }
-+
-+ if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN
-+ | PM_L1_1_EN | PM_L1_2_EN))
-+ option->force_clkreq_0 = false;
-+ else
-+ option->force_clkreq_0 = true;
- }
-
- static int rts5228_extra_init_hw(struct rtsx_pcr *pcr)
-diff --git a/drivers/misc/cardreader/rts5260.c b/drivers/misc/cardreader/rts5260.c
-index d2d3a6ccb8f7..0cef0808b1f1 100644
---- a/drivers/misc/cardreader/rts5260.c
-+++ b/drivers/misc/cardreader/rts5260.c
-@@ -488,6 +488,12 @@ static void rts5260_init_from_cfg(struct rtsx_pcr *pcr)
- if (option->ltr_enabled)
- rtsx_set_ltr_latency(pcr, option->ltr_active_latency);
- }
-+
-+ if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN
-+ | PM_L1_1_EN | PM_L1_2_EN))
-+ option->force_clkreq_0 = false;
-+ else
-+ option->force_clkreq_0 = true;
- }
-
- static int rts5260_extra_init_hw(struct rtsx_pcr *pcr)
-diff --git a/drivers/misc/cardreader/rts5261.c b/drivers/misc/cardreader/rts5261.c
-index 67252512a132..3236a82feca5 100644
---- a/drivers/misc/cardreader/rts5261.c
-+++ b/drivers/misc/cardreader/rts5261.c
-@@ -460,6 +460,12 @@ static void rts5261_init_from_cfg(struct rtsx_pcr *pcr)
- if (option->ltr_enabled)
- rtsx_set_ltr_latency(pcr, option->ltr_active_latency);
- }
-+
-+ if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN
-+ | PM_L1_1_EN | PM_L1_2_EN))
-+ option->force_clkreq_0 = false;
-+ else
-+ option->force_clkreq_0 = true;
- }
-
- static int rts5261_extra_init_hw(struct rtsx_pcr *pcr)
-diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index 21783aa2ee8e..f2f9bdb3e0c8 100644
---- a/drivers/nvme/host/core.c
-+++ b/drivers/nvme/host/core.c
-@@ -251,6 +251,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
-
- static blk_status_t nvme_error_status(u16 status)
- {
-+ if (unlikely(status & NVME_SC_DNR))
-+ return BLK_STS_TARGET;
-+
- switch (status & 0x7ff) {
- case NVME_SC_SUCCESS:
- return BLK_STS_OK;
-@@ -341,6 +344,7 @@ enum nvme_disposition {
- COMPLETE,
- RETRY,
- FAILOVER,
-+ FAILUP,
- AUTHENTICATE,
- };
-
-@@ -352,15 +356,16 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req)
- if ((nvme_req(req)->status & 0x7ff) == NVME_SC_AUTH_REQUIRED)
- return AUTHENTICATE;
-
-- if (blk_noretry_request(req) ||
-+ if ((req->cmd_flags & (REQ_FAILFAST_DEV | REQ_FAILFAST_DRIVER)) ||
- (nvme_req(req)->status & NVME_SC_DNR) ||
- nvme_req(req)->retries >= nvme_max_retries)
- return COMPLETE;
-
-- if (req->cmd_flags & REQ_NVME_MPATH) {
-+ if (req->cmd_flags & (REQ_NVME_MPATH | REQ_FAILFAST_TRANSPORT)) {
- if (nvme_is_path_error(nvme_req(req)->status) ||
- blk_queue_dying(req->q))
-- return FAILOVER;
-+ return (req->cmd_flags & REQ_NVME_MPATH) ?
-+ FAILOVER : FAILUP;
- } else {
- if (blk_queue_dying(req->q))
- return COMPLETE;
-@@ -390,6 +395,14 @@ static inline void nvme_end_req(struct request *req)
- blk_mq_end_request(req, status);
- }
-
-+static inline void nvme_failup_req(struct request *req)
-+{
-+ nvme_update_ana(req);
-+
-+ nvme_req(req)->status = NVME_SC_HOST_PATH_ERROR;
-+ nvme_end_req(req);
-+}
-+
- void nvme_complete_rq(struct request *req)
- {
- struct nvme_ctrl *ctrl = nvme_req(req)->ctrl;
-@@ -419,6 +432,9 @@ void nvme_complete_rq(struct request *req)
- case FAILOVER:
- nvme_failover_req(req);
- return;
-+ case FAILUP:
-+ nvme_failup_req(req);
-+ return;
- case AUTHENTICATE:
- #ifdef CONFIG_NVME_AUTH
- queue_work(nvme_wq, &ctrl->dhchap_auth_work);
-diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
-index 0a88d7bdc5e3..967bb3a85889 100644
---- a/drivers/nvme/host/multipath.c
-+++ b/drivers/nvme/host/multipath.c
-@@ -80,14 +80,10 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys)
- blk_freeze_queue_start(h->disk->queue);
- }
-
--void nvme_failover_req(struct request *req)
-+void nvme_update_ana(struct request *req)
- {
- struct nvme_ns *ns = req->q->queuedata;
- u16 status = nvme_req(req)->status & 0x7ff;
-- unsigned long flags;
-- struct bio *bio;
--
-- nvme_mpath_clear_current_path(ns);
-
- /*
- * If we got back an ANA error, we know the controller is alive but not
-@@ -98,6 +94,16 @@ void nvme_failover_req(struct request *req)
- set_bit(NVME_NS_ANA_PENDING, &ns->flags);
- queue_work(nvme_wq, &ns->ctrl->ana_work);
- }
-+}
-+
-+void nvme_failover_req(struct request *req)
-+{
-+ struct nvme_ns *ns = req->q->queuedata;
-+ unsigned long flags;
-+ struct bio *bio;
-+
-+ nvme_mpath_clear_current_path(ns);
-+ nvme_update_ana(req);
-
- spin_lock_irqsave(&ns->head->requeue_lock, flags);
- for (bio = req->bio; bio; bio = bio->bi_next) {
-@@ -912,8 +918,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
- int error = 0;
-
- /* check if multipath is enabled and we have the capability */
-- if (!multipath || !ctrl->subsys ||
-- !(ctrl->subsys->cmic & NVME_CTRL_CMIC_ANA))
-+ if (!ctrl->subsys || !(ctrl->subsys->cmic & NVME_CTRL_CMIC_ANA))
- return 0;
-
- if (!ctrl->max_namespaces ||
-diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
-index f35647c470af..e57357f23306 100644
---- a/drivers/nvme/host/nvme.h
-+++ b/drivers/nvme/host/nvme.h
-@@ -885,6 +885,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys);
- void nvme_mpath_start_freeze(struct nvme_subsystem *subsys);
- void nvme_mpath_default_iopolicy(struct nvme_subsystem *subsys);
- void nvme_failover_req(struct request *req);
-+void nvme_update_ana(struct request *req);
- void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl);
- int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head);
- void nvme_mpath_add_disk(struct nvme_ns *ns, __le32 anagrpid);
-@@ -923,6 +924,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl)
- static inline void nvme_failover_req(struct request *req)
- {
- }
-+static inline void nvme_update_ana(struct request *req)
-+{
-+}
- static inline void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl)
- {
- }
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index eb65170b97ff..e8b906b6ffbf 100644
+index e3e915329510..929ca9fa61a7 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
-@@ -4408,6 +4408,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
+@@ -4410,6 +4410,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9084,
quirk_bridge_cavm_thrx2_pcie_root);
@@ -1174,7 +1039,7 @@ index eb65170b97ff..e8b906b6ffbf 100644
* Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero)
* class code. Fix it.
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
-index c9416fe8542d..aafb1efe7915 100644
+index 228fb2d11c70..696cfa7025de 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -818,18 +818,24 @@ static void rtc_wake_off(struct device *dev)
@@ -1209,10 +1074,10 @@ index c9416fe8542d..aafb1efe7915 100644
}
#else
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
-index c4babb16dac7..9c9342e0c055 100644
+index 6effa13039f3..fbfbd542b858 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
-@@ -130,6 +130,14 @@ static const char *sd_cache_types[] = {
+@@ -118,6 +118,14 @@ static const char *sd_cache_types[] = {
"write back, no read (daft)"
};
@@ -1227,7 +1092,7 @@ index c4babb16dac7..9c9342e0c055 100644
static void sd_set_flush_flag(struct scsi_disk *sdkp)
{
bool wc = false, fua = false;
-@@ -4057,6 +4065,8 @@ static int __init init_sd(void)
+@@ -4045,6 +4053,8 @@ static int __init init_sd(void)
goto err_out_class;
}
@@ -1237,10 +1102,10 @@ index c4babb16dac7..9c9342e0c055 100644
if (err)
goto err_out_driver;
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index f2c561ae4bfe..36805f1c5786 100644
+index 0ff47eeffb49..005b8c595c60 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
-@@ -5824,6 +5824,13 @@ static void hub_event(struct work_struct *work)
+@@ -5782,6 +5782,13 @@ static void hub_event(struct work_struct *work)
(u16) hub->change_bits[0],
(u16) hub->event_bits[0]);
@@ -1254,39 +1119,23 @@ index f2c561ae4bfe..36805f1c5786 100644
/* Lock the device, then check to see if we were
* disconnected while waiting for the lock to succeed. */
usb_lock_device(hdev);
-diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c
-index ba5322fe34f5..35d084c52f2d 100644
---- a/fs/btrfs/space-info.c
-+++ b/fs/btrfs/space-info.c
-@@ -365,6 +365,23 @@ static u64 calc_available_free_space(struct btrfs_fs_info *fs_info,
- factor = btrfs_bg_type_to_factor(profile);
- avail = div_u64(avail, factor);
-
-+ /*
-+ * Since data allocations immediately use block groups as part of the
-+ * reservation, because we assume that data reservations will == actual
-+ * usage, we could potentially overcommit and then immediately have that
-+ * available space used by a data allocation, which could put us in a
-+ * bind when we get close to filling the file system.
-+ *
-+ * To handle this simply remove 1G (which is our current maximum chunk
-+ * allocation size) from the available space. If we are relatively
-+ * empty this won't affect our ability to overcommit much, and if we're
-+ * very close to full it'll keep us from getting into a position where
-+ * we've given ourselves very little metadata wiggle room.
-+ */
-+ if (avail < SZ_1G)
-+ return 0;
-+ avail -= SZ_1G;
-+
- /*
- * If we aren't flushing all things, let us overcommit up to
- * 1/2th of the space. If we can flush, don't let us overcommit
+diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
+index 254685085c82..0b7eab0ef7d7 100644
+--- a/include/acpi/acpi_bus.h
++++ b/include/acpi/acpi_bus.h
+@@ -539,6 +539,7 @@ int acpi_device_set_power(struct acpi_device *device, int state);
+ int acpi_bus_init_power(struct acpi_device *device);
+ int acpi_device_fix_up_power(struct acpi_device *device);
+ void acpi_device_fix_up_power_extended(struct acpi_device *adev);
++void acpi_device_fix_up_power_children(struct acpi_device *adev);
+ int acpi_bus_update_power(acpi_handle handle, int *state_p);
+ int acpi_device_update_power(struct acpi_device *device, int *state_p);
+ bool acpi_bus_power_manageable(acpi_handle handle);
diff --git a/include/linux/efi.h b/include/linux/efi.h
-index ab088c662e88..f974f9d9a7c5 100644
+index 80b21d1c6eaf..b66c0683f2fc 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
-@@ -43,6 +43,8 @@
+@@ -44,6 +44,8 @@ struct screen_info;
#define EFI_ABORTED (21 | (1UL << (BITS_PER_LONG-1)))
#define EFI_SECURITY_VIOLATION (26 | (1UL << (BITS_PER_LONG-1)))
@@ -1337,7 +1186,7 @@ index ab088c662e88..f974f9d9a7c5 100644
/*
* Variable Attributes
@@ -1133,13 +1148,6 @@ static inline bool efi_runtime_disabled(void) { return true; }
- extern void efi_call_virt_check_flags(unsigned long flags, const char *call);
+ extern void efi_call_virt_check_flags(unsigned long flags, const void *caller);
extern unsigned long efi_call_virt_save_flags(void);
-enum efi_secureboot_mode {
@@ -1351,7 +1200,7 @@ index ab088c662e88..f974f9d9a7c5 100644
enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var)
{
diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h
-index af796986baee..83e1cb0ca159 100644
+index ac962c4cb44b..d0cedef6859c 100644
--- a/include/linux/lsm_hook_defs.h
+++ b/include/linux/lsm_hook_defs.h
@@ -405,6 +405,8 @@ LSM_HOOK(void, LSM_RET_VOID, bpf_prog_free_security, struct bpf_prog_aux *aux)
@@ -1363,6 +1212,196 @@ index af796986baee..83e1cb0ca159 100644
#ifdef CONFIG_PERF_EVENTS
LSM_HOOK(int, 0, perf_event_open, struct perf_event_attr *attr, int type)
+diff --git a/include/linux/module.h b/include/linux/module.h
+index a98e188cf37b..2eef4246c2c9 100644
+--- a/include/linux/module.h
++++ b/include/linux/module.h
+@@ -418,6 +418,7 @@ struct module {
+ struct module_attribute *modinfo_attrs;
+ const char *version;
+ const char *srcversion;
++ const char *rhelversion;
+ struct kobject *holders_dir;
+
+ /* Exported symbols */
+diff --git a/include/linux/rh_kabi.h b/include/linux/rh_kabi.h
+new file mode 100644
+index 000000000000..e0d3353802bb
+--- /dev/null
++++ b/include/linux/rh_kabi.h
+@@ -0,0 +1,172 @@
++/*
++ * rh_kabi.h - Red Hat kABI abstraction header
++ *
++ * Copyright (c) 2014 Don Zickus
++ * Copyright (c) 2015-2017 Jiri Benc
++ * Copyright (c) 2015 Sabrina Dubroca, Hannes Frederic Sowa
++ * Copyright (c) 2016-2018 Prarit Bhargava
++ * Copyright (c) 2017 Paolo Abeni, Larry Woodman
++ *
++ * This file is released under the GPLv2.
++ * See the file COPYING for more details.
++ *
++ * These kabi macros hide the changes from the kabi checker and from the
++ * process that computes the exported symbols' checksums.
++ * They have 2 variants: one (defined under __GENKSYMS__) used when
++ * generating the checksums, and the other used when building the kernel's
++ * binaries.
++ *
++ * The use of these macros does not guarantee that the usage and modification
++ * of code is correct. As with all Red Hat only changes, an engineer must
++ * explain why the use of the macro is valid in the patch containing the
++ * changes.
++ *
++ */
++
++#ifndef _LINUX_RH_KABI_H
++#define _LINUX_RH_KABI_H
++
++#include <linux/compiler.h>
++#include <linux/stringify.h>
++
++/*
++ * RH_KABI_CONST
++ * Adds a new const modifier to a function parameter preserving the old
++ * checksum.
++ *
++ * RH_KABI_DEPRECATE
++ * Mark the element as deprecated and make it unusable by modules while
++ * preserving kABI checksums.
++ *
++ * RH_KABI_DEPRECATE_FN
++ * Mark the function pointer as deprecated and make it unusable by modules
++ * while preserving kABI checksums.
++ *
++ * RH_KABI_EXTEND
++ * Simple macro for adding a new element to a struct.
++ *
++ * Warning: only use if a hole exists for _all_ arches. Use pahole to verify.
++ *
++ * RH_KABI_FILL_HOLE
++ * Simple macro for filling a hole in a struct.
++ *
++ * RH_KABI_RENAME
++ * Simple macro for renaming an element without changing its type. This
++ * macro can be used in bitfields, for example.
++ *
++ * NOTE: does not include the final ';'
++ *
++ * RH_KABI_REPLACE
++ * Simple replacement of _orig with a union of _orig and _new.
++ *
++ * The RH_KABI_REPLACE* macros attempt to add the ability to use the '_new'
++ * element while preserving size alignment with the '_orig' element.
++ *
++ * The #ifdef __GENKSYMS__ preserves the kABI agreement, while the anonymous
++ * union structure preserves the size alignment (assuming the '_new' element
++ * is not bigger than the '_orig' element).
++ *
++ * RH_KABI_REPLACE_UNSAFE
++ * Unsafe version of RH_KABI_REPLACE. Only use for typedefs.
++ *
++ * RH_KABI_FORCE_CHANGE
++ * Force change of the symbol checksum. The argument of the macro is a
++ * version for cases we need to do this more than once.
++ *
++ * This macro does the opposite: it changes the symbol checksum without
++ * actually changing anything about the exported symbol. It is useful for
++ * symbols that are not whitelisted, we're changing them in an
++ * incompatible way and want to prevent 3rd party modules to silently
++ * corrupt memory. Instead, by changing the symbol checksum, such modules
++ * won't be loaded by the kernel. This macro should only be used as a
++ * last resort when all other KABI workarounds have failed.
++ *
++ * NOTE
++ * Don't use ';' after these macros as it messes up the kABI checker by
++ * changing what the resulting token string looks like. Instead let this
++ * macro add the ';' so it can be properly hidden from the kABI checker
++ * (mainly for RH_KABI_EXTEND, but applied to all macros for uniformity).
++ *
++ */
++#ifdef __GENKSYMS__
++
++# define RH_KABI_CONST
++# define RH_KABI_EXTEND(_new)
++# define RH_KABI_FILL_HOLE(_new)
++# define RH_KABI_FORCE_CHANGE(ver) __attribute__((rh_kabi_change ## ver))
++# define RH_KABI_RENAME(_orig, _new) _orig
++
++# define _RH_KABI_DEPRECATE(_type, _orig) _type _orig
++# define _RH_KABI_DEPRECATE_FN(_type, _orig, _args...) _type (*_orig)(_args)
++# define _RH_KABI_REPLACE(_orig, _new) _orig
++# define _RH_KABI_REPLACE_UNSAFE(_orig, _new) _orig
++
++#else
++
++# define RH_KABI_ALIGN_WARNING ". Disable CONFIG_RH_KABI_SIZE_ALIGN_CHECKS if debugging."
++
++# define RH_KABI_CONST const
++# define RH_KABI_EXTEND(_new) _new;
++# define RH_KABI_FILL_HOLE(_new) _new;
++# define RH_KABI_FORCE_CHANGE(ver)
++# define RH_KABI_RENAME(_orig, _new) _new
++
++
++#if IS_BUILTIN(CONFIG_RH_KABI_SIZE_ALIGN_CHECKS)
++# define __RH_KABI_CHECK_SIZE_ALIGN(_orig, _new) \
++ union { \
++ _Static_assert(sizeof(struct{_new;}) <= sizeof(struct{_orig;}), \
++ __FILE__ ":" __stringify(__LINE__) ": " __stringify(_new) " is larger than " __stringify(_orig) RH_KABI_ALIGN_WARNING); \
++ _Static_assert(__alignof__(struct{_new;}) <= __alignof__(struct{_orig;}), \
++ __FILE__ ":" __stringify(__LINE__) ": " __stringify(_orig) " is not aligned the same as " __stringify(_new) RH_KABI_ALIGN_WARNING); \
++ }
++#else
++# define __RH_KABI_CHECK_SIZE_ALIGN(_orig, _new)
++#endif
++
++# define _RH_KABI_DEPRECATE(_type, _orig) _type rh_reserved_##_orig
++# define _RH_KABI_DEPRECATE_FN(_type, _orig, _args...) \
++ _type (* rh_reserved_##_orig)(_args)
++# define _RH_KABI_REPLACE(_orig, _new) \
++ union { \
++ _new; \
++ struct { \
++ _orig; \
++ } __UNIQUE_ID(rh_kabi_hide); \
++ __RH_KABI_CHECK_SIZE_ALIGN(_orig, _new); \
++ }
++# define _RH_KABI_REPLACE_UNSAFE(_orig, _new) _new
++
++#endif /* __GENKSYMS__ */
++
++/* semicolon added wrappers for the RH_KABI_REPLACE macros */
++# define RH_KABI_DEPRECATE(_type, _orig) _RH_KABI_DEPRECATE(_type, _orig);
++# define RH_KABI_DEPRECATE_FN(_type, _orig, _args...) \
++ _RH_KABI_DEPRECATE_FN(_type, _orig, _args);
++# define RH_KABI_REPLACE(_orig, _new) _RH_KABI_REPLACE(_orig, _new);
++# define RH_KABI_REPLACE_UNSAFE(_orig, _new) _RH_KABI_REPLACE_UNSAFE(_orig, _new);
++/*
++ * Macro for breaking up a random element into two smaller chunks using an
++ * anonymous struct inside an anonymous union.
++ */
++# define RH_KABI_REPLACE2(orig, _new1, _new2) RH_KABI_REPLACE(orig, struct{ _new1; _new2;})
++
++# define RH_KABI_RESERVE(n) _RH_KABI_RESERVE(n);
++/*
++ * Simple wrappers to replace standard Red Hat reserved elements.
++ */
++# define RH_KABI_USE(n, _new) RH_KABI_REPLACE(_RH_KABI_RESERVE(n), _new)
++/*
++ * Macros for breaking up a reserved element into two smaller chunks using
++ * an anonymous struct inside an anonymous union.
++ */
++# define RH_KABI_USE2(n, _new1, _new2) RH_KABI_REPLACE(_RH_KABI_RESERVE(n), struct{ _new1; _new2; })
++
++/*
++ * We tried to standardize on Red Hat reserved names. These wrappers
++ * leverage those common names making it easier to read and find in the
++ * code.
++ */
++# define _RH_KABI_RESERVE(n) unsigned long rh_reserved##n
++
++#endif /* _LINUX_RH_KABI_H */
diff --git a/include/linux/rmi.h b/include/linux/rmi.h
index ab7eea01ab42..fff7c5f737fc 100644
--- a/include/linux/rmi.h
@@ -1376,10 +1415,10 @@ index ab7eea01ab42..fff7c5f737fc 100644
int rmi_register_transport_device(struct rmi_transport_dev *xport);
diff --git a/include/linux/security.h b/include/linux/security.h
-index bac98ea18f78..28abed10b583 100644
+index 5f16eecde00b..974be25cfa70 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
-@@ -483,6 +483,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen);
+@@ -484,6 +484,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen);
int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen);
int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen);
int security_locked_down(enum lockdown_reason what);
@@ -1387,7 +1426,7 @@ index bac98ea18f78..28abed10b583 100644
#else /* CONFIG_SECURITY */
static inline int call_blocking_lsm_notifier(enum lsm_event event, void *data)
-@@ -1394,6 +1395,10 @@ static inline int security_locked_down(enum lockdown_reason what)
+@@ -1395,6 +1396,10 @@ static inline int security_locked_down(enum lockdown_reason what)
{
return 0;
}
@@ -1398,6 +1437,26 @@ index bac98ea18f78..28abed10b583 100644
#endif /* CONFIG_SECURITY */
#if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
+diff --git a/kernel/module/main.c b/kernel/module/main.c
+index 98fedfdb8db5..a21921f880e1 100644
+--- a/kernel/module/main.c
++++ b/kernel/module/main.c
+@@ -528,6 +528,7 @@ static struct module_attribute modinfo_##field = { \
+
+ MODINFO_ATTR(version);
+ MODINFO_ATTR(srcversion);
++MODINFO_ATTR(rhelversion);
+
+ static struct {
+ char name[MODULE_NAME_LEN + 1];
+@@ -980,6 +981,7 @@ struct module_attribute *modinfo_attrs[] = {
+ &module_uevent,
+ &modinfo_version,
+ &modinfo_srcversion,
++ &modinfo_rhelversion,
+ &modinfo_initstate,
+ &modinfo_coresize,
+ #ifdef CONFIG_ARCH_WANTS_MODULES_DATA_IN_VMALLOC
diff --git a/kernel/module/signing.c b/kernel/module/signing.c
index a2ff4242e623..f0d2be1ee4f1 100644
--- a/kernel/module/signing.c
@@ -1421,6 +1480,39 @@ index a2ff4242e623..f0d2be1ee4f1 100644
}
int module_sig_check(struct load_info *info, int flags)
+diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
+index b3dee80497cb..3715db3f99d4 100644
+--- a/scripts/mod/modpost.c
++++ b/scripts/mod/modpost.c
+@@ -23,6 +23,7 @@
+ #include "modpost.h"
+ #include "../../include/linux/license.h"
+ #include "../../include/linux/module_symbol.h"
++#include "../../include/generated/uapi/linux/version.h"
+
+ static bool module_enabled;
+ /* Are we using CONFIG_MODVERSIONS? */
+@@ -2088,6 +2089,12 @@ static void write_buf(struct buffer *b, const char *fname)
+ }
+ }
+
++static void add_rhelversion(struct buffer *b, struct module *mod)
++{
++ buf_printf(b, "MODULE_INFO(rhelversion, \"%d.%d\");\n", RHEL_MAJOR,
++ RHEL_MINOR);
++}
++
+ static void write_if_changed(struct buffer *b, const char *fname)
+ {
+ char *tmp;
+@@ -2148,6 +2155,7 @@ static void write_mod_c_file(struct module *mod)
+ add_depends(&buf, mod);
+ add_moddevtable(&buf, mod);
+ add_srcversion(&buf, mod);
++ add_rhelversion(&buf, mod);
+
+ ret = snprintf(fname, sizeof(fname), "%s.mod.c", mod->name);
+ if (ret >= sizeof(fname)) {
diff --git a/scripts/tags.sh b/scripts/tags.sh
index a70d43723146..56d06b04f752 100755
--- a/scripts/tags.sh
@@ -1495,10 +1587,10 @@ index 68d19632aeb7..ef348935b6ff 100644
static int __init lockdown_lsm_init(void)
diff --git a/security/security.c b/security/security.c
-index 549104a447e3..73670798f075 100644
+index 23b129d482a7..55d0fe0d121b 100644
--- a/security/security.c
+++ b/security/security.c
-@@ -5198,6 +5198,18 @@ int security_locked_down(enum lockdown_reason what)
+@@ -5230,6 +5230,18 @@ int security_locked_down(enum lockdown_reason what)
}
EXPORT_SYMBOL(security_locked_down);
diff --git a/rpminspect.yaml b/rpminspect.yaml
index 8b160a452..b4e599a88 100644
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@@ -23,7 +23,7 @@ emptyrpm:
patches:
ignore_list:
- linux-kernel-test.patch
- - patch-6.5-redhat.patch
+ - patch-6.6-redhat.patch
runpath:
ignore:
diff --git a/sources b/sources
index 3dbb664bc..d86fe6af7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,5 @@
-SHA512 (linux-6.5.12.tar.xz) = 9953738058a9a333417070e99c3ab7e0ce0c72726c9e80e863dc2606de01bed03319fd47dc1195285ce69c157cbee84b77a6f7c74c735519ca92bff3ac4d3a19
SHA512 (kernel-abi-stablelists-6.5.12.tar.bz2) = ea72bdfb5065f430c0b7076ba49f8fbc1b16f861dc4182f1ee5bc8a809f8f3103d97766e5719354f8163a77235a759a65cc7d4efc66e314dcc658ceda6a77016
SHA512 (kernel-kabi-dw-6.5.12.tar.bz2) = 7fc7372de576d1f3602abe70483edf30cf635a6d4175261bb44e1b7d4b413bc045b1e2affc0dbe6bf710a7c10b4a5c26c7fd47d8b8e7fe4bee2a25e2fd80b13a
+SHA512 (linux-6.6.2.tar.xz) = 202683efebc3db663fbb095626e54c33efeff239894f34f5d814bee2e2b87a2ac85ac768cea33e31f6b44a01b4185b0ef384e67d812898ed6953f7089d551335
+SHA512 (kernel-abi-stablelists-6.6.2.tar.xz) = 02804c8ecbc6ddb37a25ec6e8579e49bd64634d2c9da105627be0f6bdc2cb91d627f524c72a57e7f45b24f7534c2e04a872d7090f40af9b82956267abc108aae
+SHA512 (kernel-kabi-dw-6.6.2.tar.xz) = 8ca309116cffac10c74f0103aa996f2ebd59f5f3eed40b4d95bad245ff363d6a5ce0ec973b6d3f48c21ce50a391314215d4776745e01f44072b0a7e4519d5e12
1
0
22 Nov '23
The package rpms/kernel.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/kernel.git/commit/?id=5ff8dc822452b….
Change:
+%ifnarch %nobuildarches
Thanks.
Full change:
============
commit 5ff8dc822452bf32ad8336a2d8fb56600a7178ec
Author: Justin M. Forbes <jforbes(a)fedoraproject.org>
Date: Wed Nov 22 14:47:56 2023 -0600
kernel-6.6.2-201
* Mon Nov 20 2023 Justin M. Forbes <jforbes(a)fedoraproject.org> [6.6.2-0]
- Add bug for AMD ACPI alarm (Justin M. Forbes)
- rtc: cmos: Use ACPI alarm for non-Intel x86 systems too (Mario Limonciello)
- Add bluetooth fixes to BugsFixed (Justin M. Forbes)
- Drop F37 from release targets as it will not rebase to 6.6 (Justin M. Forbes)
- Linux v6.6.2
Resolves:
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
diff --git a/Patchlist.changelog b/Patchlist.changelog
index eb625d3bd..f8e12a3dd 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,135 +1,105 @@
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/acc130077a200c2467cd265c2ef75e82f653a1ad
- acc130077a200c2467cd265c2ef75e82f653a1ad rtc: cmos: Use ACPI alarm for non-Intel x86 systems too
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/ed5f19c3892cc5dcfe95dd4d296c5e617a26c821
+ ed5f19c3892cc5dcfe95dd4d296c5e617a26c821 Revert "netfilter: nf_tables: remove catchall element in GC sync path"
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/9ed1817997b0d2f283275cce33cd7043b220d990
- 9ed1817997b0d2f283275cce33cd7043b220d990 power: supply: core: Use blocking_notifier_call_chain to avoid RCU complaint
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/81689414a7974a3f3fa3b28c18226c9d583761d4
+ 81689414a7974a3f3fa3b28c18226c9d583761d4 netfilter: nf_tables: remove catchall element in GC sync path
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/a3359bb88c8debcf1ed9aeeab15090cff336c8fd
- a3359bb88c8debcf1ed9aeeab15090cff336c8fd Revert "Add linux-next specific files for 20231004"
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/91d392fbbe771b2b4c45fd39b9150e27be3251ba
+ 91d392fbbe771b2b4c45fd39b9150e27be3251ba ACPI: video: Use acpi_device_fix_up_power_children()
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/4ef04c8ed25522fe1e4f917fe557716145c7361d
- 4ef04c8ed25522fe1e4f917fe557716145c7361d Add linux-next specific files for 20231004
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/3bd5c005766e37c5c60b1210e844091ddebd28d6
+ 3bd5c005766e37c5c60b1210e844091ddebd28d6 ACPI: PM: Add acpi_device_fix_up_power_children() function
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/afdab9b20ab7455f752527125b57c92d24601c6e
- afdab9b20ab7455f752527125b57c92d24601c6e drm/amdgpu: set completion status as preempted for the resubmission
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/46f41fa0448229c32bbc60d3c8ef50d22c33b117
+ 46f41fa0448229c32bbc60d3c8ef50d22c33b117 rtc: cmos: Use ACPI alarm for non-Intel x86 systems too
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/fe8fa52d7059d2dd7b171a0ad1a53bd55c7d449a
- fe8fa52d7059d2dd7b171a0ad1a53bd55c7d449a iommu/apple-dart: Handle DMA_FQ domains in attach_dev()
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/84c68fe1f91beef8b25ca2202d3581260447b334
+ 84c68fe1f91beef8b25ca2202d3581260447b334 drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/d08eefa0932515ada7d972c51b99153a7ea3d6ac
- d08eefa0932515ada7d972c51b99153a7ea3d6ac locking/atomic: scripts: fix fallback ifdeffery
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/51d40b1c54cf09e93d42dc0d090765016362d692
+ 51d40b1c54cf09e93d42dc0d090765016362d692 scsi: sd: Add "probe_type" module parameter to allow synchronous probing
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/d39b077dee33176ab97b22593fc8ae8a130ee768
- d39b077dee33176ab97b22593fc8ae8a130ee768 btrfs: adjust overcommit logic when very close to full
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/6e9d8352504d3de95ebdff5289e2da6e93b90767
+ 6e9d8352504d3de95ebdff5289e2da6e93b90767 Enable IO_URING for RHEL
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/a1c2565138b048b69ec731e22118ec1837fa5ceb
- a1c2565138b048b69ec731e22118ec1837fa5ceb btrfs: properly report 0 avail for very full file systems
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/e65e1c9cfce51744f3ccce9ede248e74a6e7bb5c
+ e65e1c9cfce51744f3ccce9ede248e74a6e7bb5c redhat: version two of Makefile.rhelver tweaks
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/60528063540aabceb7c4d79c7938d229ed5efc4f
- 60528063540aabceb7c4d79c7938d229ed5efc4f selinux: fix handling of empty opts in selinux_fs_context_submount()
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/97edcc85a591ed63b65fa583a1593e379ec779a0
+ 97edcc85a591ed63b65fa583a1593e379ec779a0 redhat: adapt to upstream Makefile change
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/80c615ec2edb4aadded21fe924e2caa172d59577
- 80c615ec2edb4aadded21fe924e2caa172d59577 Revert "misc: rtsx: judge ASPM Mode to set PETXCFG Reg"
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/f0274138f93a5de8d5757dc1310a51fd9adae739
+ f0274138f93a5de8d5757dc1310a51fd9adae739 Change acpi_bus_get_acpi_device to acpi_get_acpi_dev
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/c53302b2ed77cf6f3a125135a1f85af8cbc0ba4b
- c53302b2ed77cf6f3a125135a1f85af8cbc0ba4b tpm: Enable hwrng only for Pluton on AMD CPUs
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/b18359baab10beb33452ec4bac68a25db0ac2531
+ b18359baab10beb33452ec4bac68a25db0ac2531 RHEL: disable io_uring support
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/065cd69d44a8c576d6ff671ceae019f991cee492
- 065cd69d44a8c576d6ff671ceae019f991cee492 erofs: ensure that the post-EOF tails are all zeroed
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/e86246f6bff2cae6ed0728cb9855dc321aa22442
+ e86246f6bff2cae6ed0728cb9855dc321aa22442 REDHAT: coresight: etm4x: Disable coresight on HPE Apollo 70
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/b0da866f75833f1bb8570d7978a8d5179c8d9ab6
- b0da866f75833f1bb8570d7978a8d5179c8d9ab6 drm/msm/a690: Switch to a660_gmu.bin
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/780e15df6bfda4a86de773b5a76348845cd287e2
+ 780e15df6bfda4a86de773b5a76348845cd287e2 KEYS: Make use of platform keyring for module signature verify
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/f3cdb1143146a65982f46846cd590affb2b87538
- f3cdb1143146a65982f46846cd590affb2b87538 drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/e16c46de5e538011a405f267e0591a03fe4434f1
+ e16c46de5e538011a405f267e0591a03fe4434f1 Input: rmi4 - remove the need for artificial IRQ in case of HID
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/ea332dbc69a256a04bd53fee92db956439acee06
- ea332dbc69a256a04bd53fee92db956439acee06 scsi: sd: Add "probe_type" module parameter to allow synchronous probing
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/cefdb4374d26857e1d90cdd35936f219693dff11
+ cefdb4374d26857e1d90cdd35936f219693dff11 ARM: tegra: usb no reset
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/66721aea3aaa311bb78cf0947f06070f4101ee0e
- 66721aea3aaa311bb78cf0947f06070f4101ee0e Revert "Remove EXPERT from ARCH_FORCE_MAX_ORDER for aarch64"
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/161fba6e6557f41e7d2e1be2d4300aac25894c22
+ 161fba6e6557f41e7d2e1be2d4300aac25894c22 s390: Lock down the kernel when the IPL secure flag is set
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/29cd90a2b4cade829ac1401ef13314620b6c38a1
- 29cd90a2b4cade829ac1401ef13314620b6c38a1 Remove EXPERT from ARCH_FORCE_MAX_ORDER for aarch64
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/f23df5d91bbc852ed9a289c88b478b5890ff3aff
+ f23df5d91bbc852ed9a289c88b478b5890ff3aff efi: Lock down the kernel if booted in secure boot mode
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/ff96030d973a1b9233402a64d48d53e0d9461781
- ff96030d973a1b9233402a64d48d53e0d9461781 redhat: version two of Makefile.rhelver tweaks
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/388c5040283f7748c06961a807ab82960cfac7b2
+ 388c5040283f7748c06961a807ab82960cfac7b2 efi: Add an EFI_SECURE_BOOT flag to indicate secure boot mode
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/66064bbf7222c53ef297bfa4a14ffe4193b0fe94
- 66064bbf7222c53ef297bfa4a14ffe4193b0fe94 redhat: adapt to upstream Makefile change
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/e81d15d326fecd1c90d82b2acb9bdb259b4033ac
+ e81d15d326fecd1c90d82b2acb9bdb259b4033ac security: lockdown: expose a hook to lock the kernel down
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/c42de182b354644930e07bc92257d586a6c4ed18
- c42de182b354644930e07bc92257d586a6c4ed18 Change acpi_bus_get_acpi_device to acpi_get_acpi_dev
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/1297962689c5c00929be45b6261ab21f0e5de41c
+ 1297962689c5c00929be45b6261ab21f0e5de41c Make get_cert_list() use efi_status_to_str() to print error messages.
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/2e2a2e49f61d066d4bb8bfe0efde2d0f90b1491c
- 2e2a2e49f61d066d4bb8bfe0efde2d0f90b1491c nvme: nvme_mpath_init remove multipath check
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/2b290761ed33270b9f8fea815c9f29476ead5d5d
+ 2b290761ed33270b9f8fea815c9f29476ead5d5d Add efi_status_to_str() and rework efi_status_to_err().
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/5481da71dd1b1b88c550492b28e8b250e299f24c
- 5481da71dd1b1b88c550492b28e8b250e299f24c nvme: decouple basic ANA log page re-read support from native multipathing
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/4f23de5adca7e96a6bb3abc9f7e0546b997c8ea0
+ 4f23de5adca7e96a6bb3abc9f7e0546b997c8ea0 iommu/arm-smmu: workaround DMA mode issues
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/184662e0b0701841ad0229caf0e6d0ddb2a96231
- 184662e0b0701841ad0229caf0e6d0ddb2a96231 nvme: allow local retry and proper failover for REQ_FAILFAST_TRANSPORT
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/3c9be29ba9986f465b7c8fc6e391978833ffac22
+ 3c9be29ba9986f465b7c8fc6e391978833ffac22 ipmi: do not configure ipmi for HPE m400
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/00eb6277b582c42373c536e70d13860f87522e38
- 00eb6277b582c42373c536e70d13860f87522e38 nvme: Return BLK_STS_TARGET if the DNR bit is set
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/f9bd4dd2a3e0ce4fc91eea39c747a2b06ac8852c
+ f9bd4dd2a3e0ce4fc91eea39c747a2b06ac8852c kABI: Add generic kABI macros to use for kABI workarounds
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/80063932c894c04a6266f2543dc8a8c66cf0f4b5
- 80063932c894c04a6266f2543dc8a8c66cf0f4b5 REDHAT: coresight: etm4x: Disable coresight on HPE Apollo 70
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/0a826069d941f0249fa44005fbc6511875553497
+ 0a826069d941f0249fa44005fbc6511875553497 ahci: thunderx2: Fix for errata that affects stop engine
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/90f006ba80d847b4c8c689616b07370c2292a804
- 90f006ba80d847b4c8c689616b07370c2292a804 KEYS: Make use of platform keyring for module signature verify
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/b156077e6f7cdf9bc390551e7b65b80d1d5e285d
+ b156077e6f7cdf9bc390551e7b65b80d1d5e285d Vulcan: AHCI PCI bar fix for Broadcom Vulcan early silicon
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/856b4c54f954509436a51da2bfc0f0d44425d173
- 856b4c54f954509436a51da2bfc0f0d44425d173 Input: rmi4 - remove the need for artificial IRQ in case of HID
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/129dc65edece93e256a9c79b3e1f962fc7074406
+ 129dc65edece93e256a9c79b3e1f962fc7074406 tags.sh: Ignore redhat/rpm
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/9c10ed2c097b09b20c928d555bf030c56502cf88
- 9c10ed2c097b09b20c928d555bf030c56502cf88 ARM: tegra: usb no reset
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/7558a6cc3029f6cce7cb79ad0ab6348fa1083bb1
+ 7558a6cc3029f6cce7cb79ad0ab6348fa1083bb1 put RHEL info into generated headers
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/b136b0c2e0bf2f6f8f75f37fa00376563a78f6b2
- b136b0c2e0bf2f6f8f75f37fa00376563a78f6b2 s390: Lock down the kernel when the IPL secure flag is set
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/fabdc6fc464674d789063463c8a9abe954ed9f0e
+ fabdc6fc464674d789063463c8a9abe954ed9f0e aarch64: acpi scan: Fix regression related to X-Gene UARTs
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/8ffab3ce8c323b13cf4dbbd0291fb4748cae60a0
- 8ffab3ce8c323b13cf4dbbd0291fb4748cae60a0 efi: Lock down the kernel if booted in secure boot mode
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/3332716406fc60dbfbe218275c546081215fd4b3
+ 3332716406fc60dbfbe218275c546081215fd4b3 ACPI / irq: Workaround firmware issue on X-Gene based m400
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/9cae435c2ee4380b4086fa3a7ef859090e9f70d2
- 9cae435c2ee4380b4086fa3a7ef859090e9f70d2 efi: Add an EFI_SECURE_BOOT flag to indicate secure boot mode
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/ad67ea7af8f6e47745455046d807a8cf0b4e3864
+ ad67ea7af8f6e47745455046d807a8cf0b4e3864 modules: add rhelversion MODULE_INFO tag
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/de90fd8131ce4ed22c547c2bd1af1c20ea173a46
- de90fd8131ce4ed22c547c2bd1af1c20ea173a46 security: lockdown: expose a hook to lock the kernel down
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/4a9e157a9522218c86b14c2f91423dc8c6cc32ed
+ 4a9e157a9522218c86b14c2f91423dc8c6cc32ed ACPI: APEI: arm64: Ignore broken HPE moonshot APEI support
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/6fa94ce53295ae4440005260005078d7c737b828
- 6fa94ce53295ae4440005260005078d7c737b828 Make get_cert_list() use efi_status_to_str() to print error messages.
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/dd03abf0c6a7dde42a4f540f782c67d81319118d
+ dd03abf0c6a7dde42a4f540f782c67d81319118d Pull the RHEL version defines out of the Makefile
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/6c671f6b733c4ee8b88e6c314208b90486b98446
- 6c671f6b733c4ee8b88e6c314208b90486b98446 Add efi_status_to_str() and rework efi_status_to_err().
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/676e5b1fd3ede3a4d20157b2604dfd1d0e1405c3
- 676e5b1fd3ede3a4d20157b2604dfd1d0e1405c3 iommu/arm-smmu: workaround DMA mode issues
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/adbf82278579ad712bbdf5d3eaabc4c7fbf3305c
- adbf82278579ad712bbdf5d3eaabc4c7fbf3305c ipmi: do not configure ipmi for HPE m400
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/150baa5a728754cbf8f8c385a10af6b52a408cee
- 150baa5a728754cbf8f8c385a10af6b52a408cee ahci: thunderx2: Fix for errata that affects stop engine
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/0a757157eddee28f46bec619cbaf9d2015fda707
- 0a757157eddee28f46bec619cbaf9d2015fda707 Vulcan: AHCI PCI bar fix for Broadcom Vulcan early silicon
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/6ae5c032ab0cd35e82241c29e1f2bb1272b39fea
- 6ae5c032ab0cd35e82241c29e1f2bb1272b39fea tags.sh: Ignore redhat/rpm
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/36c76ea8d8223e20d158ee0928e9e9798b5b878d
- 36c76ea8d8223e20d158ee0928e9e9798b5b878d aarch64: acpi scan: Fix regression related to X-Gene UARTs
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/3ed45652209eeccc3918663abebc70001760111b
- 3ed45652209eeccc3918663abebc70001760111b ACPI / irq: Workaround firmware issue on X-Gene based m400
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/92d7a8c46934f658c9017966a90a8745e4b085bd
- 92d7a8c46934f658c9017966a90a8745e4b085bd ACPI: APEI: arm64: Ignore broken HPE moonshot APEI support
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/9e9a1ea80fc3ef4bf60f7ee2e41e1dbdd41f17cc
- 9e9a1ea80fc3ef4bf60f7ee2e41e1dbdd41f17cc Pull the RHEL version defines out of the Makefile
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/792dcdfdb07c00a91ad8f8c4624b057b84f5f2ae
- 792dcdfdb07c00a91ad8f8c4624b057b84f5f2ae [initial commit] Add Red Hat variables in the top level makefile
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/866075bfad9aeeb466f2516e071428e9ac5aafaa
+ 866075bfad9aeeb466f2516e071428e9ac5aafaa [initial commit] Add Red Hat variables in the top level makefile
diff --git a/check-kabi b/check-kabi
index f9d4dcb84..3809209ad 100755
--- a/check-kabi
+++ b/check-kabi
@@ -41,7 +41,8 @@ def load_symvers(symvers, filename):
break
if in_line == "\n":
continue
- checksum, symbol, directory, type = in_line.split()
+ checksum, symbol, directory, type, *ns = in_line.split()
+ ns = ns[0] if ns else None
symvers[symbol] = in_line[0:-1]
@@ -57,7 +58,8 @@ def load_kabi(kabi, filename):
break
if in_line == "\n":
continue
- checksum, symbol, directory, type = in_line.split()
+ checksum, symbol, directory, type, *ns = in_line.split()
+ ns = ns[0] if ns else None
kabi[symbol] = in_line[0:-1]
@@ -69,11 +71,14 @@ def check_kabi(symvers, kabi):
warn = 0
changed_symbols = []
moved_symbols = []
+ ns_symbols = []
for symbol in kabi:
- abi_hash, abi_sym, abi_dir, abi_type = kabi[symbol].split()
+ abi_hash, abi_sym, abi_dir, abi_type, *abi_ns = kabi[symbol].split()
+ abi_ns = abi_ns[0] if abi_ns else None
if symbol in symvers:
- sym_hash, sym_sym, sym_dir, sym_type = symvers[symbol].split()
+ sym_hash, sym_sym, sym_dir, sym_type, *sym_ns = symvers[symbol].split()
+ sym_ns = sym_ns[0] if sym_ns else None
if abi_hash != sym_hash:
fail = 1
changed_symbols.append(symbol)
@@ -81,6 +86,10 @@ def check_kabi(symvers, kabi):
if abi_dir != sym_dir:
warn = 1
moved_symbols.append(symbol)
+
+ if abi_ns != sym_ns:
+ warn = 1
+ ns_symbols.append(symbol)
else:
fail = 1
changed_symbols.append(symbol)
@@ -96,13 +105,21 @@ def check_kabi(symvers, kabi):
if warn:
print("*** WARNING - ABI SYMBOLS MOVED ***")
- print("")
- print("The following symbols moved (typically caused by moving a symbol from being")
- print("provided by the kernel vmlinux out to a loadable module):")
- print("")
- for symbol in moved_symbols:
- print(symbol)
- print("")
+ if moved_symbols:
+ print("")
+ print("The following symbols moved (typically caused by moving a symbol from being")
+ print("provided by the kernel vmlinux out to a loadable module):")
+ print("")
+ for symbol in moved_symbols:
+ print(symbol)
+ print("")
+ if ns_symbols:
+ print("")
+ print("The following symbols changed symbol namespaces:")
+ print("")
+ for symbol in ns_symbols:
+ print(symbol)
+ print("")
"""Halt the build, if we got errors and/or warnings. In either case,
double-checkig is required to avoid introducing / concealing
diff --git a/filter-aarch64.sh.fedora b/filter-aarch64.sh.fedora
index accb31c06..e970310a8 100644
--- a/filter-aarch64.sh.fedora
+++ b/filter-aarch64.sh.fedora
@@ -15,4 +15,4 @@ ethdrvs="3com adaptec arc alteon atheros broadcom cadence calxeda chelsio cisco
drmdrvs="amd arm bridge ast exynos hisilicon i2c imx mgag200 meson msm nouveau panel pl111 radeon rockchip tegra sun4i tiny vc4"
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr rnbd-client rnbd-server mlx5_vdpa dfl-emif octeontx2-cpt octeontx2-cptvf spi-altera-dfl rvu_cptpf rvu_cptvf regmap-sdw regmap-sdw-mbq hid-playstation hid-nintendo nvmem_u-boot-env intel-m10-bmc-pmci intel-m10-bmc-hwmon ptp_dfl_tod pds_vdpa"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr rnbd-client rnbd-server mlx5_vdpa dfl-emif octeontx2-cpt octeontx2-cptvf spi-altera-dfl rvu_cptpf rvu_cptvf regmap-sdw regmap-sdw-mbq hid-playstation hid-nintendo nvmem_u-boot-env intel-m10-bmc-pmci intel-m10-bmc-hwmon ptp_dfl_tod pds_vdpa usb_f_midi2 cs42l43-sdw"
diff --git a/filter-modules.sh.fedora b/filter-modules.sh.fedora
index 862223757..c14a79032 100755
--- a/filter-modules.sh.fedora
+++ b/filter-modules.sh.fedora
@@ -45,7 +45,7 @@ netprots="6lowpan appletalk atm ax25 batman-adv bluetooth can dsa ieee802154 l2t
drmdrvs="amd ast bridge gma500 i2c i915 mgag200 nouveau panel radeon"
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr parport_serial regmap-sdw regmap-sdw-mbq arizona-micsupp hid-asus iTCO_wdt rnbd-client rnbd-server mlx5_vdpa spi-altera-dfl nct6775 hid-playstation hid-nintendo asus_wmi_sensors asus_wmi_ec_sensors mlx5-vfio-pci video int3406_thermal apple_bl ptp_dfl_tod intel-m10-bmc-hwmon intel_rapl_tpmi pds_vdpa hp-wmi-sensors"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr parport_serial regmap-sdw regmap-sdw-mbq arizona-micsupp hid-asus iTCO_wdt rnbd-client rnbd-server mlx5_vdpa spi-altera-dfl nct6775 hid-playstation hid-nintendo asus_wmi_sensors asus_wmi_ec_sensors mlx5-vfio-pci video int3406_thermal apple_bl ptp_dfl_tod intel-m10-bmc-hwmon intel_rapl_tpmi pds_vdpa hp-wmi-sensors pds-vfio-pci"
# Grab the arch-specific filter list overrides
source ./filter-$2.sh
diff --git a/filter-ppc64le.sh.fedora b/filter-ppc64le.sh.fedora
index 63413617b..5794edd7c 100644
--- a/filter-ppc64le.sh.fedora
+++ b/filter-ppc64le.sh.fedora
@@ -11,4 +11,4 @@
driverdirs="atm auxdisplay bcma bluetooth firewire fpga infiniband leds media memstick message mmc mtd nfc ntb pcmcia platform power ssb staging tty uio w1"
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr rnbd-client rnbd-server mlx5_vdpa hid-playstation hid-nintendo mlx5-vfio-pci nvmem_u-boot-env intel-m10-bmc-pmci intel-m10-bmc-hwmon ptp_dfl_tod pds_vdpa"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr rnbd-client rnbd-server mlx5_vdpa hid-playstation hid-nintendo mlx5-vfio-pci nvmem_u-boot-env intel-m10-bmc-pmci intel-m10-bmc-hwmon ptp_dfl_tod pds_vdpa pds-vfio-pci"
diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config
index e7432ca2b..e33b90b3a 100644
--- a/kernel-aarch64-16k-debug-fedora.config
+++ b/kernel-aarch64-16k-debug-fedora.config
@@ -145,6 +145,7 @@ CONFIG_AD7949=m
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
CONFIG_ADAPTEC_STARFIRE=m
+# CONFIG_ADDRESS_MASKING is not set
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -1275,6 +1276,7 @@ CONFIG_COMMON_CLK_SI5341=m
# CONFIG_COMMON_CLK_SI5351 is not set
CONFIG_COMMON_CLK_SI544=m
# CONFIG_COMMON_CLK_SI570 is not set
+CONFIG_COMMON_CLK_VC3=m
# CONFIG_COMMON_CLK_VC5 is not set
CONFIG_COMMON_CLK_VC7=m
CONFIG_COMMON_CLK_XGENE=y
@@ -1297,6 +1299,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=3
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1352,6 +1355,8 @@ CONFIG_CPU_THERMAL=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -1781,6 +1786,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
CONFIG_DMA_OF=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
@@ -1809,6 +1815,7 @@ CONFIG_DM_INIT=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=y
@@ -1943,6 +1950,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
CONFIG_DRM_LONTIUM_LT9611=m
CONFIG_DRM_LONTIUM_LT9611UXC=m
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
CONFIG_DRM_MALI_DISPLAY=m
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -2047,11 +2055,13 @@ CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
+CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m
# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
CONFIG_DRM_PANEL_TPO_TPG110=m
CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
+CONFIG_DRM_PANEL_VISIONOX_R66451=m
CONFIG_DRM_PANEL_VISIONOX_RM69299=m
CONFIG_DRM_PANEL_VISIONOX_VTDR6130=m
CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
@@ -2099,6 +2109,7 @@ CONFIG_DRM_TOSHIBA_TC358764=m
CONFIG_DRM_TOSHIBA_TC358767=m
CONFIG_DRM_TOSHIBA_TC358768=m
CONFIG_DRM_TOSHIBA_TC358775=m
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
CONFIG_DRM_V3D=m
@@ -2307,6 +2318,7 @@ CONFIG_EROFS_FS=m
CONFIG_EROFS_FS_POSIX_ACL=y
CONFIG_EROFS_FS_SECURITY=y
CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP_DEFLATE=y
CONFIG_EROFS_FS_ZIP_LZMA=y
CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
@@ -2396,6 +2408,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -2637,6 +2650,7 @@ CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
CONFIG_GPIO_DAVINCI=m
CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_DS4520=m
CONFIG_GPIO_DWAPB=m
CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_FTGPIO010 is not set
@@ -2776,6 +2790,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
CONFIG_HID_GLORIOUS=m
# CONFIG_HID_GOOGLE_HAMMER is not set
+CONFIG_HID_GOOGLE_STADIA_FF=m
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2995,6 +3010,7 @@ CONFIG_I2C_ALGOPCF=m
CONFIG_I2C_AMD_MP2=m
CONFIG_I2C_APPLE=m
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+CONFIG_I2C_ATR=m
CONFIG_I2C_BCM2835=m
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_BRCMSTB=y
@@ -3438,6 +3454,7 @@ CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
CONFIG_IOSM=m
CONFIG_IO_STRICT_DEVMEM=y
+CONFIG_IO_URING=y
CONFIG_IP5XXX_POWER=m
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -3507,6 +3524,7 @@ CONFIG_IP_PIMSM_V2=y
# CONFIG_IPQ_APSS_6018 is not set
# CONFIG_IPQ_APSS_PLL is not set
# CONFIG_IPQ_GCC_4019 is not set
+CONFIG_IPQ_GCC_5018=m
# CONFIG_IPQ_GCC_5332 is not set
# CONFIG_IPQ_GCC_6018 is not set
# CONFIG_IPQ_GCC_806X is not set
@@ -3534,6 +3552,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+CONFIG_IPU_BRIDGE=m
CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_IOAM6_LWTUNNEL=y
@@ -3611,6 +3630,7 @@ CONFIG_IR_RC6_DECODER=m
CONFIG_IR_RCMM_DECODER=m
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
CONFIG_IR_SERIAL=m
CONFIG_IR_SERIAL_TRANSMITTER=y
CONFIG_IR_SHARP_DECODER=m
@@ -3832,11 +3852,13 @@ CONFIG_KSM=y
CONFIG_KSZ884X_PCI=m
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KUSER_HELPERS=y
+CONFIG_KVM_PROVE_MMU=y
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
CONFIG_KVM_XEN=y
@@ -3890,6 +3912,7 @@ CONFIG_LEDS_CR0014114=m
# CONFIG_LEDS_DAC124S085 is not set
# CONFIG_LEDS_EL15203000 is not set
CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GROUP_MULTICOLOR=m
# CONFIG_LEDS_IS31FL319X is not set
CONFIG_LEDS_IS31FL32XX=m
# CONFIG_LEDS_KTD2692 is not set
@@ -3917,6 +3940,7 @@ CONFIG_LEDS_PCA9532_GPIO=y
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
CONFIG_LEDS_PCA963X=m
+CONFIG_LEDS_PCA995X=m
CONFIG_LEDS_PWM=m
CONFIG_LEDS_PWM_MULTICOLOR=m
CONFIG_LEDS_QCOM_FLASH=m
@@ -4069,9 +4093,11 @@ CONFIG_MAILBOX=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88Q2XXX_PHY=m
CONFIG_MARVELL_88X2222_PHY=m
CONFIG_MARVELL_CN10K_DDR_PMU=m
CONFIG_MARVELL_CN10K_TAD_PMU=m
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -4116,11 +4142,13 @@ CONFIG_MCP41010=m
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+CONFIG_MCP4728=m
# CONFIG_MCP4922 is not set
CONFIG_MCTP_SERIAL=m
# CONFIG_MCTP_TRANSPORT_I2C is not set
CONFIG_MCTP=y
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -4244,6 +4272,8 @@ CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=y
# CONFIG_MFD_CPCAP is not set
CONFIG_MFD_CROS_EC_DEV=m
+CONFIG_MFD_CS42L43_I2C=m
+CONFIG_MFD_CS42L43_SDW=m
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
@@ -4406,6 +4436,7 @@ CONFIG_MLX5_ESWITCH=y
# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -4799,6 +4830,7 @@ CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -5314,6 +5346,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -5366,6 +5399,7 @@ CONFIG_NVMEM_LAYOUT_SL28_VPD=m
CONFIG_NVMEM_MESON_EFUSE=m
CONFIG_NVMEM_MESON_MX_EFUSE=m
CONFIG_NVMEM_QCOM_QFPROM=m
+CONFIG_NVMEM_QCOM_SEC_QFPROM=m
CONFIG_NVMEM_REBOOT_MODE=m
CONFIG_NVMEM_RMEM=m
CONFIG_NVMEM_ROCKCHIP_EFUSE=m
@@ -5445,6 +5479,7 @@ CONFIG_ORINOCO_USB=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -5535,6 +5570,7 @@ CONFIG_PCC=y
CONFIG_PCI_AARDVARK=y
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_AL is not set
@@ -5617,6 +5653,7 @@ CONFIG_PCS_XPCS=m
CONFIG_PDC_ADMA=m
CONFIG_PDS_CORE=m
CONFIG_PDS_VDPA=m
+CONFIG_PDS_VFIO_PCI=m
# CONFIG_PECI is not set
CONFIG_PERCPU_STATS=y
# CONFIG_PERCPU_TEST is not set
@@ -5675,12 +5712,14 @@ CONFIG_PHY_QCOM_EUSB2_REPEATER=m
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
CONFIG_PHY_QCOM_PCIE2=m
CONFIG_PHY_QCOM_QMP_COMBO=m
CONFIG_PHY_QCOM_QMP=m
CONFIG_PHY_QCOM_QMP_PCIE_8996=m
CONFIG_PHY_QCOM_QMP_PCIE=m
CONFIG_PHY_QCOM_QMP_UFS=m
+CONFIG_PHY_QCOM_QMP_USB_LEGACY=m
CONFIG_PHY_QCOM_QMP_USB=m
CONFIG_PHY_QCOM_QUSB2=m
CONFIG_PHY_QCOM_SGMII_ETH=m
@@ -5702,6 +5741,8 @@ CONFIG_PHY_ROCKCHIP_PCIE=y
CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=m
CONFIG_PHY_ROCKCHIP_TYPEC=m
CONFIG_PHY_ROCKCHIP_USB=m
+CONFIG_PHY_RTK_RTD_USB2PHY=m
+CONFIG_PHY_RTK_RTD_USB3PHY=m
# CONFIG_PHY_SAMSUNG_USB2 is not set
CONFIG_PHY_SUN4I_USB=m
CONFIG_PHY_SUN50I_USB3=m
@@ -5719,6 +5760,7 @@ CONFIG_PID_NS=y
CONFIG_PINCONF=y
CONFIG_PINCTRL_ALDERLAKE=m
CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_AMLOGIC_C3=y
CONFIG_PINCTRL_APPLE_GPIO=m
CONFIG_PINCTRL_AS3722=y
CONFIG_PINCTRL_AXP209=m
@@ -5727,6 +5769,7 @@ CONFIG_PINCTRL_AXP209=m
# CONFIG_PINCTRL_CANNONLAKE is not set
CONFIG_PINCTRL_CEDARFORK=m
# CONFIG_PINCTRL_CHERRYVIEW is not set
+CONFIG_PINCTRL_CS42L43=m
CONFIG_PINCTRL_CY8C95X0=m
CONFIG_PINCTRL_ELKHARTLAKE=m
CONFIG_PINCTRL_EMMITSBURG=m
@@ -5804,6 +5847,7 @@ CONFIG_PINCTRL_SDM845=m
# CONFIG_PINCTRL_SDX75 is not set
CONFIG_PINCTRL_SINGLE=y
# CONFIG_PINCTRL_SM6115 is not set
+# CONFIG_PINCTRL_SM6115_LPASS_LPI is not set
# CONFIG_PINCTRL_SM6125 is not set
# CONFIG_PINCTRL_SM6350 is not set
# CONFIG_PINCTRL_SM6375 is not set
@@ -5812,6 +5856,7 @@ CONFIG_PINCTRL_SINGLE=y
# CONFIG_PINCTRL_SM8250 is not set
CONFIG_PINCTRL_SM8250_LPASS_LPI=m
# CONFIG_PINCTRL_SM8350 is not set
+CONFIG_PINCTRL_SM8350_LPASS_LPI=m
CONFIG_PINCTRL_SM8450_LPASS_LPI=m
CONFIG_PINCTRL_SM8450=m
# CONFIG_PINCTRL_SM8550 is not set
@@ -5975,6 +6020,7 @@ CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
CONFIG_PSTORE_842_COMPRESS=y
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -5996,6 +6042,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
CONFIG_PTP_1588_CLOCK_IDTCM=m
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_PTP_1588_CLOCK_QORIQ=m
@@ -6167,6 +6214,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -6228,6 +6276,7 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=y
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP_MMIO=y
@@ -6239,6 +6288,7 @@ CONFIG_REGULATOR_ACT8865=m
CONFIG_REGULATOR_ANATOP=m
CONFIG_REGULATOR_ARM_SCMI=m
CONFIG_REGULATOR_AS3722=m
+CONFIG_REGULATOR_AW37503=m
CONFIG_REGULATOR_AXP20X=m
CONFIG_REGULATOR_BD718XX=m
CONFIG_REGULATOR_BD9571MWV=m
@@ -6266,12 +6316,14 @@ CONFIG_REGULATOR_HI655X=m
# CONFIG_REGULATOR_MAX1586 is not set
# CONFIG_REGULATOR_MAX20086 is not set
CONFIG_REGULATOR_MAX20411=m
+CONFIG_REGULATOR_MAX5970=m
CONFIG_REGULATOR_MAX597X=m
CONFIG_REGULATOR_MAX77620=y
CONFIG_REGULATOR_MAX77650=m
CONFIG_REGULATOR_MAX77686=m
CONFIG_REGULATOR_MAX77802=m
# CONFIG_REGULATOR_MAX77826 is not set
+CONFIG_REGULATOR_MAX77857=m
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
CONFIG_REGULATOR_MAX8893=m
@@ -6293,6 +6345,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_PV88090 is not set
CONFIG_REGULATOR_PWM=y
CONFIG_REGULATOR_QCOM_LABIBB=m
+CONFIG_REGULATOR_QCOM_REFGEN=m
CONFIG_REGULATOR_QCOM_RPMH=y
# CONFIG_REGULATOR_QCOM_RPM is not set
CONFIG_REGULATOR_QCOM_SMD_RPM=m
@@ -6313,6 +6366,7 @@ CONFIG_REGULATOR_RT6190=m
CONFIG_REGULATOR_RT6245=m
CONFIG_REGULATOR_RTMV20=m
CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTQ2208=m
CONFIG_REGULATOR_RTQ6752=m
# CONFIG_REGULATOR_SLG51000 is not set
CONFIG_REGULATOR_SY7636A=m
@@ -6372,8 +6426,7 @@ CONFIG_RESOURCE_KUNIT_TEST=m
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-# CONFIG_RH_DISABLE_DEPRECATED is not set
-CONFIG_RH_FEDORA=y
+# CONFIG_RHEL_DIFFERENCES is not set
CONFIG_RICHTEK_RTQ6056=m
CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
@@ -6856,6 +6909,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -6933,6 +6987,7 @@ CONFIG_SENSORS_GPIO_FAN=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
CONFIG_SENSORS_HP_WMI=m
+CONFIG_SENSORS_HS3001=m
# CONFIG_SENSORS_I5K_AMB is not set
CONFIG_SENSORS_IBMAEM=m
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -7019,6 +7074,7 @@ CONFIG_SENSORS_MCP3021=m
CONFIG_SENSORS_MLXREG_FAN=m
CONFIG_SENSORS_MP2888=m
CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_MP2975_REGULATOR=y
CONFIG_SENSORS_MP5023=m
CONFIG_SENSORS_MPQ7932=m
CONFIG_SENSORS_MPQ7932_REGULATOR=y
@@ -7390,6 +7446,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=2048
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
CONFIG_SND_HDA_TEGRA=m
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -7512,7 +7571,9 @@ CONFIG_SND_SOC_AK5558=m
CONFIG_SND_SOC_APPLE_MCA=m
CONFIG_SND_SOC_APQ8016_SBC=m
CONFIG_SND_SOC_ARNDALE=m
+CONFIG_SND_SOC_AUDIO_IIO_AUX=m
CONFIG_SND_SOC_AW8738=m
+CONFIG_SND_SOC_AW88261=m
CONFIG_SND_SOC_AW88395=m
CONFIG_SND_SOC_BD28623=m
CONFIG_SND_SOC_BT_SCO=m
@@ -7538,6 +7599,8 @@ CONFIG_SND_SOC_CS4271_I2C=m
# CONFIG_SND_SOC_CS4271_SPI is not set
CONFIG_SND_SOC_CS42L42=m
CONFIG_SND_SOC_CS42L42_SDW=m
+CONFIG_SND_SOC_CS42L43=m
+CONFIG_SND_SOC_CS42L43_SDW=m
# CONFIG_SND_SOC_CS42L51_I2C is not set
# CONFIG_SND_SOC_CS42L52 is not set
# CONFIG_SND_SOC_CS42L56 is not set
@@ -7729,6 +7792,7 @@ CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
CONFIG_SND_SOC_ROCKCHIP_PDM=m
CONFIG_SND_SOC_ROCKCHIP_RT5645=m
CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
+CONFIG_SND_SOC_RT1017_SDCA_SDW=m
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -7875,6 +7939,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
CONFIG_SND_SOC_TLV320AIC3X_I2C=m
CONFIG_SND_SOC_TLV320AIC3X=m
CONFIG_SND_SOC_TLV320AIC3X_SPI=m
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
CONFIG_SND_SOC_TPA6130A2=m
CONFIG_SND_SOC_TS3A227E=m
@@ -8016,6 +8081,7 @@ CONFIG_SPI_BITBANG=m
CONFIG_SPI_CADENCE=m
CONFIG_SPI_CADENCE_QUADSPI=m
CONFIG_SPI_CADENCE_XSPI=m
+# CONFIG_SPI_CS42L43 is not set
# CONFIG_SPI_DEBUG is not set
CONFIG_SPI_DESIGNWARE=m
CONFIG_SPI_DLN2=m
@@ -8159,6 +8225,7 @@ CONFIG_ST_UVIS25=m
CONFIG_ST_UVIS25_SPI=m
# CONFIG_SUN20I_D1_CCU is not set
# CONFIG_SUN20I_D1_R_CCU is not set
+CONFIG_SUN20I_GPADC=m
# CONFIG_SUN20I_PPU is not set
# CONFIG_SUN4I_EMAC is not set
CONFIG_SUN50I_A100_CCU=y
@@ -8213,6 +8280,7 @@ CONFIG_SURFACE_PRO3_BUTTON=m
CONFIG_SUSPEND=y
CONFIG_SVC_I3C_MASTER=m
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_SWP_EMULATION=y
# CONFIG_SW_SYNC is not set
CONFIG_SX9310=m
@@ -8348,6 +8416,7 @@ CONFIG_TEST_FPU=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIST_SORT=m
@@ -8431,6 +8500,8 @@ CONFIG_TIFM_7XX1=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+# CONFIG_TI_ICSSG_PRUETH is not set
+CONFIG_TI_ICSS_IEP=m
CONFIG_TI_K3_AM65_CPSW_NUSS=m
CONFIG_TI_K3_AM65_CPSW_SWITCHDEV=y
CONFIG_TI_K3_AM65_CPTS=m
@@ -8470,6 +8541,7 @@ CONFIG_TI_SCI_PM_DOMAINS=y
CONFIG_TI_SCI_PROTOCOL=y
# CONFIG_TI_ST is not set
CONFIG_TI_SYSCON_CLK=m
+CONFIG_TI_SYSC=y
# CONFIG_TI_TLC4541 is not set
# CONFIG_TI_TMAG5273 is not set
CONFIG_TI_TSC2046=m
@@ -8482,6 +8554,7 @@ CONFIG_TMP006=m
CONFIG_TMP117=m
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_QUOTA=y
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
CONFIG_TORTURE_TEST=m
@@ -8527,6 +8600,7 @@ CONFIG_TOUCHSCREEN_IMAGIS=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_IQS7211=m
# CONFIG_TOUCHSCREEN_MAX11801 is not set
CONFIG_TOUCHSCREEN_MCS5000=m
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -8753,6 +8827,7 @@ CONFIG_USB_CONFIGFS_EEM=y
# CONFIG_USB_CONFIGFS_F_FS is not set
CONFIG_USB_CONFIGFS_F_HID=y
# CONFIG_USB_CONFIGFS_F_LB_SS is not set
+CONFIG_USB_CONFIGFS_F_MIDI2=y
# CONFIG_USB_CONFIGFS_F_MIDI is not set
# CONFIG_USB_CONFIGFS_F_PRINTER is not set
CONFIG_USB_CONFIGFS_F_TCM=y
@@ -9147,7 +9222,9 @@ CONFIG_VFAT_FS=m
CONFIG_VFIO_AMBA=m
CONFIG_VFIO_CDX=m
CONFIG_VFIO_CONTAINER=y
+# CONFIG_VFIO_DEVICE_CDEV is not set
CONFIG_VFIO_FSL_MC=m
+CONFIG_VFIO_GROUP=y
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
CONFIG_VFIO_MDEV=m
@@ -9222,9 +9299,13 @@ CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_DS90UB913=m
+CONFIG_VIDEO_DS90UB953=m
+CONFIG_VIDEO_DS90UB960=m
# CONFIG_VIDEO_DT3155 is not set
CONFIG_VIDEO_DW100=m
CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9719=m
CONFIG_VIDEO_DW9768=m
CONFIG_VIDEO_DW9807_VCM=m
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -9598,6 +9679,7 @@ CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
# CONFIG_XEN is not set
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
+CONFIG_XEN_PRIVCMD_IRQFD=y
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_PVHVM_GUEST=y
@@ -9615,6 +9697,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config
index 9d8750123..24c5b3f6a 100644
--- a/kernel-aarch64-16k-fedora.config
+++ b/kernel-aarch64-16k-fedora.config
@@ -145,6 +145,7 @@ CONFIG_AD7949=m
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
CONFIG_ADAPTEC_STARFIRE=m
+# CONFIG_ADDRESS_MASKING is not set
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -1275,6 +1276,7 @@ CONFIG_COMMON_CLK_SI5341=m
# CONFIG_COMMON_CLK_SI5351 is not set
CONFIG_COMMON_CLK_SI544=m
# CONFIG_COMMON_CLK_SI570 is not set
+CONFIG_COMMON_CLK_VC3=m
# CONFIG_COMMON_CLK_VC5 is not set
CONFIG_COMMON_CLK_VC7=m
CONFIG_COMMON_CLK_XGENE=y
@@ -1297,6 +1299,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=3
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1352,6 +1355,8 @@ CONFIG_CPU_THERMAL=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -1772,6 +1777,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
CONFIG_DMA_OF=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
@@ -1800,6 +1806,7 @@ CONFIG_DM_INIT=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=y
@@ -1934,6 +1941,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
CONFIG_DRM_LONTIUM_LT9611=m
CONFIG_DRM_LONTIUM_LT9611UXC=m
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
CONFIG_DRM_MALI_DISPLAY=m
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -2038,11 +2046,13 @@ CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
+CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m
# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
CONFIG_DRM_PANEL_TPO_TPG110=m
CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
+CONFIG_DRM_PANEL_VISIONOX_R66451=m
CONFIG_DRM_PANEL_VISIONOX_RM69299=m
CONFIG_DRM_PANEL_VISIONOX_VTDR6130=m
CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
@@ -2090,6 +2100,7 @@ CONFIG_DRM_TOSHIBA_TC358764=m
CONFIG_DRM_TOSHIBA_TC358767=m
CONFIG_DRM_TOSHIBA_TC358768=m
CONFIG_DRM_TOSHIBA_TC358775=m
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
CONFIG_DRM_V3D=m
@@ -2298,6 +2309,7 @@ CONFIG_EROFS_FS=m
CONFIG_EROFS_FS_POSIX_ACL=y
CONFIG_EROFS_FS_SECURITY=y
CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP_DEFLATE=y
CONFIG_EROFS_FS_ZIP_LZMA=y
CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
@@ -2379,6 +2391,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -2620,6 +2633,7 @@ CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
CONFIG_GPIO_DAVINCI=m
CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_DS4520=m
CONFIG_GPIO_DWAPB=m
CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_FTGPIO010 is not set
@@ -2759,6 +2773,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
CONFIG_HID_GLORIOUS=m
# CONFIG_HID_GOOGLE_HAMMER is not set
+CONFIG_HID_GOOGLE_STADIA_FF=m
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2978,6 +2993,7 @@ CONFIG_I2C_ALGOPCF=m
CONFIG_I2C_AMD_MP2=m
CONFIG_I2C_APPLE=m
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+CONFIG_I2C_ATR=m
CONFIG_I2C_BCM2835=m
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_BRCMSTB=y
@@ -3421,6 +3437,7 @@ CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
CONFIG_IOSM=m
CONFIG_IO_STRICT_DEVMEM=y
+CONFIG_IO_URING=y
CONFIG_IP5XXX_POWER=m
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -3490,6 +3507,7 @@ CONFIG_IP_PIMSM_V2=y
# CONFIG_IPQ_APSS_6018 is not set
# CONFIG_IPQ_APSS_PLL is not set
# CONFIG_IPQ_GCC_4019 is not set
+CONFIG_IPQ_GCC_5018=m
# CONFIG_IPQ_GCC_5332 is not set
# CONFIG_IPQ_GCC_6018 is not set
# CONFIG_IPQ_GCC_806X is not set
@@ -3517,6 +3535,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+CONFIG_IPU_BRIDGE=m
CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_IOAM6_LWTUNNEL=y
@@ -3594,6 +3613,7 @@ CONFIG_IR_RC6_DECODER=m
CONFIG_IR_RCMM_DECODER=m
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
CONFIG_IR_SERIAL=m
CONFIG_IR_SERIAL_TRANSMITTER=y
CONFIG_IR_SHARP_DECODER=m
@@ -3808,11 +3828,13 @@ CONFIG_KSM=y
CONFIG_KSZ884X_PCI=m
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KUSER_HELPERS=y
+# CONFIG_KVM_PROVE_MMU is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
CONFIG_KVM_XEN=y
@@ -3866,6 +3888,7 @@ CONFIG_LEDS_CR0014114=m
# CONFIG_LEDS_DAC124S085 is not set
# CONFIG_LEDS_EL15203000 is not set
CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GROUP_MULTICOLOR=m
# CONFIG_LEDS_IS31FL319X is not set
CONFIG_LEDS_IS31FL32XX=m
# CONFIG_LEDS_KTD2692 is not set
@@ -3893,6 +3916,7 @@ CONFIG_LEDS_PCA9532_GPIO=y
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
CONFIG_LEDS_PCA963X=m
+CONFIG_LEDS_PCA995X=m
CONFIG_LEDS_PWM=m
CONFIG_LEDS_PWM_MULTICOLOR=m
CONFIG_LEDS_QCOM_FLASH=m
@@ -4045,9 +4069,11 @@ CONFIG_MAILBOX=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88Q2XXX_PHY=m
CONFIG_MARVELL_88X2222_PHY=m
CONFIG_MARVELL_CN10K_DDR_PMU=m
CONFIG_MARVELL_CN10K_TAD_PMU=m
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -4091,11 +4117,13 @@ CONFIG_MCP41010=m
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+CONFIG_MCP4728=m
# CONFIG_MCP4922 is not set
CONFIG_MCTP_SERIAL=m
# CONFIG_MCTP_TRANSPORT_I2C is not set
CONFIG_MCTP=y
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -4219,6 +4247,8 @@ CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=y
# CONFIG_MFD_CPCAP is not set
CONFIG_MFD_CROS_EC_DEV=m
+CONFIG_MFD_CS42L43_I2C=m
+CONFIG_MFD_CS42L43_SDW=m
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
@@ -4381,6 +4411,7 @@ CONFIG_MLX5_ESWITCH=y
# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -4773,6 +4804,7 @@ CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -5288,6 +5320,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -5340,6 +5373,7 @@ CONFIG_NVMEM_LAYOUT_SL28_VPD=m
CONFIG_NVMEM_MESON_EFUSE=m
CONFIG_NVMEM_MESON_MX_EFUSE=m
CONFIG_NVMEM_QCOM_QFPROM=m
+CONFIG_NVMEM_QCOM_SEC_QFPROM=m
CONFIG_NVMEM_REBOOT_MODE=m
CONFIG_NVMEM_RMEM=m
CONFIG_NVMEM_ROCKCHIP_EFUSE=m
@@ -5419,6 +5453,7 @@ CONFIG_ORINOCO_USB=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -5508,6 +5543,7 @@ CONFIG_PCC=y
CONFIG_PCI_AARDVARK=y
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_AL is not set
@@ -5590,6 +5626,7 @@ CONFIG_PCS_XPCS=m
CONFIG_PDC_ADMA=m
CONFIG_PDS_CORE=m
CONFIG_PDS_VDPA=m
+CONFIG_PDS_VFIO_PCI=m
# CONFIG_PECI is not set
# CONFIG_PERCPU_STATS is not set
# CONFIG_PERCPU_TEST is not set
@@ -5648,12 +5685,14 @@ CONFIG_PHY_QCOM_EUSB2_REPEATER=m
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
CONFIG_PHY_QCOM_PCIE2=m
CONFIG_PHY_QCOM_QMP_COMBO=m
CONFIG_PHY_QCOM_QMP=m
CONFIG_PHY_QCOM_QMP_PCIE_8996=m
CONFIG_PHY_QCOM_QMP_PCIE=m
CONFIG_PHY_QCOM_QMP_UFS=m
+CONFIG_PHY_QCOM_QMP_USB_LEGACY=m
CONFIG_PHY_QCOM_QMP_USB=m
CONFIG_PHY_QCOM_QUSB2=m
CONFIG_PHY_QCOM_SGMII_ETH=m
@@ -5675,6 +5714,8 @@ CONFIG_PHY_ROCKCHIP_PCIE=y
CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=m
CONFIG_PHY_ROCKCHIP_TYPEC=m
CONFIG_PHY_ROCKCHIP_USB=m
+CONFIG_PHY_RTK_RTD_USB2PHY=m
+CONFIG_PHY_RTK_RTD_USB3PHY=m
# CONFIG_PHY_SAMSUNG_USB2 is not set
CONFIG_PHY_SUN4I_USB=m
CONFIG_PHY_SUN50I_USB3=m
@@ -5692,6 +5733,7 @@ CONFIG_PID_NS=y
CONFIG_PINCONF=y
CONFIG_PINCTRL_ALDERLAKE=m
CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_AMLOGIC_C3=y
CONFIG_PINCTRL_APPLE_GPIO=m
CONFIG_PINCTRL_AS3722=y
CONFIG_PINCTRL_AXP209=m
@@ -5700,6 +5742,7 @@ CONFIG_PINCTRL_AXP209=m
# CONFIG_PINCTRL_CANNONLAKE is not set
CONFIG_PINCTRL_CEDARFORK=m
# CONFIG_PINCTRL_CHERRYVIEW is not set
+CONFIG_PINCTRL_CS42L43=m
CONFIG_PINCTRL_CY8C95X0=m
CONFIG_PINCTRL_ELKHARTLAKE=m
CONFIG_PINCTRL_EMMITSBURG=m
@@ -5777,6 +5820,7 @@ CONFIG_PINCTRL_SDM845=m
# CONFIG_PINCTRL_SDX75 is not set
CONFIG_PINCTRL_SINGLE=y
# CONFIG_PINCTRL_SM6115 is not set
+# CONFIG_PINCTRL_SM6115_LPASS_LPI is not set
# CONFIG_PINCTRL_SM6125 is not set
# CONFIG_PINCTRL_SM6350 is not set
# CONFIG_PINCTRL_SM6375 is not set
@@ -5785,6 +5829,7 @@ CONFIG_PINCTRL_SINGLE=y
# CONFIG_PINCTRL_SM8250 is not set
CONFIG_PINCTRL_SM8250_LPASS_LPI=m
# CONFIG_PINCTRL_SM8350 is not set
+CONFIG_PINCTRL_SM8350_LPASS_LPI=m
CONFIG_PINCTRL_SM8450_LPASS_LPI=m
CONFIG_PINCTRL_SM8450=m
# CONFIG_PINCTRL_SM8550 is not set
@@ -5948,6 +5993,7 @@ CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
CONFIG_PSTORE_842_COMPRESS=y
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -5969,6 +6015,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
CONFIG_PTP_1588_CLOCK_IDTCM=m
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_PTP_1588_CLOCK_QORIQ=m
@@ -6140,6 +6187,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -6201,6 +6249,7 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=y
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP_MMIO=y
@@ -6212,6 +6261,7 @@ CONFIG_REGULATOR_ACT8865=m
CONFIG_REGULATOR_ANATOP=m
CONFIG_REGULATOR_ARM_SCMI=m
CONFIG_REGULATOR_AS3722=m
+CONFIG_REGULATOR_AW37503=m
CONFIG_REGULATOR_AXP20X=m
CONFIG_REGULATOR_BD718XX=m
CONFIG_REGULATOR_BD9571MWV=m
@@ -6239,12 +6289,14 @@ CONFIG_REGULATOR_HI655X=m
# CONFIG_REGULATOR_MAX1586 is not set
# CONFIG_REGULATOR_MAX20086 is not set
CONFIG_REGULATOR_MAX20411=m
+CONFIG_REGULATOR_MAX5970=m
CONFIG_REGULATOR_MAX597X=m
CONFIG_REGULATOR_MAX77620=y
CONFIG_REGULATOR_MAX77650=m
CONFIG_REGULATOR_MAX77686=m
CONFIG_REGULATOR_MAX77802=m
# CONFIG_REGULATOR_MAX77826 is not set
+CONFIG_REGULATOR_MAX77857=m
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
CONFIG_REGULATOR_MAX8893=m
@@ -6266,6 +6318,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_PV88090 is not set
CONFIG_REGULATOR_PWM=y
CONFIG_REGULATOR_QCOM_LABIBB=m
+CONFIG_REGULATOR_QCOM_REFGEN=m
CONFIG_REGULATOR_QCOM_RPMH=y
# CONFIG_REGULATOR_QCOM_RPM is not set
CONFIG_REGULATOR_QCOM_SMD_RPM=m
@@ -6286,6 +6339,7 @@ CONFIG_REGULATOR_RT6190=m
CONFIG_REGULATOR_RT6245=m
CONFIG_REGULATOR_RTMV20=m
CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTQ2208=m
CONFIG_REGULATOR_RTQ6752=m
# CONFIG_REGULATOR_SLG51000 is not set
CONFIG_REGULATOR_SY7636A=m
@@ -6345,8 +6399,7 @@ CONFIG_RESOURCE_KUNIT_TEST=m
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-# CONFIG_RH_DISABLE_DEPRECATED is not set
-CONFIG_RH_FEDORA=y
+# CONFIG_RHEL_DIFFERENCES is not set
CONFIG_RICHTEK_RTQ6056=m
CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
@@ -6829,6 +6882,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -6906,6 +6960,7 @@ CONFIG_SENSORS_GPIO_FAN=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
CONFIG_SENSORS_HP_WMI=m
+CONFIG_SENSORS_HS3001=m
# CONFIG_SENSORS_I5K_AMB is not set
CONFIG_SENSORS_IBMAEM=m
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -6992,6 +7047,7 @@ CONFIG_SENSORS_MCP3021=m
CONFIG_SENSORS_MLXREG_FAN=m
CONFIG_SENSORS_MP2888=m
CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_MP2975_REGULATOR=y
CONFIG_SENSORS_MP5023=m
CONFIG_SENSORS_MPQ7932=m
CONFIG_SENSORS_MPQ7932_REGULATOR=y
@@ -7363,6 +7419,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=2048
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
CONFIG_SND_HDA_TEGRA=m
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -7484,7 +7543,9 @@ CONFIG_SND_SOC_AK5558=m
CONFIG_SND_SOC_APPLE_MCA=m
CONFIG_SND_SOC_APQ8016_SBC=m
CONFIG_SND_SOC_ARNDALE=m
+CONFIG_SND_SOC_AUDIO_IIO_AUX=m
CONFIG_SND_SOC_AW8738=m
+CONFIG_SND_SOC_AW88261=m
CONFIG_SND_SOC_AW88395=m
CONFIG_SND_SOC_BD28623=m
CONFIG_SND_SOC_BT_SCO=m
@@ -7510,6 +7571,8 @@ CONFIG_SND_SOC_CS4271_I2C=m
# CONFIG_SND_SOC_CS4271_SPI is not set
CONFIG_SND_SOC_CS42L42=m
CONFIG_SND_SOC_CS42L42_SDW=m
+CONFIG_SND_SOC_CS42L43=m
+CONFIG_SND_SOC_CS42L43_SDW=m
# CONFIG_SND_SOC_CS42L51_I2C is not set
# CONFIG_SND_SOC_CS42L52 is not set
# CONFIG_SND_SOC_CS42L56 is not set
@@ -7701,6 +7764,7 @@ CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
CONFIG_SND_SOC_ROCKCHIP_PDM=m
CONFIG_SND_SOC_ROCKCHIP_RT5645=m
CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
+CONFIG_SND_SOC_RT1017_SDCA_SDW=m
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -7846,6 +7910,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
CONFIG_SND_SOC_TLV320AIC3X_I2C=m
CONFIG_SND_SOC_TLV320AIC3X=m
CONFIG_SND_SOC_TLV320AIC3X_SPI=m
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
CONFIG_SND_SOC_TPA6130A2=m
CONFIG_SND_SOC_TS3A227E=m
@@ -7987,6 +8052,7 @@ CONFIG_SPI_BITBANG=m
CONFIG_SPI_CADENCE=m
CONFIG_SPI_CADENCE_QUADSPI=m
CONFIG_SPI_CADENCE_XSPI=m
+# CONFIG_SPI_CS42L43 is not set
# CONFIG_SPI_DEBUG is not set
CONFIG_SPI_DESIGNWARE=m
CONFIG_SPI_DLN2=m
@@ -8130,6 +8196,7 @@ CONFIG_ST_UVIS25=m
CONFIG_ST_UVIS25_SPI=m
# CONFIG_SUN20I_D1_CCU is not set
# CONFIG_SUN20I_D1_R_CCU is not set
+CONFIG_SUN20I_GPADC=m
# CONFIG_SUN20I_PPU is not set
# CONFIG_SUN4I_EMAC is not set
CONFIG_SUN50I_A100_CCU=y
@@ -8184,6 +8251,7 @@ CONFIG_SURFACE_PRO3_BUTTON=m
CONFIG_SUSPEND=y
CONFIG_SVC_I3C_MASTER=m
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_SWP_EMULATION=y
# CONFIG_SW_SYNC is not set
CONFIG_SX9310=m
@@ -8319,6 +8387,7 @@ CONFIG_TEST_CPUMASK=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
@@ -8402,6 +8471,8 @@ CONFIG_TIFM_7XX1=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+# CONFIG_TI_ICSSG_PRUETH is not set
+CONFIG_TI_ICSS_IEP=m
CONFIG_TI_K3_AM65_CPSW_NUSS=m
CONFIG_TI_K3_AM65_CPSW_SWITCHDEV=y
CONFIG_TI_K3_AM65_CPTS=m
@@ -8441,6 +8512,7 @@ CONFIG_TI_SCI_PM_DOMAINS=y
CONFIG_TI_SCI_PROTOCOL=y
# CONFIG_TI_ST is not set
CONFIG_TI_SYSCON_CLK=m
+CONFIG_TI_SYSC=y
# CONFIG_TI_TLC4541 is not set
# CONFIG_TI_TMAG5273 is not set
CONFIG_TI_TSC2046=m
@@ -8453,6 +8525,7 @@ CONFIG_TMP006=m
CONFIG_TMP117=m
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_QUOTA=y
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
CONFIG_TORTURE_TEST=m
@@ -8498,6 +8571,7 @@ CONFIG_TOUCHSCREEN_IMAGIS=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_IQS7211=m
# CONFIG_TOUCHSCREEN_MAX11801 is not set
CONFIG_TOUCHSCREEN_MCS5000=m
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -8724,6 +8798,7 @@ CONFIG_USB_CONFIGFS_EEM=y
# CONFIG_USB_CONFIGFS_F_FS is not set
CONFIG_USB_CONFIGFS_F_HID=y
# CONFIG_USB_CONFIGFS_F_LB_SS is not set
+CONFIG_USB_CONFIGFS_F_MIDI2=y
# CONFIG_USB_CONFIGFS_F_MIDI is not set
# CONFIG_USB_CONFIGFS_F_PRINTER is not set
CONFIG_USB_CONFIGFS_F_TCM=y
@@ -9118,7 +9193,9 @@ CONFIG_VFAT_FS=m
CONFIG_VFIO_AMBA=m
CONFIG_VFIO_CDX=m
CONFIG_VFIO_CONTAINER=y
+# CONFIG_VFIO_DEVICE_CDEV is not set
CONFIG_VFIO_FSL_MC=m
+CONFIG_VFIO_GROUP=y
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
CONFIG_VFIO_MDEV=m
@@ -9193,9 +9270,13 @@ CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_DS90UB913=m
+CONFIG_VIDEO_DS90UB953=m
+CONFIG_VIDEO_DS90UB960=m
# CONFIG_VIDEO_DT3155 is not set
CONFIG_VIDEO_DW100=m
CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9719=m
CONFIG_VIDEO_DW9768=m
CONFIG_VIDEO_DW9807_VCM=m
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -9569,6 +9650,7 @@ CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
# CONFIG_XEN is not set
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
+CONFIG_XEN_PRIVCMD_IRQFD=y
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_PVHVM_GUEST=y
@@ -9586,6 +9668,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config
index b831d5bcd..55b9f85a4 100644
--- a/kernel-aarch64-64k-debug-rhel.config
+++ b/kernel-aarch64-64k-debug-rhel.config
@@ -215,7 +215,6 @@ CONFIG_AMD_HSMP=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
CONFIG_AMD_PHY=m
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
# CONFIG_AMD_PTDMA is not set
# CONFIG_AMDTEE is not set
# CONFIG_AMD_XGBE_DCB is not set
@@ -249,9 +248,9 @@ CONFIG_ARCH_BCM_IPROC=y
# CONFIG_ARCH_EXYNOS is not set
CONFIG_ARCH_HISI=y
# CONFIG_ARCH_INTEL_SOCFPGA is not set
-# CONFIG_ARCH_K3 is not set
+CONFIG_ARCH_K3=y
# CONFIG_ARCH_KEEMBAY is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
+CONFIG_ARCH_LAYERSCAPE=y
# CONFIG_ARCH_LG1K is not set
# CONFIG_ARCH_MA35 is not set
# CONFIG_ARCH_MEDIATEK is not set
@@ -405,6 +404,7 @@ CONFIG_ARM_SPE_PMU=m
# CONFIG_ARM_TEGRA186_CPUFREQ is not set
CONFIG_ARM_TEGRA194_CPUFREQ=m
CONFIG_ARM_TEGRA_DEVFREQ=m
+CONFIG_ARM_TI_CPUFREQ=y
# CONFIG_AS3935 is not set
# CONFIG_AS73211 is not set
CONFIG_ASN1=y
@@ -923,6 +923,7 @@ CONFIG_CLK_IMX8QXP=y
CONFIG_CLK_IMX8ULP=y
CONFIG_CLK_IMX93=y
CONFIG_CLK_KUNIT_TEST=m
+CONFIG_CLK_LS1028A_PLLDIG=y
# CONFIG_CLK_QORIQ is not set
CONFIG_CLK_SP810=y
CONFIG_CLK_VEXPRESS_OSC=y
@@ -960,6 +961,7 @@ CONFIG_COMMAND_LINE_SIZE=4096
# CONFIG_COMMON_CLK_CS2000_CP is not set
# CONFIG_COMMON_CLK_FIXED_MMIO is not set
# CONFIG_COMMON_CLK_FSL_FLEXSPI is not set
+CONFIG_COMMON_CLK_FSL_SAI=y
CONFIG_COMMON_CLK_HI3516CV300=y
CONFIG_COMMON_CLK_HI3519=y
# CONFIG_COMMON_CLK_HI3559A is not set
@@ -981,6 +983,7 @@ CONFIG_COMMON_CLK_SCPI=m
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
CONFIG_COMMON_CLK_XGENE=y
@@ -1001,6 +1004,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1082,8 +1086,8 @@ CONFIG_CRYPTO_AES_ARM64_BS=m
CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
CONFIG_CRYPTO_AES_ARM64_CE=y
-# CONFIG_CRYPTO_AES_ARM64 is not set
CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
+CONFIG_CRYPTO_AES_ARM64=y
CONFIG_CRYPTO_AES_GCM_P10=y
# CONFIG_CRYPTO_AES_TI is not set
CONFIG_CRYPTO_AES=y
@@ -1101,6 +1105,7 @@ CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
@@ -1139,6 +1144,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_PRNG_API=y
CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=3
CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
# CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_TEST is not set
+CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
# CONFIG_CRYPTO_DEV_HISI_HPRE is not set
# CONFIG_CRYPTO_DEV_HISI_SEC2 is not set
CONFIG_CRYPTO_DEV_HISI_SEC=m
@@ -1158,6 +1164,7 @@ CONFIG_CRYPTO_DEV_OCTEONTX2_CPT=m
# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
# CONFIG_CRYPTO_DEV_QCE is not set
# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
+CONFIG_CRYPTO_DEV_SA2UL=m
# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
# CONFIG_CRYPTO_DEV_SAHARA is not set
CONFIG_CRYPTO_DEV_SP_CCP=y
@@ -1209,6 +1216,7 @@ CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_POLY1305_NEON=y
+# CONFIG_CRYPTO_POLY1305_P10 is not set
# CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
@@ -1420,6 +1428,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1442,6 +1451,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1473,6 +1483,7 @@ CONFIG_DP83867_PHY=m
# CONFIG_DP83869_PHY is not set
CONFIG_DP83TC811_PHY=m
# CONFIG_DP83TD510_PHY is not set
+CONFIG_DPAA2_CONSOLE=m
# CONFIG_DPM_WATCHDOG is not set
# CONFIG_DPOT_DAC is not set
# CONFIG_DPS310 is not set
@@ -1564,6 +1575,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MALI_DISPLAY is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1641,6 +1653,7 @@ CONFIG_DRM_SIMPLEDRM=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1782,6 +1795,7 @@ CONFIG_EDAC_DMC520=m
CONFIG_EDAC_GHES=y
CONFIG_EDAC_I10NM=m
CONFIG_EDAC_IGEN6=m
+CONFIG_EDAC_LAYERSCAPE=m
CONFIG_EDAC_LEGACY_SYSFS=y
CONFIG_EDAC_PND2=m
CONFIG_EDAC_SYNOPSYS=m
@@ -1901,6 +1915,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1989,7 +2004,15 @@ CONFIG_FSCACHE_STATS=y
CONFIG_FS_DAX=y
# CONFIG_FS_ENCRYPTION is not set
# CONFIG_FSI is not set
+# CONFIG_FSL_BMAN_TEST is not set
+CONFIG_FSL_DPAA2_ETH_DCB=y
+CONFIG_FSL_DPAA2_ETH=m
+CONFIG_FSL_DPAA2_PTP_CLOCK=m
+CONFIG_FSL_DPAA2_QDMA=m
CONFIG_FSL_DPAA2_SWITCH=m
+# CONFIG_FSL_DPAA_CHECKING is not set
+CONFIG_FSL_DPAA_ETH=m
+CONFIG_FSL_DPAA=y
# CONFIG_FSL_EDMA is not set
CONFIG_FSL_ENETC_IERB=m
CONFIG_FSL_ENETC=m
@@ -1998,10 +2021,15 @@ CONFIG_FSL_ENETC_PTP_CLOCK=m
CONFIG_FSL_ENETC_QOS=y
CONFIG_FSL_ENETC_VF=m
CONFIG_FSL_ERRATUM_A008585=y
+CONFIG_FSL_FMAN=y
CONFIG_FSL_IMX8_DDR_PMU=m
# CONFIG_FSL_IMX9_DDR_PMU is not set
+CONFIG_FSL_MC_BUS=y
+CONFIG_FSL_MC_DPIO=m
+CONFIG_FSL_MC_UAPI_SUPPORT=y
CONFIG_FSL_PQ_MDIO=m
# CONFIG_FSL_QDMA is not set
+# CONFIG_FSL_QMAN_TEST is not set
# CONFIG_FSL_RCPM is not set
CONFIG_FSL_XGMAC_MDIO=m
CONFIG_FSNOTIFY=y
@@ -2097,6 +2125,8 @@ CONFIG_GNSS=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_DAVINCI=y
+# CONFIG_GPIO_DS4520 is not set
CONFIG_GPIO_DWAPB=m
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -2125,6 +2155,7 @@ CONFIG_GPIO_MLXBF2=m
# CONFIG_GPIO_MLXBF3 is not set
# CONFIG_GPIO_MLXBF is not set
# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_MPC8XXX=y
CONFIG_GPIO_MXC=m
# CONFIG_GPIO_PCA953X_IRQ is not set
# CONFIG_GPIO_PCA953X is not set
@@ -2226,6 +2257,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2382,15 +2414,17 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
CONFIG_HW_RANDOM_CAVIUM=m
# CONFIG_HW_RANDOM_CCTRNG is not set
CONFIG_HW_RANDOM_CN10K=m
-CONFIG_HW_RANDOM_HISI=y
+CONFIG_HW_RANDOM_HISI=m
# CONFIG_HW_RANDOM_HISTB is not set
# CONFIG_HW_RANDOM_IPROC_RNG200 is not set
+CONFIG_HW_RANDOM_OMAP=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
CONFIG_HW_RANDOM_TPM=y
CONFIG_HW_RANDOM_VIRTIO=y
CONFIG_HW_RANDOM_XGENE=m
# CONFIG_HW_RANDOM_XIPHERA is not set
CONFIG_HW_RANDOM=y
+CONFIG_HWSPINLOCK_OMAP=m
# CONFIG_HWSPINLOCK_QCOM is not set
CONFIG_HWSPINLOCK=y
# CONFIG_HX711 is not set
@@ -2420,6 +2454,7 @@ CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_AMD_MP2 is not set
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_BCM_IPROC is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
@@ -2466,6 +2501,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NOMADIK is not set
# CONFIG_I2C_NVIDIA_GPU is not set
# CONFIG_I2C_OCORES is not set
+CONFIG_I2C_OMAP=m
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PCI1XXXX is not set
# CONFIG_I2C_PIIX4 is not set
@@ -2669,7 +2705,7 @@ CONFIG_INPUT_APANEL=m
# CONFIG_INPUT_ATI_REMOTE2 is not set
CONFIG_INPUT_ATLAS_BTNS=m
# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
-# CONFIG_INPUT_BBNSM_PWRKEY is not set
+CONFIG_INPUT_BBNSM_PWRKEY=m
# CONFIG_INPUT_BMA150 is not set
# CONFIG_INPUT_CM109 is not set
# CONFIG_INPUT_CMA3000 is not set
@@ -2763,6 +2799,7 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_TCC_COOLING is not set
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_VSC is not set
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
CONFIG_INTEL_XWAY_PHY=m
@@ -2797,7 +2834,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2883,6 +2920,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2959,6 +2997,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -3014,6 +3053,8 @@ CONFIG_JOLIET=y
# CONFIG_JSA1212 is not set
CONFIG_JUMP_LABEL=y
# CONFIG_K3_DMA is not set
+CONFIG_K3_RTI_WATCHDOG=m
+CONFIG_K3_THERMAL=m
CONFIG_KALLSYMS_ALL=y
CONFIG_KALLSYMS_BASE_RELATIVE=y
# CONFIG_KALLSYMS_SELFTEST is not set
@@ -3107,13 +3148,15 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD_SEV=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
# CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set
+CONFIG_KVM_PROVE_MMU=y
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
# CONFIG_KVM_XEN is not set
@@ -3186,6 +3229,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
@@ -3327,9 +3371,11 @@ CONFIG_MAILBOX=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
CONFIG_MARVELL_CN10K_DDR_PMU=m
CONFIG_MARVELL_CN10K_TAD_PMU=m
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3371,9 +3417,11 @@ CONFIG_MAX_SKB_FRAGS=17
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
# CONFIG_MDIO_BCM_IPROC is not set
@@ -3430,6 +3478,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3464,6 +3513,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3615,6 +3666,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3857,6 +3909,9 @@ CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTK_T7XX=m
CONFIG_MULTIUSER=y
+CONFIG_MUX_ADG792A=m
+# CONFIG_MUX_ADGS1408 is not set
+CONFIG_MUX_GPIO=m
# CONFIG_MVMDIO is not set
# CONFIG_MV_XOR_V2 is not set
# CONFIG_MWAVE is not set
@@ -3916,6 +3971,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4344,6 +4400,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4391,9 +4448,11 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_IMX_IIM is not set
# CONFIG_NVMEM_IMX_OCOTP_ELE is not set
CONFIG_NVMEM_IMX_OCOTP=m
+CONFIG_NVMEM_LAYERSCAPE_SFP=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
# CONFIG_NVMEM_SNVS_LPGPR is not set
@@ -4429,6 +4488,11 @@ CONFIG_OF_MDIO=y
CONFIG_OF_PMEM=m
# CONFIG_OF_UNITTEST is not set
CONFIG_OF=y
+CONFIG_OMAP2PLUS_MBOX=m
+CONFIG_OMAP_DM_TIMER=y
+# CONFIG_OMAP_GPMC is not set
+CONFIG_OMAP_MBOX_KFIFO_SIZE=256
+CONFIG_OMAP_USB2=m
# CONFIG_OMFS_FS is not set
# CONFIG_OPAL_CORE is not set
# CONFIG_OPEN_DICE is not set
@@ -4443,6 +4507,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
# CONFIG_OSF_PARTITION is not set
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+CONFIG_OVERLAY_FS_DEBUG=y
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4523,6 +4588,7 @@ CONFIG_PCC=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_AL is not set
@@ -4570,6 +4636,8 @@ CONFIG_PCI_IMX6_HOST=y
CONFIG_PCI_IMX6=y
CONFIG_PCI_IOV=y
# CONFIG_PCI_J721E_HOST is not set
+CONFIG_PCI_KEYSTONE_HOST=y
+CONFIG_PCI_LAYERSCAPE=y
# CONFIG_PCI_MESON is not set
CONFIG_PCI_MSI=y
CONFIG_PCI_P2PDMA=y
@@ -4602,6 +4670,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
CONFIG_PER_VMA_LOCK_STATS=y
# CONFIG_PHANTOM is not set
# CONFIG_PHONET is not set
+CONFIG_PHY_AM654_SERDES=m
# CONFIG_PHY_BCM_NS_USB2 is not set
# CONFIG_PHY_BCM_NS_USB3 is not set
# CONFIG_PHY_BCM_SR_PCIE is not set
@@ -4623,9 +4692,10 @@ CONFIG_PHY_FSL_IMX8MQ_USB=m
CONFIG_PHY_HI6220_USB=m
# CONFIG_PHY_HISI_INNO_USB2 is not set
# CONFIG_PHY_HISTB_COMBPHY is not set
+CONFIG_PHY_J721E_WIZ=m
# CONFIG_PHY_LAN966X_SERDES is not set
CONFIG_PHYLIB=y
-CONFIG_PHYLINK=m
+CONFIG_PHYLINK=y
# CONFIG_PHY_MAPPHONE_MDM6600 is not set
# CONFIG_PHY_MIXEL_LVDS_PHY is not set
# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
@@ -4639,6 +4709,7 @@ CONFIG_PHY_NS2_USB_DRD=y
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_PCIE2 is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
@@ -4649,6 +4720,8 @@ CONFIG_PHY_NS2_USB_DRD=y
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
CONFIG_PHY_TEGRA194_P2U=y
CONFIG_PHY_TEGRA_XUSB=m
# CONFIG_PHY_TUSB1210 is not set
@@ -4829,6 +4902,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4848,6 +4922,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_QORIQ=m
CONFIG_PTP_1588_CLOCK=y
@@ -4865,8 +4940,11 @@ CONFIG_PWM_BCM_IPROC=y
# CONFIG_PWM_IMX1 is not set
CONFIG_PWM_IMX27=m
CONFIG_PWM_IMX_TPM=m
+CONFIG_PWM_OMAP_DMTIMER=y
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM_TEGRA=y
+CONFIG_PWM_TIECAP=m
+CONFIG_PWM_TIEHRPWM=m
# CONFIG_PWM_XILINX is not set
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
@@ -4962,6 +5040,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -5006,6 +5085,7 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
@@ -5013,6 +5093,7 @@ CONFIG_REGMAP=y
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
# CONFIG_REGULATOR_ARM_SCMI is not set
+# CONFIG_REGULATOR_AW37503 is not set
CONFIG_REGULATOR_BD718XX=m
# CONFIG_REGULATOR_DA9121 is not set
# CONFIG_REGULATOR_DA9210 is not set
@@ -5036,6 +5117,7 @@ CONFIG_REGULATOR_GPIO=y
CONFIG_REGULATOR_MAX77620=y
CONFIG_REGULATOR_MAX77686=m
# CONFIG_REGULATOR_MAX77826 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8893 is not set
@@ -5054,6 +5136,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
# CONFIG_REGULATOR_RT4801 is not set
@@ -5066,6 +5149,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_RT6245 is not set
# CONFIG_REGULATOR_RTMV20 is not set
# CONFIG_REGULATOR_RTQ2134 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_RTQ6752 is not set
# CONFIG_REGULATOR_SLG51000 is not set
# CONFIG_REGULATOR_SY8106A is not set
@@ -5100,6 +5184,7 @@ CONFIG_RESET_IMX7=y
# CONFIG_RESET_QCOM_PDC is not set
# CONFIG_RESET_SCMI is not set
# CONFIG_RESET_SIMPLE is not set
+CONFIG_RESET_TI_SCI=m
# CONFIG_RESET_TI_SYSCON is not set
# CONFIG_RESET_TI_TPS380X is not set
CONFIG_RESOURCE_KUNIT_TEST=m
@@ -5109,7 +5194,6 @@ CONFIG_RETPOLINE=y
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -5203,6 +5287,7 @@ CONFIG_RTC_DRV_DS3232=m
CONFIG_RTC_DRV_EFI=y
CONFIG_RTC_DRV_EM3027=m
CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_FSL_FTM_ALARM=m
# CONFIG_RTC_DRV_FTRTC010 is not set
# CONFIG_RTC_DRV_GOLDFISH is not set
# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
@@ -5257,6 +5342,7 @@ CONFIG_RTC_DRV_RX8581=m
CONFIG_RTC_DRV_STK17TA8=m
# CONFIG_RTC_DRV_TEGRA is not set
# CONFIG_RTC_DRV_TEST is not set
+CONFIG_RTC_DRV_TI_K3=m
CONFIG_RTC_DRV_V3020=m
CONFIG_RTC_DRV_X1205=m
# CONFIG_RTC_DRV_XGENE is not set
@@ -5480,6 +5566,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5489,6 +5576,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5566,6 +5654,7 @@ CONFIG_SENSORS_G762=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
# CONFIG_SENSORS_I5K_AMB is not set
# CONFIG_SENSORS_IBMAEM is not set
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5747,6 +5836,8 @@ CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_MANY_PORTS=y
CONFIG_SERIAL_8250_MID=y
CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y
+CONFIG_SERIAL_8250_OMAP=y
CONFIG_SERIAL_8250_PCI1XXXX=y
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PERICOM=y
@@ -6065,7 +6156,9 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -6082,7 +6175,6 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -6147,6 +6239,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -6157,6 +6250,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
# CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
@@ -6276,6 +6370,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -6335,6 +6430,7 @@ CONFIG_SND_SOC_SOF_HDA_PROBES=m
# CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set
# CONFIG_SND_SOC_SOF_JASPERLAKE is not set
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
# CONFIG_SND_SOC_SOF_MERRIFIELD is not set
# CONFIG_SND_SOC_SOF_METEORLAKE is not set
# CONFIG_SND_SOC_SOF_OF is not set
@@ -6405,6 +6501,7 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_BUILD=y
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6496,7 +6593,7 @@ CONFIG_SOC_IMX8M=y
CONFIG_SOC_IMX9=m
# CONFIG_SOCIONEXT_SYNQUACER_PREITS is not set
CONFIG_SOC_TEGRA_CBB=m
-# CONFIG_SOC_TI is not set
+CONFIG_SOC_TI=y
CONFIG_SOFTLOCKUP_DETECTOR=y
CONFIG_SOFT_WATCHDOG=m
# CONFIG_SOLARIS_X86_PARTITION is not set
@@ -6536,6 +6633,7 @@ CONFIG_SPI_AMD=y
# CONFIG_SPI_CADENCE_XSPI is not set
CONFIG_SPI_DEBUG=y
# CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_FSL_DSPI=y
CONFIG_SPI_FSL_LPSPI=m
CONFIG_SPI_FSL_QUADSPI=m
# CONFIG_SPI_FSL_SPI is not set
@@ -6554,6 +6652,7 @@ CONFIG_SPI_MEM=y
# CONFIG_SPI_MXIC is not set
CONFIG_SPI_NXP_FLEXSPI=m
# CONFIG_SPI_OC_TINY is not set
+CONFIG_SPI_OMAP24XX=m
CONFIG_SPI_PCI1XXXX=m
CONFIG_SPI_PL022=m
# CONFIG_SPI_PXA2XX is not set
@@ -6655,6 +6754,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
CONFIG_SUSPEND=y
CONFIG_SVC_I3C_MASTER=m
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
# CONFIG_SX9324 is not set
@@ -6773,6 +6873,7 @@ CONFIG_TEST_FPU=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIST_SORT=m
@@ -6849,6 +6950,9 @@ CONFIG_THUNDERX2_PMU=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+CONFIG_TI_K3_RINGACC=y
+CONFIG_TI_K3_UDMA_GLUE_LAYER=y
+CONFIG_TI_K3_UDMA=y
# CONFIG_TI_LMP92064 is not set
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y
@@ -6868,7 +6972,13 @@ CONFIG_TIPC_DIAG=m
CONFIG_TIPC=m
CONFIG_TIPC_MEDIA_IB=y
CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TI_PRUSS=m
+CONFIG_TI_SCI_CLK=m
+# CONFIG_TI_SCI_CLK_PROBE_FROM_FW is not set
+CONFIG_TI_SCI_PM_DOMAINS=m
# CONFIG_TI_ST is not set
+CONFIG_TI_SYSCON_CLK=m
+CONFIG_TI_SYSC=y
# CONFIG_TI_TLC4541 is not set
# CONFIG_TI_TMAG5273 is not set
# CONFIG_TI_TSC2046 is not set
@@ -6881,6 +6991,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -6925,6 +7036,7 @@ CONFIG_TORTURE_TEST=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7089,8 +7201,10 @@ CONFIG_USB_CXACRU=m
CONFIG_USB_DEFAULT_PERSIST=y
# CONFIG_USB_DSBR is not set
# CONFIG_USB_DWC2 is not set
+CONFIG_USB_DWC3_AM62=m
CONFIG_USB_DWC3_IMX8MP=m
# CONFIG_USB_DWC3 is not set
+CONFIG_USB_DWC3_KEYSTONE=m
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_EHCI_FSL is not set
CONFIG_USB_EHCI_HCD_PLATFORM=m
@@ -7374,6 +7488,7 @@ CONFIG_VEXPRESS_CONFIG=y
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=m
# CONFIG_VFIO_AMBA is not set
+CONFIG_VFIO_FSL_MC=m
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
# CONFIG_VFIO_MDEV is not set
@@ -7438,8 +7553,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7737,6 +7856,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config
index f2b75decb..f80290dfb 100644
--- a/kernel-aarch64-64k-rhel.config
+++ b/kernel-aarch64-64k-rhel.config
@@ -215,7 +215,6 @@ CONFIG_AMD_HSMP=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
CONFIG_AMD_PHY=m
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
# CONFIG_AMD_PTDMA is not set
# CONFIG_AMDTEE is not set
# CONFIG_AMD_XGBE_DCB is not set
@@ -249,9 +248,9 @@ CONFIG_ARCH_BCM_IPROC=y
# CONFIG_ARCH_EXYNOS is not set
CONFIG_ARCH_HISI=y
# CONFIG_ARCH_INTEL_SOCFPGA is not set
-# CONFIG_ARCH_K3 is not set
+CONFIG_ARCH_K3=y
# CONFIG_ARCH_KEEMBAY is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
+CONFIG_ARCH_LAYERSCAPE=y
# CONFIG_ARCH_LG1K is not set
# CONFIG_ARCH_MA35 is not set
# CONFIG_ARCH_MEDIATEK is not set
@@ -405,6 +404,7 @@ CONFIG_ARM_SPE_PMU=m
# CONFIG_ARM_TEGRA186_CPUFREQ is not set
CONFIG_ARM_TEGRA194_CPUFREQ=m
CONFIG_ARM_TEGRA_DEVFREQ=m
+CONFIG_ARM_TI_CPUFREQ=y
# CONFIG_AS3935 is not set
# CONFIG_AS73211 is not set
CONFIG_ASN1=y
@@ -923,6 +923,7 @@ CONFIG_CLK_IMX8QXP=y
CONFIG_CLK_IMX8ULP=y
CONFIG_CLK_IMX93=y
CONFIG_CLK_KUNIT_TEST=m
+CONFIG_CLK_LS1028A_PLLDIG=y
# CONFIG_CLK_QORIQ is not set
CONFIG_CLK_SP810=y
CONFIG_CLK_VEXPRESS_OSC=y
@@ -960,6 +961,7 @@ CONFIG_COMMAND_LINE_SIZE=4096
# CONFIG_COMMON_CLK_CS2000_CP is not set
# CONFIG_COMMON_CLK_FIXED_MMIO is not set
# CONFIG_COMMON_CLK_FSL_FLEXSPI is not set
+CONFIG_COMMON_CLK_FSL_SAI=y
CONFIG_COMMON_CLK_HI3516CV300=y
CONFIG_COMMON_CLK_HI3519=y
# CONFIG_COMMON_CLK_HI3559A is not set
@@ -981,6 +983,7 @@ CONFIG_COMMON_CLK_SCPI=m
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
CONFIG_COMMON_CLK_XGENE=y
@@ -1001,6 +1004,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1082,8 +1086,8 @@ CONFIG_CRYPTO_AES_ARM64_BS=m
CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
CONFIG_CRYPTO_AES_ARM64_CE=y
-# CONFIG_CRYPTO_AES_ARM64 is not set
CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
+CONFIG_CRYPTO_AES_ARM64=y
CONFIG_CRYPTO_AES_GCM_P10=y
# CONFIG_CRYPTO_AES_TI is not set
CONFIG_CRYPTO_AES=y
@@ -1101,6 +1105,7 @@ CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
@@ -1139,6 +1144,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_PRNG_API=y
CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=3
CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
# CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_TEST is not set
+CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
# CONFIG_CRYPTO_DEV_HISI_HPRE is not set
# CONFIG_CRYPTO_DEV_HISI_SEC2 is not set
CONFIG_CRYPTO_DEV_HISI_SEC=m
@@ -1158,6 +1164,7 @@ CONFIG_CRYPTO_DEV_OCTEONTX2_CPT=m
# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
# CONFIG_CRYPTO_DEV_QCE is not set
# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
+CONFIG_CRYPTO_DEV_SA2UL=m
# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
# CONFIG_CRYPTO_DEV_SAHARA is not set
CONFIG_CRYPTO_DEV_SP_CCP=y
@@ -1209,6 +1216,7 @@ CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_POLY1305_NEON=y
+# CONFIG_CRYPTO_POLY1305_P10 is not set
# CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
@@ -1412,6 +1420,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1434,6 +1443,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1465,6 +1475,7 @@ CONFIG_DP83867_PHY=m
# CONFIG_DP83869_PHY is not set
CONFIG_DP83TC811_PHY=m
# CONFIG_DP83TD510_PHY is not set
+CONFIG_DPAA2_CONSOLE=m
# CONFIG_DPM_WATCHDOG is not set
# CONFIG_DPOT_DAC is not set
# CONFIG_DPS310 is not set
@@ -1556,6 +1567,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MALI_DISPLAY is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1633,6 +1645,7 @@ CONFIG_DRM_SIMPLEDRM=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1774,6 +1787,7 @@ CONFIG_EDAC_DMC520=m
CONFIG_EDAC_GHES=y
CONFIG_EDAC_I10NM=m
CONFIG_EDAC_IGEN6=m
+CONFIG_EDAC_LAYERSCAPE=m
CONFIG_EDAC_LEGACY_SYSFS=y
CONFIG_EDAC_PND2=m
CONFIG_EDAC_SYNOPSYS=m
@@ -1885,6 +1899,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1973,7 +1988,15 @@ CONFIG_FSCACHE_STATS=y
CONFIG_FS_DAX=y
# CONFIG_FS_ENCRYPTION is not set
# CONFIG_FSI is not set
+# CONFIG_FSL_BMAN_TEST is not set
+CONFIG_FSL_DPAA2_ETH_DCB=y
+CONFIG_FSL_DPAA2_ETH=m
+CONFIG_FSL_DPAA2_PTP_CLOCK=m
+CONFIG_FSL_DPAA2_QDMA=m
CONFIG_FSL_DPAA2_SWITCH=m
+# CONFIG_FSL_DPAA_CHECKING is not set
+CONFIG_FSL_DPAA_ETH=m
+CONFIG_FSL_DPAA=y
# CONFIG_FSL_EDMA is not set
CONFIG_FSL_ENETC_IERB=m
CONFIG_FSL_ENETC=m
@@ -1982,10 +2005,15 @@ CONFIG_FSL_ENETC_PTP_CLOCK=m
CONFIG_FSL_ENETC_QOS=y
CONFIG_FSL_ENETC_VF=m
CONFIG_FSL_ERRATUM_A008585=y
+CONFIG_FSL_FMAN=y
CONFIG_FSL_IMX8_DDR_PMU=m
# CONFIG_FSL_IMX9_DDR_PMU is not set
+CONFIG_FSL_MC_BUS=y
+CONFIG_FSL_MC_DPIO=m
+CONFIG_FSL_MC_UAPI_SUPPORT=y
CONFIG_FSL_PQ_MDIO=m
# CONFIG_FSL_QDMA is not set
+# CONFIG_FSL_QMAN_TEST is not set
# CONFIG_FSL_RCPM is not set
CONFIG_FSL_XGMAC_MDIO=m
CONFIG_FSNOTIFY=y
@@ -2081,6 +2109,8 @@ CONFIG_GNSS=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_DAVINCI=y
+# CONFIG_GPIO_DS4520 is not set
CONFIG_GPIO_DWAPB=m
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -2109,6 +2139,7 @@ CONFIG_GPIO_MLXBF2=m
# CONFIG_GPIO_MLXBF3 is not set
# CONFIG_GPIO_MLXBF is not set
# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_MPC8XXX=y
CONFIG_GPIO_MXC=m
# CONFIG_GPIO_PCA953X_IRQ is not set
# CONFIG_GPIO_PCA953X is not set
@@ -2210,6 +2241,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2366,15 +2398,17 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
CONFIG_HW_RANDOM_CAVIUM=m
# CONFIG_HW_RANDOM_CCTRNG is not set
CONFIG_HW_RANDOM_CN10K=m
-CONFIG_HW_RANDOM_HISI=y
+CONFIG_HW_RANDOM_HISI=m
# CONFIG_HW_RANDOM_HISTB is not set
# CONFIG_HW_RANDOM_IPROC_RNG200 is not set
+CONFIG_HW_RANDOM_OMAP=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
CONFIG_HW_RANDOM_TPM=y
CONFIG_HW_RANDOM_VIRTIO=y
CONFIG_HW_RANDOM_XGENE=m
# CONFIG_HW_RANDOM_XIPHERA is not set
CONFIG_HW_RANDOM=y
+CONFIG_HWSPINLOCK_OMAP=m
# CONFIG_HWSPINLOCK_QCOM is not set
CONFIG_HWSPINLOCK=y
# CONFIG_HX711 is not set
@@ -2404,6 +2438,7 @@ CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_AMD_MP2 is not set
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_BCM_IPROC is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
@@ -2450,6 +2485,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NOMADIK is not set
# CONFIG_I2C_NVIDIA_GPU is not set
# CONFIG_I2C_OCORES is not set
+CONFIG_I2C_OMAP=m
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PCI1XXXX is not set
# CONFIG_I2C_PIIX4 is not set
@@ -2653,7 +2689,7 @@ CONFIG_INPUT_APANEL=m
# CONFIG_INPUT_ATI_REMOTE2 is not set
CONFIG_INPUT_ATLAS_BTNS=m
# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
-# CONFIG_INPUT_BBNSM_PWRKEY is not set
+CONFIG_INPUT_BBNSM_PWRKEY=m
# CONFIG_INPUT_BMA150 is not set
# CONFIG_INPUT_CM109 is not set
# CONFIG_INPUT_CMA3000 is not set
@@ -2747,6 +2783,7 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_TCC_COOLING is not set
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_VSC is not set
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
CONFIG_INTEL_XWAY_PHY=m
@@ -2781,7 +2818,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2867,6 +2904,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2943,6 +2981,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -2998,6 +3037,8 @@ CONFIG_JOLIET=y
# CONFIG_JSA1212 is not set
CONFIG_JUMP_LABEL=y
# CONFIG_K3_DMA is not set
+CONFIG_K3_RTI_WATCHDOG=m
+CONFIG_K3_THERMAL=m
CONFIG_KALLSYMS_ALL=y
CONFIG_KALLSYMS_BASE_RELATIVE=y
# CONFIG_KALLSYMS_SELFTEST is not set
@@ -3086,13 +3127,15 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD_SEV=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
# CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set
+# CONFIG_KVM_PROVE_MMU is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
# CONFIG_KVM_XEN is not set
@@ -3165,6 +3208,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
@@ -3306,9 +3350,11 @@ CONFIG_MAILBOX=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
CONFIG_MARVELL_CN10K_DDR_PMU=m
CONFIG_MARVELL_CN10K_TAD_PMU=m
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3350,9 +3396,11 @@ CONFIG_MAX_SKB_FRAGS=17
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
# CONFIG_MDIO_BCM_IPROC is not set
@@ -3409,6 +3457,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3443,6 +3492,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3594,6 +3645,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3836,6 +3888,9 @@ CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTK_T7XX=m
CONFIG_MULTIUSER=y
+CONFIG_MUX_ADG792A=m
+# CONFIG_MUX_ADGS1408 is not set
+CONFIG_MUX_GPIO=m
# CONFIG_MVMDIO is not set
# CONFIG_MV_XOR_V2 is not set
# CONFIG_MWAVE is not set
@@ -3895,6 +3950,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4323,6 +4379,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4370,9 +4427,11 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_IMX_IIM is not set
# CONFIG_NVMEM_IMX_OCOTP_ELE is not set
CONFIG_NVMEM_IMX_OCOTP=m
+CONFIG_NVMEM_LAYERSCAPE_SFP=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
# CONFIG_NVMEM_SNVS_LPGPR is not set
@@ -4408,6 +4467,11 @@ CONFIG_OF_MDIO=y
CONFIG_OF_PMEM=m
# CONFIG_OF_UNITTEST is not set
CONFIG_OF=y
+CONFIG_OMAP2PLUS_MBOX=m
+CONFIG_OMAP_DM_TIMER=y
+# CONFIG_OMAP_GPMC is not set
+CONFIG_OMAP_MBOX_KFIFO_SIZE=256
+CONFIG_OMAP_USB2=m
# CONFIG_OMFS_FS is not set
# CONFIG_OPAL_CORE is not set
# CONFIG_OPEN_DICE is not set
@@ -4422,6 +4486,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
# CONFIG_OSF_PARTITION is not set
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4500,6 +4565,7 @@ CONFIG_PCC=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_AL is not set
@@ -4547,6 +4613,8 @@ CONFIG_PCI_IMX6_HOST=y
CONFIG_PCI_IMX6=y
CONFIG_PCI_IOV=y
# CONFIG_PCI_J721E_HOST is not set
+CONFIG_PCI_KEYSTONE_HOST=y
+CONFIG_PCI_LAYERSCAPE=y
# CONFIG_PCI_MESON is not set
CONFIG_PCI_MSI=y
CONFIG_PCI_P2PDMA=y
@@ -4579,6 +4647,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
CONFIG_PER_VMA_LOCK_STATS=y
# CONFIG_PHANTOM is not set
# CONFIG_PHONET is not set
+CONFIG_PHY_AM654_SERDES=m
# CONFIG_PHY_BCM_NS_USB2 is not set
# CONFIG_PHY_BCM_NS_USB3 is not set
# CONFIG_PHY_BCM_SR_PCIE is not set
@@ -4600,9 +4669,10 @@ CONFIG_PHY_FSL_IMX8MQ_USB=m
CONFIG_PHY_HI6220_USB=m
# CONFIG_PHY_HISI_INNO_USB2 is not set
# CONFIG_PHY_HISTB_COMBPHY is not set
+CONFIG_PHY_J721E_WIZ=m
# CONFIG_PHY_LAN966X_SERDES is not set
CONFIG_PHYLIB=y
-CONFIG_PHYLINK=m
+CONFIG_PHYLINK=y
# CONFIG_PHY_MAPPHONE_MDM6600 is not set
# CONFIG_PHY_MIXEL_LVDS_PHY is not set
# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
@@ -4616,6 +4686,7 @@ CONFIG_PHY_NS2_USB_DRD=y
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_PCIE2 is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
@@ -4626,6 +4697,8 @@ CONFIG_PHY_NS2_USB_DRD=y
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
CONFIG_PHY_TEGRA194_P2U=y
CONFIG_PHY_TEGRA_XUSB=m
# CONFIG_PHY_TUSB1210 is not set
@@ -4806,6 +4879,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4825,6 +4899,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_QORIQ=m
CONFIG_PTP_1588_CLOCK=y
@@ -4842,8 +4917,11 @@ CONFIG_PWM_BCM_IPROC=y
# CONFIG_PWM_IMX1 is not set
CONFIG_PWM_IMX27=m
CONFIG_PWM_IMX_TPM=m
+CONFIG_PWM_OMAP_DMTIMER=y
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM_TEGRA=y
+CONFIG_PWM_TIECAP=m
+CONFIG_PWM_TIEHRPWM=m
# CONFIG_PWM_XILINX is not set
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
@@ -4939,6 +5017,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -4983,6 +5062,7 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
@@ -4990,6 +5070,7 @@ CONFIG_REGMAP=y
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
# CONFIG_REGULATOR_ARM_SCMI is not set
+# CONFIG_REGULATOR_AW37503 is not set
CONFIG_REGULATOR_BD718XX=m
# CONFIG_REGULATOR_DA9121 is not set
# CONFIG_REGULATOR_DA9210 is not set
@@ -5013,6 +5094,7 @@ CONFIG_REGULATOR_GPIO=y
CONFIG_REGULATOR_MAX77620=y
CONFIG_REGULATOR_MAX77686=m
# CONFIG_REGULATOR_MAX77826 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8893 is not set
@@ -5031,6 +5113,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
# CONFIG_REGULATOR_RT4801 is not set
@@ -5043,6 +5126,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_RT6245 is not set
# CONFIG_REGULATOR_RTMV20 is not set
# CONFIG_REGULATOR_RTQ2134 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_RTQ6752 is not set
# CONFIG_REGULATOR_SLG51000 is not set
# CONFIG_REGULATOR_SY8106A is not set
@@ -5077,6 +5161,7 @@ CONFIG_RESET_IMX7=y
# CONFIG_RESET_QCOM_PDC is not set
# CONFIG_RESET_SCMI is not set
# CONFIG_RESET_SIMPLE is not set
+CONFIG_RESET_TI_SCI=m
# CONFIG_RESET_TI_SYSCON is not set
# CONFIG_RESET_TI_TPS380X is not set
CONFIG_RESOURCE_KUNIT_TEST=m
@@ -5086,7 +5171,6 @@ CONFIG_RETPOLINE=y
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -5180,6 +5264,7 @@ CONFIG_RTC_DRV_DS3232=m
CONFIG_RTC_DRV_EFI=y
CONFIG_RTC_DRV_EM3027=m
CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_FSL_FTM_ALARM=m
# CONFIG_RTC_DRV_FTRTC010 is not set
# CONFIG_RTC_DRV_GOLDFISH is not set
# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
@@ -5234,6 +5319,7 @@ CONFIG_RTC_DRV_RX8581=m
CONFIG_RTC_DRV_STK17TA8=m
# CONFIG_RTC_DRV_TEGRA is not set
# CONFIG_RTC_DRV_TEST is not set
+CONFIG_RTC_DRV_TI_K3=m
CONFIG_RTC_DRV_V3020=m
CONFIG_RTC_DRV_X1205=m
# CONFIG_RTC_DRV_XGENE is not set
@@ -5457,6 +5543,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5466,6 +5553,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5543,6 +5631,7 @@ CONFIG_SENSORS_G762=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
# CONFIG_SENSORS_I5K_AMB is not set
# CONFIG_SENSORS_IBMAEM is not set
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5724,6 +5813,8 @@ CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_MANY_PORTS=y
CONFIG_SERIAL_8250_MID=y
CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y
+CONFIG_SERIAL_8250_OMAP=y
CONFIG_SERIAL_8250_PCI1XXXX=y
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PERICOM=y
@@ -6041,7 +6132,9 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -6058,7 +6151,6 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -6123,6 +6215,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -6133,6 +6226,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
# CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
@@ -6252,6 +6346,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -6310,6 +6405,7 @@ CONFIG_SND_SOC_SOF_ACPI=m
# CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set
# CONFIG_SND_SOC_SOF_JASPERLAKE is not set
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
# CONFIG_SND_SOC_SOF_MERRIFIELD is not set
# CONFIG_SND_SOC_SOF_METEORLAKE is not set
# CONFIG_SND_SOC_SOF_OF is not set
@@ -6380,6 +6476,7 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6471,7 +6568,7 @@ CONFIG_SOC_IMX8M=y
CONFIG_SOC_IMX9=m
# CONFIG_SOCIONEXT_SYNQUACER_PREITS is not set
CONFIG_SOC_TEGRA_CBB=m
-# CONFIG_SOC_TI is not set
+CONFIG_SOC_TI=y
CONFIG_SOFTLOCKUP_DETECTOR=y
CONFIG_SOFT_WATCHDOG=m
# CONFIG_SOLARIS_X86_PARTITION is not set
@@ -6511,6 +6608,7 @@ CONFIG_SPI_AMD=y
# CONFIG_SPI_CADENCE_XSPI is not set
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_FSL_DSPI=y
CONFIG_SPI_FSL_LPSPI=m
CONFIG_SPI_FSL_QUADSPI=m
# CONFIG_SPI_FSL_SPI is not set
@@ -6529,6 +6627,7 @@ CONFIG_SPI_MEM=y
# CONFIG_SPI_MXIC is not set
CONFIG_SPI_NXP_FLEXSPI=m
# CONFIG_SPI_OC_TINY is not set
+CONFIG_SPI_OMAP24XX=m
CONFIG_SPI_PCI1XXXX=m
CONFIG_SPI_PL022=m
# CONFIG_SPI_PXA2XX is not set
@@ -6630,6 +6729,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
CONFIG_SUSPEND=y
CONFIG_SVC_I3C_MASTER=m
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
# CONFIG_SX9324 is not set
@@ -6748,6 +6848,7 @@ CONFIG_TEST_CPUMASK=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
@@ -6824,6 +6925,9 @@ CONFIG_THUNDERX2_PMU=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+CONFIG_TI_K3_RINGACC=y
+CONFIG_TI_K3_UDMA_GLUE_LAYER=y
+CONFIG_TI_K3_UDMA=y
# CONFIG_TI_LMP92064 is not set
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y
@@ -6843,7 +6947,13 @@ CONFIG_TIPC_DIAG=m
CONFIG_TIPC=m
CONFIG_TIPC_MEDIA_IB=y
CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TI_PRUSS=m
+CONFIG_TI_SCI_CLK=m
+# CONFIG_TI_SCI_CLK_PROBE_FROM_FW is not set
+CONFIG_TI_SCI_PM_DOMAINS=m
# CONFIG_TI_ST is not set
+CONFIG_TI_SYSCON_CLK=m
+CONFIG_TI_SYSC=y
# CONFIG_TI_TLC4541 is not set
# CONFIG_TI_TMAG5273 is not set
# CONFIG_TI_TSC2046 is not set
@@ -6856,6 +6966,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -6900,6 +7011,7 @@ CONFIG_TORTURE_TEST=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7064,8 +7176,10 @@ CONFIG_USB_CXACRU=m
CONFIG_USB_DEFAULT_PERSIST=y
# CONFIG_USB_DSBR is not set
# CONFIG_USB_DWC2 is not set
+CONFIG_USB_DWC3_AM62=m
CONFIG_USB_DWC3_IMX8MP=m
# CONFIG_USB_DWC3 is not set
+CONFIG_USB_DWC3_KEYSTONE=m
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_EHCI_FSL is not set
CONFIG_USB_EHCI_HCD_PLATFORM=m
@@ -7349,6 +7463,7 @@ CONFIG_VEXPRESS_CONFIG=y
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=m
# CONFIG_VFIO_AMBA is not set
+CONFIG_VFIO_FSL_MC=m
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
# CONFIG_VFIO_MDEV is not set
@@ -7413,8 +7528,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7712,6 +7831,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index c1b177f3c..58139abe4 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -145,6 +145,7 @@ CONFIG_AD7949=m
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
CONFIG_ADAPTEC_STARFIRE=m
+# CONFIG_ADDRESS_MASKING is not set
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -1275,6 +1276,7 @@ CONFIG_COMMON_CLK_SI5341=m
# CONFIG_COMMON_CLK_SI5351 is not set
CONFIG_COMMON_CLK_SI544=m
# CONFIG_COMMON_CLK_SI570 is not set
+CONFIG_COMMON_CLK_VC3=m
# CONFIG_COMMON_CLK_VC5 is not set
CONFIG_COMMON_CLK_VC7=m
CONFIG_COMMON_CLK_XGENE=y
@@ -1297,6 +1299,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=3
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1352,6 +1355,8 @@ CONFIG_CPU_THERMAL=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -1781,6 +1786,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
CONFIG_DMA_OF=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
@@ -1809,6 +1815,7 @@ CONFIG_DM_INIT=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=y
@@ -1943,6 +1950,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
CONFIG_DRM_LONTIUM_LT9611=m
CONFIG_DRM_LONTIUM_LT9611UXC=m
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
CONFIG_DRM_MALI_DISPLAY=m
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -2047,11 +2055,13 @@ CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
+CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m
# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
CONFIG_DRM_PANEL_TPO_TPG110=m
CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
+CONFIG_DRM_PANEL_VISIONOX_R66451=m
CONFIG_DRM_PANEL_VISIONOX_RM69299=m
CONFIG_DRM_PANEL_VISIONOX_VTDR6130=m
CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
@@ -2099,6 +2109,7 @@ CONFIG_DRM_TOSHIBA_TC358764=m
CONFIG_DRM_TOSHIBA_TC358767=m
CONFIG_DRM_TOSHIBA_TC358768=m
CONFIG_DRM_TOSHIBA_TC358775=m
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
CONFIG_DRM_V3D=m
@@ -2307,6 +2318,7 @@ CONFIG_EROFS_FS=m
CONFIG_EROFS_FS_POSIX_ACL=y
CONFIG_EROFS_FS_SECURITY=y
CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP_DEFLATE=y
CONFIG_EROFS_FS_ZIP_LZMA=y
CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
@@ -2396,6 +2408,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -2637,6 +2650,7 @@ CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
CONFIG_GPIO_DAVINCI=m
CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_DS4520=m
CONFIG_GPIO_DWAPB=m
CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_FTGPIO010 is not set
@@ -2776,6 +2790,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
CONFIG_HID_GLORIOUS=m
# CONFIG_HID_GOOGLE_HAMMER is not set
+CONFIG_HID_GOOGLE_STADIA_FF=m
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2995,6 +3010,7 @@ CONFIG_I2C_ALGOPCF=m
CONFIG_I2C_AMD_MP2=m
CONFIG_I2C_APPLE=m
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+CONFIG_I2C_ATR=m
CONFIG_I2C_BCM2835=m
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_BRCMSTB=y
@@ -3438,6 +3454,7 @@ CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
CONFIG_IOSM=m
CONFIG_IO_STRICT_DEVMEM=y
+CONFIG_IO_URING=y
CONFIG_IP5XXX_POWER=m
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -3507,6 +3524,7 @@ CONFIG_IP_PIMSM_V2=y
# CONFIG_IPQ_APSS_6018 is not set
# CONFIG_IPQ_APSS_PLL is not set
# CONFIG_IPQ_GCC_4019 is not set
+CONFIG_IPQ_GCC_5018=m
# CONFIG_IPQ_GCC_5332 is not set
# CONFIG_IPQ_GCC_6018 is not set
# CONFIG_IPQ_GCC_806X is not set
@@ -3534,6 +3552,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+CONFIG_IPU_BRIDGE=m
CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_IOAM6_LWTUNNEL=y
@@ -3611,6 +3630,7 @@ CONFIG_IR_RC6_DECODER=m
CONFIG_IR_RCMM_DECODER=m
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
CONFIG_IR_SERIAL=m
CONFIG_IR_SERIAL_TRANSMITTER=y
CONFIG_IR_SHARP_DECODER=m
@@ -3832,11 +3852,13 @@ CONFIG_KSM=y
CONFIG_KSZ884X_PCI=m
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KUSER_HELPERS=y
+CONFIG_KVM_PROVE_MMU=y
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
CONFIG_KVM_XEN=y
@@ -3890,6 +3912,7 @@ CONFIG_LEDS_CR0014114=m
# CONFIG_LEDS_DAC124S085 is not set
# CONFIG_LEDS_EL15203000 is not set
CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GROUP_MULTICOLOR=m
# CONFIG_LEDS_IS31FL319X is not set
CONFIG_LEDS_IS31FL32XX=m
# CONFIG_LEDS_KTD2692 is not set
@@ -3917,6 +3940,7 @@ CONFIG_LEDS_PCA9532_GPIO=y
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
CONFIG_LEDS_PCA963X=m
+CONFIG_LEDS_PCA995X=m
CONFIG_LEDS_PWM=m
CONFIG_LEDS_PWM_MULTICOLOR=m
CONFIG_LEDS_QCOM_FLASH=m
@@ -4069,9 +4093,11 @@ CONFIG_MAILBOX=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88Q2XXX_PHY=m
CONFIG_MARVELL_88X2222_PHY=m
CONFIG_MARVELL_CN10K_DDR_PMU=m
CONFIG_MARVELL_CN10K_TAD_PMU=m
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -4116,11 +4142,13 @@ CONFIG_MCP41010=m
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+CONFIG_MCP4728=m
# CONFIG_MCP4922 is not set
CONFIG_MCTP_SERIAL=m
# CONFIG_MCTP_TRANSPORT_I2C is not set
CONFIG_MCTP=y
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -4244,6 +4272,8 @@ CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=y
# CONFIG_MFD_CPCAP is not set
CONFIG_MFD_CROS_EC_DEV=m
+CONFIG_MFD_CS42L43_I2C=m
+CONFIG_MFD_CS42L43_SDW=m
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
@@ -4406,6 +4436,7 @@ CONFIG_MLX5_ESWITCH=y
# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -4799,6 +4830,7 @@ CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -5314,6 +5346,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -5366,6 +5399,7 @@ CONFIG_NVMEM_LAYOUT_SL28_VPD=m
CONFIG_NVMEM_MESON_EFUSE=m
CONFIG_NVMEM_MESON_MX_EFUSE=m
CONFIG_NVMEM_QCOM_QFPROM=m
+CONFIG_NVMEM_QCOM_SEC_QFPROM=m
CONFIG_NVMEM_REBOOT_MODE=m
CONFIG_NVMEM_RMEM=m
CONFIG_NVMEM_ROCKCHIP_EFUSE=m
@@ -5445,6 +5479,7 @@ CONFIG_ORINOCO_USB=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -5535,6 +5570,7 @@ CONFIG_PCC=y
CONFIG_PCI_AARDVARK=y
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_AL is not set
@@ -5617,6 +5653,7 @@ CONFIG_PCS_XPCS=m
CONFIG_PDC_ADMA=m
CONFIG_PDS_CORE=m
CONFIG_PDS_VDPA=m
+CONFIG_PDS_VFIO_PCI=m
# CONFIG_PECI is not set
CONFIG_PERCPU_STATS=y
# CONFIG_PERCPU_TEST is not set
@@ -5675,12 +5712,14 @@ CONFIG_PHY_QCOM_EUSB2_REPEATER=m
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
CONFIG_PHY_QCOM_PCIE2=m
CONFIG_PHY_QCOM_QMP_COMBO=m
CONFIG_PHY_QCOM_QMP=m
CONFIG_PHY_QCOM_QMP_PCIE_8996=m
CONFIG_PHY_QCOM_QMP_PCIE=m
CONFIG_PHY_QCOM_QMP_UFS=m
+CONFIG_PHY_QCOM_QMP_USB_LEGACY=m
CONFIG_PHY_QCOM_QMP_USB=m
CONFIG_PHY_QCOM_QUSB2=m
CONFIG_PHY_QCOM_SGMII_ETH=m
@@ -5702,6 +5741,8 @@ CONFIG_PHY_ROCKCHIP_PCIE=y
CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=m
CONFIG_PHY_ROCKCHIP_TYPEC=m
CONFIG_PHY_ROCKCHIP_USB=m
+CONFIG_PHY_RTK_RTD_USB2PHY=m
+CONFIG_PHY_RTK_RTD_USB3PHY=m
# CONFIG_PHY_SAMSUNG_USB2 is not set
CONFIG_PHY_SUN4I_USB=m
CONFIG_PHY_SUN50I_USB3=m
@@ -5719,6 +5760,7 @@ CONFIG_PID_NS=y
CONFIG_PINCONF=y
CONFIG_PINCTRL_ALDERLAKE=m
CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_AMLOGIC_C3=y
CONFIG_PINCTRL_APPLE_GPIO=m
CONFIG_PINCTRL_AS3722=y
CONFIG_PINCTRL_AXP209=m
@@ -5727,6 +5769,7 @@ CONFIG_PINCTRL_AXP209=m
# CONFIG_PINCTRL_CANNONLAKE is not set
CONFIG_PINCTRL_CEDARFORK=m
# CONFIG_PINCTRL_CHERRYVIEW is not set
+CONFIG_PINCTRL_CS42L43=m
CONFIG_PINCTRL_CY8C95X0=m
CONFIG_PINCTRL_ELKHARTLAKE=m
CONFIG_PINCTRL_EMMITSBURG=m
@@ -5804,6 +5847,7 @@ CONFIG_PINCTRL_SDM845=m
# CONFIG_PINCTRL_SDX75 is not set
CONFIG_PINCTRL_SINGLE=y
# CONFIG_PINCTRL_SM6115 is not set
+# CONFIG_PINCTRL_SM6115_LPASS_LPI is not set
# CONFIG_PINCTRL_SM6125 is not set
# CONFIG_PINCTRL_SM6350 is not set
# CONFIG_PINCTRL_SM6375 is not set
@@ -5812,6 +5856,7 @@ CONFIG_PINCTRL_SINGLE=y
# CONFIG_PINCTRL_SM8250 is not set
CONFIG_PINCTRL_SM8250_LPASS_LPI=m
# CONFIG_PINCTRL_SM8350 is not set
+CONFIG_PINCTRL_SM8350_LPASS_LPI=m
CONFIG_PINCTRL_SM8450_LPASS_LPI=m
CONFIG_PINCTRL_SM8450=m
# CONFIG_PINCTRL_SM8550 is not set
@@ -5975,6 +6020,7 @@ CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
CONFIG_PSTORE_842_COMPRESS=y
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -5996,6 +6042,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
CONFIG_PTP_1588_CLOCK_IDTCM=m
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_PTP_1588_CLOCK_QORIQ=m
@@ -6167,6 +6214,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -6228,6 +6276,7 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=y
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP_MMIO=y
@@ -6239,6 +6288,7 @@ CONFIG_REGULATOR_ACT8865=m
CONFIG_REGULATOR_ANATOP=m
CONFIG_REGULATOR_ARM_SCMI=m
CONFIG_REGULATOR_AS3722=m
+CONFIG_REGULATOR_AW37503=m
CONFIG_REGULATOR_AXP20X=m
CONFIG_REGULATOR_BD718XX=m
CONFIG_REGULATOR_BD9571MWV=m
@@ -6266,12 +6316,14 @@ CONFIG_REGULATOR_HI655X=m
# CONFIG_REGULATOR_MAX1586 is not set
# CONFIG_REGULATOR_MAX20086 is not set
CONFIG_REGULATOR_MAX20411=m
+CONFIG_REGULATOR_MAX5970=m
CONFIG_REGULATOR_MAX597X=m
CONFIG_REGULATOR_MAX77620=y
CONFIG_REGULATOR_MAX77650=m
CONFIG_REGULATOR_MAX77686=m
CONFIG_REGULATOR_MAX77802=m
# CONFIG_REGULATOR_MAX77826 is not set
+CONFIG_REGULATOR_MAX77857=m
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
CONFIG_REGULATOR_MAX8893=m
@@ -6293,6 +6345,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_PV88090 is not set
CONFIG_REGULATOR_PWM=y
CONFIG_REGULATOR_QCOM_LABIBB=m
+CONFIG_REGULATOR_QCOM_REFGEN=m
CONFIG_REGULATOR_QCOM_RPMH=y
# CONFIG_REGULATOR_QCOM_RPM is not set
CONFIG_REGULATOR_QCOM_SMD_RPM=m
@@ -6313,6 +6366,7 @@ CONFIG_REGULATOR_RT6190=m
CONFIG_REGULATOR_RT6245=m
CONFIG_REGULATOR_RTMV20=m
CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTQ2208=m
CONFIG_REGULATOR_RTQ6752=m
# CONFIG_REGULATOR_SLG51000 is not set
CONFIG_REGULATOR_SY7636A=m
@@ -6372,8 +6426,7 @@ CONFIG_RESOURCE_KUNIT_TEST=m
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-# CONFIG_RH_DISABLE_DEPRECATED is not set
-CONFIG_RH_FEDORA=y
+# CONFIG_RHEL_DIFFERENCES is not set
CONFIG_RICHTEK_RTQ6056=m
CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
@@ -6856,6 +6909,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -6933,6 +6987,7 @@ CONFIG_SENSORS_GPIO_FAN=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
CONFIG_SENSORS_HP_WMI=m
+CONFIG_SENSORS_HS3001=m
# CONFIG_SENSORS_I5K_AMB is not set
CONFIG_SENSORS_IBMAEM=m
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -7019,6 +7074,7 @@ CONFIG_SENSORS_MCP3021=m
CONFIG_SENSORS_MLXREG_FAN=m
CONFIG_SENSORS_MP2888=m
CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_MP2975_REGULATOR=y
CONFIG_SENSORS_MP5023=m
CONFIG_SENSORS_MPQ7932=m
CONFIG_SENSORS_MPQ7932_REGULATOR=y
@@ -7390,6 +7446,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=2048
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
CONFIG_SND_HDA_TEGRA=m
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -7512,7 +7571,9 @@ CONFIG_SND_SOC_AK5558=m
CONFIG_SND_SOC_APPLE_MCA=m
CONFIG_SND_SOC_APQ8016_SBC=m
CONFIG_SND_SOC_ARNDALE=m
+CONFIG_SND_SOC_AUDIO_IIO_AUX=m
CONFIG_SND_SOC_AW8738=m
+CONFIG_SND_SOC_AW88261=m
CONFIG_SND_SOC_AW88395=m
CONFIG_SND_SOC_BD28623=m
CONFIG_SND_SOC_BT_SCO=m
@@ -7538,6 +7599,8 @@ CONFIG_SND_SOC_CS4271_I2C=m
# CONFIG_SND_SOC_CS4271_SPI is not set
CONFIG_SND_SOC_CS42L42=m
CONFIG_SND_SOC_CS42L42_SDW=m
+CONFIG_SND_SOC_CS42L43=m
+CONFIG_SND_SOC_CS42L43_SDW=m
# CONFIG_SND_SOC_CS42L51_I2C is not set
# CONFIG_SND_SOC_CS42L52 is not set
# CONFIG_SND_SOC_CS42L56 is not set
@@ -7729,6 +7792,7 @@ CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
CONFIG_SND_SOC_ROCKCHIP_PDM=m
CONFIG_SND_SOC_ROCKCHIP_RT5645=m
CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
+CONFIG_SND_SOC_RT1017_SDCA_SDW=m
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -7875,6 +7939,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
CONFIG_SND_SOC_TLV320AIC3X_I2C=m
CONFIG_SND_SOC_TLV320AIC3X=m
CONFIG_SND_SOC_TLV320AIC3X_SPI=m
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
CONFIG_SND_SOC_TPA6130A2=m
CONFIG_SND_SOC_TS3A227E=m
@@ -8016,6 +8081,7 @@ CONFIG_SPI_BITBANG=m
CONFIG_SPI_CADENCE=m
CONFIG_SPI_CADENCE_QUADSPI=m
CONFIG_SPI_CADENCE_XSPI=m
+# CONFIG_SPI_CS42L43 is not set
# CONFIG_SPI_DEBUG is not set
CONFIG_SPI_DESIGNWARE=m
CONFIG_SPI_DLN2=m
@@ -8159,6 +8225,7 @@ CONFIG_ST_UVIS25=m
CONFIG_ST_UVIS25_SPI=m
# CONFIG_SUN20I_D1_CCU is not set
# CONFIG_SUN20I_D1_R_CCU is not set
+CONFIG_SUN20I_GPADC=m
# CONFIG_SUN20I_PPU is not set
# CONFIG_SUN4I_EMAC is not set
CONFIG_SUN50I_A100_CCU=y
@@ -8213,6 +8280,7 @@ CONFIG_SURFACE_PRO3_BUTTON=m
CONFIG_SUSPEND=y
CONFIG_SVC_I3C_MASTER=m
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_SWP_EMULATION=y
# CONFIG_SW_SYNC is not set
CONFIG_SX9310=m
@@ -8348,6 +8416,7 @@ CONFIG_TEST_FPU=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIST_SORT=m
@@ -8431,6 +8500,8 @@ CONFIG_TIFM_7XX1=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+# CONFIG_TI_ICSSG_PRUETH is not set
+CONFIG_TI_ICSS_IEP=m
CONFIG_TI_K3_AM65_CPSW_NUSS=m
CONFIG_TI_K3_AM65_CPSW_SWITCHDEV=y
CONFIG_TI_K3_AM65_CPTS=m
@@ -8470,6 +8541,7 @@ CONFIG_TI_SCI_PM_DOMAINS=y
CONFIG_TI_SCI_PROTOCOL=y
# CONFIG_TI_ST is not set
CONFIG_TI_SYSCON_CLK=m
+CONFIG_TI_SYSC=y
# CONFIG_TI_TLC4541 is not set
# CONFIG_TI_TMAG5273 is not set
CONFIG_TI_TSC2046=m
@@ -8482,6 +8554,7 @@ CONFIG_TMP006=m
CONFIG_TMP117=m
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_QUOTA=y
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
CONFIG_TORTURE_TEST=m
@@ -8527,6 +8600,7 @@ CONFIG_TOUCHSCREEN_IMAGIS=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_IQS7211=m
# CONFIG_TOUCHSCREEN_MAX11801 is not set
CONFIG_TOUCHSCREEN_MCS5000=m
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -8753,6 +8827,7 @@ CONFIG_USB_CONFIGFS_EEM=y
# CONFIG_USB_CONFIGFS_F_FS is not set
CONFIG_USB_CONFIGFS_F_HID=y
# CONFIG_USB_CONFIGFS_F_LB_SS is not set
+CONFIG_USB_CONFIGFS_F_MIDI2=y
# CONFIG_USB_CONFIGFS_F_MIDI is not set
# CONFIG_USB_CONFIGFS_F_PRINTER is not set
CONFIG_USB_CONFIGFS_F_TCM=y
@@ -9147,7 +9222,9 @@ CONFIG_VFAT_FS=m
CONFIG_VFIO_AMBA=m
CONFIG_VFIO_CDX=m
CONFIG_VFIO_CONTAINER=y
+# CONFIG_VFIO_DEVICE_CDEV is not set
CONFIG_VFIO_FSL_MC=m
+CONFIG_VFIO_GROUP=y
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
CONFIG_VFIO_MDEV=m
@@ -9222,9 +9299,13 @@ CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_DS90UB913=m
+CONFIG_VIDEO_DS90UB953=m
+CONFIG_VIDEO_DS90UB960=m
# CONFIG_VIDEO_DT3155 is not set
CONFIG_VIDEO_DW100=m
CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9719=m
CONFIG_VIDEO_DW9768=m
CONFIG_VIDEO_DW9807_VCM=m
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -9598,6 +9679,7 @@ CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
# CONFIG_XEN is not set
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
+CONFIG_XEN_PRIVCMD_IRQFD=y
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_PVHVM_GUEST=y
@@ -9615,6 +9697,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 5d721b9b9..73eb2ab4c 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -215,7 +215,6 @@ CONFIG_AMD_HSMP=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
CONFIG_AMD_PHY=m
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
# CONFIG_AMD_PTDMA is not set
# CONFIG_AMDTEE is not set
# CONFIG_AMD_XGBE_DCB is not set
@@ -249,9 +248,9 @@ CONFIG_ARCH_BCM_IPROC=y
# CONFIG_ARCH_EXYNOS is not set
CONFIG_ARCH_HISI=y
# CONFIG_ARCH_INTEL_SOCFPGA is not set
-# CONFIG_ARCH_K3 is not set
+CONFIG_ARCH_K3=y
# CONFIG_ARCH_KEEMBAY is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
+CONFIG_ARCH_LAYERSCAPE=y
# CONFIG_ARCH_LG1K is not set
# CONFIG_ARCH_MA35 is not set
# CONFIG_ARCH_MEDIATEK is not set
@@ -402,6 +401,7 @@ CONFIG_ARM_SPE_PMU=m
# CONFIG_ARM_TEGRA186_CPUFREQ is not set
CONFIG_ARM_TEGRA194_CPUFREQ=m
CONFIG_ARM_TEGRA_DEVFREQ=m
+CONFIG_ARM_TI_CPUFREQ=y
# CONFIG_AS3935 is not set
# CONFIG_AS73211 is not set
CONFIG_ASN1=y
@@ -920,6 +920,7 @@ CONFIG_CLK_IMX8QXP=y
CONFIG_CLK_IMX8ULP=y
CONFIG_CLK_IMX93=y
CONFIG_CLK_KUNIT_TEST=m
+CONFIG_CLK_LS1028A_PLLDIG=y
# CONFIG_CLK_QORIQ is not set
CONFIG_CLK_SP810=y
CONFIG_CLK_VEXPRESS_OSC=y
@@ -957,6 +958,7 @@ CONFIG_COMMAND_LINE_SIZE=4096
# CONFIG_COMMON_CLK_CS2000_CP is not set
# CONFIG_COMMON_CLK_FIXED_MMIO is not set
# CONFIG_COMMON_CLK_FSL_FLEXSPI is not set
+CONFIG_COMMON_CLK_FSL_SAI=y
CONFIG_COMMON_CLK_HI3516CV300=y
CONFIG_COMMON_CLK_HI3519=y
# CONFIG_COMMON_CLK_HI3559A is not set
@@ -978,6 +980,7 @@ CONFIG_COMMON_CLK_SCPI=m
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
CONFIG_COMMON_CLK_XGENE=y
@@ -998,6 +1001,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1079,8 +1083,8 @@ CONFIG_CRYPTO_AES_ARM64_BS=m
CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
CONFIG_CRYPTO_AES_ARM64_CE=y
-# CONFIG_CRYPTO_AES_ARM64 is not set
CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
+CONFIG_CRYPTO_AES_ARM64=y
CONFIG_CRYPTO_AES_GCM_P10=y
# CONFIG_CRYPTO_AES_TI is not set
CONFIG_CRYPTO_AES=y
@@ -1098,6 +1102,7 @@ CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
@@ -1136,6 +1141,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_PRNG_API=y
CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=3
CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
# CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_TEST is not set
+CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
# CONFIG_CRYPTO_DEV_HISI_HPRE is not set
# CONFIG_CRYPTO_DEV_HISI_SEC2 is not set
CONFIG_CRYPTO_DEV_HISI_SEC=m
@@ -1155,6 +1161,7 @@ CONFIG_CRYPTO_DEV_OCTEONTX2_CPT=m
# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
# CONFIG_CRYPTO_DEV_QCE is not set
# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
+CONFIG_CRYPTO_DEV_SA2UL=m
# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
# CONFIG_CRYPTO_DEV_SAHARA is not set
CONFIG_CRYPTO_DEV_SP_CCP=y
@@ -1206,6 +1213,7 @@ CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_POLY1305_NEON=y
+# CONFIG_CRYPTO_POLY1305_P10 is not set
# CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
@@ -1417,6 +1425,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1439,6 +1448,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1470,6 +1480,7 @@ CONFIG_DP83867_PHY=m
# CONFIG_DP83869_PHY is not set
CONFIG_DP83TC811_PHY=m
# CONFIG_DP83TD510_PHY is not set
+CONFIG_DPAA2_CONSOLE=m
# CONFIG_DPM_WATCHDOG is not set
# CONFIG_DPOT_DAC is not set
# CONFIG_DPS310 is not set
@@ -1561,6 +1572,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MALI_DISPLAY is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1638,6 +1650,7 @@ CONFIG_DRM_SIMPLEDRM=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1779,6 +1792,7 @@ CONFIG_EDAC_DMC520=m
CONFIG_EDAC_GHES=y
CONFIG_EDAC_I10NM=m
CONFIG_EDAC_IGEN6=m
+CONFIG_EDAC_LAYERSCAPE=m
CONFIG_EDAC_LEGACY_SYSFS=y
CONFIG_EDAC_PND2=m
CONFIG_EDAC_SYNOPSYS=m
@@ -1898,6 +1912,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1985,7 +2000,15 @@ CONFIG_FSCACHE_STATS=y
CONFIG_FS_DAX=y
# CONFIG_FS_ENCRYPTION is not set
# CONFIG_FSI is not set
+# CONFIG_FSL_BMAN_TEST is not set
+CONFIG_FSL_DPAA2_ETH_DCB=y
+CONFIG_FSL_DPAA2_ETH=m
+CONFIG_FSL_DPAA2_PTP_CLOCK=m
+CONFIG_FSL_DPAA2_QDMA=m
CONFIG_FSL_DPAA2_SWITCH=m
+# CONFIG_FSL_DPAA_CHECKING is not set
+CONFIG_FSL_DPAA_ETH=m
+CONFIG_FSL_DPAA=y
# CONFIG_FSL_EDMA is not set
CONFIG_FSL_ENETC_IERB=m
CONFIG_FSL_ENETC=m
@@ -1994,10 +2017,15 @@ CONFIG_FSL_ENETC_PTP_CLOCK=m
CONFIG_FSL_ENETC_QOS=y
CONFIG_FSL_ENETC_VF=m
CONFIG_FSL_ERRATUM_A008585=y
+CONFIG_FSL_FMAN=y
CONFIG_FSL_IMX8_DDR_PMU=m
# CONFIG_FSL_IMX9_DDR_PMU is not set
+CONFIG_FSL_MC_BUS=y
+CONFIG_FSL_MC_DPIO=m
+CONFIG_FSL_MC_UAPI_SUPPORT=y
CONFIG_FSL_PQ_MDIO=m
# CONFIG_FSL_QDMA is not set
+# CONFIG_FSL_QMAN_TEST is not set
# CONFIG_FSL_RCPM is not set
CONFIG_FSL_XGMAC_MDIO=m
CONFIG_FSNOTIFY=y
@@ -2093,6 +2121,8 @@ CONFIG_GNSS=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_DAVINCI=y
+# CONFIG_GPIO_DS4520 is not set
CONFIG_GPIO_DWAPB=m
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -2121,6 +2151,7 @@ CONFIG_GPIO_MLXBF2=m
# CONFIG_GPIO_MLXBF3 is not set
# CONFIG_GPIO_MLXBF is not set
# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_MPC8XXX=y
CONFIG_GPIO_MXC=m
# CONFIG_GPIO_PCA953X_IRQ is not set
# CONFIG_GPIO_PCA953X is not set
@@ -2222,6 +2253,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2378,15 +2410,17 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
CONFIG_HW_RANDOM_CAVIUM=m
# CONFIG_HW_RANDOM_CCTRNG is not set
CONFIG_HW_RANDOM_CN10K=m
-CONFIG_HW_RANDOM_HISI=y
+CONFIG_HW_RANDOM_HISI=m
# CONFIG_HW_RANDOM_HISTB is not set
# CONFIG_HW_RANDOM_IPROC_RNG200 is not set
+CONFIG_HW_RANDOM_OMAP=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
CONFIG_HW_RANDOM_TPM=y
CONFIG_HW_RANDOM_VIRTIO=y
CONFIG_HW_RANDOM_XGENE=m
# CONFIG_HW_RANDOM_XIPHERA is not set
CONFIG_HW_RANDOM=y
+CONFIG_HWSPINLOCK_OMAP=m
# CONFIG_HWSPINLOCK_QCOM is not set
CONFIG_HWSPINLOCK=y
# CONFIG_HX711 is not set
@@ -2416,6 +2450,7 @@ CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_AMD_MP2 is not set
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_BCM_IPROC is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
@@ -2462,6 +2497,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NOMADIK is not set
# CONFIG_I2C_NVIDIA_GPU is not set
# CONFIG_I2C_OCORES is not set
+CONFIG_I2C_OMAP=m
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PCI1XXXX is not set
# CONFIG_I2C_PIIX4 is not set
@@ -2665,7 +2701,7 @@ CONFIG_INPUT_APANEL=m
# CONFIG_INPUT_ATI_REMOTE2 is not set
CONFIG_INPUT_ATLAS_BTNS=m
# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
-# CONFIG_INPUT_BBNSM_PWRKEY is not set
+CONFIG_INPUT_BBNSM_PWRKEY=m
# CONFIG_INPUT_BMA150 is not set
# CONFIG_INPUT_CM109 is not set
# CONFIG_INPUT_CMA3000 is not set
@@ -2759,6 +2795,7 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_TCC_COOLING is not set
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_VSC is not set
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
CONFIG_INTEL_XWAY_PHY=m
@@ -2793,7 +2830,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2879,6 +2916,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2955,6 +2993,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -3010,6 +3049,8 @@ CONFIG_JOLIET=y
# CONFIG_JSA1212 is not set
CONFIG_JUMP_LABEL=y
# CONFIG_K3_DMA is not set
+CONFIG_K3_RTI_WATCHDOG=m
+CONFIG_K3_THERMAL=m
CONFIG_KALLSYMS_ALL=y
CONFIG_KALLSYMS_BASE_RELATIVE=y
# CONFIG_KALLSYMS_SELFTEST is not set
@@ -3103,13 +3144,15 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD_SEV=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
# CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set
+CONFIG_KVM_PROVE_MMU=y
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
# CONFIG_KVM_XEN is not set
@@ -3182,6 +3225,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
@@ -3323,9 +3367,11 @@ CONFIG_MAILBOX=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
CONFIG_MARVELL_CN10K_DDR_PMU=m
CONFIG_MARVELL_CN10K_TAD_PMU=m
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3367,9 +3413,11 @@ CONFIG_MAX_SKB_FRAGS=17
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
# CONFIG_MDIO_BCM_IPROC is not set
@@ -3426,6 +3474,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3460,6 +3509,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3611,6 +3662,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3853,6 +3905,9 @@ CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTK_T7XX=m
CONFIG_MULTIUSER=y
+CONFIG_MUX_ADG792A=m
+# CONFIG_MUX_ADGS1408 is not set
+CONFIG_MUX_GPIO=m
# CONFIG_MVMDIO is not set
# CONFIG_MV_XOR_V2 is not set
# CONFIG_MWAVE is not set
@@ -3912,6 +3967,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4340,6 +4396,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4387,9 +4444,11 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_IMX_IIM is not set
# CONFIG_NVMEM_IMX_OCOTP_ELE is not set
CONFIG_NVMEM_IMX_OCOTP=m
+CONFIG_NVMEM_LAYERSCAPE_SFP=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
# CONFIG_NVMEM_SNVS_LPGPR is not set
@@ -4425,6 +4484,11 @@ CONFIG_OF_MDIO=y
CONFIG_OF_PMEM=m
# CONFIG_OF_UNITTEST is not set
CONFIG_OF=y
+CONFIG_OMAP2PLUS_MBOX=m
+CONFIG_OMAP_DM_TIMER=y
+# CONFIG_OMAP_GPMC is not set
+CONFIG_OMAP_MBOX_KFIFO_SIZE=256
+CONFIG_OMAP_USB2=m
# CONFIG_OMFS_FS is not set
# CONFIG_OPAL_CORE is not set
# CONFIG_OPEN_DICE is not set
@@ -4439,6 +4503,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
# CONFIG_OSF_PARTITION is not set
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+CONFIG_OVERLAY_FS_DEBUG=y
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4519,6 +4584,7 @@ CONFIG_PCC=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_AL is not set
@@ -4566,6 +4632,8 @@ CONFIG_PCI_IMX6_HOST=y
CONFIG_PCI_IMX6=y
CONFIG_PCI_IOV=y
# CONFIG_PCI_J721E_HOST is not set
+CONFIG_PCI_KEYSTONE_HOST=y
+CONFIG_PCI_LAYERSCAPE=y
# CONFIG_PCI_MESON is not set
CONFIG_PCI_MSI=y
CONFIG_PCI_P2PDMA=y
@@ -4598,6 +4666,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
CONFIG_PER_VMA_LOCK_STATS=y
# CONFIG_PHANTOM is not set
# CONFIG_PHONET is not set
+CONFIG_PHY_AM654_SERDES=m
# CONFIG_PHY_BCM_NS_USB2 is not set
# CONFIG_PHY_BCM_NS_USB3 is not set
# CONFIG_PHY_BCM_SR_PCIE is not set
@@ -4619,9 +4688,10 @@ CONFIG_PHY_FSL_IMX8MQ_USB=m
CONFIG_PHY_HI6220_USB=m
# CONFIG_PHY_HISI_INNO_USB2 is not set
# CONFIG_PHY_HISTB_COMBPHY is not set
+CONFIG_PHY_J721E_WIZ=m
# CONFIG_PHY_LAN966X_SERDES is not set
CONFIG_PHYLIB=y
-CONFIG_PHYLINK=m
+CONFIG_PHYLINK=y
# CONFIG_PHY_MAPPHONE_MDM6600 is not set
# CONFIG_PHY_MIXEL_LVDS_PHY is not set
# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
@@ -4635,6 +4705,7 @@ CONFIG_PHY_NS2_USB_DRD=y
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_PCIE2 is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
@@ -4645,6 +4716,8 @@ CONFIG_PHY_NS2_USB_DRD=y
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
CONFIG_PHY_TEGRA194_P2U=y
CONFIG_PHY_TEGRA_XUSB=m
# CONFIG_PHY_TUSB1210 is not set
@@ -4825,6 +4898,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4844,6 +4918,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_QORIQ=m
CONFIG_PTP_1588_CLOCK=y
@@ -4861,8 +4936,11 @@ CONFIG_PWM_BCM_IPROC=y
# CONFIG_PWM_IMX1 is not set
CONFIG_PWM_IMX27=m
CONFIG_PWM_IMX_TPM=m
+CONFIG_PWM_OMAP_DMTIMER=y
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM_TEGRA=y
+CONFIG_PWM_TIECAP=m
+CONFIG_PWM_TIEHRPWM=m
# CONFIG_PWM_XILINX is not set
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
@@ -4958,6 +5036,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -5002,6 +5081,7 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
@@ -5009,6 +5089,7 @@ CONFIG_REGMAP=y
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
# CONFIG_REGULATOR_ARM_SCMI is not set
+# CONFIG_REGULATOR_AW37503 is not set
CONFIG_REGULATOR_BD718XX=m
# CONFIG_REGULATOR_DA9121 is not set
# CONFIG_REGULATOR_DA9210 is not set
@@ -5032,6 +5113,7 @@ CONFIG_REGULATOR_GPIO=y
CONFIG_REGULATOR_MAX77620=y
CONFIG_REGULATOR_MAX77686=m
# CONFIG_REGULATOR_MAX77826 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8893 is not set
@@ -5050,6 +5132,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
# CONFIG_REGULATOR_RT4801 is not set
@@ -5062,6 +5145,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_RT6245 is not set
# CONFIG_REGULATOR_RTMV20 is not set
# CONFIG_REGULATOR_RTQ2134 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_RTQ6752 is not set
# CONFIG_REGULATOR_SLG51000 is not set
# CONFIG_REGULATOR_SY8106A is not set
@@ -5096,6 +5180,7 @@ CONFIG_RESET_IMX7=y
# CONFIG_RESET_QCOM_PDC is not set
# CONFIG_RESET_SCMI is not set
# CONFIG_RESET_SIMPLE is not set
+CONFIG_RESET_TI_SCI=m
# CONFIG_RESET_TI_SYSCON is not set
# CONFIG_RESET_TI_TPS380X is not set
CONFIG_RESOURCE_KUNIT_TEST=m
@@ -5105,7 +5190,6 @@ CONFIG_RETPOLINE=y
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -5199,6 +5283,7 @@ CONFIG_RTC_DRV_DS3232=m
CONFIG_RTC_DRV_EFI=y
CONFIG_RTC_DRV_EM3027=m
CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_FSL_FTM_ALARM=m
# CONFIG_RTC_DRV_FTRTC010 is not set
# CONFIG_RTC_DRV_GOLDFISH is not set
# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
@@ -5253,6 +5338,7 @@ CONFIG_RTC_DRV_RX8581=m
CONFIG_RTC_DRV_STK17TA8=m
# CONFIG_RTC_DRV_TEGRA is not set
# CONFIG_RTC_DRV_TEST is not set
+CONFIG_RTC_DRV_TI_K3=m
CONFIG_RTC_DRV_V3020=m
CONFIG_RTC_DRV_X1205=m
# CONFIG_RTC_DRV_XGENE is not set
@@ -5476,6 +5562,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5485,6 +5572,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5562,6 +5650,7 @@ CONFIG_SENSORS_G762=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
# CONFIG_SENSORS_I5K_AMB is not set
# CONFIG_SENSORS_IBMAEM is not set
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5743,6 +5832,8 @@ CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_MANY_PORTS=y
CONFIG_SERIAL_8250_MID=y
CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y
+CONFIG_SERIAL_8250_OMAP=y
CONFIG_SERIAL_8250_PCI1XXXX=y
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PERICOM=y
@@ -6061,7 +6152,9 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -6078,7 +6171,6 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -6143,6 +6235,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -6153,6 +6246,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
# CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
@@ -6272,6 +6366,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -6331,6 +6426,7 @@ CONFIG_SND_SOC_SOF_HDA_PROBES=m
# CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set
# CONFIG_SND_SOC_SOF_JASPERLAKE is not set
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
# CONFIG_SND_SOC_SOF_MERRIFIELD is not set
# CONFIG_SND_SOC_SOF_METEORLAKE is not set
# CONFIG_SND_SOC_SOF_OF is not set
@@ -6401,6 +6497,7 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_BUILD=y
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6492,7 +6589,7 @@ CONFIG_SOC_IMX8M=y
CONFIG_SOC_IMX9=m
# CONFIG_SOCIONEXT_SYNQUACER_PREITS is not set
CONFIG_SOC_TEGRA_CBB=m
-# CONFIG_SOC_TI is not set
+CONFIG_SOC_TI=y
CONFIG_SOFTLOCKUP_DETECTOR=y
CONFIG_SOFT_WATCHDOG=m
# CONFIG_SOLARIS_X86_PARTITION is not set
@@ -6532,6 +6629,7 @@ CONFIG_SPI_AMD=y
# CONFIG_SPI_CADENCE_XSPI is not set
CONFIG_SPI_DEBUG=y
# CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_FSL_DSPI=y
CONFIG_SPI_FSL_LPSPI=m
CONFIG_SPI_FSL_QUADSPI=m
# CONFIG_SPI_FSL_SPI is not set
@@ -6550,6 +6648,7 @@ CONFIG_SPI_MEM=y
# CONFIG_SPI_MXIC is not set
CONFIG_SPI_NXP_FLEXSPI=m
# CONFIG_SPI_OC_TINY is not set
+CONFIG_SPI_OMAP24XX=m
CONFIG_SPI_PCI1XXXX=m
CONFIG_SPI_PL022=m
# CONFIG_SPI_PXA2XX is not set
@@ -6651,6 +6750,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
CONFIG_SUSPEND=y
CONFIG_SVC_I3C_MASTER=m
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
# CONFIG_SX9324 is not set
@@ -6769,6 +6869,7 @@ CONFIG_TEST_FPU=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIST_SORT=m
@@ -6845,6 +6946,9 @@ CONFIG_THUNDERX2_PMU=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+CONFIG_TI_K3_RINGACC=y
+CONFIG_TI_K3_UDMA_GLUE_LAYER=y
+CONFIG_TI_K3_UDMA=y
# CONFIG_TI_LMP92064 is not set
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y
@@ -6864,7 +6968,13 @@ CONFIG_TIPC_DIAG=m
CONFIG_TIPC=m
CONFIG_TIPC_MEDIA_IB=y
CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TI_PRUSS=m
+CONFIG_TI_SCI_CLK=m
+# CONFIG_TI_SCI_CLK_PROBE_FROM_FW is not set
+CONFIG_TI_SCI_PM_DOMAINS=m
# CONFIG_TI_ST is not set
+CONFIG_TI_SYSCON_CLK=m
+CONFIG_TI_SYSC=y
# CONFIG_TI_TLC4541 is not set
# CONFIG_TI_TMAG5273 is not set
# CONFIG_TI_TSC2046 is not set
@@ -6877,6 +6987,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -6921,6 +7032,7 @@ CONFIG_TORTURE_TEST=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7085,8 +7197,10 @@ CONFIG_USB_CXACRU=m
CONFIG_USB_DEFAULT_PERSIST=y
# CONFIG_USB_DSBR is not set
# CONFIG_USB_DWC2 is not set
+CONFIG_USB_DWC3_AM62=m
CONFIG_USB_DWC3_IMX8MP=m
# CONFIG_USB_DWC3 is not set
+CONFIG_USB_DWC3_KEYSTONE=m
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_EHCI_FSL is not set
CONFIG_USB_EHCI_HCD_PLATFORM=m
@@ -7370,6 +7484,7 @@ CONFIG_VEXPRESS_CONFIG=y
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=m
# CONFIG_VFIO_AMBA is not set
+CONFIG_VFIO_FSL_MC=m
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
# CONFIG_VFIO_MDEV is not set
@@ -7434,8 +7549,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7733,6 +7852,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index b86a050c2..767a87292 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -145,6 +145,7 @@ CONFIG_AD7949=m
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
CONFIG_ADAPTEC_STARFIRE=m
+# CONFIG_ADDRESS_MASKING is not set
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -1275,6 +1276,7 @@ CONFIG_COMMON_CLK_SI5341=m
# CONFIG_COMMON_CLK_SI5351 is not set
CONFIG_COMMON_CLK_SI544=m
# CONFIG_COMMON_CLK_SI570 is not set
+CONFIG_COMMON_CLK_VC3=m
# CONFIG_COMMON_CLK_VC5 is not set
CONFIG_COMMON_CLK_VC7=m
CONFIG_COMMON_CLK_XGENE=y
@@ -1297,6 +1299,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=3
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1352,6 +1355,8 @@ CONFIG_CPU_THERMAL=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -1772,6 +1777,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
CONFIG_DMA_OF=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
@@ -1800,6 +1806,7 @@ CONFIG_DM_INIT=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=y
@@ -1934,6 +1941,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
CONFIG_DRM_LONTIUM_LT9611=m
CONFIG_DRM_LONTIUM_LT9611UXC=m
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
CONFIG_DRM_MALI_DISPLAY=m
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -2038,11 +2046,13 @@ CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
+CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m
# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
CONFIG_DRM_PANEL_TPO_TPG110=m
CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
+CONFIG_DRM_PANEL_VISIONOX_R66451=m
CONFIG_DRM_PANEL_VISIONOX_RM69299=m
CONFIG_DRM_PANEL_VISIONOX_VTDR6130=m
CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
@@ -2090,6 +2100,7 @@ CONFIG_DRM_TOSHIBA_TC358764=m
CONFIG_DRM_TOSHIBA_TC358767=m
CONFIG_DRM_TOSHIBA_TC358768=m
CONFIG_DRM_TOSHIBA_TC358775=m
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
CONFIG_DRM_V3D=m
@@ -2298,6 +2309,7 @@ CONFIG_EROFS_FS=m
CONFIG_EROFS_FS_POSIX_ACL=y
CONFIG_EROFS_FS_SECURITY=y
CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP_DEFLATE=y
CONFIG_EROFS_FS_ZIP_LZMA=y
CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
@@ -2379,6 +2391,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -2620,6 +2633,7 @@ CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
CONFIG_GPIO_DAVINCI=m
CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_DS4520=m
CONFIG_GPIO_DWAPB=m
CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_FTGPIO010 is not set
@@ -2759,6 +2773,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
CONFIG_HID_GLORIOUS=m
# CONFIG_HID_GOOGLE_HAMMER is not set
+CONFIG_HID_GOOGLE_STADIA_FF=m
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2978,6 +2993,7 @@ CONFIG_I2C_ALGOPCF=m
CONFIG_I2C_AMD_MP2=m
CONFIG_I2C_APPLE=m
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+CONFIG_I2C_ATR=m
CONFIG_I2C_BCM2835=m
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_BRCMSTB=y
@@ -3421,6 +3437,7 @@ CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
CONFIG_IOSM=m
CONFIG_IO_STRICT_DEVMEM=y
+CONFIG_IO_URING=y
CONFIG_IP5XXX_POWER=m
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -3490,6 +3507,7 @@ CONFIG_IP_PIMSM_V2=y
# CONFIG_IPQ_APSS_6018 is not set
# CONFIG_IPQ_APSS_PLL is not set
# CONFIG_IPQ_GCC_4019 is not set
+CONFIG_IPQ_GCC_5018=m
# CONFIG_IPQ_GCC_5332 is not set
# CONFIG_IPQ_GCC_6018 is not set
# CONFIG_IPQ_GCC_806X is not set
@@ -3517,6 +3535,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+CONFIG_IPU_BRIDGE=m
CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_IOAM6_LWTUNNEL=y
@@ -3594,6 +3613,7 @@ CONFIG_IR_RC6_DECODER=m
CONFIG_IR_RCMM_DECODER=m
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
CONFIG_IR_SERIAL=m
CONFIG_IR_SERIAL_TRANSMITTER=y
CONFIG_IR_SHARP_DECODER=m
@@ -3808,11 +3828,13 @@ CONFIG_KSM=y
CONFIG_KSZ884X_PCI=m
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KUSER_HELPERS=y
+# CONFIG_KVM_PROVE_MMU is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
CONFIG_KVM_XEN=y
@@ -3866,6 +3888,7 @@ CONFIG_LEDS_CR0014114=m
# CONFIG_LEDS_DAC124S085 is not set
# CONFIG_LEDS_EL15203000 is not set
CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GROUP_MULTICOLOR=m
# CONFIG_LEDS_IS31FL319X is not set
CONFIG_LEDS_IS31FL32XX=m
# CONFIG_LEDS_KTD2692 is not set
@@ -3893,6 +3916,7 @@ CONFIG_LEDS_PCA9532_GPIO=y
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
CONFIG_LEDS_PCA963X=m
+CONFIG_LEDS_PCA995X=m
CONFIG_LEDS_PWM=m
CONFIG_LEDS_PWM_MULTICOLOR=m
CONFIG_LEDS_QCOM_FLASH=m
@@ -4045,9 +4069,11 @@ CONFIG_MAILBOX=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88Q2XXX_PHY=m
CONFIG_MARVELL_88X2222_PHY=m
CONFIG_MARVELL_CN10K_DDR_PMU=m
CONFIG_MARVELL_CN10K_TAD_PMU=m
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -4091,11 +4117,13 @@ CONFIG_MCP41010=m
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+CONFIG_MCP4728=m
# CONFIG_MCP4922 is not set
CONFIG_MCTP_SERIAL=m
# CONFIG_MCTP_TRANSPORT_I2C is not set
CONFIG_MCTP=y
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -4219,6 +4247,8 @@ CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=y
# CONFIG_MFD_CPCAP is not set
CONFIG_MFD_CROS_EC_DEV=m
+CONFIG_MFD_CS42L43_I2C=m
+CONFIG_MFD_CS42L43_SDW=m
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
@@ -4381,6 +4411,7 @@ CONFIG_MLX5_ESWITCH=y
# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -4773,6 +4804,7 @@ CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -5288,6 +5320,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -5340,6 +5373,7 @@ CONFIG_NVMEM_LAYOUT_SL28_VPD=m
CONFIG_NVMEM_MESON_EFUSE=m
CONFIG_NVMEM_MESON_MX_EFUSE=m
CONFIG_NVMEM_QCOM_QFPROM=m
+CONFIG_NVMEM_QCOM_SEC_QFPROM=m
CONFIG_NVMEM_REBOOT_MODE=m
CONFIG_NVMEM_RMEM=m
CONFIG_NVMEM_ROCKCHIP_EFUSE=m
@@ -5419,6 +5453,7 @@ CONFIG_ORINOCO_USB=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -5508,6 +5543,7 @@ CONFIG_PCC=y
CONFIG_PCI_AARDVARK=y
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_AL is not set
@@ -5590,6 +5626,7 @@ CONFIG_PCS_XPCS=m
CONFIG_PDC_ADMA=m
CONFIG_PDS_CORE=m
CONFIG_PDS_VDPA=m
+CONFIG_PDS_VFIO_PCI=m
# CONFIG_PECI is not set
# CONFIG_PERCPU_STATS is not set
# CONFIG_PERCPU_TEST is not set
@@ -5648,12 +5685,14 @@ CONFIG_PHY_QCOM_EUSB2_REPEATER=m
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
CONFIG_PHY_QCOM_PCIE2=m
CONFIG_PHY_QCOM_QMP_COMBO=m
CONFIG_PHY_QCOM_QMP=m
CONFIG_PHY_QCOM_QMP_PCIE_8996=m
CONFIG_PHY_QCOM_QMP_PCIE=m
CONFIG_PHY_QCOM_QMP_UFS=m
+CONFIG_PHY_QCOM_QMP_USB_LEGACY=m
CONFIG_PHY_QCOM_QMP_USB=m
CONFIG_PHY_QCOM_QUSB2=m
CONFIG_PHY_QCOM_SGMII_ETH=m
@@ -5675,6 +5714,8 @@ CONFIG_PHY_ROCKCHIP_PCIE=y
CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=m
CONFIG_PHY_ROCKCHIP_TYPEC=m
CONFIG_PHY_ROCKCHIP_USB=m
+CONFIG_PHY_RTK_RTD_USB2PHY=m
+CONFIG_PHY_RTK_RTD_USB3PHY=m
# CONFIG_PHY_SAMSUNG_USB2 is not set
CONFIG_PHY_SUN4I_USB=m
CONFIG_PHY_SUN50I_USB3=m
@@ -5692,6 +5733,7 @@ CONFIG_PID_NS=y
CONFIG_PINCONF=y
CONFIG_PINCTRL_ALDERLAKE=m
CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_AMLOGIC_C3=y
CONFIG_PINCTRL_APPLE_GPIO=m
CONFIG_PINCTRL_AS3722=y
CONFIG_PINCTRL_AXP209=m
@@ -5700,6 +5742,7 @@ CONFIG_PINCTRL_AXP209=m
# CONFIG_PINCTRL_CANNONLAKE is not set
CONFIG_PINCTRL_CEDARFORK=m
# CONFIG_PINCTRL_CHERRYVIEW is not set
+CONFIG_PINCTRL_CS42L43=m
CONFIG_PINCTRL_CY8C95X0=m
CONFIG_PINCTRL_ELKHARTLAKE=m
CONFIG_PINCTRL_EMMITSBURG=m
@@ -5777,6 +5820,7 @@ CONFIG_PINCTRL_SDM845=m
# CONFIG_PINCTRL_SDX75 is not set
CONFIG_PINCTRL_SINGLE=y
# CONFIG_PINCTRL_SM6115 is not set
+# CONFIG_PINCTRL_SM6115_LPASS_LPI is not set
# CONFIG_PINCTRL_SM6125 is not set
# CONFIG_PINCTRL_SM6350 is not set
# CONFIG_PINCTRL_SM6375 is not set
@@ -5785,6 +5829,7 @@ CONFIG_PINCTRL_SINGLE=y
# CONFIG_PINCTRL_SM8250 is not set
CONFIG_PINCTRL_SM8250_LPASS_LPI=m
# CONFIG_PINCTRL_SM8350 is not set
+CONFIG_PINCTRL_SM8350_LPASS_LPI=m
CONFIG_PINCTRL_SM8450_LPASS_LPI=m
CONFIG_PINCTRL_SM8450=m
# CONFIG_PINCTRL_SM8550 is not set
@@ -5948,6 +5993,7 @@ CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
CONFIG_PSTORE_842_COMPRESS=y
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -5969,6 +6015,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
CONFIG_PTP_1588_CLOCK_IDTCM=m
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_PTP_1588_CLOCK_QORIQ=m
@@ -6140,6 +6187,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -6201,6 +6249,7 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=y
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP_MMIO=y
@@ -6212,6 +6261,7 @@ CONFIG_REGULATOR_ACT8865=m
CONFIG_REGULATOR_ANATOP=m
CONFIG_REGULATOR_ARM_SCMI=m
CONFIG_REGULATOR_AS3722=m
+CONFIG_REGULATOR_AW37503=m
CONFIG_REGULATOR_AXP20X=m
CONFIG_REGULATOR_BD718XX=m
CONFIG_REGULATOR_BD9571MWV=m
@@ -6239,12 +6289,14 @@ CONFIG_REGULATOR_HI655X=m
# CONFIG_REGULATOR_MAX1586 is not set
# CONFIG_REGULATOR_MAX20086 is not set
CONFIG_REGULATOR_MAX20411=m
+CONFIG_REGULATOR_MAX5970=m
CONFIG_REGULATOR_MAX597X=m
CONFIG_REGULATOR_MAX77620=y
CONFIG_REGULATOR_MAX77650=m
CONFIG_REGULATOR_MAX77686=m
CONFIG_REGULATOR_MAX77802=m
# CONFIG_REGULATOR_MAX77826 is not set
+CONFIG_REGULATOR_MAX77857=m
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
CONFIG_REGULATOR_MAX8893=m
@@ -6266,6 +6318,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_PV88090 is not set
CONFIG_REGULATOR_PWM=y
CONFIG_REGULATOR_QCOM_LABIBB=m
+CONFIG_REGULATOR_QCOM_REFGEN=m
CONFIG_REGULATOR_QCOM_RPMH=y
# CONFIG_REGULATOR_QCOM_RPM is not set
CONFIG_REGULATOR_QCOM_SMD_RPM=m
@@ -6286,6 +6339,7 @@ CONFIG_REGULATOR_RT6190=m
CONFIG_REGULATOR_RT6245=m
CONFIG_REGULATOR_RTMV20=m
CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTQ2208=m
CONFIG_REGULATOR_RTQ6752=m
# CONFIG_REGULATOR_SLG51000 is not set
CONFIG_REGULATOR_SY7636A=m
@@ -6345,8 +6399,7 @@ CONFIG_RESOURCE_KUNIT_TEST=m
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-# CONFIG_RH_DISABLE_DEPRECATED is not set
-CONFIG_RH_FEDORA=y
+# CONFIG_RHEL_DIFFERENCES is not set
CONFIG_RICHTEK_RTQ6056=m
CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
@@ -6829,6 +6882,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -6906,6 +6960,7 @@ CONFIG_SENSORS_GPIO_FAN=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
CONFIG_SENSORS_HP_WMI=m
+CONFIG_SENSORS_HS3001=m
# CONFIG_SENSORS_I5K_AMB is not set
CONFIG_SENSORS_IBMAEM=m
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -6992,6 +7047,7 @@ CONFIG_SENSORS_MCP3021=m
CONFIG_SENSORS_MLXREG_FAN=m
CONFIG_SENSORS_MP2888=m
CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_MP2975_REGULATOR=y
CONFIG_SENSORS_MP5023=m
CONFIG_SENSORS_MPQ7932=m
CONFIG_SENSORS_MPQ7932_REGULATOR=y
@@ -7363,6 +7419,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=2048
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
CONFIG_SND_HDA_TEGRA=m
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -7484,7 +7543,9 @@ CONFIG_SND_SOC_AK5558=m
CONFIG_SND_SOC_APPLE_MCA=m
CONFIG_SND_SOC_APQ8016_SBC=m
CONFIG_SND_SOC_ARNDALE=m
+CONFIG_SND_SOC_AUDIO_IIO_AUX=m
CONFIG_SND_SOC_AW8738=m
+CONFIG_SND_SOC_AW88261=m
CONFIG_SND_SOC_AW88395=m
CONFIG_SND_SOC_BD28623=m
CONFIG_SND_SOC_BT_SCO=m
@@ -7510,6 +7571,8 @@ CONFIG_SND_SOC_CS4271_I2C=m
# CONFIG_SND_SOC_CS4271_SPI is not set
CONFIG_SND_SOC_CS42L42=m
CONFIG_SND_SOC_CS42L42_SDW=m
+CONFIG_SND_SOC_CS42L43=m
+CONFIG_SND_SOC_CS42L43_SDW=m
# CONFIG_SND_SOC_CS42L51_I2C is not set
# CONFIG_SND_SOC_CS42L52 is not set
# CONFIG_SND_SOC_CS42L56 is not set
@@ -7701,6 +7764,7 @@ CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
CONFIG_SND_SOC_ROCKCHIP_PDM=m
CONFIG_SND_SOC_ROCKCHIP_RT5645=m
CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
+CONFIG_SND_SOC_RT1017_SDCA_SDW=m
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -7846,6 +7910,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
CONFIG_SND_SOC_TLV320AIC3X_I2C=m
CONFIG_SND_SOC_TLV320AIC3X=m
CONFIG_SND_SOC_TLV320AIC3X_SPI=m
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
CONFIG_SND_SOC_TPA6130A2=m
CONFIG_SND_SOC_TS3A227E=m
@@ -7987,6 +8052,7 @@ CONFIG_SPI_BITBANG=m
CONFIG_SPI_CADENCE=m
CONFIG_SPI_CADENCE_QUADSPI=m
CONFIG_SPI_CADENCE_XSPI=m
+# CONFIG_SPI_CS42L43 is not set
# CONFIG_SPI_DEBUG is not set
CONFIG_SPI_DESIGNWARE=m
CONFIG_SPI_DLN2=m
@@ -8130,6 +8196,7 @@ CONFIG_ST_UVIS25=m
CONFIG_ST_UVIS25_SPI=m
# CONFIG_SUN20I_D1_CCU is not set
# CONFIG_SUN20I_D1_R_CCU is not set
+CONFIG_SUN20I_GPADC=m
# CONFIG_SUN20I_PPU is not set
# CONFIG_SUN4I_EMAC is not set
CONFIG_SUN50I_A100_CCU=y
@@ -8184,6 +8251,7 @@ CONFIG_SURFACE_PRO3_BUTTON=m
CONFIG_SUSPEND=y
CONFIG_SVC_I3C_MASTER=m
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_SWP_EMULATION=y
# CONFIG_SW_SYNC is not set
CONFIG_SX9310=m
@@ -8319,6 +8387,7 @@ CONFIG_TEST_CPUMASK=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
@@ -8402,6 +8471,8 @@ CONFIG_TIFM_7XX1=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+# CONFIG_TI_ICSSG_PRUETH is not set
+CONFIG_TI_ICSS_IEP=m
CONFIG_TI_K3_AM65_CPSW_NUSS=m
CONFIG_TI_K3_AM65_CPSW_SWITCHDEV=y
CONFIG_TI_K3_AM65_CPTS=m
@@ -8441,6 +8512,7 @@ CONFIG_TI_SCI_PM_DOMAINS=y
CONFIG_TI_SCI_PROTOCOL=y
# CONFIG_TI_ST is not set
CONFIG_TI_SYSCON_CLK=m
+CONFIG_TI_SYSC=y
# CONFIG_TI_TLC4541 is not set
# CONFIG_TI_TMAG5273 is not set
CONFIG_TI_TSC2046=m
@@ -8453,6 +8525,7 @@ CONFIG_TMP006=m
CONFIG_TMP117=m
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_QUOTA=y
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
CONFIG_TORTURE_TEST=m
@@ -8498,6 +8571,7 @@ CONFIG_TOUCHSCREEN_IMAGIS=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_IQS7211=m
# CONFIG_TOUCHSCREEN_MAX11801 is not set
CONFIG_TOUCHSCREEN_MCS5000=m
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -8724,6 +8798,7 @@ CONFIG_USB_CONFIGFS_EEM=y
# CONFIG_USB_CONFIGFS_F_FS is not set
CONFIG_USB_CONFIGFS_F_HID=y
# CONFIG_USB_CONFIGFS_F_LB_SS is not set
+CONFIG_USB_CONFIGFS_F_MIDI2=y
# CONFIG_USB_CONFIGFS_F_MIDI is not set
# CONFIG_USB_CONFIGFS_F_PRINTER is not set
CONFIG_USB_CONFIGFS_F_TCM=y
@@ -9118,7 +9193,9 @@ CONFIG_VFAT_FS=m
CONFIG_VFIO_AMBA=m
CONFIG_VFIO_CDX=m
CONFIG_VFIO_CONTAINER=y
+# CONFIG_VFIO_DEVICE_CDEV is not set
CONFIG_VFIO_FSL_MC=m
+CONFIG_VFIO_GROUP=y
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
CONFIG_VFIO_MDEV=m
@@ -9193,9 +9270,13 @@ CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_DS90UB913=m
+CONFIG_VIDEO_DS90UB953=m
+CONFIG_VIDEO_DS90UB960=m
# CONFIG_VIDEO_DT3155 is not set
CONFIG_VIDEO_DW100=m
CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9719=m
CONFIG_VIDEO_DW9768=m
CONFIG_VIDEO_DW9807_VCM=m
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -9569,6 +9650,7 @@ CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
# CONFIG_XEN is not set
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
+CONFIG_XEN_PRIVCMD_IRQFD=y
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_PVHVM_GUEST=y
@@ -9586,6 +9668,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 544d01fd5..03816c4bf 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -215,7 +215,6 @@ CONFIG_AMD_HSMP=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
CONFIG_AMD_PHY=m
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
# CONFIG_AMD_PTDMA is not set
# CONFIG_AMDTEE is not set
# CONFIG_AMD_XGBE_DCB is not set
@@ -249,9 +248,9 @@ CONFIG_ARCH_BCM_IPROC=y
# CONFIG_ARCH_EXYNOS is not set
CONFIG_ARCH_HISI=y
# CONFIG_ARCH_INTEL_SOCFPGA is not set
-# CONFIG_ARCH_K3 is not set
+CONFIG_ARCH_K3=y
# CONFIG_ARCH_KEEMBAY is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
+CONFIG_ARCH_LAYERSCAPE=y
# CONFIG_ARCH_LG1K is not set
# CONFIG_ARCH_MA35 is not set
# CONFIG_ARCH_MEDIATEK is not set
@@ -402,6 +401,7 @@ CONFIG_ARM_SPE_PMU=m
# CONFIG_ARM_TEGRA186_CPUFREQ is not set
CONFIG_ARM_TEGRA194_CPUFREQ=m
CONFIG_ARM_TEGRA_DEVFREQ=m
+CONFIG_ARM_TI_CPUFREQ=y
# CONFIG_AS3935 is not set
# CONFIG_AS73211 is not set
CONFIG_ASN1=y
@@ -920,6 +920,7 @@ CONFIG_CLK_IMX8QXP=y
CONFIG_CLK_IMX8ULP=y
CONFIG_CLK_IMX93=y
CONFIG_CLK_KUNIT_TEST=m
+CONFIG_CLK_LS1028A_PLLDIG=y
# CONFIG_CLK_QORIQ is not set
CONFIG_CLK_SP810=y
CONFIG_CLK_VEXPRESS_OSC=y
@@ -957,6 +958,7 @@ CONFIG_COMMAND_LINE_SIZE=4096
# CONFIG_COMMON_CLK_CS2000_CP is not set
# CONFIG_COMMON_CLK_FIXED_MMIO is not set
# CONFIG_COMMON_CLK_FSL_FLEXSPI is not set
+CONFIG_COMMON_CLK_FSL_SAI=y
CONFIG_COMMON_CLK_HI3516CV300=y
CONFIG_COMMON_CLK_HI3519=y
# CONFIG_COMMON_CLK_HI3559A is not set
@@ -978,6 +980,7 @@ CONFIG_COMMON_CLK_SCPI=m
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
CONFIG_COMMON_CLK_XGENE=y
@@ -998,6 +1001,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1079,8 +1083,8 @@ CONFIG_CRYPTO_AES_ARM64_BS=m
CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
CONFIG_CRYPTO_AES_ARM64_CE=y
-# CONFIG_CRYPTO_AES_ARM64 is not set
CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
+CONFIG_CRYPTO_AES_ARM64=y
CONFIG_CRYPTO_AES_GCM_P10=y
# CONFIG_CRYPTO_AES_TI is not set
CONFIG_CRYPTO_AES=y
@@ -1098,6 +1102,7 @@ CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
@@ -1136,6 +1141,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_PRNG_API=y
CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=3
CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
# CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_TEST is not set
+CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
# CONFIG_CRYPTO_DEV_HISI_HPRE is not set
# CONFIG_CRYPTO_DEV_HISI_SEC2 is not set
CONFIG_CRYPTO_DEV_HISI_SEC=m
@@ -1155,6 +1161,7 @@ CONFIG_CRYPTO_DEV_OCTEONTX2_CPT=m
# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
# CONFIG_CRYPTO_DEV_QCE is not set
# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
+CONFIG_CRYPTO_DEV_SA2UL=m
# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
# CONFIG_CRYPTO_DEV_SAHARA is not set
CONFIG_CRYPTO_DEV_SP_CCP=y
@@ -1206,6 +1213,7 @@ CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_POLY1305_NEON=y
+# CONFIG_CRYPTO_POLY1305_P10 is not set
# CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
@@ -1409,6 +1417,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1431,6 +1440,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1462,6 +1472,7 @@ CONFIG_DP83867_PHY=m
# CONFIG_DP83869_PHY is not set
CONFIG_DP83TC811_PHY=m
# CONFIG_DP83TD510_PHY is not set
+CONFIG_DPAA2_CONSOLE=m
# CONFIG_DPM_WATCHDOG is not set
# CONFIG_DPOT_DAC is not set
# CONFIG_DPS310 is not set
@@ -1553,6 +1564,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MALI_DISPLAY is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1630,6 +1642,7 @@ CONFIG_DRM_SIMPLEDRM=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1771,6 +1784,7 @@ CONFIG_EDAC_DMC520=m
CONFIG_EDAC_GHES=y
CONFIG_EDAC_I10NM=m
CONFIG_EDAC_IGEN6=m
+CONFIG_EDAC_LAYERSCAPE=m
CONFIG_EDAC_LEGACY_SYSFS=y
CONFIG_EDAC_PND2=m
CONFIG_EDAC_SYNOPSYS=m
@@ -1882,6 +1896,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1969,7 +1984,15 @@ CONFIG_FSCACHE_STATS=y
CONFIG_FS_DAX=y
# CONFIG_FS_ENCRYPTION is not set
# CONFIG_FSI is not set
+# CONFIG_FSL_BMAN_TEST is not set
+CONFIG_FSL_DPAA2_ETH_DCB=y
+CONFIG_FSL_DPAA2_ETH=m
+CONFIG_FSL_DPAA2_PTP_CLOCK=m
+CONFIG_FSL_DPAA2_QDMA=m
CONFIG_FSL_DPAA2_SWITCH=m
+# CONFIG_FSL_DPAA_CHECKING is not set
+CONFIG_FSL_DPAA_ETH=m
+CONFIG_FSL_DPAA=y
# CONFIG_FSL_EDMA is not set
CONFIG_FSL_ENETC_IERB=m
CONFIG_FSL_ENETC=m
@@ -1978,10 +2001,15 @@ CONFIG_FSL_ENETC_PTP_CLOCK=m
CONFIG_FSL_ENETC_QOS=y
CONFIG_FSL_ENETC_VF=m
CONFIG_FSL_ERRATUM_A008585=y
+CONFIG_FSL_FMAN=y
CONFIG_FSL_IMX8_DDR_PMU=m
# CONFIG_FSL_IMX9_DDR_PMU is not set
+CONFIG_FSL_MC_BUS=y
+CONFIG_FSL_MC_DPIO=m
+CONFIG_FSL_MC_UAPI_SUPPORT=y
CONFIG_FSL_PQ_MDIO=m
# CONFIG_FSL_QDMA is not set
+# CONFIG_FSL_QMAN_TEST is not set
# CONFIG_FSL_RCPM is not set
CONFIG_FSL_XGMAC_MDIO=m
CONFIG_FSNOTIFY=y
@@ -2077,6 +2105,8 @@ CONFIG_GNSS=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_DAVINCI=y
+# CONFIG_GPIO_DS4520 is not set
CONFIG_GPIO_DWAPB=m
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -2105,6 +2135,7 @@ CONFIG_GPIO_MLXBF2=m
# CONFIG_GPIO_MLXBF3 is not set
# CONFIG_GPIO_MLXBF is not set
# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_MPC8XXX=y
CONFIG_GPIO_MXC=m
# CONFIG_GPIO_PCA953X_IRQ is not set
# CONFIG_GPIO_PCA953X is not set
@@ -2206,6 +2237,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2362,15 +2394,17 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
CONFIG_HW_RANDOM_CAVIUM=m
# CONFIG_HW_RANDOM_CCTRNG is not set
CONFIG_HW_RANDOM_CN10K=m
-CONFIG_HW_RANDOM_HISI=y
+CONFIG_HW_RANDOM_HISI=m
# CONFIG_HW_RANDOM_HISTB is not set
# CONFIG_HW_RANDOM_IPROC_RNG200 is not set
+CONFIG_HW_RANDOM_OMAP=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
CONFIG_HW_RANDOM_TPM=y
CONFIG_HW_RANDOM_VIRTIO=y
CONFIG_HW_RANDOM_XGENE=m
# CONFIG_HW_RANDOM_XIPHERA is not set
CONFIG_HW_RANDOM=y
+CONFIG_HWSPINLOCK_OMAP=m
# CONFIG_HWSPINLOCK_QCOM is not set
CONFIG_HWSPINLOCK=y
# CONFIG_HX711 is not set
@@ -2400,6 +2434,7 @@ CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_AMD_MP2 is not set
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_BCM_IPROC is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
@@ -2446,6 +2481,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NOMADIK is not set
# CONFIG_I2C_NVIDIA_GPU is not set
# CONFIG_I2C_OCORES is not set
+CONFIG_I2C_OMAP=m
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PCI1XXXX is not set
# CONFIG_I2C_PIIX4 is not set
@@ -2649,7 +2685,7 @@ CONFIG_INPUT_APANEL=m
# CONFIG_INPUT_ATI_REMOTE2 is not set
CONFIG_INPUT_ATLAS_BTNS=m
# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
-# CONFIG_INPUT_BBNSM_PWRKEY is not set
+CONFIG_INPUT_BBNSM_PWRKEY=m
# CONFIG_INPUT_BMA150 is not set
# CONFIG_INPUT_CM109 is not set
# CONFIG_INPUT_CMA3000 is not set
@@ -2743,6 +2779,7 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_TCC_COOLING is not set
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_VSC is not set
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
CONFIG_INTEL_XWAY_PHY=m
@@ -2777,7 +2814,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2863,6 +2900,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2939,6 +2977,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -2994,6 +3033,8 @@ CONFIG_JOLIET=y
# CONFIG_JSA1212 is not set
CONFIG_JUMP_LABEL=y
# CONFIG_K3_DMA is not set
+CONFIG_K3_RTI_WATCHDOG=m
+CONFIG_K3_THERMAL=m
CONFIG_KALLSYMS_ALL=y
CONFIG_KALLSYMS_BASE_RELATIVE=y
# CONFIG_KALLSYMS_SELFTEST is not set
@@ -3082,13 +3123,15 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD_SEV=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
# CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set
+# CONFIG_KVM_PROVE_MMU is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
# CONFIG_KVM_XEN is not set
@@ -3161,6 +3204,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
@@ -3302,9 +3346,11 @@ CONFIG_MAILBOX=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
CONFIG_MARVELL_CN10K_DDR_PMU=m
CONFIG_MARVELL_CN10K_TAD_PMU=m
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3346,9 +3392,11 @@ CONFIG_MAX_SKB_FRAGS=17
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
# CONFIG_MDIO_BCM_IPROC is not set
@@ -3405,6 +3453,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3439,6 +3488,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3590,6 +3641,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3832,6 +3884,9 @@ CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTK_T7XX=m
CONFIG_MULTIUSER=y
+CONFIG_MUX_ADG792A=m
+# CONFIG_MUX_ADGS1408 is not set
+CONFIG_MUX_GPIO=m
# CONFIG_MVMDIO is not set
# CONFIG_MV_XOR_V2 is not set
# CONFIG_MWAVE is not set
@@ -3891,6 +3946,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4319,6 +4375,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4366,9 +4423,11 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_IMX_IIM is not set
# CONFIG_NVMEM_IMX_OCOTP_ELE is not set
CONFIG_NVMEM_IMX_OCOTP=m
+CONFIG_NVMEM_LAYERSCAPE_SFP=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
# CONFIG_NVMEM_SNVS_LPGPR is not set
@@ -4404,6 +4463,11 @@ CONFIG_OF_MDIO=y
CONFIG_OF_PMEM=m
# CONFIG_OF_UNITTEST is not set
CONFIG_OF=y
+CONFIG_OMAP2PLUS_MBOX=m
+CONFIG_OMAP_DM_TIMER=y
+# CONFIG_OMAP_GPMC is not set
+CONFIG_OMAP_MBOX_KFIFO_SIZE=256
+CONFIG_OMAP_USB2=m
# CONFIG_OMFS_FS is not set
# CONFIG_OPAL_CORE is not set
# CONFIG_OPEN_DICE is not set
@@ -4418,6 +4482,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
# CONFIG_OSF_PARTITION is not set
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4496,6 +4561,7 @@ CONFIG_PCC=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_AL is not set
@@ -4543,6 +4609,8 @@ CONFIG_PCI_IMX6_HOST=y
CONFIG_PCI_IMX6=y
CONFIG_PCI_IOV=y
# CONFIG_PCI_J721E_HOST is not set
+CONFIG_PCI_KEYSTONE_HOST=y
+CONFIG_PCI_LAYERSCAPE=y
# CONFIG_PCI_MESON is not set
CONFIG_PCI_MSI=y
CONFIG_PCI_P2PDMA=y
@@ -4575,6 +4643,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
CONFIG_PER_VMA_LOCK_STATS=y
# CONFIG_PHANTOM is not set
# CONFIG_PHONET is not set
+CONFIG_PHY_AM654_SERDES=m
# CONFIG_PHY_BCM_NS_USB2 is not set
# CONFIG_PHY_BCM_NS_USB3 is not set
# CONFIG_PHY_BCM_SR_PCIE is not set
@@ -4596,9 +4665,10 @@ CONFIG_PHY_FSL_IMX8MQ_USB=m
CONFIG_PHY_HI6220_USB=m
# CONFIG_PHY_HISI_INNO_USB2 is not set
# CONFIG_PHY_HISTB_COMBPHY is not set
+CONFIG_PHY_J721E_WIZ=m
# CONFIG_PHY_LAN966X_SERDES is not set
CONFIG_PHYLIB=y
-CONFIG_PHYLINK=m
+CONFIG_PHYLINK=y
# CONFIG_PHY_MAPPHONE_MDM6600 is not set
# CONFIG_PHY_MIXEL_LVDS_PHY is not set
# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
@@ -4612,6 +4682,7 @@ CONFIG_PHY_NS2_USB_DRD=y
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_PCIE2 is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
@@ -4622,6 +4693,8 @@ CONFIG_PHY_NS2_USB_DRD=y
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
CONFIG_PHY_TEGRA194_P2U=y
CONFIG_PHY_TEGRA_XUSB=m
# CONFIG_PHY_TUSB1210 is not set
@@ -4802,6 +4875,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4821,6 +4895,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_QORIQ=m
CONFIG_PTP_1588_CLOCK=y
@@ -4838,8 +4913,11 @@ CONFIG_PWM_BCM_IPROC=y
# CONFIG_PWM_IMX1 is not set
CONFIG_PWM_IMX27=m
CONFIG_PWM_IMX_TPM=m
+CONFIG_PWM_OMAP_DMTIMER=y
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM_TEGRA=y
+CONFIG_PWM_TIECAP=m
+CONFIG_PWM_TIEHRPWM=m
# CONFIG_PWM_XILINX is not set
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
@@ -4935,6 +5013,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -4979,6 +5058,7 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
@@ -4986,6 +5066,7 @@ CONFIG_REGMAP=y
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
# CONFIG_REGULATOR_ARM_SCMI is not set
+# CONFIG_REGULATOR_AW37503 is not set
CONFIG_REGULATOR_BD718XX=m
# CONFIG_REGULATOR_DA9121 is not set
# CONFIG_REGULATOR_DA9210 is not set
@@ -5009,6 +5090,7 @@ CONFIG_REGULATOR_GPIO=y
CONFIG_REGULATOR_MAX77620=y
CONFIG_REGULATOR_MAX77686=m
# CONFIG_REGULATOR_MAX77826 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8893 is not set
@@ -5027,6 +5109,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
# CONFIG_REGULATOR_RT4801 is not set
@@ -5039,6 +5122,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_RT6245 is not set
# CONFIG_REGULATOR_RTMV20 is not set
# CONFIG_REGULATOR_RTQ2134 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_RTQ6752 is not set
# CONFIG_REGULATOR_SLG51000 is not set
# CONFIG_REGULATOR_SY8106A is not set
@@ -5073,6 +5157,7 @@ CONFIG_RESET_IMX7=y
# CONFIG_RESET_QCOM_PDC is not set
# CONFIG_RESET_SCMI is not set
# CONFIG_RESET_SIMPLE is not set
+CONFIG_RESET_TI_SCI=m
# CONFIG_RESET_TI_SYSCON is not set
# CONFIG_RESET_TI_TPS380X is not set
CONFIG_RESOURCE_KUNIT_TEST=m
@@ -5082,7 +5167,6 @@ CONFIG_RETPOLINE=y
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -5176,6 +5260,7 @@ CONFIG_RTC_DRV_DS3232=m
CONFIG_RTC_DRV_EFI=y
CONFIG_RTC_DRV_EM3027=m
CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_FSL_FTM_ALARM=m
# CONFIG_RTC_DRV_FTRTC010 is not set
# CONFIG_RTC_DRV_GOLDFISH is not set
# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
@@ -5230,6 +5315,7 @@ CONFIG_RTC_DRV_RX8581=m
CONFIG_RTC_DRV_STK17TA8=m
# CONFIG_RTC_DRV_TEGRA is not set
# CONFIG_RTC_DRV_TEST is not set
+CONFIG_RTC_DRV_TI_K3=m
CONFIG_RTC_DRV_V3020=m
CONFIG_RTC_DRV_X1205=m
# CONFIG_RTC_DRV_XGENE is not set
@@ -5453,6 +5539,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5462,6 +5549,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5539,6 +5627,7 @@ CONFIG_SENSORS_G762=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
# CONFIG_SENSORS_I5K_AMB is not set
# CONFIG_SENSORS_IBMAEM is not set
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5720,6 +5809,8 @@ CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_MANY_PORTS=y
CONFIG_SERIAL_8250_MID=y
CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y
+CONFIG_SERIAL_8250_OMAP=y
CONFIG_SERIAL_8250_PCI1XXXX=y
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PERICOM=y
@@ -6037,7 +6128,9 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -6054,7 +6147,6 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -6119,6 +6211,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -6129,6 +6222,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
# CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
@@ -6248,6 +6342,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -6306,6 +6401,7 @@ CONFIG_SND_SOC_SOF_ACPI=m
# CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set
# CONFIG_SND_SOC_SOF_JASPERLAKE is not set
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
# CONFIG_SND_SOC_SOF_MERRIFIELD is not set
# CONFIG_SND_SOC_SOF_METEORLAKE is not set
# CONFIG_SND_SOC_SOF_OF is not set
@@ -6376,6 +6472,7 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6467,7 +6564,7 @@ CONFIG_SOC_IMX8M=y
CONFIG_SOC_IMX9=m
# CONFIG_SOCIONEXT_SYNQUACER_PREITS is not set
CONFIG_SOC_TEGRA_CBB=m
-# CONFIG_SOC_TI is not set
+CONFIG_SOC_TI=y
CONFIG_SOFTLOCKUP_DETECTOR=y
CONFIG_SOFT_WATCHDOG=m
# CONFIG_SOLARIS_X86_PARTITION is not set
@@ -6507,6 +6604,7 @@ CONFIG_SPI_AMD=y
# CONFIG_SPI_CADENCE_XSPI is not set
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_FSL_DSPI=y
CONFIG_SPI_FSL_LPSPI=m
CONFIG_SPI_FSL_QUADSPI=m
# CONFIG_SPI_FSL_SPI is not set
@@ -6525,6 +6623,7 @@ CONFIG_SPI_MEM=y
# CONFIG_SPI_MXIC is not set
CONFIG_SPI_NXP_FLEXSPI=m
# CONFIG_SPI_OC_TINY is not set
+CONFIG_SPI_OMAP24XX=m
CONFIG_SPI_PCI1XXXX=m
CONFIG_SPI_PL022=m
# CONFIG_SPI_PXA2XX is not set
@@ -6626,6 +6725,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
CONFIG_SUSPEND=y
CONFIG_SVC_I3C_MASTER=m
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
# CONFIG_SX9324 is not set
@@ -6744,6 +6844,7 @@ CONFIG_TEST_CPUMASK=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
@@ -6820,6 +6921,9 @@ CONFIG_THUNDERX2_PMU=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+CONFIG_TI_K3_RINGACC=y
+CONFIG_TI_K3_UDMA_GLUE_LAYER=y
+CONFIG_TI_K3_UDMA=y
# CONFIG_TI_LMP92064 is not set
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y
@@ -6839,7 +6943,13 @@ CONFIG_TIPC_DIAG=m
CONFIG_TIPC=m
CONFIG_TIPC_MEDIA_IB=y
CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TI_PRUSS=m
+CONFIG_TI_SCI_CLK=m
+# CONFIG_TI_SCI_CLK_PROBE_FROM_FW is not set
+CONFIG_TI_SCI_PM_DOMAINS=m
# CONFIG_TI_ST is not set
+CONFIG_TI_SYSCON_CLK=m
+CONFIG_TI_SYSC=y
# CONFIG_TI_TLC4541 is not set
# CONFIG_TI_TMAG5273 is not set
# CONFIG_TI_TSC2046 is not set
@@ -6852,6 +6962,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -6896,6 +7007,7 @@ CONFIG_TORTURE_TEST=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7060,8 +7172,10 @@ CONFIG_USB_CXACRU=m
CONFIG_USB_DEFAULT_PERSIST=y
# CONFIG_USB_DSBR is not set
# CONFIG_USB_DWC2 is not set
+CONFIG_USB_DWC3_AM62=m
CONFIG_USB_DWC3_IMX8MP=m
# CONFIG_USB_DWC3 is not set
+CONFIG_USB_DWC3_KEYSTONE=m
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_EHCI_FSL is not set
CONFIG_USB_EHCI_HCD_PLATFORM=m
@@ -7345,6 +7459,7 @@ CONFIG_VEXPRESS_CONFIG=y
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=m
# CONFIG_VFIO_AMBA is not set
+CONFIG_VFIO_FSL_MC=m
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
# CONFIG_VFIO_MDEV is not set
@@ -7409,8 +7524,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7708,6 +7827,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config
index 15b5751d7..150d43325 100644
--- a/kernel-aarch64-rt-debug-rhel.config
+++ b/kernel-aarch64-rt-debug-rhel.config
@@ -215,7 +215,6 @@ CONFIG_AMD_HSMP=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
CONFIG_AMD_PHY=m
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
# CONFIG_AMD_PTDMA is not set
# CONFIG_AMDTEE is not set
# CONFIG_AMD_XGBE_DCB is not set
@@ -249,9 +248,9 @@ CONFIG_ARCH_BCM_IPROC=y
# CONFIG_ARCH_EXYNOS is not set
CONFIG_ARCH_HISI=y
# CONFIG_ARCH_INTEL_SOCFPGA is not set
-# CONFIG_ARCH_K3 is not set
+CONFIG_ARCH_K3=y
# CONFIG_ARCH_KEEMBAY is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
+CONFIG_ARCH_LAYERSCAPE=y
# CONFIG_ARCH_LG1K is not set
# CONFIG_ARCH_MA35 is not set
# CONFIG_ARCH_MEDIATEK is not set
@@ -402,6 +401,7 @@ CONFIG_ARM_SPE_PMU=m
# CONFIG_ARM_TEGRA186_CPUFREQ is not set
CONFIG_ARM_TEGRA194_CPUFREQ=m
CONFIG_ARM_TEGRA_DEVFREQ=m
+CONFIG_ARM_TI_CPUFREQ=y
# CONFIG_AS3935 is not set
# CONFIG_AS73211 is not set
CONFIG_ASN1=y
@@ -920,6 +920,7 @@ CONFIG_CLK_IMX8QXP=y
CONFIG_CLK_IMX8ULP=y
CONFIG_CLK_IMX93=y
CONFIG_CLK_KUNIT_TEST=m
+CONFIG_CLK_LS1028A_PLLDIG=y
# CONFIG_CLK_QORIQ is not set
CONFIG_CLK_SP810=y
CONFIG_CLK_VEXPRESS_OSC=y
@@ -957,6 +958,7 @@ CONFIG_COMMAND_LINE_SIZE=4096
# CONFIG_COMMON_CLK_CS2000_CP is not set
# CONFIG_COMMON_CLK_FIXED_MMIO is not set
# CONFIG_COMMON_CLK_FSL_FLEXSPI is not set
+CONFIG_COMMON_CLK_FSL_SAI=y
CONFIG_COMMON_CLK_HI3516CV300=y
CONFIG_COMMON_CLK_HI3519=y
# CONFIG_COMMON_CLK_HI3559A is not set
@@ -978,6 +980,7 @@ CONFIG_COMMON_CLK_SCPI=m
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
CONFIG_COMMON_CLK_XGENE=y
@@ -998,6 +1001,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1080,8 +1084,8 @@ CONFIG_CRYPTO_AES_ARM64_BS=m
CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
CONFIG_CRYPTO_AES_ARM64_CE=y
-# CONFIG_CRYPTO_AES_ARM64 is not set
CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
+CONFIG_CRYPTO_AES_ARM64=y
CONFIG_CRYPTO_AES_GCM_P10=y
# CONFIG_CRYPTO_AES_TI is not set
CONFIG_CRYPTO_AES=y
@@ -1099,6 +1103,7 @@ CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
@@ -1137,6 +1142,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_PRNG_API=y
CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=3
CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
# CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_TEST is not set
+CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
# CONFIG_CRYPTO_DEV_HISI_HPRE is not set
# CONFIG_CRYPTO_DEV_HISI_SEC2 is not set
CONFIG_CRYPTO_DEV_HISI_SEC=m
@@ -1156,6 +1162,7 @@ CONFIG_CRYPTO_DEV_OCTEONTX2_CPT=m
# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
# CONFIG_CRYPTO_DEV_QCE is not set
# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
+CONFIG_CRYPTO_DEV_SA2UL=m
# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
# CONFIG_CRYPTO_DEV_SAHARA is not set
CONFIG_CRYPTO_DEV_SP_CCP=y
@@ -1207,6 +1214,7 @@ CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_POLY1305_NEON=y
+# CONFIG_CRYPTO_POLY1305_P10 is not set
# CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
@@ -1419,6 +1427,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1441,6 +1450,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1472,6 +1482,7 @@ CONFIG_DP83867_PHY=m
# CONFIG_DP83869_PHY is not set
CONFIG_DP83TC811_PHY=m
# CONFIG_DP83TD510_PHY is not set
+CONFIG_DPAA2_CONSOLE=m
# CONFIG_DPM_WATCHDOG is not set
# CONFIG_DPOT_DAC is not set
# CONFIG_DPS310 is not set
@@ -1563,6 +1574,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MALI_DISPLAY is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1640,6 +1652,7 @@ CONFIG_DRM_SIMPLEDRM=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1817,6 +1830,7 @@ CONFIG_EDAC_DMC520=m
CONFIG_EDAC_GHES=y
CONFIG_EDAC_I10NM=m
CONFIG_EDAC_IGEN6=m
+CONFIG_EDAC_LAYERSCAPE=m
CONFIG_EDAC_LEGACY_SYSFS=y
CONFIG_EDAC_PND2=m
CONFIG_EDAC_SYNOPSYS=m
@@ -1936,6 +1950,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -2023,7 +2038,15 @@ CONFIG_FSCACHE_STATS=y
CONFIG_FS_DAX=y
# CONFIG_FS_ENCRYPTION is not set
# CONFIG_FSI is not set
+# CONFIG_FSL_BMAN_TEST is not set
+CONFIG_FSL_DPAA2_ETH_DCB=y
+CONFIG_FSL_DPAA2_ETH=m
+CONFIG_FSL_DPAA2_PTP_CLOCK=m
+CONFIG_FSL_DPAA2_QDMA=m
CONFIG_FSL_DPAA2_SWITCH=m
+# CONFIG_FSL_DPAA_CHECKING is not set
+CONFIG_FSL_DPAA_ETH=m
+CONFIG_FSL_DPAA=y
# CONFIG_FSL_EDMA is not set
CONFIG_FSL_ENETC_IERB=m
CONFIG_FSL_ENETC=m
@@ -2032,10 +2055,15 @@ CONFIG_FSL_ENETC_PTP_CLOCK=m
CONFIG_FSL_ENETC_QOS=y
CONFIG_FSL_ENETC_VF=m
CONFIG_FSL_ERRATUM_A008585=y
+CONFIG_FSL_FMAN=y
CONFIG_FSL_IMX8_DDR_PMU=m
# CONFIG_FSL_IMX9_DDR_PMU is not set
+CONFIG_FSL_MC_BUS=y
+CONFIG_FSL_MC_DPIO=m
+CONFIG_FSL_MC_UAPI_SUPPORT=y
CONFIG_FSL_PQ_MDIO=m
# CONFIG_FSL_QDMA is not set
+# CONFIG_FSL_QMAN_TEST is not set
# CONFIG_FSL_RCPM is not set
CONFIG_FSL_XGMAC_MDIO=m
CONFIG_FSNOTIFY=y
@@ -2132,6 +2160,8 @@ CONFIG_GNSS=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_DAVINCI=y
+# CONFIG_GPIO_DS4520 is not set
CONFIG_GPIO_DWAPB=m
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -2160,6 +2190,7 @@ CONFIG_GPIO_MLXBF2=m
# CONFIG_GPIO_MLXBF3 is not set
# CONFIG_GPIO_MLXBF is not set
# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_MPC8XXX=y
CONFIG_GPIO_MXC=m
# CONFIG_GPIO_PCA953X_IRQ is not set
# CONFIG_GPIO_PCA953X is not set
@@ -2262,6 +2293,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2418,15 +2450,17 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
CONFIG_HW_RANDOM_CAVIUM=m
# CONFIG_HW_RANDOM_CCTRNG is not set
CONFIG_HW_RANDOM_CN10K=m
-CONFIG_HW_RANDOM_HISI=y
+CONFIG_HW_RANDOM_HISI=m
# CONFIG_HW_RANDOM_HISTB is not set
# CONFIG_HW_RANDOM_IPROC_RNG200 is not set
+CONFIG_HW_RANDOM_OMAP=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
CONFIG_HW_RANDOM_TPM=y
CONFIG_HW_RANDOM_VIRTIO=y
CONFIG_HW_RANDOM_XGENE=m
# CONFIG_HW_RANDOM_XIPHERA is not set
CONFIG_HW_RANDOM=y
+CONFIG_HWSPINLOCK_OMAP=m
# CONFIG_HWSPINLOCK_QCOM is not set
CONFIG_HWSPINLOCK=y
# CONFIG_HX711 is not set
@@ -2456,6 +2490,7 @@ CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_AMD_MP2 is not set
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_BCM_IPROC is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
@@ -2502,6 +2537,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NOMADIK is not set
# CONFIG_I2C_NVIDIA_GPU is not set
# CONFIG_I2C_OCORES is not set
+CONFIG_I2C_OMAP=m
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PCI1XXXX is not set
# CONFIG_I2C_PIIX4 is not set
@@ -2705,7 +2741,7 @@ CONFIG_INPUT_APANEL=m
# CONFIG_INPUT_ATI_REMOTE2 is not set
CONFIG_INPUT_ATLAS_BTNS=m
# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
-# CONFIG_INPUT_BBNSM_PWRKEY is not set
+CONFIG_INPUT_BBNSM_PWRKEY=m
# CONFIG_INPUT_BMA150 is not set
# CONFIG_INPUT_CM109 is not set
# CONFIG_INPUT_CMA3000 is not set
@@ -2799,6 +2835,7 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_TCC_COOLING is not set
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_VSC is not set
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
CONFIG_INTEL_XWAY_PHY=m
@@ -2833,7 +2870,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2919,6 +2956,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2995,6 +3033,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -3050,6 +3089,8 @@ CONFIG_JOLIET=y
# CONFIG_JSA1212 is not set
CONFIG_JUMP_LABEL=y
# CONFIG_K3_DMA is not set
+CONFIG_K3_RTI_WATCHDOG=m
+CONFIG_K3_THERMAL=m
CONFIG_KALLSYMS_ALL=y
CONFIG_KALLSYMS_BASE_RELATIVE=y
# CONFIG_KALLSYMS_SELFTEST is not set
@@ -3143,13 +3184,15 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD_SEV=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
# CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set
+CONFIG_KVM_PROVE_MMU=y
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
# CONFIG_KVM_XEN is not set
@@ -3222,6 +3265,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
@@ -3363,9 +3407,11 @@ CONFIG_MAILBOX=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
CONFIG_MARVELL_CN10K_DDR_PMU=m
CONFIG_MARVELL_CN10K_TAD_PMU=m
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3407,9 +3453,11 @@ CONFIG_MAX_SKB_FRAGS=17
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
# CONFIG_MDIO_BCM_IPROC is not set
@@ -3471,6 +3519,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3505,6 +3554,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3656,6 +3707,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3898,6 +3950,9 @@ CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTK_T7XX=m
CONFIG_MULTIUSER=y
+CONFIG_MUX_ADG792A=m
+# CONFIG_MUX_ADGS1408 is not set
+CONFIG_MUX_GPIO=m
# CONFIG_MVMDIO is not set
# CONFIG_MV_XOR_V2 is not set
# CONFIG_MWAVE is not set
@@ -3957,6 +4012,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4385,6 +4441,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4432,9 +4489,11 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_IMX_IIM is not set
# CONFIG_NVMEM_IMX_OCOTP_ELE is not set
CONFIG_NVMEM_IMX_OCOTP=m
+CONFIG_NVMEM_LAYERSCAPE_SFP=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
# CONFIG_NVMEM_SNVS_LPGPR is not set
@@ -4470,6 +4529,11 @@ CONFIG_OF_MDIO=y
CONFIG_OF_PMEM=m
# CONFIG_OF_UNITTEST is not set
CONFIG_OF=y
+CONFIG_OMAP2PLUS_MBOX=m
+CONFIG_OMAP_DM_TIMER=y
+# CONFIG_OMAP_GPMC is not set
+CONFIG_OMAP_MBOX_KFIFO_SIZE=256
+CONFIG_OMAP_USB2=m
# CONFIG_OMFS_FS is not set
# CONFIG_OPAL_CORE is not set
# CONFIG_OPEN_DICE is not set
@@ -4484,6 +4548,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
# CONFIG_OSF_PARTITION is not set
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+CONFIG_OVERLAY_FS_DEBUG=y
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4564,6 +4629,7 @@ CONFIG_PCC=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_AL is not set
@@ -4611,6 +4677,8 @@ CONFIG_PCI_IMX6_HOST=y
CONFIG_PCI_IMX6=y
CONFIG_PCI_IOV=y
# CONFIG_PCI_J721E_HOST is not set
+CONFIG_PCI_KEYSTONE_HOST=y
+CONFIG_PCI_LAYERSCAPE=y
# CONFIG_PCI_MESON is not set
CONFIG_PCI_MSI=y
CONFIG_PCI_P2PDMA=y
@@ -4643,6 +4711,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
CONFIG_PER_VMA_LOCK_STATS=y
# CONFIG_PHANTOM is not set
# CONFIG_PHONET is not set
+CONFIG_PHY_AM654_SERDES=m
# CONFIG_PHY_BCM_NS_USB2 is not set
# CONFIG_PHY_BCM_NS_USB3 is not set
# CONFIG_PHY_BCM_SR_PCIE is not set
@@ -4664,9 +4733,10 @@ CONFIG_PHY_FSL_IMX8MQ_USB=m
CONFIG_PHY_HI6220_USB=m
# CONFIG_PHY_HISI_INNO_USB2 is not set
# CONFIG_PHY_HISTB_COMBPHY is not set
+CONFIG_PHY_J721E_WIZ=m
# CONFIG_PHY_LAN966X_SERDES is not set
CONFIG_PHYLIB=y
-CONFIG_PHYLINK=m
+CONFIG_PHYLINK=y
# CONFIG_PHY_MAPPHONE_MDM6600 is not set
# CONFIG_PHY_MIXEL_LVDS_PHY is not set
# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
@@ -4680,6 +4750,7 @@ CONFIG_PHY_NS2_USB_DRD=y
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_PCIE2 is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
@@ -4690,6 +4761,8 @@ CONFIG_PHY_NS2_USB_DRD=y
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
CONFIG_PHY_TEGRA194_P2U=y
CONFIG_PHY_TEGRA_XUSB=m
# CONFIG_PHY_TUSB1210 is not set
@@ -4874,6 +4947,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4893,6 +4967,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_QORIQ=m
CONFIG_PTP_1588_CLOCK=y
@@ -4910,8 +4985,11 @@ CONFIG_PWM_BCM_IPROC=y
# CONFIG_PWM_IMX1 is not set
CONFIG_PWM_IMX27=m
CONFIG_PWM_IMX_TPM=m
+CONFIG_PWM_OMAP_DMTIMER=y
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM_TEGRA=y
+CONFIG_PWM_TIECAP=m
+CONFIG_PWM_TIEHRPWM=m
# CONFIG_PWM_XILINX is not set
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
@@ -5007,6 +5085,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -5054,6 +5133,7 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
@@ -5061,6 +5141,7 @@ CONFIG_REGMAP=y
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
# CONFIG_REGULATOR_ARM_SCMI is not set
+# CONFIG_REGULATOR_AW37503 is not set
CONFIG_REGULATOR_BD718XX=m
# CONFIG_REGULATOR_DA9121 is not set
# CONFIG_REGULATOR_DA9210 is not set
@@ -5084,6 +5165,7 @@ CONFIG_REGULATOR_GPIO=y
CONFIG_REGULATOR_MAX77620=y
CONFIG_REGULATOR_MAX77686=m
# CONFIG_REGULATOR_MAX77826 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8893 is not set
@@ -5102,6 +5184,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
# CONFIG_REGULATOR_RT4801 is not set
@@ -5114,6 +5197,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_RT6245 is not set
# CONFIG_REGULATOR_RTMV20 is not set
# CONFIG_REGULATOR_RTQ2134 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_RTQ6752 is not set
# CONFIG_REGULATOR_SLG51000 is not set
# CONFIG_REGULATOR_SY8106A is not set
@@ -5148,6 +5232,7 @@ CONFIG_RESET_IMX7=y
# CONFIG_RESET_QCOM_PDC is not set
# CONFIG_RESET_SCMI is not set
# CONFIG_RESET_SIMPLE is not set
+CONFIG_RESET_TI_SCI=m
# CONFIG_RESET_TI_SYSCON is not set
# CONFIG_RESET_TI_TPS380X is not set
CONFIG_RESOURCE_KUNIT_TEST=m
@@ -5157,7 +5242,6 @@ CONFIG_RETPOLINE=y
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -5251,6 +5335,7 @@ CONFIG_RTC_DRV_DS3232=m
CONFIG_RTC_DRV_EFI=y
CONFIG_RTC_DRV_EM3027=m
CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_FSL_FTM_ALARM=m
# CONFIG_RTC_DRV_FTRTC010 is not set
# CONFIG_RTC_DRV_GOLDFISH is not set
# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
@@ -5305,6 +5390,7 @@ CONFIG_RTC_DRV_RX8581=m
CONFIG_RTC_DRV_STK17TA8=m
# CONFIG_RTC_DRV_TEGRA is not set
# CONFIG_RTC_DRV_TEST is not set
+CONFIG_RTC_DRV_TI_K3=m
CONFIG_RTC_DRV_V3020=m
CONFIG_RTC_DRV_X1205=m
# CONFIG_RTC_DRV_XGENE is not set
@@ -5528,6 +5614,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5537,6 +5624,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5614,6 +5702,7 @@ CONFIG_SENSORS_G762=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
# CONFIG_SENSORS_I5K_AMB is not set
# CONFIG_SENSORS_IBMAEM is not set
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5795,6 +5884,8 @@ CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_MANY_PORTS=y
CONFIG_SERIAL_8250_MID=y
CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y
+CONFIG_SERIAL_8250_OMAP=y
CONFIG_SERIAL_8250_PCI1XXXX=y
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PERICOM=y
@@ -6115,7 +6206,9 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -6132,7 +6225,6 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -6197,6 +6289,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -6207,6 +6300,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
# CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
@@ -6326,6 +6420,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -6385,6 +6480,7 @@ CONFIG_SND_SOC_SOF_HDA_PROBES=m
# CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set
# CONFIG_SND_SOC_SOF_JASPERLAKE is not set
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
# CONFIG_SND_SOC_SOF_MERRIFIELD is not set
# CONFIG_SND_SOC_SOF_METEORLAKE is not set
# CONFIG_SND_SOC_SOF_OF is not set
@@ -6455,6 +6551,7 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_BUILD=y
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6546,7 +6643,7 @@ CONFIG_SOC_IMX8M=y
CONFIG_SOC_IMX9=m
# CONFIG_SOCIONEXT_SYNQUACER_PREITS is not set
CONFIG_SOC_TEGRA_CBB=m
-# CONFIG_SOC_TI is not set
+CONFIG_SOC_TI=y
CONFIG_SOFTLOCKUP_DETECTOR=y
CONFIG_SOFT_WATCHDOG=m
# CONFIG_SOLARIS_X86_PARTITION is not set
@@ -6586,6 +6683,7 @@ CONFIG_SPI_AMD=y
# CONFIG_SPI_CADENCE_XSPI is not set
CONFIG_SPI_DEBUG=y
# CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_FSL_DSPI=y
CONFIG_SPI_FSL_LPSPI=m
CONFIG_SPI_FSL_QUADSPI=m
# CONFIG_SPI_FSL_SPI is not set
@@ -6604,6 +6702,7 @@ CONFIG_SPI_MEM=y
# CONFIG_SPI_MXIC is not set
CONFIG_SPI_NXP_FLEXSPI=m
# CONFIG_SPI_OC_TINY is not set
+CONFIG_SPI_OMAP24XX=m
CONFIG_SPI_PCI1XXXX=m
CONFIG_SPI_PL022=m
# CONFIG_SPI_PXA2XX is not set
@@ -6705,6 +6804,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
CONFIG_SUSPEND=y
CONFIG_SVC_I3C_MASTER=m
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
# CONFIG_SX9324 is not set
@@ -6823,6 +6923,7 @@ CONFIG_TEST_FPU=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIST_SORT=m
@@ -6899,6 +7000,9 @@ CONFIG_THUNDERX2_PMU=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+CONFIG_TI_K3_RINGACC=y
+CONFIG_TI_K3_UDMA_GLUE_LAYER=y
+CONFIG_TI_K3_UDMA=y
# CONFIG_TI_LMP92064 is not set
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y
@@ -6918,7 +7022,13 @@ CONFIG_TIPC_DIAG=m
CONFIG_TIPC=m
CONFIG_TIPC_MEDIA_IB=y
CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TI_PRUSS=m
+CONFIG_TI_SCI_CLK=m
+# CONFIG_TI_SCI_CLK_PROBE_FROM_FW is not set
+CONFIG_TI_SCI_PM_DOMAINS=m
# CONFIG_TI_ST is not set
+CONFIG_TI_SYSCON_CLK=m
+CONFIG_TI_SYSC=y
# CONFIG_TI_TLC4541 is not set
# CONFIG_TI_TMAG5273 is not set
# CONFIG_TI_TSC2046 is not set
@@ -6931,6 +7041,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -6975,6 +7086,7 @@ CONFIG_TORTURE_TEST=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7140,8 +7252,10 @@ CONFIG_USB_CXACRU=m
CONFIG_USB_DEFAULT_PERSIST=y
# CONFIG_USB_DSBR is not set
# CONFIG_USB_DWC2 is not set
+CONFIG_USB_DWC3_AM62=m
CONFIG_USB_DWC3_IMX8MP=m
# CONFIG_USB_DWC3 is not set
+CONFIG_USB_DWC3_KEYSTONE=m
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_EHCI_FSL is not set
CONFIG_USB_EHCI_HCD_PLATFORM=m
@@ -7425,6 +7539,7 @@ CONFIG_VEXPRESS_CONFIG=y
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=m
# CONFIG_VFIO_AMBA is not set
+CONFIG_VFIO_FSL_MC=m
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
# CONFIG_VFIO_MDEV is not set
@@ -7489,8 +7604,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7789,6 +7908,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config
index 89b2369d1..2f0ffefc4 100644
--- a/kernel-aarch64-rt-rhel.config
+++ b/kernel-aarch64-rt-rhel.config
@@ -215,7 +215,6 @@ CONFIG_AMD_HSMP=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
CONFIG_AMD_PHY=m
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
# CONFIG_AMD_PTDMA is not set
# CONFIG_AMDTEE is not set
# CONFIG_AMD_XGBE_DCB is not set
@@ -249,9 +248,9 @@ CONFIG_ARCH_BCM_IPROC=y
# CONFIG_ARCH_EXYNOS is not set
CONFIG_ARCH_HISI=y
# CONFIG_ARCH_INTEL_SOCFPGA is not set
-# CONFIG_ARCH_K3 is not set
+CONFIG_ARCH_K3=y
# CONFIG_ARCH_KEEMBAY is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
+CONFIG_ARCH_LAYERSCAPE=y
# CONFIG_ARCH_LG1K is not set
# CONFIG_ARCH_MA35 is not set
# CONFIG_ARCH_MEDIATEK is not set
@@ -402,6 +401,7 @@ CONFIG_ARM_SPE_PMU=m
# CONFIG_ARM_TEGRA186_CPUFREQ is not set
CONFIG_ARM_TEGRA194_CPUFREQ=m
CONFIG_ARM_TEGRA_DEVFREQ=m
+CONFIG_ARM_TI_CPUFREQ=y
# CONFIG_AS3935 is not set
# CONFIG_AS73211 is not set
CONFIG_ASN1=y
@@ -920,6 +920,7 @@ CONFIG_CLK_IMX8QXP=y
CONFIG_CLK_IMX8ULP=y
CONFIG_CLK_IMX93=y
CONFIG_CLK_KUNIT_TEST=m
+CONFIG_CLK_LS1028A_PLLDIG=y
# CONFIG_CLK_QORIQ is not set
CONFIG_CLK_SP810=y
CONFIG_CLK_VEXPRESS_OSC=y
@@ -957,6 +958,7 @@ CONFIG_COMMAND_LINE_SIZE=4096
# CONFIG_COMMON_CLK_CS2000_CP is not set
# CONFIG_COMMON_CLK_FIXED_MMIO is not set
# CONFIG_COMMON_CLK_FSL_FLEXSPI is not set
+CONFIG_COMMON_CLK_FSL_SAI=y
CONFIG_COMMON_CLK_HI3516CV300=y
CONFIG_COMMON_CLK_HI3519=y
# CONFIG_COMMON_CLK_HI3559A is not set
@@ -978,6 +980,7 @@ CONFIG_COMMON_CLK_SCPI=m
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
CONFIG_COMMON_CLK_XGENE=y
@@ -998,6 +1001,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1080,8 +1084,8 @@ CONFIG_CRYPTO_AES_ARM64_BS=m
CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
CONFIG_CRYPTO_AES_ARM64_CE=y
-# CONFIG_CRYPTO_AES_ARM64 is not set
CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
+CONFIG_CRYPTO_AES_ARM64=y
CONFIG_CRYPTO_AES_GCM_P10=y
# CONFIG_CRYPTO_AES_TI is not set
CONFIG_CRYPTO_AES=y
@@ -1099,6 +1103,7 @@ CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
@@ -1137,6 +1142,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_PRNG_API=y
CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=3
CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
# CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_TEST is not set
+CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
# CONFIG_CRYPTO_DEV_HISI_HPRE is not set
# CONFIG_CRYPTO_DEV_HISI_SEC2 is not set
CONFIG_CRYPTO_DEV_HISI_SEC=m
@@ -1156,6 +1162,7 @@ CONFIG_CRYPTO_DEV_OCTEONTX2_CPT=m
# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
# CONFIG_CRYPTO_DEV_QCE is not set
# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
+CONFIG_CRYPTO_DEV_SA2UL=m
# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
# CONFIG_CRYPTO_DEV_SAHARA is not set
CONFIG_CRYPTO_DEV_SP_CCP=y
@@ -1207,6 +1214,7 @@ CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_POLY1305_NEON=y
+# CONFIG_CRYPTO_POLY1305_P10 is not set
# CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
@@ -1411,6 +1419,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1433,6 +1442,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1464,6 +1474,7 @@ CONFIG_DP83867_PHY=m
# CONFIG_DP83869_PHY is not set
CONFIG_DP83TC811_PHY=m
# CONFIG_DP83TD510_PHY is not set
+CONFIG_DPAA2_CONSOLE=m
# CONFIG_DPM_WATCHDOG is not set
# CONFIG_DPOT_DAC is not set
# CONFIG_DPS310 is not set
@@ -1555,6 +1566,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MALI_DISPLAY is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1632,6 +1644,7 @@ CONFIG_DRM_SIMPLEDRM=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1809,6 +1822,7 @@ CONFIG_EDAC_DMC520=m
CONFIG_EDAC_GHES=y
CONFIG_EDAC_I10NM=m
CONFIG_EDAC_IGEN6=m
+CONFIG_EDAC_LAYERSCAPE=m
CONFIG_EDAC_LEGACY_SYSFS=y
CONFIG_EDAC_PND2=m
CONFIG_EDAC_SYNOPSYS=m
@@ -1920,6 +1934,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -2007,7 +2022,15 @@ CONFIG_FSCACHE_STATS=y
CONFIG_FS_DAX=y
# CONFIG_FS_ENCRYPTION is not set
# CONFIG_FSI is not set
+# CONFIG_FSL_BMAN_TEST is not set
+CONFIG_FSL_DPAA2_ETH_DCB=y
+CONFIG_FSL_DPAA2_ETH=m
+CONFIG_FSL_DPAA2_PTP_CLOCK=m
+CONFIG_FSL_DPAA2_QDMA=m
CONFIG_FSL_DPAA2_SWITCH=m
+# CONFIG_FSL_DPAA_CHECKING is not set
+CONFIG_FSL_DPAA_ETH=m
+CONFIG_FSL_DPAA=y
# CONFIG_FSL_EDMA is not set
CONFIG_FSL_ENETC_IERB=m
CONFIG_FSL_ENETC=m
@@ -2016,10 +2039,15 @@ CONFIG_FSL_ENETC_PTP_CLOCK=m
CONFIG_FSL_ENETC_QOS=y
CONFIG_FSL_ENETC_VF=m
CONFIG_FSL_ERRATUM_A008585=y
+CONFIG_FSL_FMAN=y
CONFIG_FSL_IMX8_DDR_PMU=m
# CONFIG_FSL_IMX9_DDR_PMU is not set
+CONFIG_FSL_MC_BUS=y
+CONFIG_FSL_MC_DPIO=m
+CONFIG_FSL_MC_UAPI_SUPPORT=y
CONFIG_FSL_PQ_MDIO=m
# CONFIG_FSL_QDMA is not set
+# CONFIG_FSL_QMAN_TEST is not set
# CONFIG_FSL_RCPM is not set
CONFIG_FSL_XGMAC_MDIO=m
CONFIG_FSNOTIFY=y
@@ -2116,6 +2144,8 @@ CONFIG_GNSS=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_DAVINCI=y
+# CONFIG_GPIO_DS4520 is not set
CONFIG_GPIO_DWAPB=m
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -2144,6 +2174,7 @@ CONFIG_GPIO_MLXBF2=m
# CONFIG_GPIO_MLXBF3 is not set
# CONFIG_GPIO_MLXBF is not set
# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_MPC8XXX=y
CONFIG_GPIO_MXC=m
# CONFIG_GPIO_PCA953X_IRQ is not set
# CONFIG_GPIO_PCA953X is not set
@@ -2246,6 +2277,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2402,15 +2434,17 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
CONFIG_HW_RANDOM_CAVIUM=m
# CONFIG_HW_RANDOM_CCTRNG is not set
CONFIG_HW_RANDOM_CN10K=m
-CONFIG_HW_RANDOM_HISI=y
+CONFIG_HW_RANDOM_HISI=m
# CONFIG_HW_RANDOM_HISTB is not set
# CONFIG_HW_RANDOM_IPROC_RNG200 is not set
+CONFIG_HW_RANDOM_OMAP=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
CONFIG_HW_RANDOM_TPM=y
CONFIG_HW_RANDOM_VIRTIO=y
CONFIG_HW_RANDOM_XGENE=m
# CONFIG_HW_RANDOM_XIPHERA is not set
CONFIG_HW_RANDOM=y
+CONFIG_HWSPINLOCK_OMAP=m
# CONFIG_HWSPINLOCK_QCOM is not set
CONFIG_HWSPINLOCK=y
# CONFIG_HX711 is not set
@@ -2440,6 +2474,7 @@ CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_AMD_MP2 is not set
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_BCM_IPROC is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
@@ -2486,6 +2521,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NOMADIK is not set
# CONFIG_I2C_NVIDIA_GPU is not set
# CONFIG_I2C_OCORES is not set
+CONFIG_I2C_OMAP=m
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PCI1XXXX is not set
# CONFIG_I2C_PIIX4 is not set
@@ -2689,7 +2725,7 @@ CONFIG_INPUT_APANEL=m
# CONFIG_INPUT_ATI_REMOTE2 is not set
CONFIG_INPUT_ATLAS_BTNS=m
# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
-# CONFIG_INPUT_BBNSM_PWRKEY is not set
+CONFIG_INPUT_BBNSM_PWRKEY=m
# CONFIG_INPUT_BMA150 is not set
# CONFIG_INPUT_CM109 is not set
# CONFIG_INPUT_CMA3000 is not set
@@ -2783,6 +2819,7 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_TCC_COOLING is not set
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_VSC is not set
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
CONFIG_INTEL_XWAY_PHY=m
@@ -2817,7 +2854,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2903,6 +2940,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2979,6 +3017,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -3034,6 +3073,8 @@ CONFIG_JOLIET=y
# CONFIG_JSA1212 is not set
CONFIG_JUMP_LABEL=y
# CONFIG_K3_DMA is not set
+CONFIG_K3_RTI_WATCHDOG=m
+CONFIG_K3_THERMAL=m
CONFIG_KALLSYMS_ALL=y
CONFIG_KALLSYMS_BASE_RELATIVE=y
# CONFIG_KALLSYMS_SELFTEST is not set
@@ -3122,13 +3163,15 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD_SEV=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
# CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set
+# CONFIG_KVM_PROVE_MMU is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
# CONFIG_KVM_XEN is not set
@@ -3201,6 +3244,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
@@ -3342,9 +3386,11 @@ CONFIG_MAILBOX=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
CONFIG_MARVELL_CN10K_DDR_PMU=m
CONFIG_MARVELL_CN10K_TAD_PMU=m
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3386,9 +3432,11 @@ CONFIG_MAX_SKB_FRAGS=17
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
# CONFIG_MDIO_BCM_IPROC is not set
@@ -3450,6 +3498,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3484,6 +3533,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3635,6 +3686,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3877,6 +3929,9 @@ CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTK_T7XX=m
CONFIG_MULTIUSER=y
+CONFIG_MUX_ADG792A=m
+# CONFIG_MUX_ADGS1408 is not set
+CONFIG_MUX_GPIO=m
# CONFIG_MVMDIO is not set
# CONFIG_MV_XOR_V2 is not set
# CONFIG_MWAVE is not set
@@ -3936,6 +3991,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4364,6 +4420,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4411,9 +4468,11 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_IMX_IIM is not set
# CONFIG_NVMEM_IMX_OCOTP_ELE is not set
CONFIG_NVMEM_IMX_OCOTP=m
+CONFIG_NVMEM_LAYERSCAPE_SFP=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
# CONFIG_NVMEM_SNVS_LPGPR is not set
@@ -4449,6 +4508,11 @@ CONFIG_OF_MDIO=y
CONFIG_OF_PMEM=m
# CONFIG_OF_UNITTEST is not set
CONFIG_OF=y
+CONFIG_OMAP2PLUS_MBOX=m
+CONFIG_OMAP_DM_TIMER=y
+# CONFIG_OMAP_GPMC is not set
+CONFIG_OMAP_MBOX_KFIFO_SIZE=256
+CONFIG_OMAP_USB2=m
# CONFIG_OMFS_FS is not set
# CONFIG_OPAL_CORE is not set
# CONFIG_OPEN_DICE is not set
@@ -4463,6 +4527,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
# CONFIG_OSF_PARTITION is not set
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4541,6 +4606,7 @@ CONFIG_PCC=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_AL is not set
@@ -4588,6 +4654,8 @@ CONFIG_PCI_IMX6_HOST=y
CONFIG_PCI_IMX6=y
CONFIG_PCI_IOV=y
# CONFIG_PCI_J721E_HOST is not set
+CONFIG_PCI_KEYSTONE_HOST=y
+CONFIG_PCI_LAYERSCAPE=y
# CONFIG_PCI_MESON is not set
CONFIG_PCI_MSI=y
CONFIG_PCI_P2PDMA=y
@@ -4620,6 +4688,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
CONFIG_PER_VMA_LOCK_STATS=y
# CONFIG_PHANTOM is not set
# CONFIG_PHONET is not set
+CONFIG_PHY_AM654_SERDES=m
# CONFIG_PHY_BCM_NS_USB2 is not set
# CONFIG_PHY_BCM_NS_USB3 is not set
# CONFIG_PHY_BCM_SR_PCIE is not set
@@ -4641,9 +4710,10 @@ CONFIG_PHY_FSL_IMX8MQ_USB=m
CONFIG_PHY_HI6220_USB=m
# CONFIG_PHY_HISI_INNO_USB2 is not set
# CONFIG_PHY_HISTB_COMBPHY is not set
+CONFIG_PHY_J721E_WIZ=m
# CONFIG_PHY_LAN966X_SERDES is not set
CONFIG_PHYLIB=y
-CONFIG_PHYLINK=m
+CONFIG_PHYLINK=y
# CONFIG_PHY_MAPPHONE_MDM6600 is not set
# CONFIG_PHY_MIXEL_LVDS_PHY is not set
# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
@@ -4657,6 +4727,7 @@ CONFIG_PHY_NS2_USB_DRD=y
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_PCIE2 is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
@@ -4667,6 +4738,8 @@ CONFIG_PHY_NS2_USB_DRD=y
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
CONFIG_PHY_TEGRA194_P2U=y
CONFIG_PHY_TEGRA_XUSB=m
# CONFIG_PHY_TUSB1210 is not set
@@ -4851,6 +4924,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4870,6 +4944,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_QORIQ=m
CONFIG_PTP_1588_CLOCK=y
@@ -4887,8 +4962,11 @@ CONFIG_PWM_BCM_IPROC=y
# CONFIG_PWM_IMX1 is not set
CONFIG_PWM_IMX27=m
CONFIG_PWM_IMX_TPM=m
+CONFIG_PWM_OMAP_DMTIMER=y
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM_TEGRA=y
+CONFIG_PWM_TIECAP=m
+CONFIG_PWM_TIEHRPWM=m
# CONFIG_PWM_XILINX is not set
CONFIG_PWM=y
# CONFIG_PWRSEQ_EMMC is not set
@@ -4984,6 +5062,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -5031,6 +5110,7 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
@@ -5038,6 +5118,7 @@ CONFIG_REGMAP=y
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
# CONFIG_REGULATOR_ARM_SCMI is not set
+# CONFIG_REGULATOR_AW37503 is not set
CONFIG_REGULATOR_BD718XX=m
# CONFIG_REGULATOR_DA9121 is not set
# CONFIG_REGULATOR_DA9210 is not set
@@ -5061,6 +5142,7 @@ CONFIG_REGULATOR_GPIO=y
CONFIG_REGULATOR_MAX77620=y
CONFIG_REGULATOR_MAX77686=m
# CONFIG_REGULATOR_MAX77826 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8893 is not set
@@ -5079,6 +5161,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
# CONFIG_REGULATOR_RT4801 is not set
@@ -5091,6 +5174,7 @@ CONFIG_REGULATOR_PFUZE100=m
# CONFIG_REGULATOR_RT6245 is not set
# CONFIG_REGULATOR_RTMV20 is not set
# CONFIG_REGULATOR_RTQ2134 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_RTQ6752 is not set
# CONFIG_REGULATOR_SLG51000 is not set
# CONFIG_REGULATOR_SY8106A is not set
@@ -5125,6 +5209,7 @@ CONFIG_RESET_IMX7=y
# CONFIG_RESET_QCOM_PDC is not set
# CONFIG_RESET_SCMI is not set
# CONFIG_RESET_SIMPLE is not set
+CONFIG_RESET_TI_SCI=m
# CONFIG_RESET_TI_SYSCON is not set
# CONFIG_RESET_TI_TPS380X is not set
CONFIG_RESOURCE_KUNIT_TEST=m
@@ -5134,7 +5219,6 @@ CONFIG_RETPOLINE=y
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -5228,6 +5312,7 @@ CONFIG_RTC_DRV_DS3232=m
CONFIG_RTC_DRV_EFI=y
CONFIG_RTC_DRV_EM3027=m
CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_FSL_FTM_ALARM=m
# CONFIG_RTC_DRV_FTRTC010 is not set
# CONFIG_RTC_DRV_GOLDFISH is not set
# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
@@ -5282,6 +5367,7 @@ CONFIG_RTC_DRV_RX8581=m
CONFIG_RTC_DRV_STK17TA8=m
# CONFIG_RTC_DRV_TEGRA is not set
# CONFIG_RTC_DRV_TEST is not set
+CONFIG_RTC_DRV_TI_K3=m
CONFIG_RTC_DRV_V3020=m
CONFIG_RTC_DRV_X1205=m
# CONFIG_RTC_DRV_XGENE is not set
@@ -5505,6 +5591,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5514,6 +5601,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5591,6 +5679,7 @@ CONFIG_SENSORS_G762=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
# CONFIG_SENSORS_I5K_AMB is not set
# CONFIG_SENSORS_IBMAEM is not set
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5772,6 +5861,8 @@ CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_MANY_PORTS=y
CONFIG_SERIAL_8250_MID=y
CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y
+CONFIG_SERIAL_8250_OMAP=y
CONFIG_SERIAL_8250_PCI1XXXX=y
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PERICOM=y
@@ -6091,7 +6182,9 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -6108,7 +6201,6 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -6173,6 +6265,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -6183,6 +6276,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
# CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
@@ -6302,6 +6396,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -6360,6 +6455,7 @@ CONFIG_SND_SOC_SOF_ACPI=m
# CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set
# CONFIG_SND_SOC_SOF_JASPERLAKE is not set
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
# CONFIG_SND_SOC_SOF_MERRIFIELD is not set
# CONFIG_SND_SOC_SOF_METEORLAKE is not set
# CONFIG_SND_SOC_SOF_OF is not set
@@ -6430,6 +6526,7 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6521,7 +6618,7 @@ CONFIG_SOC_IMX8M=y
CONFIG_SOC_IMX9=m
# CONFIG_SOCIONEXT_SYNQUACER_PREITS is not set
CONFIG_SOC_TEGRA_CBB=m
-# CONFIG_SOC_TI is not set
+CONFIG_SOC_TI=y
CONFIG_SOFTLOCKUP_DETECTOR=y
CONFIG_SOFT_WATCHDOG=m
# CONFIG_SOLARIS_X86_PARTITION is not set
@@ -6561,6 +6658,7 @@ CONFIG_SPI_AMD=y
# CONFIG_SPI_CADENCE_XSPI is not set
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_FSL_DSPI=y
CONFIG_SPI_FSL_LPSPI=m
CONFIG_SPI_FSL_QUADSPI=m
# CONFIG_SPI_FSL_SPI is not set
@@ -6579,6 +6677,7 @@ CONFIG_SPI_MEM=y
# CONFIG_SPI_MXIC is not set
CONFIG_SPI_NXP_FLEXSPI=m
# CONFIG_SPI_OC_TINY is not set
+CONFIG_SPI_OMAP24XX=m
CONFIG_SPI_PCI1XXXX=m
CONFIG_SPI_PL022=m
# CONFIG_SPI_PXA2XX is not set
@@ -6680,6 +6779,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
CONFIG_SUSPEND=y
CONFIG_SVC_I3C_MASTER=m
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
# CONFIG_SX9324 is not set
@@ -6798,6 +6898,7 @@ CONFIG_TEST_CPUMASK=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
@@ -6874,6 +6975,9 @@ CONFIG_THUNDERX2_PMU=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+CONFIG_TI_K3_RINGACC=y
+CONFIG_TI_K3_UDMA_GLUE_LAYER=y
+CONFIG_TI_K3_UDMA=y
# CONFIG_TI_LMP92064 is not set
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y
@@ -6893,7 +6997,13 @@ CONFIG_TIPC_DIAG=m
CONFIG_TIPC=m
CONFIG_TIPC_MEDIA_IB=y
CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TI_PRUSS=m
+CONFIG_TI_SCI_CLK=m
+# CONFIG_TI_SCI_CLK_PROBE_FROM_FW is not set
+CONFIG_TI_SCI_PM_DOMAINS=m
# CONFIG_TI_ST is not set
+CONFIG_TI_SYSCON_CLK=m
+CONFIG_TI_SYSC=y
# CONFIG_TI_TLC4541 is not set
# CONFIG_TI_TMAG5273 is not set
# CONFIG_TI_TSC2046 is not set
@@ -6906,6 +7016,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -6950,6 +7061,7 @@ CONFIG_TORTURE_TEST=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7115,8 +7227,10 @@ CONFIG_USB_CXACRU=m
CONFIG_USB_DEFAULT_PERSIST=y
# CONFIG_USB_DSBR is not set
# CONFIG_USB_DWC2 is not set
+CONFIG_USB_DWC3_AM62=m
CONFIG_USB_DWC3_IMX8MP=m
# CONFIG_USB_DWC3 is not set
+CONFIG_USB_DWC3_KEYSTONE=m
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_EHCI_FSL is not set
CONFIG_USB_EHCI_HCD_PLATFORM=m
@@ -7400,6 +7514,7 @@ CONFIG_VEXPRESS_CONFIG=y
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=m
# CONFIG_VFIO_AMBA is not set
+CONFIG_VFIO_FSL_MC=m
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
# CONFIG_VFIO_MDEV is not set
@@ -7464,8 +7579,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7764,6 +7883,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index b6dce9017..f8ce74b42 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -136,6 +136,7 @@ CONFIG_AD7949=m
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
CONFIG_ADAPTEC_STARFIRE=m
+# CONFIG_ADDRESS_MASKING is not set
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -952,6 +953,7 @@ CONFIG_COMMON_CLK_SI521XX=y
# CONFIG_COMMON_CLK_SI5351 is not set
CONFIG_COMMON_CLK_SI544=m
# CONFIG_COMMON_CLK_SI570 is not set
+CONFIG_COMMON_CLK_VC3=m
# CONFIG_COMMON_CLK_VC5 is not set
CONFIG_COMMON_CLK_VC7=m
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -968,6 +970,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=3
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1007,6 +1010,8 @@ CONFIG_CPUSETS=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -1056,6 +1061,7 @@ CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32C_VPMSUM=m
@@ -1144,6 +1150,7 @@ CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
+# CONFIG_CRYPTO_POLY1305_P10 is not set
CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y
@@ -1353,6 +1360,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1377,6 +1385,7 @@ CONFIG_DM_INIT=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=y
@@ -1488,6 +1497,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
CONFIG_DRM_LONTIUM_LT9611UXC=m
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
CONFIG_DRM_MGAG200=m
@@ -1574,11 +1584,13 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
+CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m
# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
# CONFIG_DRM_PANEL_TPO_TPG110 is not set
# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+CONFIG_DRM_PANEL_VISIONOX_R66451=m
CONFIG_DRM_PANEL_VISIONOX_RM69299=m
# CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set
CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
@@ -1615,6 +1627,7 @@ CONFIG_DRM_TOSHIBA_TC358764=m
# CONFIG_DRM_TOSHIBA_TC358767 is not set
CONFIG_DRM_TOSHIBA_TC358768=m
CONFIG_DRM_TOSHIBA_TC358775=m
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1797,6 +1810,7 @@ CONFIG_EROFS_FS=m
CONFIG_EROFS_FS_POSIX_ACL=y
CONFIG_EROFS_FS_SECURITY=y
CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP_DEFLATE=y
CONFIG_EROFS_FS_ZIP_LZMA=y
CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
@@ -1884,6 +1898,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1996,6 +2011,7 @@ CONFIG_FSI=m
CONFIG_FSI_MASTER_ASPEED=m
CONFIG_FSI_MASTER_GPIO=m
CONFIG_FSI_MASTER_HUB=m
+# CONFIG_FSI_MASTER_I2CR is not set
# CONFIG_FSI_NEW_DEV_NODE is not set
CONFIG_FSI_OCC=m
CONFIG_FSI_SBEFIFO=m
@@ -2105,6 +2121,7 @@ CONFIG_GPIO_CADENCE=m
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_DS4520=m
# CONFIG_GPIO_DWAPB is not set
CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_FTGPIO010 is not set
@@ -2219,6 +2236,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
CONFIG_HID_GLORIOUS=m
# CONFIG_HID_GOOGLE_HAMMER is not set
+CONFIG_HID_GOOGLE_STADIA_FF=m
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2413,6 +2431,7 @@ CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_AMD8111 is not set
CONFIG_I2C_AMD_MP2=m
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+CONFIG_I2C_ATR=m
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
@@ -2767,6 +2786,7 @@ CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
CONFIG_IOSM=m
CONFIG_IO_STRICT_DEVMEM=y
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2855,6 +2875,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+CONFIG_IPU_BRIDGE=m
CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_IOAM6_LWTUNNEL=y
@@ -2931,6 +2952,7 @@ CONFIG_IR_RC6_DECODER=m
CONFIG_IR_RCMM_DECODER=m
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
CONFIG_IR_SERIAL=m
CONFIG_IR_SERIAL_TRANSMITTER=y
CONFIG_IR_SHARP_DECODER=m
@@ -3134,7 +3156,7 @@ CONFIG_KSM=y
CONFIG_KSZ884X_PCI=m
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
@@ -3146,6 +3168,7 @@ CONFIG_KVM_BOOK3S_HV_NESTED_PMU_WORKAROUND=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
# CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set
CONFIG_KVM_GUEST=y
+CONFIG_KVM_PROVE_MMU=y
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
CONFIG_KVM_XEN=y
@@ -3199,6 +3222,7 @@ CONFIG_LEDS_CR0014114=m
# CONFIG_LEDS_DAC124S085 is not set
# CONFIG_LEDS_EL15203000 is not set
CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GROUP_MULTICOLOR=m
# CONFIG_LEDS_IS31FL319X is not set
CONFIG_LEDS_IS31FL32XX=m
# CONFIG_LEDS_KTD2692 is not set
@@ -3226,6 +3250,7 @@ CONFIG_LEDS_PCA9532_GPIO=y
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+CONFIG_LEDS_PCA995X=m
CONFIG_LEDS_POWERNV=m
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_PWM_MULTICOLOR=m
@@ -3378,6 +3403,7 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88Q2XXX_PHY=m
CONFIG_MARVELL_88X2222_PHY=m
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
@@ -3421,11 +3447,13 @@ CONFIG_MCP41010=m
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+CONFIG_MCP4728=m
# CONFIG_MCP4922 is not set
CONFIG_MCTP_SERIAL=m
# CONFIG_MCTP_TRANSPORT_I2C is not set
CONFIG_MCTP=y
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3524,6 +3552,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=m
# CONFIG_MFD_CPCAP is not set
+CONFIG_MFD_CS42L43_I2C=m
+CONFIG_MFD_CS42L43_SDW=m
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
@@ -3675,6 +3705,7 @@ CONFIG_MLX5_ESWITCH=y
# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -4002,6 +4033,7 @@ CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4513,6 +4545,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4605,6 +4638,7 @@ CONFIG_ORINOCO_USB=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4690,6 +4724,7 @@ CONFIG_PATA_WINBOND=m
# CONFIG_PCH_GBE is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -4745,6 +4780,7 @@ CONFIG_PCS_XPCS=m
CONFIG_PDC_ADMA=m
CONFIG_PDS_CORE=m
CONFIG_PDS_VDPA=m
+CONFIG_PDS_VFIO_PCI=m
# CONFIG_PECI is not set
CONFIG_PERCPU_STATS=y
# CONFIG_PERCPU_TEST is not set
@@ -4782,6 +4818,8 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+CONFIG_PHY_RTK_RTD_USB2PHY=m
+CONFIG_PHY_RTK_RTD_USB3PHY=m
# CONFIG_PHY_TUSB1210 is not set
# CONFIG_PI433 is not set
CONFIG_PID_NS=y
@@ -4789,6 +4827,7 @@ CONFIG_PID_NS=y
CONFIG_PINCTRL_ALDERLAKE=m
# CONFIG_PINCTRL_CANNONLAKE is not set
CONFIG_PINCTRL_CEDARFORK=m
+CONFIG_PINCTRL_CS42L43=m
CONFIG_PINCTRL_CY8C95X0=m
CONFIG_PINCTRL_ELKHARTLAKE=m
CONFIG_PINCTRL_EMMITSBURG=m
@@ -4816,6 +4855,7 @@ CONFIG_PINCTRL_RK805=m
# CONFIG_PINCTRL_SM8150 is not set
# CONFIG_PINCTRL_SM8250 is not set
# CONFIG_PINCTRL_SM8350 is not set
+CONFIG_PINCTRL_SM8350_LPASS_LPI=m
# CONFIG_PINCTRL_SM8450 is not set
# CONFIG_PINCTRL_STMFX is not set
# CONFIG_PINCTRL_SUN4I_A10 is not set
@@ -5002,6 +5042,7 @@ CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
CONFIG_PSTORE_842_COMPRESS=y
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -5023,6 +5064,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
CONFIG_PTP_1588_CLOCK_IDTCM=m
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_PTP_1588_CLOCK=y
@@ -5104,6 +5146,7 @@ CONFIG_RANDOM32_SELFTEST=y
CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -5163,12 +5206,14 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=y
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
+CONFIG_REGULATOR_AW37503=m
CONFIG_REGULATOR_BD9571MWV=m
# CONFIG_REGULATOR_DA9121 is not set
# CONFIG_REGULATOR_DA9210 is not set
@@ -5189,9 +5234,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_MAX1586 is not set
# CONFIG_REGULATOR_MAX20086 is not set
CONFIG_REGULATOR_MAX20411=m
+CONFIG_REGULATOR_MAX5970=m
CONFIG_REGULATOR_MAX597X=m
CONFIG_REGULATOR_MAX77650=m
# CONFIG_REGULATOR_MAX77826 is not set
+CONFIG_REGULATOR_MAX77857=m
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
CONFIG_REGULATOR_MAX8893=m
@@ -5224,6 +5271,7 @@ CONFIG_REGULATOR_RT6190=m
CONFIG_REGULATOR_RT6245=m
CONFIG_REGULATOR_RTMV20=m
CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTQ2208=m
CONFIG_REGULATOR_RTQ6752=m
# CONFIG_REGULATOR_SLG51000 is not set
CONFIG_REGULATOR_SY7636A=m
@@ -5269,8 +5317,7 @@ CONFIG_RESOURCE_KUNIT_TEST=m
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-# CONFIG_RH_DISABLE_DEPRECATED is not set
-CONFIG_RH_FEDORA=y
+# CONFIG_RHEL_DIFFERENCES is not set
CONFIG_RICHTEK_RTQ6056=m
CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
@@ -5678,6 +5725,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5753,6 +5801,7 @@ CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
CONFIG_SENSORS_HP_WMI=m
+CONFIG_SENSORS_HS3001=m
# CONFIG_SENSORS_I5K_AMB is not set
CONFIG_SENSORS_IBMAEM=m
CONFIG_SENSORS_IBM_CFFPS=m
@@ -5840,6 +5889,7 @@ CONFIG_SENSORS_MCP3021=m
CONFIG_SENSORS_MLXREG_FAN=m
CONFIG_SENSORS_MP2888=m
CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_MP2975_REGULATOR=y
CONFIG_SENSORS_MP5023=m
CONFIG_SENSORS_MPQ7932=m
CONFIG_SENSORS_MPQ7932_REGULATOR=y
@@ -6148,6 +6198,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=2048
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
# CONFIG_SND_HDA_TEGRA is not set
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -6261,7 +6314,9 @@ CONFIG_SND_SOC_AK5558=m
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+CONFIG_SND_SOC_AUDIO_IIO_AUX=m
CONFIG_SND_SOC_AW8738=m
+CONFIG_SND_SOC_AW88261=m
CONFIG_SND_SOC_AW88395=m
CONFIG_SND_SOC_BD28623=m
CONFIG_SND_SOC_BT_SCO=m
@@ -6278,7 +6333,6 @@ CONFIG_SND_SOC_CS35L36=m
CONFIG_SND_SOC_CS35L45_I2C=m
CONFIG_SND_SOC_CS35L45_SPI=m
CONFIG_SND_SOC_CS35L56_I2C=m
-CONFIG_SND_SOC_CS35L56_SDW=m
CONFIG_SND_SOC_CS35L56_SPI=m
CONFIG_SND_SOC_CS4234=m
# CONFIG_SND_SOC_CS4265 is not set
@@ -6287,6 +6341,8 @@ CONFIG_SND_SOC_CS4234=m
# CONFIG_SND_SOC_CS4271_SPI is not set
CONFIG_SND_SOC_CS42L42=m
CONFIG_SND_SOC_CS42L42_SDW=m
+CONFIG_SND_SOC_CS42L43=m
+CONFIG_SND_SOC_CS42L43_SDW=m
# CONFIG_SND_SOC_CS42L51_I2C is not set
# CONFIG_SND_SOC_CS42L52 is not set
# CONFIG_SND_SOC_CS42L56 is not set
@@ -6472,6 +6528,7 @@ CONFIG_SND_SOC_RL6231=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+CONFIG_SND_SOC_RT1017_SDCA_SDW=m
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -6603,6 +6660,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6730,6 +6788,7 @@ CONFIG_SPI_AX88796C=m
# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_CADENCE_QUADSPI is not set
# CONFIG_SPI_CADENCE_XSPI is not set
+# CONFIG_SPI_CS42L43 is not set
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
CONFIG_SPI_DLN2=m
@@ -6861,6 +6920,7 @@ CONFIG_SUSPEND_FREEZER=y
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_SWIOTLB=y
# CONFIG_SW_SYNC is not set
CONFIG_SX9310=m
@@ -6971,6 +7031,7 @@ CONFIG_TEST_FPU=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIST_SORT=m
@@ -7046,6 +7107,8 @@ CONFIG_TIFM_7XX1=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+# CONFIG_TI_ICSSG_PRUETH is not set
+CONFIG_TI_ICSS_IEP=m
CONFIG_TI_LMP92064=m
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y
@@ -7078,6 +7141,7 @@ CONFIG_TLS=m
CONFIG_TMP117=m
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_QUOTA=y
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -7124,6 +7188,7 @@ CONFIG_TOUCHSCREEN_IMAGIS=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_IQS7211=m
# CONFIG_TOUCHSCREEN_MAX11801 is not set
CONFIG_TOUCHSCREEN_MCS5000=m
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7322,6 +7387,7 @@ CONFIG_USB_CHIPIDEA_IMX=m
# CONFIG_USB_CHIPIDEA is not set
CONFIG_USB_CHIPIDEA_MSM=m
CONFIG_USB_CHIPIDEA_PCI=m
+CONFIG_USB_CONFIGFS_F_MIDI2=y
# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
# CONFIG_USB_CONN_GPIO is not set
CONFIG_USB_CXACRU=m
@@ -7658,6 +7724,8 @@ CONFIG_VETH=m
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=m
CONFIG_VFIO_CONTAINER=y
+# CONFIG_VFIO_DEVICE_CDEV is not set
+CONFIG_VFIO_GROUP=y
# CONFIG_VFIO_IOMMU_TYPE1 is not set
CONFIG_VFIO=m
CONFIG_VFIO_MDEV=m
@@ -7726,8 +7794,12 @@ CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_DS90UB913=m
+CONFIG_VIDEO_DS90UB953=m
+CONFIG_VIDEO_DS90UB960=m
# CONFIG_VIDEO_DT3155 is not set
CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9719=m
CONFIG_VIDEO_DW9768=m
CONFIG_VIDEO_DW9807_VCM=m
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -8067,6 +8139,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
+CONFIG_XEN_PRIVCMD_IRQFD=y
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_PVHVM_GUEST=y
@@ -8084,6 +8157,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 0fdc7a988..515b48780 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -206,7 +206,6 @@ CONFIG_AMD_HSMP=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
CONFIG_AMD_PHY=m
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
# CONFIG_AMD_PTDMA is not set
# CONFIG_AMDTEE is not set
# CONFIG_AMIGA_PARTITION is not set
@@ -812,6 +811,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -829,6 +829,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -911,6 +912,7 @@ CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
@@ -1000,6 +1002,7 @@ CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
+# CONFIG_CRYPTO_POLY1305_P10 is not set
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y
@@ -1206,6 +1209,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1228,6 +1232,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1348,6 +1353,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MALI_DISPLAY is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1421,6 +1427,7 @@ CONFIG_DRM_SIMPLEDRM=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1669,6 +1676,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1855,6 +1863,7 @@ CONFIG_GNSS=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+# CONFIG_GPIO_DS4520 is not set
# CONFIG_GPIO_DWAPB is not set
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -1975,6 +1984,7 @@ CONFIG_HID_GENERIC=y
# CONFIG_HID_GFRM is not set
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
# CONFIG_HID_GT683R is not set
CONFIG_HID_GYRATION=m
@@ -2126,7 +2136,6 @@ CONFIG_HWPOISON_INJECT=m
CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
# CONFIG_HW_RANDOM_BA431 is not set
# CONFIG_HW_RANDOM_CCTRNG is not set
-CONFIG_HW_RANDOM_HISI=y
# CONFIG_HW_RANDOM_HISTB is not set
CONFIG_HW_RANDOM_POWERNV=m
CONFIG_HW_RANDOM_PSERIES=m
@@ -2163,6 +2172,7 @@ CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_AMD_MP2 is not set
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
@@ -2478,6 +2488,7 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_TCC_COOLING is not set
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_VSC is not set
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
CONFIG_INTEL_XWAY_PHY=m
@@ -2507,7 +2518,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2594,6 +2605,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2671,6 +2683,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -2816,10 +2829,11 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD_SEV=y
CONFIG_KVM_BOOK3S_64_HV=m
CONFIG_KVM_BOOK3S_64=m
@@ -2830,6 +2844,7 @@ CONFIG_KVM_BOOK3S_HV_NESTED_PMU_WORKAROUND=y
# CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set
CONFIG_KVM_BOOK3S_PR_POSSIBLE=y
CONFIG_KVM_GUEST=y
+CONFIG_KVM_PROVE_MMU=y
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
# CONFIG_KVM_XEN is not set
@@ -2903,6 +2918,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
CONFIG_LEDS_POWERNV=m
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
@@ -3045,7 +3061,9 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3085,9 +3103,11 @@ CONFIG_MAX_SKB_FRAGS=17
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3141,6 +3161,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3175,6 +3196,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3321,6 +3344,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3604,6 +3628,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4024,6 +4049,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4070,6 +4096,7 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
CONFIG_NVMEM_SYSFS=y
@@ -4114,6 +4141,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+CONFIG_OVERLAY_FS_DEBUG=y
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4190,6 +4218,7 @@ CONFIG_PATA_PLATFORM=m
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -4281,6 +4310,7 @@ CONFIG_PHYLIB=y
# CONFIG_PHY_QCOM_EUSB2_REPEATER is not set
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
# CONFIG_PHY_QCOM_SGMII_ETH is not set
@@ -4290,6 +4320,8 @@ CONFIG_PHYLIB=y
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
CONFIG_PHYSICAL_ALIGN=0x200000
# CONFIG_PHY_TUSB1210 is not set
# CONFIG_PI433 is not set
@@ -4487,6 +4519,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4505,6 +4538,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK=y
# CONFIG_PUNIT_ATOM_DEBUG is not set
@@ -4599,6 +4633,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -4643,12 +4678,14 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
+# CONFIG_REGULATOR_AW37503 is not set
# CONFIG_REGULATOR_DA9210 is not set
# CONFIG_REGULATOR_DA9211 is not set
# CONFIG_REGULATOR_DEBUG is not set
@@ -4665,6 +4702,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_LTC3589 is not set
# CONFIG_REGULATOR_LTC3676 is not set
# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8952 is not set
@@ -4677,9 +4715,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RT4803 is not set
# CONFIG_REGULATOR_RT5739 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_SY8106A is not set
# CONFIG_REGULATOR_TPS51632 is not set
# CONFIG_REGULATOR_TPS62360 is not set
@@ -4713,7 +4753,6 @@ CONFIG_RETPOLINE=y
# CONFIG_RFKILL_GPIO is not set
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -5081,6 +5120,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5090,6 +5130,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5165,6 +5206,7 @@ CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
# CONFIG_SENSORS_I5K_AMB is not set
CONFIG_SENSORS_IBMAEM=m
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5655,7 +5697,9 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -5672,7 +5716,6 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -5737,6 +5780,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -5747,6 +5791,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
# CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
@@ -5866,6 +5911,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -5925,6 +5971,7 @@ CONFIG_SND_SOC_SOF_HDA_PROBES=m
# CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set
# CONFIG_SND_SOC_SOF_JASPERLAKE is not set
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
# CONFIG_SND_SOC_SOF_MERRIFIELD is not set
# CONFIG_SND_SOC_SOF_METEORLAKE is not set
# CONFIG_SND_SOC_SOF_OF is not set
@@ -5995,6 +6042,7 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_BUILD=y
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6217,6 +6265,7 @@ CONFIG_SUSPEND_FREEZER=y
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
# CONFIG_SX9324 is not set
@@ -6323,6 +6372,7 @@ CONFIG_TEST_FPU=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIST_SORT=m
@@ -6428,6 +6478,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -6473,6 +6524,7 @@ CONFIG_TORTURE_TEST=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -6976,8 +7028,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7275,6 +7331,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index a30f566e8..47ffcd797 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -136,6 +136,7 @@ CONFIG_AD7949=m
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
CONFIG_ADAPTEC_STARFIRE=m
+# CONFIG_ADDRESS_MASKING is not set
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -950,6 +951,7 @@ CONFIG_COMMON_CLK_SI521XX=y
# CONFIG_COMMON_CLK_SI5351 is not set
CONFIG_COMMON_CLK_SI544=m
# CONFIG_COMMON_CLK_SI570 is not set
+CONFIG_COMMON_CLK_VC3=m
# CONFIG_COMMON_CLK_VC5 is not set
CONFIG_COMMON_CLK_VC7=m
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -966,6 +968,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=3
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1005,6 +1008,8 @@ CONFIG_CPUSETS=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -1054,6 +1059,7 @@ CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32C_VPMSUM=m
@@ -1142,6 +1148,7 @@ CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
+# CONFIG_CRYPTO_POLY1305_P10 is not set
CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y
@@ -1342,6 +1349,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1366,6 +1374,7 @@ CONFIG_DM_INIT=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=y
@@ -1477,6 +1486,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
CONFIG_DRM_LONTIUM_LT9611UXC=m
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
CONFIG_DRM_MGAG200=m
@@ -1563,11 +1573,13 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
+CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m
# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
# CONFIG_DRM_PANEL_TPO_TPG110 is not set
# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+CONFIG_DRM_PANEL_VISIONOX_R66451=m
CONFIG_DRM_PANEL_VISIONOX_RM69299=m
# CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set
CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
@@ -1604,6 +1616,7 @@ CONFIG_DRM_TOSHIBA_TC358764=m
# CONFIG_DRM_TOSHIBA_TC358767 is not set
CONFIG_DRM_TOSHIBA_TC358768=m
CONFIG_DRM_TOSHIBA_TC358775=m
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1786,6 +1799,7 @@ CONFIG_EROFS_FS=m
CONFIG_EROFS_FS_POSIX_ACL=y
CONFIG_EROFS_FS_SECURITY=y
CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP_DEFLATE=y
CONFIG_EROFS_FS_ZIP_LZMA=y
CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
@@ -1865,6 +1879,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1977,6 +1992,7 @@ CONFIG_FSI=m
CONFIG_FSI_MASTER_ASPEED=m
CONFIG_FSI_MASTER_GPIO=m
CONFIG_FSI_MASTER_HUB=m
+# CONFIG_FSI_MASTER_I2CR is not set
# CONFIG_FSI_NEW_DEV_NODE is not set
CONFIG_FSI_OCC=m
CONFIG_FSI_SBEFIFO=m
@@ -2086,6 +2102,7 @@ CONFIG_GPIO_CADENCE=m
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_DS4520=m
# CONFIG_GPIO_DWAPB is not set
CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_FTGPIO010 is not set
@@ -2200,6 +2217,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
CONFIG_HID_GLORIOUS=m
# CONFIG_HID_GOOGLE_HAMMER is not set
+CONFIG_HID_GOOGLE_STADIA_FF=m
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2394,6 +2412,7 @@ CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_AMD8111 is not set
CONFIG_I2C_AMD_MP2=m
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+CONFIG_I2C_ATR=m
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
@@ -2747,6 +2766,7 @@ CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
CONFIG_IOSM=m
CONFIG_IO_STRICT_DEVMEM=y
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2835,6 +2855,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+CONFIG_IPU_BRIDGE=m
CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_IOAM6_LWTUNNEL=y
@@ -2911,6 +2932,7 @@ CONFIG_IR_RC6_DECODER=m
CONFIG_IR_RCMM_DECODER=m
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
CONFIG_IR_SERIAL=m
CONFIG_IR_SERIAL_TRANSMITTER=y
CONFIG_IR_SHARP_DECODER=m
@@ -3108,7 +3130,7 @@ CONFIG_KSM=y
CONFIG_KSZ884X_PCI=m
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
@@ -3120,6 +3142,7 @@ CONFIG_KVM_BOOK3S_HV_NESTED_PMU_WORKAROUND=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
# CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set
CONFIG_KVM_GUEST=y
+# CONFIG_KVM_PROVE_MMU is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
CONFIG_KVM_XEN=y
@@ -3173,6 +3196,7 @@ CONFIG_LEDS_CR0014114=m
# CONFIG_LEDS_DAC124S085 is not set
# CONFIG_LEDS_EL15203000 is not set
CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GROUP_MULTICOLOR=m
# CONFIG_LEDS_IS31FL319X is not set
CONFIG_LEDS_IS31FL32XX=m
# CONFIG_LEDS_KTD2692 is not set
@@ -3200,6 +3224,7 @@ CONFIG_LEDS_PCA9532_GPIO=y
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+CONFIG_LEDS_PCA995X=m
CONFIG_LEDS_POWERNV=m
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_PWM_MULTICOLOR=m
@@ -3352,6 +3377,7 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88Q2XXX_PHY=m
CONFIG_MARVELL_88X2222_PHY=m
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
@@ -3394,11 +3420,13 @@ CONFIG_MCP41010=m
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+CONFIG_MCP4728=m
# CONFIG_MCP4922 is not set
CONFIG_MCTP_SERIAL=m
# CONFIG_MCTP_TRANSPORT_I2C is not set
CONFIG_MCTP=y
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3497,6 +3525,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=m
# CONFIG_MFD_CPCAP is not set
+CONFIG_MFD_CS42L43_I2C=m
+CONFIG_MFD_CS42L43_SDW=m
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
@@ -3648,6 +3678,7 @@ CONFIG_MLX5_ESWITCH=y
# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3974,6 +4005,7 @@ CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4485,6 +4517,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4577,6 +4610,7 @@ CONFIG_ORINOCO_USB=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4661,6 +4695,7 @@ CONFIG_PATA_WINBOND=m
# CONFIG_PCH_GBE is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -4716,6 +4751,7 @@ CONFIG_PCS_XPCS=m
CONFIG_PDC_ADMA=m
CONFIG_PDS_CORE=m
CONFIG_PDS_VDPA=m
+CONFIG_PDS_VFIO_PCI=m
# CONFIG_PECI is not set
# CONFIG_PERCPU_STATS is not set
# CONFIG_PERCPU_TEST is not set
@@ -4753,6 +4789,8 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+CONFIG_PHY_RTK_RTD_USB2PHY=m
+CONFIG_PHY_RTK_RTD_USB3PHY=m
# CONFIG_PHY_TUSB1210 is not set
# CONFIG_PI433 is not set
CONFIG_PID_NS=y
@@ -4760,6 +4798,7 @@ CONFIG_PID_NS=y
CONFIG_PINCTRL_ALDERLAKE=m
# CONFIG_PINCTRL_CANNONLAKE is not set
CONFIG_PINCTRL_CEDARFORK=m
+CONFIG_PINCTRL_CS42L43=m
CONFIG_PINCTRL_CY8C95X0=m
CONFIG_PINCTRL_ELKHARTLAKE=m
CONFIG_PINCTRL_EMMITSBURG=m
@@ -4787,6 +4826,7 @@ CONFIG_PINCTRL_RK805=m
# CONFIG_PINCTRL_SM8150 is not set
# CONFIG_PINCTRL_SM8250 is not set
# CONFIG_PINCTRL_SM8350 is not set
+CONFIG_PINCTRL_SM8350_LPASS_LPI=m
# CONFIG_PINCTRL_SM8450 is not set
# CONFIG_PINCTRL_STMFX is not set
# CONFIG_PINCTRL_SUN4I_A10 is not set
@@ -4973,6 +5013,7 @@ CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
CONFIG_PSTORE_842_COMPRESS=y
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4994,6 +5035,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
CONFIG_PTP_1588_CLOCK_IDTCM=m
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_PTP_1588_CLOCK=y
@@ -5075,6 +5117,7 @@ CONFIG_RAID_ATTRS=m
CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -5134,12 +5177,14 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=y
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
+CONFIG_REGULATOR_AW37503=m
CONFIG_REGULATOR_BD9571MWV=m
# CONFIG_REGULATOR_DA9121 is not set
# CONFIG_REGULATOR_DA9210 is not set
@@ -5160,9 +5205,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_MAX1586 is not set
# CONFIG_REGULATOR_MAX20086 is not set
CONFIG_REGULATOR_MAX20411=m
+CONFIG_REGULATOR_MAX5970=m
CONFIG_REGULATOR_MAX597X=m
CONFIG_REGULATOR_MAX77650=m
# CONFIG_REGULATOR_MAX77826 is not set
+CONFIG_REGULATOR_MAX77857=m
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
CONFIG_REGULATOR_MAX8893=m
@@ -5195,6 +5242,7 @@ CONFIG_REGULATOR_RT6190=m
CONFIG_REGULATOR_RT6245=m
CONFIG_REGULATOR_RTMV20=m
CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTQ2208=m
CONFIG_REGULATOR_RTQ6752=m
# CONFIG_REGULATOR_SLG51000 is not set
CONFIG_REGULATOR_SY7636A=m
@@ -5240,8 +5288,7 @@ CONFIG_RESOURCE_KUNIT_TEST=m
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-# CONFIG_RH_DISABLE_DEPRECATED is not set
-CONFIG_RH_FEDORA=y
+# CONFIG_RHEL_DIFFERENCES is not set
CONFIG_RICHTEK_RTQ6056=m
CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
@@ -5649,6 +5696,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5724,6 +5772,7 @@ CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
CONFIG_SENSORS_HP_WMI=m
+CONFIG_SENSORS_HS3001=m
# CONFIG_SENSORS_I5K_AMB is not set
CONFIG_SENSORS_IBMAEM=m
CONFIG_SENSORS_IBM_CFFPS=m
@@ -5811,6 +5860,7 @@ CONFIG_SENSORS_MCP3021=m
CONFIG_SENSORS_MLXREG_FAN=m
CONFIG_SENSORS_MP2888=m
CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_MP2975_REGULATOR=y
CONFIG_SENSORS_MP5023=m
CONFIG_SENSORS_MPQ7932=m
CONFIG_SENSORS_MPQ7932_REGULATOR=y
@@ -6119,6 +6169,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=2048
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
# CONFIG_SND_HDA_TEGRA is not set
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -6231,7 +6284,9 @@ CONFIG_SND_SOC_AK5558=m
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+CONFIG_SND_SOC_AUDIO_IIO_AUX=m
CONFIG_SND_SOC_AW8738=m
+CONFIG_SND_SOC_AW88261=m
CONFIG_SND_SOC_AW88395=m
CONFIG_SND_SOC_BD28623=m
CONFIG_SND_SOC_BT_SCO=m
@@ -6248,7 +6303,6 @@ CONFIG_SND_SOC_CS35L36=m
CONFIG_SND_SOC_CS35L45_I2C=m
CONFIG_SND_SOC_CS35L45_SPI=m
CONFIG_SND_SOC_CS35L56_I2C=m
-CONFIG_SND_SOC_CS35L56_SDW=m
CONFIG_SND_SOC_CS35L56_SPI=m
CONFIG_SND_SOC_CS4234=m
# CONFIG_SND_SOC_CS4265 is not set
@@ -6257,6 +6311,8 @@ CONFIG_SND_SOC_CS4234=m
# CONFIG_SND_SOC_CS4271_SPI is not set
CONFIG_SND_SOC_CS42L42=m
CONFIG_SND_SOC_CS42L42_SDW=m
+CONFIG_SND_SOC_CS42L43=m
+CONFIG_SND_SOC_CS42L43_SDW=m
# CONFIG_SND_SOC_CS42L51_I2C is not set
# CONFIG_SND_SOC_CS42L52 is not set
# CONFIG_SND_SOC_CS42L56 is not set
@@ -6442,6 +6498,7 @@ CONFIG_SND_SOC_RL6231=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+CONFIG_SND_SOC_RT1017_SDCA_SDW=m
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -6572,6 +6629,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6699,6 +6757,7 @@ CONFIG_SPI_AX88796C=m
# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_CADENCE_QUADSPI is not set
# CONFIG_SPI_CADENCE_XSPI is not set
+# CONFIG_SPI_CS42L43 is not set
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
CONFIG_SPI_DLN2=m
@@ -6830,6 +6889,7 @@ CONFIG_SUSPEND_FREEZER=y
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_SWIOTLB=y
# CONFIG_SW_SYNC is not set
CONFIG_SX9310=m
@@ -6940,6 +7000,7 @@ CONFIG_TEST_CPUMASK=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
@@ -7015,6 +7076,8 @@ CONFIG_TIFM_7XX1=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+# CONFIG_TI_ICSSG_PRUETH is not set
+CONFIG_TI_ICSS_IEP=m
CONFIG_TI_LMP92064=m
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y
@@ -7047,6 +7110,7 @@ CONFIG_TLS=m
CONFIG_TMP117=m
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_QUOTA=y
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -7093,6 +7157,7 @@ CONFIG_TOUCHSCREEN_IMAGIS=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_IQS7211=m
# CONFIG_TOUCHSCREEN_MAX11801 is not set
CONFIG_TOUCHSCREEN_MCS5000=m
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7291,6 +7356,7 @@ CONFIG_USB_CHIPIDEA_IMX=m
# CONFIG_USB_CHIPIDEA is not set
CONFIG_USB_CHIPIDEA_MSM=m
CONFIG_USB_CHIPIDEA_PCI=m
+CONFIG_USB_CONFIGFS_F_MIDI2=y
# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
# CONFIG_USB_CONN_GPIO is not set
CONFIG_USB_CXACRU=m
@@ -7627,6 +7693,8 @@ CONFIG_VETH=m
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=m
CONFIG_VFIO_CONTAINER=y
+# CONFIG_VFIO_DEVICE_CDEV is not set
+CONFIG_VFIO_GROUP=y
# CONFIG_VFIO_IOMMU_TYPE1 is not set
CONFIG_VFIO=m
CONFIG_VFIO_MDEV=m
@@ -7695,8 +7763,12 @@ CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_DS90UB913=m
+CONFIG_VIDEO_DS90UB953=m
+CONFIG_VIDEO_DS90UB960=m
# CONFIG_VIDEO_DT3155 is not set
CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9719=m
CONFIG_VIDEO_DW9768=m
CONFIG_VIDEO_DW9807_VCM=m
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -8036,6 +8108,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
+CONFIG_XEN_PRIVCMD_IRQFD=y
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_PVHVM_GUEST=y
@@ -8053,6 +8126,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index ced577211..f258bbae2 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -206,7 +206,6 @@ CONFIG_AMD_HSMP=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
CONFIG_AMD_PHY=m
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
# CONFIG_AMD_PTDMA is not set
# CONFIG_AMDTEE is not set
# CONFIG_AMIGA_PARTITION is not set
@@ -812,6 +811,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -829,6 +829,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -911,6 +912,7 @@ CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
@@ -1000,6 +1002,7 @@ CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
+# CONFIG_CRYPTO_POLY1305_P10 is not set
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y
@@ -1198,6 +1201,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1220,6 +1224,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1340,6 +1345,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MALI_DISPLAY is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1413,6 +1419,7 @@ CONFIG_DRM_SIMPLEDRM=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1653,6 +1660,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1839,6 +1847,7 @@ CONFIG_GNSS=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+# CONFIG_GPIO_DS4520 is not set
# CONFIG_GPIO_DWAPB is not set
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -1959,6 +1968,7 @@ CONFIG_HID_GENERIC=y
# CONFIG_HID_GFRM is not set
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
# CONFIG_HID_GT683R is not set
CONFIG_HID_GYRATION=m
@@ -2110,7 +2120,6 @@ CONFIG_HWPOISON_INJECT=m
CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
# CONFIG_HW_RANDOM_BA431 is not set
# CONFIG_HW_RANDOM_CCTRNG is not set
-CONFIG_HW_RANDOM_HISI=y
# CONFIG_HW_RANDOM_HISTB is not set
CONFIG_HW_RANDOM_POWERNV=m
CONFIG_HW_RANDOM_PSERIES=m
@@ -2147,6 +2156,7 @@ CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_AMD_MP2 is not set
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
@@ -2462,6 +2472,7 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_TCC_COOLING is not set
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_VSC is not set
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
CONFIG_INTEL_XWAY_PHY=m
@@ -2491,7 +2502,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2578,6 +2589,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2655,6 +2667,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -2796,10 +2809,11 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD_SEV=y
CONFIG_KVM_BOOK3S_64_HV=m
CONFIG_KVM_BOOK3S_64=m
@@ -2810,6 +2824,7 @@ CONFIG_KVM_BOOK3S_HV_NESTED_PMU_WORKAROUND=y
# CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set
CONFIG_KVM_BOOK3S_PR_POSSIBLE=y
CONFIG_KVM_GUEST=y
+# CONFIG_KVM_PROVE_MMU is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
# CONFIG_KVM_XEN is not set
@@ -2883,6 +2898,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
CONFIG_LEDS_POWERNV=m
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
@@ -3025,7 +3041,9 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3065,9 +3083,11 @@ CONFIG_MAX_SKB_FRAGS=17
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3121,6 +3141,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3155,6 +3176,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3301,6 +3324,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3584,6 +3608,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4004,6 +4029,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4050,6 +4076,7 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
CONFIG_NVMEM_SYSFS=y
@@ -4094,6 +4121,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4169,6 +4197,7 @@ CONFIG_PATA_PLATFORM=m
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -4260,6 +4289,7 @@ CONFIG_PHYLIB=y
# CONFIG_PHY_QCOM_EUSB2_REPEATER is not set
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
# CONFIG_PHY_QCOM_SGMII_ETH is not set
@@ -4269,6 +4299,8 @@ CONFIG_PHYLIB=y
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
CONFIG_PHYSICAL_ALIGN=0x200000
# CONFIG_PHY_TUSB1210 is not set
# CONFIG_PI433 is not set
@@ -4466,6 +4498,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4484,6 +4517,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK=y
# CONFIG_PUNIT_ATOM_DEBUG is not set
@@ -4578,6 +4612,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -4622,12 +4657,14 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
+# CONFIG_REGULATOR_AW37503 is not set
# CONFIG_REGULATOR_DA9210 is not set
# CONFIG_REGULATOR_DA9211 is not set
# CONFIG_REGULATOR_DEBUG is not set
@@ -4644,6 +4681,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_LTC3589 is not set
# CONFIG_REGULATOR_LTC3676 is not set
# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8952 is not set
@@ -4656,9 +4694,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RT4803 is not set
# CONFIG_REGULATOR_RT5739 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_SY8106A is not set
# CONFIG_REGULATOR_TPS51632 is not set
# CONFIG_REGULATOR_TPS62360 is not set
@@ -4692,7 +4732,6 @@ CONFIG_RETPOLINE=y
# CONFIG_RFKILL_GPIO is not set
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -5060,6 +5099,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5069,6 +5109,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5144,6 +5185,7 @@ CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
# CONFIG_SENSORS_I5K_AMB is not set
CONFIG_SENSORS_IBMAEM=m
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5633,7 +5675,9 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -5650,7 +5694,6 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -5715,6 +5758,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -5725,6 +5769,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
# CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
@@ -5844,6 +5889,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -5902,6 +5948,7 @@ CONFIG_SND_SOC_SOF_ACPI=m
# CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set
# CONFIG_SND_SOC_SOF_JASPERLAKE is not set
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
# CONFIG_SND_SOC_SOF_MERRIFIELD is not set
# CONFIG_SND_SOC_SOF_METEORLAKE is not set
# CONFIG_SND_SOC_SOF_OF is not set
@@ -5972,6 +6019,7 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6194,6 +6242,7 @@ CONFIG_SUSPEND_FREEZER=y
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
# CONFIG_SX9324 is not set
@@ -6300,6 +6349,7 @@ CONFIG_TEST_CPUMASK=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
@@ -6405,6 +6455,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -6450,6 +6501,7 @@ CONFIG_TORTURE_TEST=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -6953,8 +7005,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7252,6 +7308,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index c45d4b9b2..e81f2cafe 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -137,6 +137,7 @@ CONFIG_AD7949=m
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
CONFIG_ADAPTEC_STARFIRE=m
+# CONFIG_ADDRESS_MASKING is not set
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -806,6 +807,7 @@ CONFIG_CEPH_FS_SECURITY_LABEL=y
CONFIG_CEPH_LIB=m
CONFIG_CEPH_LIB_PRETTYDEBUG=y
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+CONFIG_CERT_STORE=y
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
@@ -957,6 +959,7 @@ CONFIG_COMMON_CLK_SI521XX=y
# CONFIG_COMMON_CLK_SI5351 is not set
CONFIG_COMMON_CLK_SI544=m
# CONFIG_COMMON_CLK_SI570 is not set
+CONFIG_COMMON_CLK_VC3=m
# CONFIG_COMMON_CLK_VC5 is not set
CONFIG_COMMON_CLK_VC7=m
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -973,6 +976,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=3
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1012,6 +1016,8 @@ CONFIG_CPUSETS=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -1359,6 +1365,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1383,6 +1390,7 @@ CONFIG_DM_INIT=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=y
@@ -1494,6 +1502,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
CONFIG_DRM_LONTIUM_LT9611UXC=m
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
# CONFIG_DRM_MGAG200 is not set
@@ -1579,11 +1588,13 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
+CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m
# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
# CONFIG_DRM_PANEL_TPO_TPG110 is not set
# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+CONFIG_DRM_PANEL_VISIONOX_R66451=m
CONFIG_DRM_PANEL_VISIONOX_RM69299=m
# CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set
CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
@@ -1620,6 +1631,7 @@ CONFIG_DRM_TOSHIBA_TC358764=m
# CONFIG_DRM_TOSHIBA_TC358767 is not set
CONFIG_DRM_TOSHIBA_TC358768=m
CONFIG_DRM_TOSHIBA_TC358775=m
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1798,6 +1810,7 @@ CONFIG_EROFS_FS=m
CONFIG_EROFS_FS_POSIX_ACL=y
CONFIG_EROFS_FS_SECURITY=y
CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP_DEFLATE=y
CONFIG_EROFS_FS_ZIP_LZMA=y
CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
@@ -1887,6 +1900,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -2098,6 +2112,7 @@ CONFIG_GPIO_CADENCE=m
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_DS4520=m
# CONFIG_GPIO_DWAPB is not set
CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_FTGPIO010 is not set
@@ -2210,6 +2225,7 @@ CONFIG_HID_GENERIC=m
CONFIG_HID_GFRM=m
CONFIG_HID_GLORIOUS=m
# CONFIG_HID_GOOGLE_HAMMER is not set
+CONFIG_HID_GOOGLE_STADIA_FF=m
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2394,6 +2410,7 @@ CONFIG_I2C_ALGOBIT=m
# CONFIG_I2C_AMD8111 is not set
CONFIG_I2C_AMD_MP2=m
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+CONFIG_I2C_ATR=m
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
# CONFIG_I2C_CHARDEV is not set
@@ -2740,6 +2757,7 @@ CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
CONFIG_IOSM=m
CONFIG_IO_STRICT_DEVMEM=y
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2827,6 +2845,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+CONFIG_IPU_BRIDGE=m
CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_IOAM6_LWTUNNEL=y
@@ -2902,6 +2921,7 @@ CONFIG_IR_RC6_DECODER=m
CONFIG_IR_RCMM_DECODER=m
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
CONFIG_IR_SERIAL=m
CONFIG_IR_SERIAL_TRANSMITTER=y
CONFIG_IR_SHARP_DECODER=m
@@ -3108,11 +3128,12 @@ CONFIG_KSM=y
CONFIG_KSZ884X_PCI=m
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
CONFIG_KVM=m
+CONFIG_KVM_PROVE_MMU=y
# CONFIG_KVM_S390_UCONTROL is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
@@ -3165,6 +3186,7 @@ CONFIG_LEDS_CR0014114=m
# CONFIG_LEDS_DAC124S085 is not set
# CONFIG_LEDS_EL15203000 is not set
CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GROUP_MULTICOLOR=m
# CONFIG_LEDS_IS31FL319X is not set
CONFIG_LEDS_IS31FL32XX=m
# CONFIG_LEDS_KTD2692 is not set
@@ -3192,6 +3214,7 @@ CONFIG_LEDS_PCA9532_GPIO=y
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+CONFIG_LEDS_PCA995X=m
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_PWM_MULTICOLOR=m
CONFIG_LEDS_QCOM_FLASH=m
@@ -3351,6 +3374,7 @@ CONFIG_MARCH_Z13=y
# CONFIG_MARCH_Z990 is not set
# CONFIG_MARCH_ZEC12 is not set
CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88Q2XXX_PHY=m
CONFIG_MARVELL_88X2222_PHY=m
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
@@ -3395,11 +3419,13 @@ CONFIG_MCP41010=m
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+CONFIG_MCP4728=m
# CONFIG_MCP4922 is not set
CONFIG_MCTP_SERIAL=m
# CONFIG_MCTP_TRANSPORT_I2C is not set
CONFIG_MCTP=y
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3498,6 +3524,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BD9571MWV is not set
CONFIG_MFD_CORE=m
# CONFIG_MFD_CPCAP is not set
+CONFIG_MFD_CS42L43_I2C=m
+CONFIG_MFD_CS42L43_SDW=m
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
@@ -3649,6 +3677,7 @@ CONFIG_MLX5_ESWITCH=y
# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3973,6 +4002,7 @@ CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4484,6 +4514,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4570,6 +4601,7 @@ CONFIG_ORINOCO_USB=m
# CONFIG_OSF_PARTITION is not set
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4654,6 +4686,7 @@ CONFIG_PATA_WINBOND=m
# CONFIG_PCH_GBE is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -4710,6 +4743,7 @@ CONFIG_PCS_XPCS=m
CONFIG_PDC_ADMA=m
CONFIG_PDS_CORE=m
CONFIG_PDS_VDPA=m
+CONFIG_PDS_VFIO_PCI=m
# CONFIG_PECI is not set
CONFIG_PERCPU_STATS=y
# CONFIG_PERCPU_TEST is not set
@@ -4748,6 +4782,8 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+CONFIG_PHY_RTK_RTD_USB2PHY=m
+CONFIG_PHY_RTK_RTD_USB3PHY=m
# CONFIG_PHY_TUSB1210 is not set
# CONFIG_PI433 is not set
CONFIG_PID_NS=y
@@ -4755,6 +4791,7 @@ CONFIG_PID_NS=y
CONFIG_PINCTRL_ALDERLAKE=m
# CONFIG_PINCTRL_CANNONLAKE is not set
CONFIG_PINCTRL_CEDARFORK=m
+CONFIG_PINCTRL_CS42L43=m
CONFIG_PINCTRL_CY8C95X0=m
CONFIG_PINCTRL_ELKHARTLAKE=m
CONFIG_PINCTRL_EMMITSBURG=m
@@ -4782,6 +4819,7 @@ CONFIG_PINCTRL_RK805=m
# CONFIG_PINCTRL_SM8150 is not set
# CONFIG_PINCTRL_SM8250 is not set
# CONFIG_PINCTRL_SM8350 is not set
+CONFIG_PINCTRL_SM8350_LPASS_LPI=m
# CONFIG_PINCTRL_SM8450 is not set
# CONFIG_PINCTRL_STMFX is not set
# CONFIG_PINCTRL_SUN4I_A10 is not set
@@ -4920,6 +4958,7 @@ CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
CONFIG_PSTORE_842_COMPRESS=y
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4941,6 +4980,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
CONFIG_PTP_1588_CLOCK_IDTCM=m
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_PTP_1588_CLOCK=y
@@ -5028,6 +5068,7 @@ CONFIG_RANDOMIZE_BASE=y
CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -5087,12 +5128,14 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=y
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_I2C=m
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
+CONFIG_REGULATOR_AW37503=m
CONFIG_REGULATOR_BD9571MWV=m
# CONFIG_REGULATOR_DA9121 is not set
# CONFIG_REGULATOR_DA9210 is not set
@@ -5113,9 +5156,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_MAX1586 is not set
# CONFIG_REGULATOR_MAX20086 is not set
CONFIG_REGULATOR_MAX20411=m
+CONFIG_REGULATOR_MAX5970=m
CONFIG_REGULATOR_MAX597X=m
CONFIG_REGULATOR_MAX77650=m
# CONFIG_REGULATOR_MAX77826 is not set
+CONFIG_REGULATOR_MAX77857=m
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
CONFIG_REGULATOR_MAX8893=m
@@ -5148,6 +5193,7 @@ CONFIG_REGULATOR_RT6190=m
CONFIG_REGULATOR_RT6245=m
CONFIG_REGULATOR_RTMV20=m
CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTQ2208=m
CONFIG_REGULATOR_RTQ6752=m
# CONFIG_REGULATOR_SLG51000 is not set
CONFIG_REGULATOR_SY7636A=m
@@ -5194,8 +5240,7 @@ CONFIG_RESOURCE_KUNIT_TEST=m
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
# CONFIG_RFKILL is not set
-# CONFIG_RH_DISABLE_DEPRECATED is not set
-CONFIG_RH_FEDORA=y
+# CONFIG_RHEL_DIFFERENCES is not set
CONFIG_RICHTEK_RTQ6056=m
CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
@@ -5418,10 +5463,9 @@ CONFIG_RV=y
CONFIG_RXKAD=y
# CONFIG_RXPERF is not set
CONFIG_S2IO=m
-CONFIG_S390_AP_IOMMU=y
-CONFIG_S390_CCW_IOMMU=y
CONFIG_S390_GUEST=y
CONFIG_S390_HYPFS_FS=y
+CONFIG_S390_HYPFS=y
# CONFIG_S390_KPROBES_SANITY_TEST is not set
# CONFIG_S390_MODULES_SANITY_TEST is not set
CONFIG_S390_PRNG=m
@@ -5613,6 +5657,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5688,6 +5733,7 @@ CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
CONFIG_SENSORS_HP_WMI=m
+CONFIG_SENSORS_HS3001=m
# CONFIG_SENSORS_I5K_AMB is not set
CONFIG_SENSORS_IBMAEM=m
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5774,6 +5820,7 @@ CONFIG_SENSORS_MCP3021=m
CONFIG_SENSORS_MLXREG_FAN=m
CONFIG_SENSORS_MP2888=m
CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_MP2975_REGULATOR=y
CONFIG_SENSORS_MP5023=m
CONFIG_SENSORS_MPQ7932=m
CONFIG_SENSORS_MPQ7932_REGULATOR=y
@@ -6081,6 +6128,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=2048
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
# CONFIG_SND_HDA_TEGRA is not set
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -6194,7 +6244,9 @@ CONFIG_SND_SOC_AK5558=m
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+CONFIG_SND_SOC_AUDIO_IIO_AUX=m
CONFIG_SND_SOC_AW8738=m
+CONFIG_SND_SOC_AW88261=m
CONFIG_SND_SOC_AW88395=m
CONFIG_SND_SOC_BD28623=m
CONFIG_SND_SOC_BT_SCO=m
@@ -6211,7 +6263,6 @@ CONFIG_SND_SOC_CS35L36=m
CONFIG_SND_SOC_CS35L45_I2C=m
CONFIG_SND_SOC_CS35L45_SPI=m
CONFIG_SND_SOC_CS35L56_I2C=m
-CONFIG_SND_SOC_CS35L56_SDW=m
CONFIG_SND_SOC_CS35L56_SPI=m
CONFIG_SND_SOC_CS4234=m
# CONFIG_SND_SOC_CS4265 is not set
@@ -6220,6 +6271,8 @@ CONFIG_SND_SOC_CS4234=m
# CONFIG_SND_SOC_CS4271_SPI is not set
CONFIG_SND_SOC_CS42L42=m
CONFIG_SND_SOC_CS42L42_SDW=m
+CONFIG_SND_SOC_CS42L43=m
+CONFIG_SND_SOC_CS42L43_SDW=m
# CONFIG_SND_SOC_CS42L51_I2C is not set
# CONFIG_SND_SOC_CS42L52 is not set
# CONFIG_SND_SOC_CS42L56 is not set
@@ -6405,6 +6458,7 @@ CONFIG_SND_SOC_RL6231=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+CONFIG_SND_SOC_RT1017_SDCA_SDW=m
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -6536,6 +6590,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6660,6 +6715,7 @@ CONFIG_SPI_AX88796C=m
# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_CADENCE_QUADSPI is not set
# CONFIG_SPI_CADENCE_XSPI is not set
+# CONFIG_SPI_CS42L43 is not set
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
CONFIG_SPI_DLN2=m
@@ -6790,6 +6846,7 @@ CONFIG_SURFACE_PRO3_BUTTON=m
# CONFIG_SUSPEND is not set
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
# CONFIG_SW_SYNC is not set
CONFIG_SX9310=m
CONFIG_SX9324=m
@@ -6900,6 +6957,7 @@ CONFIG_TEST_FPU=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIST_SORT=m
@@ -6974,6 +7032,8 @@ CONFIG_TIFM_7XX1=m
# CONFIG_TIFM_CORE is not set
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+# CONFIG_TI_ICSSG_PRUETH is not set
+CONFIG_TI_ICSS_IEP=m
CONFIG_TI_LMP92064=m
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y
@@ -7006,6 +7066,7 @@ CONFIG_TLS=m
CONFIG_TMP117=m
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_QUOTA=y
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
CONFIG_TN3215_CONSOLE=y
@@ -7057,6 +7118,7 @@ CONFIG_TOUCHSCREEN_IMAGIS=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_IQS7211=m
# CONFIG_TOUCHSCREEN_MAX11801 is not set
CONFIG_TOUCHSCREEN_MCS5000=m
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7264,6 +7326,7 @@ CONFIG_USB_CHIPIDEA_IMX=m
# CONFIG_USB_CHIPIDEA is not set
CONFIG_USB_CHIPIDEA_MSM=m
CONFIG_USB_CHIPIDEA_PCI=m
+CONFIG_USB_CONFIGFS_F_MIDI2=y
# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
# CONFIG_USB_CONN_GPIO is not set
CONFIG_USB_CXACRU=m
@@ -7598,6 +7661,8 @@ CONFIG_VFAT_FS=m
CONFIG_VFIO_AP=m
CONFIG_VFIO_CCW=m
CONFIG_VFIO_CONTAINER=y
+# CONFIG_VFIO_DEVICE_CDEV is not set
+CONFIG_VFIO_GROUP=y
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
CONFIG_VFIO_MDEV=m
@@ -7666,8 +7731,12 @@ CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_DS90UB913=m
+CONFIG_VIDEO_DS90UB953=m
+CONFIG_VIDEO_DS90UB960=m
# CONFIG_VIDEO_DT3155 is not set
CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9719=m
CONFIG_VIDEO_DW9768=m
CONFIG_VIDEO_DW9807_VCM=m
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -8008,6 +8077,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
+CONFIG_XEN_PRIVCMD_IRQFD=y
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_PVHVM_GUEST=y
@@ -8025,6 +8095,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index cb49b8ce8..1f00593df 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -203,7 +203,6 @@ CONFIG_AMD_HSMP=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
# CONFIG_AMD_PHY is not set
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
# CONFIG_AMD_PTDMA is not set
# CONFIG_AMDTEE is not set
# CONFIG_AMIGA_PARTITION is not set
@@ -677,6 +676,7 @@ CONFIG_CEPH_FS_SECURITY_LABEL=y
CONFIG_CEPH_LIB=m
CONFIG_CEPH_LIB_PRETTYDEBUG=y
CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
+CONFIG_CERT_STORE=y
# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
CONFIG_CFG80211_CRDA_SUPPORT=y
CONFIG_CFG80211_DEBUGFS=y
@@ -812,6 +812,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -829,6 +830,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -910,6 +912,7 @@ CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA_S390=y
CONFIG_CRYPTO_CMAC=y
@@ -997,6 +1000,7 @@ CONFIG_CRYPTO_PAES_S390=m
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
+# CONFIG_CRYPTO_POLY1305_P10 is not set
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y
@@ -1211,6 +1215,7 @@ CONFIG_DMADEVICES_VDEBUG=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1233,6 +1238,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1353,6 +1359,7 @@ CONFIG_DRM_KUNIT_TEST=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
CONFIG_DRM=m
# CONFIG_DRM_MALI_DISPLAY is not set
@@ -1427,6 +1434,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1675,6 +1683,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1857,6 +1866,7 @@ CONFIG_GNSS=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+# CONFIG_GPIO_DS4520 is not set
# CONFIG_GPIO_DWAPB is not set
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -1976,6 +1986,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2119,7 +2130,6 @@ CONFIG_HWPOISON_INJECT=m
CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
# CONFIG_HW_RANDOM_BA431 is not set
# CONFIG_HW_RANDOM_CCTRNG is not set
-CONFIG_HW_RANDOM_HISI=y
# CONFIG_HW_RANDOM_HISTB is not set
CONFIG_HW_RANDOM_S390=y
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
@@ -2155,6 +2165,7 @@ CONFIG_I2C_ALGOBIT=m
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_AMD_MP2 is not set
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
# CONFIG_I2C_CHARDEV is not set
@@ -2464,6 +2475,7 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_TCC_COOLING is not set
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_VSC is not set
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
CONFIG_INTEL_XWAY_PHY=m
@@ -2492,7 +2504,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2578,6 +2590,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2654,6 +2667,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -2801,14 +2815,16 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD_SEV=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
# CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set
CONFIG_KVM=m
+CONFIG_KVM_PROVE_MMU=y
# CONFIG_KVM_S390_UCONTROL is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
@@ -2881,6 +2897,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
@@ -3030,7 +3047,9 @@ CONFIG_MARCH_Z14=y
# CONFIG_MARCH_Z990 is not set
# CONFIG_MARCH_ZEC12 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
+CONFIG_MARVELL_GTI_WDT=y
# CONFIG_MARVELL_PHY is not set
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3071,9 +3090,11 @@ CONFIG_MAX_SKB_FRAGS=17
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3125,6 +3146,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3159,6 +3181,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3305,6 +3329,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3586,6 +3611,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4006,6 +4032,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4052,6 +4079,7 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
CONFIG_NVMEM_SYSFS=y
@@ -4095,6 +4123,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
# CONFIG_OSF_PARTITION is not set
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+CONFIG_OVERLAY_FS_DEBUG=y
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4170,6 +4199,7 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
CONFIG_PCI_DEBUG=y
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -4263,6 +4293,7 @@ CONFIG_PHY_BCM_SR_USB=m
# CONFIG_PHY_QCOM_EUSB2_REPEATER is not set
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
# CONFIG_PHY_QCOM_SGMII_ETH is not set
@@ -4272,6 +4303,8 @@ CONFIG_PHY_BCM_SR_USB=m
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
# CONFIG_PHY_TUSB1210 is not set
# CONFIG_PI433 is not set
CONFIG_PID_NS=y
@@ -4423,6 +4456,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4441,6 +4475,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK=y
# CONFIG_PUNIT_ATOM_DEBUG is not set
@@ -4540,6 +4575,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -4584,12 +4620,14 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
# CONFIG_REALTEK_PHY is not set
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
# CONFIG_REGMAP is not set
CONFIG_REGMAP_KUNIT=m
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
+# CONFIG_REGULATOR_AW37503 is not set
# CONFIG_REGULATOR_DA9210 is not set
# CONFIG_REGULATOR_DA9211 is not set
# CONFIG_REGULATOR_DEBUG is not set
@@ -4606,6 +4644,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_LTC3589 is not set
# CONFIG_REGULATOR_LTC3676 is not set
# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8952 is not set
@@ -4618,9 +4657,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RT4803 is not set
# CONFIG_REGULATOR_RT5739 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_SY8106A is not set
# CONFIG_REGULATOR_TPS51632 is not set
# CONFIG_REGULATOR_TPS62360 is not set
@@ -4653,7 +4694,6 @@ CONFIG_RETPOLINE=y
# CONFIG_RFKILL_GPIO is not set
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -4856,10 +4896,9 @@ CONFIG_RV_REACT_PRINTK=y
CONFIG_RV=y
CONFIG_RXKAD=y
CONFIG_RXPERF=m
-CONFIG_S390_AP_IOMMU=y
-CONFIG_S390_CCW_IOMMU=y
CONFIG_S390_GUEST=y
CONFIG_S390_HYPFS_FS=y
+CONFIG_S390_HYPFS=y
# CONFIG_S390_KPROBES_SANITY_TEST is not set
# CONFIG_S390_MODULES_SANITY_TEST is not set
CONFIG_S390_PRNG=m
@@ -5063,6 +5102,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5072,6 +5112,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5147,6 +5188,7 @@ CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
# CONFIG_SENSORS_I5K_AMB is not set
CONFIG_SENSORS_IBMAEM=m
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5630,7 +5672,9 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -5647,7 +5691,6 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -5712,6 +5755,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -5722,6 +5766,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
# CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
@@ -5841,6 +5886,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -5900,6 +5946,7 @@ CONFIG_SND_SOC_SOF_HDA_PROBES=m
# CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set
# CONFIG_SND_SOC_SOF_JASPERLAKE is not set
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
# CONFIG_SND_SOC_SOF_MERRIFIELD is not set
# CONFIG_SND_SOC_SOF_METEORLAKE is not set
# CONFIG_SND_SOC_SOF_OF is not set
@@ -5970,6 +6017,7 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_BUILD=y
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6190,6 +6238,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
# CONFIG_SX9324 is not set
@@ -6295,6 +6344,7 @@ CONFIG_TEST_FPU=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIST_SORT=m
@@ -6399,6 +6449,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
CONFIG_TN3215_CONSOLE=y
@@ -6449,6 +6500,7 @@ CONFIG_TORTURE_TEST=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -6960,8 +7012,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7260,6 +7316,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 2d562738d..9a0fd13e9 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -137,6 +137,7 @@ CONFIG_AD7949=m
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
CONFIG_ADAPTEC_STARFIRE=m
+# CONFIG_ADDRESS_MASKING is not set
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -804,6 +805,7 @@ CONFIG_CEPH_FS_SECURITY_LABEL=y
CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+CONFIG_CERT_STORE=y
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
@@ -955,6 +957,7 @@ CONFIG_COMMON_CLK_SI521XX=y
# CONFIG_COMMON_CLK_SI5351 is not set
CONFIG_COMMON_CLK_SI544=m
# CONFIG_COMMON_CLK_SI570 is not set
+CONFIG_COMMON_CLK_VC3=m
# CONFIG_COMMON_CLK_VC5 is not set
CONFIG_COMMON_CLK_VC7=m
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -971,6 +974,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=3
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1010,6 +1014,8 @@ CONFIG_CPUSETS=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -1348,6 +1354,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1372,6 +1379,7 @@ CONFIG_DM_INIT=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=y
@@ -1483,6 +1491,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
CONFIG_DRM_LONTIUM_LT9611UXC=m
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
# CONFIG_DRM_MGAG200 is not set
@@ -1568,11 +1577,13 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
+CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m
# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
# CONFIG_DRM_PANEL_TPO_TPG110 is not set
# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+CONFIG_DRM_PANEL_VISIONOX_R66451=m
CONFIG_DRM_PANEL_VISIONOX_RM69299=m
# CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set
CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
@@ -1609,6 +1620,7 @@ CONFIG_DRM_TOSHIBA_TC358764=m
# CONFIG_DRM_TOSHIBA_TC358767 is not set
CONFIG_DRM_TOSHIBA_TC358768=m
CONFIG_DRM_TOSHIBA_TC358775=m
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1787,6 +1799,7 @@ CONFIG_EROFS_FS=m
CONFIG_EROFS_FS_POSIX_ACL=y
CONFIG_EROFS_FS_SECURITY=y
CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP_DEFLATE=y
CONFIG_EROFS_FS_ZIP_LZMA=y
CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
@@ -1868,6 +1881,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -2079,6 +2093,7 @@ CONFIG_GPIO_CADENCE=m
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_DS4520=m
# CONFIG_GPIO_DWAPB is not set
CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_FTGPIO010 is not set
@@ -2191,6 +2206,7 @@ CONFIG_HID_GENERIC=m
CONFIG_HID_GFRM=m
CONFIG_HID_GLORIOUS=m
# CONFIG_HID_GOOGLE_HAMMER is not set
+CONFIG_HID_GOOGLE_STADIA_FF=m
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2375,6 +2391,7 @@ CONFIG_I2C_ALGOBIT=m
# CONFIG_I2C_AMD8111 is not set
CONFIG_I2C_AMD_MP2=m
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+CONFIG_I2C_ATR=m
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
# CONFIG_I2C_CHARDEV is not set
@@ -2720,6 +2737,7 @@ CONFIG_IONIC=m
CONFIG_IOSCHED_BFQ=y
CONFIG_IOSM=m
CONFIG_IO_STRICT_DEVMEM=y
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2807,6 +2825,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+CONFIG_IPU_BRIDGE=m
CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_IOAM6_LWTUNNEL=y
@@ -2882,6 +2901,7 @@ CONFIG_IR_RC6_DECODER=m
CONFIG_IR_RCMM_DECODER=m
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
CONFIG_IR_SERIAL=m
CONFIG_IR_SERIAL_TRANSMITTER=y
CONFIG_IR_SHARP_DECODER=m
@@ -3082,11 +3102,12 @@ CONFIG_KSM=y
CONFIG_KSZ884X_PCI=m
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
CONFIG_KVM=m
+# CONFIG_KVM_PROVE_MMU is not set
# CONFIG_KVM_S390_UCONTROL is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
@@ -3139,6 +3160,7 @@ CONFIG_LEDS_CR0014114=m
# CONFIG_LEDS_DAC124S085 is not set
# CONFIG_LEDS_EL15203000 is not set
CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GROUP_MULTICOLOR=m
# CONFIG_LEDS_IS31FL319X is not set
CONFIG_LEDS_IS31FL32XX=m
# CONFIG_LEDS_KTD2692 is not set
@@ -3166,6 +3188,7 @@ CONFIG_LEDS_PCA9532_GPIO=y
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+CONFIG_LEDS_PCA995X=m
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_PWM_MULTICOLOR=m
CONFIG_LEDS_QCOM_FLASH=m
@@ -3325,6 +3348,7 @@ CONFIG_MARCH_Z13=y
# CONFIG_MARCH_Z990 is not set
# CONFIG_MARCH_ZEC12 is not set
CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88Q2XXX_PHY=m
CONFIG_MARVELL_88X2222_PHY=m
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
@@ -3368,11 +3392,13 @@ CONFIG_MCP41010=m
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+CONFIG_MCP4728=m
# CONFIG_MCP4922 is not set
CONFIG_MCTP_SERIAL=m
# CONFIG_MCTP_TRANSPORT_I2C is not set
CONFIG_MCTP=y
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3471,6 +3497,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BD9571MWV is not set
CONFIG_MFD_CORE=m
# CONFIG_MFD_CPCAP is not set
+CONFIG_MFD_CS42L43_I2C=m
+CONFIG_MFD_CS42L43_SDW=m
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
@@ -3622,6 +3650,7 @@ CONFIG_MLX5_ESWITCH=y
# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3945,6 +3974,7 @@ CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4456,6 +4486,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4542,6 +4573,7 @@ CONFIG_ORINOCO_USB=m
# CONFIG_OSF_PARTITION is not set
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4625,6 +4657,7 @@ CONFIG_PATA_WINBOND=m
# CONFIG_PCH_GBE is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -4681,6 +4714,7 @@ CONFIG_PCS_XPCS=m
CONFIG_PDC_ADMA=m
CONFIG_PDS_CORE=m
CONFIG_PDS_VDPA=m
+CONFIG_PDS_VFIO_PCI=m
# CONFIG_PECI is not set
# CONFIG_PERCPU_STATS is not set
# CONFIG_PERCPU_TEST is not set
@@ -4719,6 +4753,8 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+CONFIG_PHY_RTK_RTD_USB2PHY=m
+CONFIG_PHY_RTK_RTD_USB3PHY=m
# CONFIG_PHY_TUSB1210 is not set
# CONFIG_PI433 is not set
CONFIG_PID_NS=y
@@ -4726,6 +4762,7 @@ CONFIG_PID_NS=y
CONFIG_PINCTRL_ALDERLAKE=m
# CONFIG_PINCTRL_CANNONLAKE is not set
CONFIG_PINCTRL_CEDARFORK=m
+CONFIG_PINCTRL_CS42L43=m
CONFIG_PINCTRL_CY8C95X0=m
CONFIG_PINCTRL_ELKHARTLAKE=m
CONFIG_PINCTRL_EMMITSBURG=m
@@ -4753,6 +4790,7 @@ CONFIG_PINCTRL_RK805=m
# CONFIG_PINCTRL_SM8150 is not set
# CONFIG_PINCTRL_SM8250 is not set
# CONFIG_PINCTRL_SM8350 is not set
+CONFIG_PINCTRL_SM8350_LPASS_LPI=m
# CONFIG_PINCTRL_SM8450 is not set
# CONFIG_PINCTRL_STMFX is not set
# CONFIG_PINCTRL_SUN4I_A10 is not set
@@ -4891,6 +4929,7 @@ CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
CONFIG_PSTORE_842_COMPRESS=y
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4912,6 +4951,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
CONFIG_PTP_1588_CLOCK_IDTCM=m
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_PTP_1588_CLOCK=y
@@ -4999,6 +5039,7 @@ CONFIG_RANDOMIZE_BASE=y
CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -5058,12 +5099,14 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=y
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_I2C=m
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
+CONFIG_REGULATOR_AW37503=m
CONFIG_REGULATOR_BD9571MWV=m
# CONFIG_REGULATOR_DA9121 is not set
# CONFIG_REGULATOR_DA9210 is not set
@@ -5084,9 +5127,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_MAX1586 is not set
# CONFIG_REGULATOR_MAX20086 is not set
CONFIG_REGULATOR_MAX20411=m
+CONFIG_REGULATOR_MAX5970=m
CONFIG_REGULATOR_MAX597X=m
CONFIG_REGULATOR_MAX77650=m
# CONFIG_REGULATOR_MAX77826 is not set
+CONFIG_REGULATOR_MAX77857=m
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
CONFIG_REGULATOR_MAX8893=m
@@ -5119,6 +5164,7 @@ CONFIG_REGULATOR_RT6190=m
CONFIG_REGULATOR_RT6245=m
CONFIG_REGULATOR_RTMV20=m
CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTQ2208=m
CONFIG_REGULATOR_RTQ6752=m
# CONFIG_REGULATOR_SLG51000 is not set
CONFIG_REGULATOR_SY7636A=m
@@ -5165,8 +5211,7 @@ CONFIG_RESOURCE_KUNIT_TEST=m
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
# CONFIG_RFKILL is not set
-# CONFIG_RH_DISABLE_DEPRECATED is not set
-CONFIG_RH_FEDORA=y
+# CONFIG_RHEL_DIFFERENCES is not set
CONFIG_RICHTEK_RTQ6056=m
CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
@@ -5389,10 +5434,9 @@ CONFIG_RV=y
CONFIG_RXKAD=y
# CONFIG_RXPERF is not set
CONFIG_S2IO=m
-CONFIG_S390_AP_IOMMU=y
-CONFIG_S390_CCW_IOMMU=y
CONFIG_S390_GUEST=y
CONFIG_S390_HYPFS_FS=y
+CONFIG_S390_HYPFS=y
# CONFIG_S390_KPROBES_SANITY_TEST is not set
# CONFIG_S390_MODULES_SANITY_TEST is not set
CONFIG_S390_PRNG=m
@@ -5584,6 +5628,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5659,6 +5704,7 @@ CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
CONFIG_SENSORS_HP_WMI=m
+CONFIG_SENSORS_HS3001=m
# CONFIG_SENSORS_I5K_AMB is not set
CONFIG_SENSORS_IBMAEM=m
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5745,6 +5791,7 @@ CONFIG_SENSORS_MCP3021=m
CONFIG_SENSORS_MLXREG_FAN=m
CONFIG_SENSORS_MP2888=m
CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_MP2975_REGULATOR=y
CONFIG_SENSORS_MP5023=m
CONFIG_SENSORS_MPQ7932=m
CONFIG_SENSORS_MPQ7932_REGULATOR=y
@@ -6052,6 +6099,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=2048
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
# CONFIG_SND_HDA_TEGRA is not set
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -6164,7 +6214,9 @@ CONFIG_SND_SOC_AK5558=m
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+CONFIG_SND_SOC_AUDIO_IIO_AUX=m
CONFIG_SND_SOC_AW8738=m
+CONFIG_SND_SOC_AW88261=m
CONFIG_SND_SOC_AW88395=m
CONFIG_SND_SOC_BD28623=m
CONFIG_SND_SOC_BT_SCO=m
@@ -6181,7 +6233,6 @@ CONFIG_SND_SOC_CS35L36=m
CONFIG_SND_SOC_CS35L45_I2C=m
CONFIG_SND_SOC_CS35L45_SPI=m
CONFIG_SND_SOC_CS35L56_I2C=m
-CONFIG_SND_SOC_CS35L56_SDW=m
CONFIG_SND_SOC_CS35L56_SPI=m
CONFIG_SND_SOC_CS4234=m
# CONFIG_SND_SOC_CS4265 is not set
@@ -6190,6 +6241,8 @@ CONFIG_SND_SOC_CS4234=m
# CONFIG_SND_SOC_CS4271_SPI is not set
CONFIG_SND_SOC_CS42L42=m
CONFIG_SND_SOC_CS42L42_SDW=m
+CONFIG_SND_SOC_CS42L43=m
+CONFIG_SND_SOC_CS42L43_SDW=m
# CONFIG_SND_SOC_CS42L51_I2C is not set
# CONFIG_SND_SOC_CS42L52 is not set
# CONFIG_SND_SOC_CS42L56 is not set
@@ -6375,6 +6428,7 @@ CONFIG_SND_SOC_RL6231=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+CONFIG_SND_SOC_RT1017_SDCA_SDW=m
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -6505,6 +6559,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6629,6 +6684,7 @@ CONFIG_SPI_AX88796C=m
# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_CADENCE_QUADSPI is not set
# CONFIG_SPI_CADENCE_XSPI is not set
+# CONFIG_SPI_CS42L43 is not set
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
CONFIG_SPI_DLN2=m
@@ -6759,6 +6815,7 @@ CONFIG_SURFACE_PRO3_BUTTON=m
# CONFIG_SUSPEND is not set
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
# CONFIG_SW_SYNC is not set
CONFIG_SX9310=m
CONFIG_SX9324=m
@@ -6869,6 +6926,7 @@ CONFIG_TEST_CPUMASK=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
@@ -6943,6 +7001,8 @@ CONFIG_TIFM_7XX1=m
# CONFIG_TIFM_CORE is not set
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+# CONFIG_TI_ICSSG_PRUETH is not set
+CONFIG_TI_ICSS_IEP=m
CONFIG_TI_LMP92064=m
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y
@@ -6975,6 +7035,7 @@ CONFIG_TLS=m
CONFIG_TMP117=m
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_QUOTA=y
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
CONFIG_TN3215_CONSOLE=y
@@ -7026,6 +7087,7 @@ CONFIG_TOUCHSCREEN_IMAGIS=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_IQS7211=m
# CONFIG_TOUCHSCREEN_MAX11801 is not set
CONFIG_TOUCHSCREEN_MCS5000=m
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7233,6 +7295,7 @@ CONFIG_USB_CHIPIDEA_IMX=m
# CONFIG_USB_CHIPIDEA is not set
CONFIG_USB_CHIPIDEA_MSM=m
CONFIG_USB_CHIPIDEA_PCI=m
+CONFIG_USB_CONFIGFS_F_MIDI2=y
# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
# CONFIG_USB_CONN_GPIO is not set
CONFIG_USB_CXACRU=m
@@ -7567,6 +7630,8 @@ CONFIG_VFAT_FS=m
CONFIG_VFIO_AP=m
CONFIG_VFIO_CCW=m
CONFIG_VFIO_CONTAINER=y
+# CONFIG_VFIO_DEVICE_CDEV is not set
+CONFIG_VFIO_GROUP=y
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
CONFIG_VFIO_MDEV=m
@@ -7635,8 +7700,12 @@ CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_DS90UB913=m
+CONFIG_VIDEO_DS90UB953=m
+CONFIG_VIDEO_DS90UB960=m
# CONFIG_VIDEO_DT3155 is not set
CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9719=m
CONFIG_VIDEO_DW9768=m
CONFIG_VIDEO_DW9807_VCM=m
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7977,6 +8046,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
+CONFIG_XEN_PRIVCMD_IRQFD=y
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_PVHVM_GUEST=y
@@ -7994,6 +8064,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index cd0ad6206..bf4e52866 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -203,7 +203,6 @@ CONFIG_AMD_HSMP=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
# CONFIG_AMD_PHY is not set
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
# CONFIG_AMD_PTDMA is not set
# CONFIG_AMDTEE is not set
# CONFIG_AMIGA_PARTITION is not set
@@ -677,6 +676,7 @@ CONFIG_CEPH_FS_SECURITY_LABEL=y
CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
+CONFIG_CERT_STORE=y
# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
CONFIG_CFG80211_CRDA_SUPPORT=y
# CONFIG_CFG80211_DEBUGFS is not set
@@ -812,6 +812,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -829,6 +830,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -910,6 +912,7 @@ CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA_S390=y
CONFIG_CRYPTO_CMAC=y
@@ -997,6 +1000,7 @@ CONFIG_CRYPTO_PAES_S390=m
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
+# CONFIG_CRYPTO_POLY1305_P10 is not set
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y
@@ -1203,6 +1207,7 @@ CONFIG_DMABUF_MOVE_NOTIFY=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1225,6 +1230,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1345,6 +1351,7 @@ CONFIG_DRM_KUNIT_TEST=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
CONFIG_DRM=m
# CONFIG_DRM_MALI_DISPLAY is not set
@@ -1419,6 +1426,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1659,6 +1667,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1841,6 +1850,7 @@ CONFIG_GNSS=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+# CONFIG_GPIO_DS4520 is not set
# CONFIG_GPIO_DWAPB is not set
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -1960,6 +1970,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2103,7 +2114,6 @@ CONFIG_HWPOISON_INJECT=m
CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
# CONFIG_HW_RANDOM_BA431 is not set
# CONFIG_HW_RANDOM_CCTRNG is not set
-CONFIG_HW_RANDOM_HISI=y
# CONFIG_HW_RANDOM_HISTB is not set
CONFIG_HW_RANDOM_S390=y
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
@@ -2139,6 +2149,7 @@ CONFIG_I2C_ALGOBIT=m
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_AMD_MP2 is not set
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
# CONFIG_I2C_CHARDEV is not set
@@ -2448,6 +2459,7 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_TCC_COOLING is not set
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_VSC is not set
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
CONFIG_INTEL_XWAY_PHY=m
@@ -2476,7 +2488,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2562,6 +2574,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2638,6 +2651,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -2781,14 +2795,16 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD_SEV=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
# CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set
CONFIG_KVM=m
+# CONFIG_KVM_PROVE_MMU is not set
# CONFIG_KVM_S390_UCONTROL is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
@@ -2861,6 +2877,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
@@ -3010,7 +3027,9 @@ CONFIG_MARCH_Z14=y
# CONFIG_MARCH_Z990 is not set
# CONFIG_MARCH_ZEC12 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
+CONFIG_MARVELL_GTI_WDT=y
# CONFIG_MARVELL_PHY is not set
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3051,9 +3070,11 @@ CONFIG_MAX_SKB_FRAGS=17
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3105,6 +3126,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3139,6 +3161,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3285,6 +3309,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3566,6 +3591,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -3986,6 +4012,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4032,6 +4059,7 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
CONFIG_NVMEM_SYSFS=y
@@ -4075,6 +4103,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
# CONFIG_OSF_PARTITION is not set
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4149,6 +4178,7 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -4242,6 +4272,7 @@ CONFIG_PHY_BCM_SR_USB=m
# CONFIG_PHY_QCOM_EUSB2_REPEATER is not set
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
# CONFIG_PHY_QCOM_SGMII_ETH is not set
@@ -4251,6 +4282,8 @@ CONFIG_PHY_BCM_SR_USB=m
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
# CONFIG_PHY_TUSB1210 is not set
# CONFIG_PI433 is not set
CONFIG_PID_NS=y
@@ -4402,6 +4435,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4420,6 +4454,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK=y
# CONFIG_PUNIT_ATOM_DEBUG is not set
@@ -4519,6 +4554,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -4563,12 +4599,14 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
# CONFIG_REALTEK_PHY is not set
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
# CONFIG_REGMAP is not set
CONFIG_REGMAP_KUNIT=m
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
+# CONFIG_REGULATOR_AW37503 is not set
# CONFIG_REGULATOR_DA9210 is not set
# CONFIG_REGULATOR_DA9211 is not set
# CONFIG_REGULATOR_DEBUG is not set
@@ -4585,6 +4623,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_LTC3589 is not set
# CONFIG_REGULATOR_LTC3676 is not set
# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8952 is not set
@@ -4597,9 +4636,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RT4803 is not set
# CONFIG_REGULATOR_RT5739 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_SY8106A is not set
# CONFIG_REGULATOR_TPS51632 is not set
# CONFIG_REGULATOR_TPS62360 is not set
@@ -4632,7 +4673,6 @@ CONFIG_RETPOLINE=y
# CONFIG_RFKILL_GPIO is not set
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -4835,10 +4875,9 @@ CONFIG_RV_REACT_PRINTK=y
CONFIG_RV=y
CONFIG_RXKAD=y
CONFIG_RXPERF=m
-CONFIG_S390_AP_IOMMU=y
-CONFIG_S390_CCW_IOMMU=y
CONFIG_S390_GUEST=y
CONFIG_S390_HYPFS_FS=y
+CONFIG_S390_HYPFS=y
# CONFIG_S390_KPROBES_SANITY_TEST is not set
# CONFIG_S390_MODULES_SANITY_TEST is not set
CONFIG_S390_PRNG=m
@@ -5042,6 +5081,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5051,6 +5091,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5126,6 +5167,7 @@ CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
# CONFIG_SENSORS_I5K_AMB is not set
CONFIG_SENSORS_IBMAEM=m
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5608,7 +5650,9 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -5625,7 +5669,6 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -5690,6 +5733,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -5700,6 +5744,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
# CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
@@ -5819,6 +5864,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -5877,6 +5923,7 @@ CONFIG_SND_SOC_SOF_ACPI=m
# CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set
# CONFIG_SND_SOC_SOF_JASPERLAKE is not set
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
# CONFIG_SND_SOC_SOF_MERRIFIELD is not set
# CONFIG_SND_SOC_SOF_METEORLAKE is not set
# CONFIG_SND_SOC_SOF_OF is not set
@@ -5947,6 +5994,7 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6167,6 +6215,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
# CONFIG_SX9324 is not set
@@ -6272,6 +6321,7 @@ CONFIG_TEST_CPUMASK=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
@@ -6376,6 +6426,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
CONFIG_TN3215_CONSOLE=y
@@ -6426,6 +6477,7 @@ CONFIG_TORTURE_TEST=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -6937,8 +6989,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7237,6 +7293,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 6e8f10a5e..2d5a1cce5 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -203,7 +203,6 @@ CONFIG_AMD_HSMP=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
# CONFIG_AMD_PHY is not set
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
# CONFIG_AMD_PTDMA is not set
# CONFIG_AMDTEE is not set
# CONFIG_AMIGA_PARTITION is not set
@@ -679,6 +678,7 @@ CONFIG_CEPH_FS_SECURITY_LABEL=y
CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
+CONFIG_CERT_STORE=y
# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
CONFIG_CFG80211_CRDA_SUPPORT=y
# CONFIG_CFG80211_DEBUGFS is not set
@@ -814,6 +814,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -831,6 +832,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=y
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -911,6 +913,7 @@ CONFIG_CRYPTO_CAST6=y
CONFIG_CRYPTO_CBC=y
# CONFIG_CRYPTO_CCM is not set
CONFIG_CRYPTO_CFB=y
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=y
CONFIG_CRYPTO_CHACHA20=y
CONFIG_CRYPTO_CHACHA_S390=y
@@ -998,6 +1001,7 @@ CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PAES_S390=m
CONFIG_CRYPTO_PCBC=y
CONFIG_CRYPTO_PCRYPT=y
+# CONFIG_CRYPTO_POLY1305_P10 is not set
CONFIG_CRYPTO_POLY1305=y
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=y
@@ -1205,6 +1209,7 @@ CONFIG_DMABUF_MOVE_NOTIFY=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1227,6 +1232,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1347,6 +1353,7 @@ CONFIG_DRM_KUNIT_TEST=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
CONFIG_DRM=m
# CONFIG_DRM_MALI_DISPLAY is not set
@@ -1421,6 +1428,7 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1662,6 +1670,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1847,6 +1856,7 @@ CONFIG_GLOB=y
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+# CONFIG_GPIO_DS4520 is not set
# CONFIG_GPIO_DWAPB is not set
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -1966,6 +1976,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2110,7 +2121,6 @@ CONFIG_HWPOISON_INJECT=m
CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
# CONFIG_HW_RANDOM_BA431 is not set
# CONFIG_HW_RANDOM_CCTRNG is not set
-CONFIG_HW_RANDOM_HISI=y
# CONFIG_HW_RANDOM_HISTB is not set
CONFIG_HW_RANDOM_S390=y
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
@@ -2146,6 +2156,7 @@ CONFIG_I2C_ALGOBIT=m
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_AMD_MP2 is not set
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
# CONFIG_I2C_CHARDEV is not set
@@ -2456,6 +2467,7 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_TCC_COOLING is not set
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_VSC is not set
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
CONFIG_INTEL_XWAY_PHY=m
@@ -2484,7 +2496,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2570,6 +2582,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2646,6 +2659,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -2790,14 +2804,16 @@ CONFIG_KPROBES=y
# CONFIG_KSM is not set
# CONFIG_KUNIT_ALL_TESTS is not set
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
# CONFIG_KUNIT is not set
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD_SEV=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
# CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set
# CONFIG_KVM is not set
+# CONFIG_KVM_PROVE_MMU is not set
# CONFIG_KVM_S390_UCONTROL is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
@@ -2870,6 +2886,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
@@ -3020,7 +3037,9 @@ CONFIG_MARCH_Z14=y
# CONFIG_MARCH_Z990 is not set
# CONFIG_MARCH_ZEC12 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
+CONFIG_MARVELL_GTI_WDT=y
# CONFIG_MARVELL_PHY is not set
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3061,9 +3080,11 @@ CONFIG_MAX_SKB_FRAGS=17
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3115,6 +3136,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
# CONFIG_MEMORY_HOTPLUG is not set
@@ -3149,6 +3171,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3295,6 +3319,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3576,6 +3601,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -3999,6 +4025,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
# CONFIG_NMI_CHECK_CPU is not set
# CONFIG_NOA1305 is not set
@@ -4044,6 +4071,7 @@ CONFIG_NVME_AUTH=y
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
CONFIG_NVMEM_SYSFS=y
@@ -4087,6 +4115,7 @@ CONFIG_OPENVSWITCH_GENEVE=m
# CONFIG_OSF_PARTITION is not set
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
# CONFIG_OVERLAY_FS is not set
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4161,6 +4190,7 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -4254,6 +4284,7 @@ CONFIG_PHY_BCM_SR_USB=m
# CONFIG_PHY_QCOM_EUSB2_REPEATER is not set
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
# CONFIG_PHY_QCOM_SGMII_ETH is not set
@@ -4263,6 +4294,8 @@ CONFIG_PHY_BCM_SR_USB=m
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
# CONFIG_PHY_TUSB1210 is not set
# CONFIG_PI433 is not set
CONFIG_PID_NS=y
@@ -4415,6 +4448,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4433,6 +4467,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK=y
# CONFIG_PUNIT_ATOM_DEBUG is not set
@@ -4532,6 +4567,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -4576,12 +4612,14 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
# CONFIG_REALTEK_PHY is not set
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
# CONFIG_REGMAP is not set
CONFIG_REGMAP_KUNIT=m
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
+# CONFIG_REGULATOR_AW37503 is not set
# CONFIG_REGULATOR_DA9210 is not set
# CONFIG_REGULATOR_DA9211 is not set
# CONFIG_REGULATOR_DEBUG is not set
@@ -4598,6 +4636,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_LTC3589 is not set
# CONFIG_REGULATOR_LTC3676 is not set
# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8952 is not set
@@ -4610,9 +4649,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RT4803 is not set
# CONFIG_REGULATOR_RT5739 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_SY8106A is not set
# CONFIG_REGULATOR_TPS51632 is not set
# CONFIG_REGULATOR_TPS62360 is not set
@@ -4645,7 +4686,6 @@ CONFIG_RETPOLINE=y
# CONFIG_RFKILL_GPIO is not set
CONFIG_RFKILL_INPUT=y
# CONFIG_RFKILL is not set
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -4849,10 +4889,9 @@ CONFIG_RV_REACT_PRINTK=y
CONFIG_RV=y
CONFIG_RXKAD=y
CONFIG_RXPERF=m
-CONFIG_S390_AP_IOMMU=y
-CONFIG_S390_CCW_IOMMU=y
# CONFIG_S390_GUEST is not set
# CONFIG_S390_HYPFS_FS is not set
+CONFIG_S390_HYPFS=y
# CONFIG_S390_KPROBES_SANITY_TEST is not set
# CONFIG_S390_MODULES_SANITY_TEST is not set
CONFIG_S390_PRNG=y
@@ -5060,6 +5099,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5068,6 +5108,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_SMACK is not set
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5143,6 +5184,7 @@ CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
# CONFIG_SENSORS_I5K_AMB is not set
CONFIG_SENSORS_IBMAEM=m
# CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5625,7 +5667,9 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_AMD_YC_MACH is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -5642,7 +5686,6 @@ CONFIG_SND_SEQ_UMP=y
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -5707,6 +5750,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -5717,6 +5761,7 @@ CONFIG_SND_SOC_CX2072X=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
# CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
@@ -5836,6 +5881,7 @@ CONFIG_SND_SOC_MAX98927=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
# CONFIG_SND_SOC_RT1308 is not set
# CONFIG_SND_SOC_RT1308_SDW is not set
# CONFIG_SND_SOC_RT1316_SDW is not set
@@ -5894,6 +5940,7 @@ CONFIG_SND_SOC_SOF_ACPI=m
# CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set
# CONFIG_SND_SOC_SOF_JASPERLAKE is not set
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
# CONFIG_SND_SOC_SOF_MERRIFIELD is not set
# CONFIG_SND_SOC_SOF_METEORLAKE is not set
# CONFIG_SND_SOC_SOF_OF is not set
@@ -5964,6 +6011,7 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
# CONFIG_SND_SOC_TS3A227E is not set
@@ -6187,6 +6235,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SUSPEND=y
# CONFIG_SWAP is not set
+# CONFIG_SWIOTLB_DYNAMIC is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
# CONFIG_SX9324 is not set
@@ -6294,6 +6343,7 @@ CONFIG_TEST_CPUMASK=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
@@ -6399,6 +6449,7 @@ CONFIG_TLS=m
CONFIG_TMPFS_INODE64=y
# CONFIG_TMPFS is not set
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TN3215_CONSOLE=y
CONFIG_TN3215=y
@@ -6448,6 +6499,7 @@ CONFIG_TN3270=y
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -6960,8 +7012,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7260,6 +7316,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
# CONFIG_XFS_FS is not set
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index d2ca299c0..f8b8c8916 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -154,7 +154,7 @@ CONFIG_AD7949=m
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
CONFIG_ADAPTEC_STARFIRE=m
-# CONFIG_ADDRESS_MASKING is not set
+CONFIG_ADDRESS_MASKING=y
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -1021,6 +1021,7 @@ CONFIG_COMMON_CLK_SI521XX=y
CONFIG_COMMON_CLK_SI544=m
# CONFIG_COMMON_CLK_SI570 is not set
CONFIG_COMMON_CLK_TPS68470=m
+CONFIG_COMMON_CLK_VC3=m
# CONFIG_COMMON_CLK_VC5 is not set
CONFIG_COMMON_CLK_VC7=m
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -1038,6 +1039,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=3
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1082,6 +1084,8 @@ CONFIG_CPU_UNRET_ENTRY=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -1486,6 +1490,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1510,6 +1515,7 @@ CONFIG_DM_INIT=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=y
@@ -1634,6 +1640,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
CONFIG_DRM_LONTIUM_LT9611UXC=m
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
CONFIG_DRM_MGAG200=m
@@ -1719,11 +1726,13 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
+CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m
# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
# CONFIG_DRM_PANEL_TPO_TPG110 is not set
# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+CONFIG_DRM_PANEL_VISIONOX_R66451=m
CONFIG_DRM_PANEL_VISIONOX_RM69299=m
# CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set
CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
@@ -1760,6 +1769,7 @@ CONFIG_DRM_TOSHIBA_TC358764=m
# CONFIG_DRM_TOSHIBA_TC358767 is not set
CONFIG_DRM_TOSHIBA_TC358768=m
CONFIG_DRM_TOSHIBA_TC358775=m
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
CONFIG_DRM_VBOXVIDEO=m
@@ -1973,6 +1983,7 @@ CONFIG_EROFS_FS=m
CONFIG_EROFS_FS_POSIX_ACL=y
CONFIG_EROFS_FS_SECURITY=y
CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP_DEFLATE=y
CONFIG_EROFS_FS_ZIP_LZMA=y
CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
@@ -2064,6 +2075,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -2293,6 +2305,7 @@ CONFIG_GPIO_CDEV=y
CONFIG_GPIO_CRYSTAL_COVE=y
# CONFIG_GPIO_CS5535 is not set
CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_DS4520=m
# CONFIG_GPIO_DWAPB is not set
CONFIG_GPIO_ELKHARTLAKE=m
CONFIG_GPIO_EXAR=m
@@ -2416,6 +2429,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
CONFIG_HID_GLORIOUS=m
# CONFIG_HID_GOOGLE_HAMMER is not set
+CONFIG_HID_GOOGLE_STADIA_FF=m
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2541,6 +2555,7 @@ CONFIG_HOTPLUG_PCI=y
# CONFIG_HP03 is not set
# CONFIG_HP206C is not set
CONFIG_HP_ACCEL=m
+CONFIG_HP_BIOSCFG=m
# CONFIG_HPET_MMAP is not set
CONFIG_HPET_TIMER=y
CONFIG_HPET=y
@@ -2615,6 +2630,7 @@ CONFIG_I2C_AMD756_S4882=m
CONFIG_I2C_AMD8111=m
CONFIG_I2C_AMD_MP2=m
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+CONFIG_I2C_ATR=m
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
@@ -3032,6 +3048,7 @@ CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_INTEL_TXT=y
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
CONFIG_INTEL_VBTN=m
+CONFIG_INTEL_VSC=m
CONFIG_INTEL_VSEC=m
CONFIG_INTEL_WMI_SBL_FW_UPDATE=m
CONFIG_INTEL_WMI_THUNDERBOLT=m
@@ -3062,6 +3079,7 @@ CONFIG_IOSCHED_BFQ=y
CONFIG_IOSF_MBI=y
CONFIG_IOSM=m
CONFIG_IO_STRICT_DEVMEM=y
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -3149,6 +3167,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+CONFIG_IPU_BRIDGE=m
CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_IOAM6_LWTUNNEL=y
@@ -3226,6 +3245,7 @@ CONFIG_IR_RC6_DECODER=m
CONFIG_IR_RCMM_DECODER=m
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
CONFIG_IR_SERIAL=m
CONFIG_IR_SERIAL_TRANSMITTER=y
CONFIG_IR_SHARP_DECODER=m
@@ -3438,7 +3458,7 @@ CONFIG_KSM=y
CONFIG_KSZ884X_PCI=m
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
@@ -3448,6 +3468,7 @@ CONFIG_KVM_GUEST=y
CONFIG_KVM_INTEL=m
CONFIG_KVM=m
CONFIG_KVM_MMU_AUDIT=y
+CONFIG_KVM_PROVE_MMU=y
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
CONFIG_KVM_XEN=y
@@ -3500,6 +3521,7 @@ CONFIG_LEDS_CR0014114=m
# CONFIG_LEDS_DAC124S085 is not set
# CONFIG_LEDS_EL15203000 is not set
CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GROUP_MULTICOLOR=m
CONFIG_LEDS_INTEL_SS4200=m
# CONFIG_LEDS_IS31FL319X is not set
CONFIG_LEDS_IS31FL32XX=m
@@ -3528,6 +3550,7 @@ CONFIG_LEDS_PCA9532_GPIO=y
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+CONFIG_LEDS_PCA995X=m
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_PWM_MULTICOLOR=m
CONFIG_LEDS_QCOM_FLASH=m
@@ -3683,6 +3706,7 @@ CONFIG_MANA_INFINIBAND=m
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88Q2XXX_PHY=m
CONFIG_MARVELL_88X2222_PHY=m
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
@@ -3726,11 +3750,13 @@ CONFIG_MCP41010=m
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+CONFIG_MCP4728=m
# CONFIG_MCP4922 is not set
CONFIG_MCTP_SERIAL=m
# CONFIG_MCTP_TRANSPORT_I2C is not set
CONFIG_MCTP=y
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3830,6 +3856,8 @@ CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=y
# CONFIG_MFD_CPCAP is not set
CONFIG_MFD_CROS_EC_DEV=m
+CONFIG_MFD_CS42L43_I2C=m
+CONFIG_MFD_CS42L43_SDW=m
# CONFIG_MFD_CS47L24 is not set
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
@@ -3996,6 +4024,7 @@ CONFIG_MLX5_ESWITCH=y
# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -4332,6 +4361,7 @@ CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4847,6 +4877,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4946,6 +4977,7 @@ CONFIG_ORINOCO_USB=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -5049,6 +5081,7 @@ CONFIG_PCH_PHUB=m
CONFIG_PCI_BIOS=y
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -5120,6 +5153,7 @@ CONFIG_PD6729=m
CONFIG_PDC_ADMA=m
CONFIG_PDS_CORE=m
CONFIG_PDS_VDPA=m
+CONFIG_PDS_VFIO_PCI=m
CONFIG_PEAQ_WMI=m
# CONFIG_PECI is not set
CONFIG_PERCPU_STATS=y
@@ -5165,6 +5199,8 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+CONFIG_PHY_RTK_RTD_USB2PHY=m
+CONFIG_PHY_RTK_RTD_USB3PHY=m
CONFIG_PHYSICAL_ALIGN=0x1000000
CONFIG_PHYSICAL_START=0x1000000
# CONFIG_PHY_TUSB1210 is not set
@@ -5178,6 +5214,7 @@ CONFIG_PINCTRL_BROXTON=m
CONFIG_PINCTRL_CANNONLAKE=m
CONFIG_PINCTRL_CEDARFORK=m
CONFIG_PINCTRL_CHERRYVIEW=y
+CONFIG_PINCTRL_CS42L43=m
CONFIG_PINCTRL_CY8C95X0=m
CONFIG_PINCTRL_DENVERTON=m
CONFIG_PINCTRL_ELKHARTLAKE=m
@@ -5209,6 +5246,7 @@ CONFIG_PINCTRL_RK805=m
# CONFIG_PINCTRL_SM8150 is not set
# CONFIG_PINCTRL_SM8250 is not set
# CONFIG_PINCTRL_SM8350 is not set
+CONFIG_PINCTRL_SM8350_LPASS_LPI=m
# CONFIG_PINCTRL_SM8450 is not set
# CONFIG_PINCTRL_STMFX is not set
# CONFIG_PINCTRL_SUN4I_A10 is not set
@@ -5356,6 +5394,7 @@ CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
CONFIG_PSTORE_842_COMPRESS=y
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -5377,6 +5416,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
CONFIG_PTP_1588_CLOCK_IDTCM=m
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_PTP_1588_CLOCK_VMW=m
@@ -5468,6 +5508,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -5529,6 +5570,7 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=y
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
@@ -5537,6 +5579,7 @@ CONFIG_REGMAP=y
# CONFIG_REGULATOR_AD5398 is not set
CONFIG_REGULATOR_ARIZONA_LDO1=m
CONFIG_REGULATOR_ARIZONA_MICSUPP=m
+CONFIG_REGULATOR_AW37503=m
# CONFIG_REGULATOR_AXP20X is not set
# CONFIG_REGULATOR_BD9571MWV is not set
# CONFIG_REGULATOR_DA9121 is not set
@@ -5558,9 +5601,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_MAX1586 is not set
# CONFIG_REGULATOR_MAX20086 is not set
CONFIG_REGULATOR_MAX20411=m
+CONFIG_REGULATOR_MAX5970=m
CONFIG_REGULATOR_MAX597X=m
CONFIG_REGULATOR_MAX77650=m
# CONFIG_REGULATOR_MAX77826 is not set
+CONFIG_REGULATOR_MAX77857=m
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
CONFIG_REGULATOR_MAX8893=m
@@ -5593,6 +5638,7 @@ CONFIG_REGULATOR_RT6190=m
CONFIG_REGULATOR_RT6245=m
CONFIG_REGULATOR_RTMV20=m
CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTQ2208=m
CONFIG_REGULATOR_RTQ6752=m
# CONFIG_REGULATOR_SLG51000 is not set
CONFIG_REGULATOR_SY7636A=m
@@ -5641,8 +5687,7 @@ CONFIG_RETPOLINE=y
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-# CONFIG_RH_DISABLE_DEPRECATED is not set
-CONFIG_RH_FEDORA=y
+# CONFIG_RHEL_DIFFERENCES is not set
CONFIG_RICHTEK_RTQ6056=m
CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
@@ -6051,6 +6096,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -6060,6 +6106,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+CONFIG_SEL3350_PLATFORM=m
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -6137,6 +6184,7 @@ CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
CONFIG_SENSORS_HP_WMI=m
+CONFIG_SENSORS_HS3001=m
CONFIG_SENSORS_I5500=m
CONFIG_SENSORS_I5K_AMB=m
CONFIG_SENSORS_IBMAEM=m
@@ -6226,6 +6274,7 @@ CONFIG_SENSORS_MCP3021=m
CONFIG_SENSORS_MLXREG_FAN=m
CONFIG_SENSORS_MP2888=m
CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_MP2975_REGULATOR=y
CONFIG_SENSORS_MP5023=m
CONFIG_SENSORS_MPQ7932=m
CONFIG_SENSORS_MPQ7932_REGULATOR=y
@@ -6553,6 +6602,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=0
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
# CONFIG_SND_HDA_TEGRA is not set
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -6668,7 +6720,9 @@ CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
CONFIG_SND_SOC_AMD_YC_MACH=m
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+CONFIG_SND_SOC_AUDIO_IIO_AUX=m
CONFIG_SND_SOC_AW8738=m
+CONFIG_SND_SOC_AW88261=m
CONFIG_SND_SOC_AW88395=m
CONFIG_SND_SOC_BD28623=m
CONFIG_SND_SOC_BT_SCO=m
@@ -6694,6 +6748,8 @@ CONFIG_SND_SOC_CS4234=m
# CONFIG_SND_SOC_CS4271_SPI is not set
CONFIG_SND_SOC_CS42L42=m
CONFIG_SND_SOC_CS42L42_SDW=m
+CONFIG_SND_SOC_CS42L43=m
+CONFIG_SND_SOC_CS42L43_SDW=m
# CONFIG_SND_SOC_CS42L51_I2C is not set
# CONFIG_SND_SOC_CS42L52 is not set
# CONFIG_SND_SOC_CS42L56 is not set
@@ -6751,6 +6807,7 @@ CONFIG_SND_SOC_IDT821034=m
CONFIG_SND_SOC_INTEL_AVS=m
CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219=m
CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336=m
CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO=m
CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST=m
CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A=m
@@ -6761,6 +6818,7 @@ CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE=m
CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=m
CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=m
CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663=m
CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682=m
CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567=m
CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
@@ -6881,6 +6939,7 @@ CONFIG_SND_SOC_RL6231=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+CONFIG_SND_SOC_RT1017_SDCA_SDW=m
CONFIG_SND_SOC_RT1308=m
CONFIG_SND_SOC_RT1308_SDW=m
CONFIG_SND_SOC_RT1316_SDW=m
@@ -6922,6 +6981,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE=m
CONFIG_SND_SOC_SOF_AMD_REMBRANDT=m
CONFIG_SND_SOC_SOF_AMD_RENOIR=m
CONFIG_SND_SOC_SOF_AMD_TOPLEVEL=m
+CONFIG_SND_SOC_SOF_AMD_VANGOGH=m
CONFIG_SND_SOC_SOF_APOLLOLAKE=m
CONFIG_SND_SOC_SOF_BAYTRAIL=m
CONFIG_SND_SOC_SOF_BROADWELL=m
@@ -6942,6 +7002,7 @@ CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
CONFIG_SND_SOC_SOF_JASPERLAKE=m
CONFIG_SND_SOC_SOF_KABYLAKE=m
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
CONFIG_SND_SOC_SOF_MERRIFIELD=m
CONFIG_SND_SOC_SOF_METEORLAKE=m
# CONFIG_SND_SOC_SOF_MT8195 is not set
@@ -7014,6 +7075,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
CONFIG_SND_SOC_TS3A227E=m
@@ -7147,6 +7209,7 @@ CONFIG_SPI_AX88796C=m
# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_CADENCE_QUADSPI is not set
# CONFIG_SPI_CADENCE_XSPI is not set
+# CONFIG_SPI_CS42L43 is not set
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
CONFIG_SPI_DLN2=m
@@ -7288,6 +7351,7 @@ CONFIG_SURFACE_PRO3_BUTTON=m
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_SWIOTLB=y
# CONFIG_SW_SYNC is not set
CONFIG_SX9310=m
@@ -7398,6 +7462,7 @@ CONFIG_TEST_FPU=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIST_SORT=m
@@ -7479,6 +7544,8 @@ CONFIG_TIFM_7XX1=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+# CONFIG_TI_ICSSG_PRUETH is not set
+CONFIG_TI_ICSS_IEP=m
CONFIG_TI_LMP92064=m
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y
@@ -7511,6 +7578,7 @@ CONFIG_TLS=m
CONFIG_TMP117=m
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_QUOTA=y
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
CONFIG_TOPSTAR_LAPTOP=m
@@ -7560,6 +7628,7 @@ CONFIG_TOUCHSCREEN_IMAGIS=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
CONFIG_TOUCHSCREEN_INEXIO=m
CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_IQS7211=m
# CONFIG_TOUCHSCREEN_MAX11801 is not set
CONFIG_TOUCHSCREEN_MCS5000=m
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7761,6 +7830,7 @@ CONFIG_USB_CHIPIDEA_IMX=m
# CONFIG_USB_CHIPIDEA is not set
CONFIG_USB_CHIPIDEA_MSM=m
CONFIG_USB_CHIPIDEA_PCI=m
+CONFIG_USB_CONFIGFS_F_MIDI2=y
# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
# CONFIG_USB_CONN_GPIO is not set
CONFIG_USB_CXACRU=m
@@ -7773,9 +7843,11 @@ CONFIG_USB_DSBR=m
# CONFIG_USB_DWC2_PERIPHERAL is not set
# CONFIG_USB_DWC3_GADGET is not set
# CONFIG_USB_DWC3_HAPS is not set
-# CONFIG_USB_DWC3_HOST is not set
-# CONFIG_USB_DWC3 is not set
+CONFIG_USB_DWC3_HOST=y
+CONFIG_USB_DWC3=m
# CONFIG_USB_DWC3_OF_SIMPLE is not set
+CONFIG_USB_DWC3_PCI=m
+# CONFIG_USB_DWC3_ULPI is not set
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_EHCI_FSL is not set
# CONFIG_USB_EHCI_HCD_PLATFORM is not set
@@ -8100,6 +8172,8 @@ CONFIG_VETH=m
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=m
CONFIG_VFIO_CONTAINER=y
+# CONFIG_VFIO_DEVICE_CDEV is not set
+CONFIG_VFIO_GROUP=y
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
CONFIG_VFIO_MDEV=m
@@ -8172,8 +8246,12 @@ CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_DS90UB913=m
+CONFIG_VIDEO_DS90UB953=m
+CONFIG_VIDEO_DS90UB960=m
# CONFIG_VIDEO_DT3155 is not set
CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9719=m
CONFIG_VIDEO_DW9768=m
CONFIG_VIDEO_DW9807_VCM=m
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -8571,6 +8649,7 @@ CONFIG_X86_SGX_KVM=y
CONFIG_X86_SGX=y
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
CONFIG_X86_UMIP=y
+CONFIG_X86_USER_SHADOW_STACK=y
CONFIG_X86_UV=y
# CONFIG_X86_VERBOSE_BOOTUP is not set
# CONFIG_X86_VSMP is not set
@@ -8603,6 +8682,7 @@ CONFIG_XEN_NETDEV_BACKEND=m
CONFIG_XEN_NETDEV_FRONTEND=m
CONFIG_XEN_PCIDEV_BACKEND=m
CONFIG_XEN_PCIDEV_FRONTEND=m
+CONFIG_XEN_PRIVCMD_IRQFD=y
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_BACKEND is not set
# CONFIG_XEN_PVCALLS_FRONTEND is not set
@@ -8633,6 +8713,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index e41338652..b6814ad60 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -134,7 +134,7 @@ CONFIG_ACPI=y
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
-# CONFIG_ADDRESS_MASKING is not set
+CONFIG_ADDRESS_MASKING=y
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -225,7 +225,8 @@ CONFIG_AMD_MEM_ENCRYPT=y
CONFIG_AMD_NUMA=y
CONFIG_AMD_PHY=m
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
+CONFIG_AMD_PMF_DEBUG=y
+CONFIG_AMD_PMF=m
CONFIG_AMD_PTDMA=m
CONFIG_AMD_SFH_HID=m
# CONFIG_AMDTEE is not set
@@ -842,6 +843,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -860,6 +862,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -906,6 +909,8 @@ CONFIG_CPU_UNRET_ENTRY=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -958,6 +963,7 @@ CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA20_X86_64=y
CONFIG_CRYPTO_CMAC=y
@@ -1054,6 +1060,7 @@ CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
+# CONFIG_CRYPTO_POLY1305_P10 is not set
CONFIG_CRYPTO_POLY1305_X86_64=y
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
@@ -1288,6 +1295,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1310,6 +1318,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1435,6 +1444,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MALI_DISPLAY is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1508,6 +1518,7 @@ CONFIG_DRM_SIMPLEDRM=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1781,6 +1792,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1970,6 +1982,7 @@ CONFIG_GPIO_AMDPT=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+# CONFIG_GPIO_DS4520 is not set
# CONFIG_GPIO_DWAPB is not set
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -2092,6 +2105,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2256,7 +2270,6 @@ CONFIG_HW_RANDOM_AMD=m
CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
# CONFIG_HW_RANDOM_BA431 is not set
# CONFIG_HW_RANDOM_CCTRNG is not set
-CONFIG_HW_RANDOM_HISI=y
# CONFIG_HW_RANDOM_HISTB is not set
CONFIG_HW_RANDOM_INTEL=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -2294,6 +2307,7 @@ CONFIG_I2C_AMD756_S4882=m
CONFIG_I2C_AMD8111=m
# CONFIG_I2C_AMD_MP2 is not set
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
@@ -2653,6 +2667,7 @@ CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_INTEL_TXT=y
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
CONFIG_INTEL_VBTN=m
+# CONFIG_INTEL_VSC is not set
CONFIG_INTEL_VSEC=m
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
@@ -2684,7 +2699,7 @@ CONFIG_IOSCHED_BFQ=y
CONFIG_IOSF_MBI=y
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2770,6 +2785,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2847,6 +2863,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -2994,10 +3011,11 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD=m
CONFIG_KVM_AMD_SEV=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
@@ -3006,6 +3024,7 @@ CONFIG_KVM_GUEST=y
CONFIG_KVM_INTEL=m
CONFIG_KVM=m
CONFIG_KVM_MMU_AUDIT=y
+CONFIG_KVM_PROVE_MMU=y
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
# CONFIG_KVM_XEN is not set
@@ -3076,6 +3095,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
@@ -3219,7 +3239,9 @@ CONFIG_MANA_INFINIBAND=m
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3261,9 +3283,11 @@ CONFIG_MAXSMP=y
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3315,6 +3339,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3349,6 +3374,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3504,6 +3531,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3794,6 +3822,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4213,6 +4242,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4262,6 +4292,7 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
CONFIG_NVMEM_SYSFS=y
@@ -4306,6 +4337,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+CONFIG_OVERLAY_FS_DEBUG=y
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4391,6 +4423,7 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -4490,6 +4523,7 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_EUSB2_REPEATER is not set
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
# CONFIG_PHY_QCOM_SGMII_ETH is not set
@@ -4499,6 +4533,8 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
CONFIG_PHYSICAL_ALIGN=0x200000
CONFIG_PHYSICAL_START=0x1000000
# CONFIG_PHY_TUSB1210 is not set
@@ -4667,6 +4703,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4685,6 +4722,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_VMW=m
CONFIG_PTP_1588_CLOCK=y
@@ -4783,6 +4821,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -4827,12 +4866,14 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
+# CONFIG_REGULATOR_AW37503 is not set
# CONFIG_REGULATOR_DA9210 is not set
# CONFIG_REGULATOR_DA9211 is not set
# CONFIG_REGULATOR_DEBUG is not set
@@ -4849,6 +4890,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_LTC3589 is not set
# CONFIG_REGULATOR_LTC3676 is not set
# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8952 is not set
@@ -4861,9 +4903,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RT4803 is not set
# CONFIG_REGULATOR_RT5739 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_SY8106A is not set
# CONFIG_REGULATOR_TPS51632 is not set
# CONFIG_REGULATOR_TPS62360 is not set
@@ -4897,7 +4941,6 @@ CONFIG_RETPOLINE=y
# CONFIG_RFKILL_GPIO is not set
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -5291,6 +5334,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5300,6 +5344,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5377,6 +5422,7 @@ CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
CONFIG_SENSORS_I5500=m
CONFIG_SENSORS_I5K_AMB=m
CONFIG_SENSORS_IBMAEM=m
@@ -5761,6 +5807,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=0
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
# CONFIG_SND_HDA_TEGRA is not set
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -5872,7 +5921,9 @@ CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
CONFIG_SND_SOC_AMD_YC_MACH=m
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -5889,7 +5940,7 @@ CONFIG_SND_SOC_CS35L41_SPI=m
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
+CONFIG_SND_SOC_CS35L56_SDW=m
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -5954,6 +6005,7 @@ CONFIG_SND_SOC_HDAC_HDMI=m
CONFIG_SND_SOC_INTEL_AVS=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -5964,6 +6016,7 @@ CONFIG_SND_SOC_INTEL_AVS=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
@@ -6084,6 +6137,7 @@ CONFIG_SND_SOC_RL6231=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
CONFIG_SND_SOC_RT1308=m
CONFIG_SND_SOC_RT1308_SDW=m
CONFIG_SND_SOC_RT1316_SDW=m
@@ -6144,6 +6198,7 @@ CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
CONFIG_SND_SOC_SOF_JASPERLAKE=m
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
CONFIG_SND_SOC_SOF_MERRIFIELD=m
CONFIG_SND_SOC_SOF_METEORLAKE=m
# CONFIG_SND_SOC_SOF_OF is not set
@@ -6214,6 +6269,7 @@ CONFIG_SND_SOC_SSM4567=m
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_BUILD=y
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
CONFIG_SND_SOC_TS3A227E=m
@@ -6453,6 +6509,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_SWIOTLB=y
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
@@ -6558,6 +6615,7 @@ CONFIG_TEST_FPU=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIST_SORT=m
@@ -6669,6 +6727,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -6717,6 +6776,7 @@ CONFIG_TOUCHSCREEN_ELO=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7223,8 +7283,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7554,6 +7618,7 @@ CONFIG_X86_SGX_KVM=y
CONFIG_X86_SGX=y
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
CONFIG_X86_UMIP=y
+CONFIG_X86_USER_SHADOW_STACK=y
CONFIG_X86_UV=y
# CONFIG_X86_VERBOSE_BOOTUP is not set
# CONFIG_X86_VSMP is not set
@@ -7603,6 +7668,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index fbdf8ee7e..6ef39288b 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -154,7 +154,7 @@ CONFIG_AD7949=m
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
CONFIG_ADAPTEC_STARFIRE=m
-# CONFIG_ADDRESS_MASKING is not set
+CONFIG_ADDRESS_MASKING=y
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -1019,6 +1019,7 @@ CONFIG_COMMON_CLK_SI521XX=y
CONFIG_COMMON_CLK_SI544=m
# CONFIG_COMMON_CLK_SI570 is not set
CONFIG_COMMON_CLK_TPS68470=m
+CONFIG_COMMON_CLK_VC3=m
# CONFIG_COMMON_CLK_VC5 is not set
CONFIG_COMMON_CLK_VC7=m
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -1036,6 +1037,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=3
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -1080,6 +1082,8 @@ CONFIG_CPU_UNRET_ENTRY=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -1475,6 +1479,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1499,6 +1504,7 @@ CONFIG_DM_INIT=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=y
@@ -1623,6 +1629,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
CONFIG_DRM_LONTIUM_LT9611UXC=m
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
CONFIG_DRM_MGAG200=m
@@ -1708,11 +1715,13 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
+CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m
# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
# CONFIG_DRM_PANEL_TPO_TPG110 is not set
# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+CONFIG_DRM_PANEL_VISIONOX_R66451=m
CONFIG_DRM_PANEL_VISIONOX_RM69299=m
# CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set
CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
@@ -1749,6 +1758,7 @@ CONFIG_DRM_TOSHIBA_TC358764=m
# CONFIG_DRM_TOSHIBA_TC358767 is not set
CONFIG_DRM_TOSHIBA_TC358768=m
CONFIG_DRM_TOSHIBA_TC358775=m
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
CONFIG_DRM_VBOXVIDEO=m
@@ -1962,6 +1972,7 @@ CONFIG_EROFS_FS=m
CONFIG_EROFS_FS_POSIX_ACL=y
CONFIG_EROFS_FS_SECURITY=y
CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP_DEFLATE=y
CONFIG_EROFS_FS_ZIP_LZMA=y
CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
@@ -2045,6 +2056,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -2274,6 +2286,7 @@ CONFIG_GPIO_CDEV=y
CONFIG_GPIO_CRYSTAL_COVE=y
# CONFIG_GPIO_CS5535 is not set
CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_DS4520=m
# CONFIG_GPIO_DWAPB is not set
CONFIG_GPIO_ELKHARTLAKE=m
CONFIG_GPIO_EXAR=m
@@ -2397,6 +2410,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
CONFIG_HID_GLORIOUS=m
# CONFIG_HID_GOOGLE_HAMMER is not set
+CONFIG_HID_GOOGLE_STADIA_FF=m
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2522,6 +2536,7 @@ CONFIG_HOTPLUG_PCI=y
# CONFIG_HP03 is not set
# CONFIG_HP206C is not set
CONFIG_HP_ACCEL=m
+CONFIG_HP_BIOSCFG=m
# CONFIG_HPET_MMAP is not set
CONFIG_HPET_TIMER=y
CONFIG_HPET=y
@@ -2596,6 +2611,7 @@ CONFIG_I2C_AMD756_S4882=m
CONFIG_I2C_AMD8111=m
CONFIG_I2C_AMD_MP2=m
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+CONFIG_I2C_ATR=m
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
@@ -3012,6 +3028,7 @@ CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_INTEL_TXT=y
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
CONFIG_INTEL_VBTN=m
+CONFIG_INTEL_VSC=m
CONFIG_INTEL_VSEC=m
CONFIG_INTEL_WMI_SBL_FW_UPDATE=m
CONFIG_INTEL_WMI_THUNDERBOLT=m
@@ -3042,6 +3059,7 @@ CONFIG_IOSCHED_BFQ=y
CONFIG_IOSF_MBI=y
CONFIG_IOSM=m
CONFIG_IO_STRICT_DEVMEM=y
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -3129,6 +3147,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+CONFIG_IPU_BRIDGE=m
CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_IOAM6_LWTUNNEL=y
@@ -3206,6 +3225,7 @@ CONFIG_IR_RC6_DECODER=m
CONFIG_IR_RCMM_DECODER=m
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
CONFIG_IR_SERIAL=m
CONFIG_IR_SERIAL_TRANSMITTER=y
CONFIG_IR_SHARP_DECODER=m
@@ -3412,7 +3432,7 @@ CONFIG_KSM=y
CONFIG_KSZ884X_PCI=m
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
@@ -3422,6 +3442,7 @@ CONFIG_KVM_GUEST=y
CONFIG_KVM_INTEL=m
CONFIG_KVM=m
CONFIG_KVM_MMU_AUDIT=y
+# CONFIG_KVM_PROVE_MMU is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
CONFIG_KVM_XEN=y
@@ -3474,6 +3495,7 @@ CONFIG_LEDS_CR0014114=m
# CONFIG_LEDS_DAC124S085 is not set
# CONFIG_LEDS_EL15203000 is not set
CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GROUP_MULTICOLOR=m
CONFIG_LEDS_INTEL_SS4200=m
# CONFIG_LEDS_IS31FL319X is not set
CONFIG_LEDS_IS31FL32XX=m
@@ -3502,6 +3524,7 @@ CONFIG_LEDS_PCA9532_GPIO=y
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+CONFIG_LEDS_PCA995X=m
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_PWM_MULTICOLOR=m
CONFIG_LEDS_QCOM_FLASH=m
@@ -3657,6 +3680,7 @@ CONFIG_MANA_INFINIBAND=m
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88Q2XXX_PHY=m
CONFIG_MARVELL_88X2222_PHY=m
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
@@ -3700,11 +3724,13 @@ CONFIG_MCP41010=m
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+CONFIG_MCP4728=m
# CONFIG_MCP4922 is not set
CONFIG_MCTP_SERIAL=m
# CONFIG_MCTP_TRANSPORT_I2C is not set
CONFIG_MCTP=y
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3804,6 +3830,8 @@ CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=y
# CONFIG_MFD_CPCAP is not set
CONFIG_MFD_CROS_EC_DEV=m
+CONFIG_MFD_CS42L43_I2C=m
+CONFIG_MFD_CS42L43_SDW=m
# CONFIG_MFD_CS47L24 is not set
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
@@ -3970,6 +3998,7 @@ CONFIG_MLX5_ESWITCH=y
# CONFIG_MLX5_FPGA is not set
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -4306,6 +4335,7 @@ CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4821,6 +4851,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4920,6 +4951,7 @@ CONFIG_ORINOCO_USB=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -5022,6 +5054,7 @@ CONFIG_PCH_PHUB=m
CONFIG_PCI_BIOS=y
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -5093,6 +5126,7 @@ CONFIG_PD6729=m
CONFIG_PDC_ADMA=m
CONFIG_PDS_CORE=m
CONFIG_PDS_VDPA=m
+CONFIG_PDS_VFIO_PCI=m
CONFIG_PEAQ_WMI=m
# CONFIG_PECI is not set
# CONFIG_PERCPU_STATS is not set
@@ -5138,6 +5172,8 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+CONFIG_PHY_RTK_RTD_USB2PHY=m
+CONFIG_PHY_RTK_RTD_USB3PHY=m
CONFIG_PHYSICAL_ALIGN=0x1000000
CONFIG_PHYSICAL_START=0x1000000
# CONFIG_PHY_TUSB1210 is not set
@@ -5151,6 +5187,7 @@ CONFIG_PINCTRL_BROXTON=m
CONFIG_PINCTRL_CANNONLAKE=m
CONFIG_PINCTRL_CEDARFORK=m
CONFIG_PINCTRL_CHERRYVIEW=y
+CONFIG_PINCTRL_CS42L43=m
CONFIG_PINCTRL_CY8C95X0=m
CONFIG_PINCTRL_DENVERTON=m
CONFIG_PINCTRL_ELKHARTLAKE=m
@@ -5182,6 +5219,7 @@ CONFIG_PINCTRL_RK805=m
# CONFIG_PINCTRL_SM8150 is not set
# CONFIG_PINCTRL_SM8250 is not set
# CONFIG_PINCTRL_SM8350 is not set
+CONFIG_PINCTRL_SM8350_LPASS_LPI=m
# CONFIG_PINCTRL_SM8450 is not set
# CONFIG_PINCTRL_STMFX is not set
# CONFIG_PINCTRL_SUN4I_A10 is not set
@@ -5328,6 +5366,7 @@ CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
CONFIG_PSTORE_842_COMPRESS=y
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -5349,6 +5388,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
CONFIG_PTP_1588_CLOCK_IDTCM=m
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_PTP_1588_CLOCK_VMW=m
@@ -5440,6 +5480,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -5501,6 +5542,7 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=y
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
@@ -5509,6 +5551,7 @@ CONFIG_REGMAP=y
# CONFIG_REGULATOR_AD5398 is not set
CONFIG_REGULATOR_ARIZONA_LDO1=m
CONFIG_REGULATOR_ARIZONA_MICSUPP=m
+CONFIG_REGULATOR_AW37503=m
# CONFIG_REGULATOR_AXP20X is not set
# CONFIG_REGULATOR_BD9571MWV is not set
# CONFIG_REGULATOR_DA9121 is not set
@@ -5530,9 +5573,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_MAX1586 is not set
# CONFIG_REGULATOR_MAX20086 is not set
CONFIG_REGULATOR_MAX20411=m
+CONFIG_REGULATOR_MAX5970=m
CONFIG_REGULATOR_MAX597X=m
CONFIG_REGULATOR_MAX77650=m
# CONFIG_REGULATOR_MAX77826 is not set
+CONFIG_REGULATOR_MAX77857=m
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
CONFIG_REGULATOR_MAX8893=m
@@ -5565,6 +5610,7 @@ CONFIG_REGULATOR_RT6190=m
CONFIG_REGULATOR_RT6245=m
CONFIG_REGULATOR_RTMV20=m
CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTQ2208=m
CONFIG_REGULATOR_RTQ6752=m
# CONFIG_REGULATOR_SLG51000 is not set
CONFIG_REGULATOR_SY7636A=m
@@ -5613,8 +5659,7 @@ CONFIG_RETPOLINE=y
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-# CONFIG_RH_DISABLE_DEPRECATED is not set
-CONFIG_RH_FEDORA=y
+# CONFIG_RHEL_DIFFERENCES is not set
CONFIG_RICHTEK_RTQ6056=m
CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
@@ -6023,6 +6068,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -6032,6 +6078,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+CONFIG_SEL3350_PLATFORM=m
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -6109,6 +6156,7 @@ CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
CONFIG_SENSORS_HP_WMI=m
+CONFIG_SENSORS_HS3001=m
CONFIG_SENSORS_I5500=m
CONFIG_SENSORS_I5K_AMB=m
CONFIG_SENSORS_IBMAEM=m
@@ -6198,6 +6246,7 @@ CONFIG_SENSORS_MCP3021=m
CONFIG_SENSORS_MLXREG_FAN=m
CONFIG_SENSORS_MP2888=m
CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_MP2975_REGULATOR=y
CONFIG_SENSORS_MP5023=m
CONFIG_SENSORS_MPQ7932=m
CONFIG_SENSORS_MPQ7932_REGULATOR=y
@@ -6525,6 +6574,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=0
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
# CONFIG_SND_HDA_TEGRA is not set
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -6639,7 +6691,9 @@ CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
CONFIG_SND_SOC_AMD_YC_MACH=m
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+CONFIG_SND_SOC_AUDIO_IIO_AUX=m
CONFIG_SND_SOC_AW8738=m
+CONFIG_SND_SOC_AW88261=m
CONFIG_SND_SOC_AW88395=m
CONFIG_SND_SOC_BD28623=m
CONFIG_SND_SOC_BT_SCO=m
@@ -6665,6 +6719,8 @@ CONFIG_SND_SOC_CS4234=m
# CONFIG_SND_SOC_CS4271_SPI is not set
CONFIG_SND_SOC_CS42L42=m
CONFIG_SND_SOC_CS42L42_SDW=m
+CONFIG_SND_SOC_CS42L43=m
+CONFIG_SND_SOC_CS42L43_SDW=m
# CONFIG_SND_SOC_CS42L51_I2C is not set
# CONFIG_SND_SOC_CS42L52 is not set
# CONFIG_SND_SOC_CS42L56 is not set
@@ -6722,6 +6778,7 @@ CONFIG_SND_SOC_IDT821034=m
CONFIG_SND_SOC_INTEL_AVS=m
CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219=m
CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336=m
CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO=m
CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST=m
CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A=m
@@ -6732,6 +6789,7 @@ CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE=m
CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=m
CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=m
CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663=m
CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682=m
CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567=m
CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
@@ -6852,6 +6910,7 @@ CONFIG_SND_SOC_RL6231=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+CONFIG_SND_SOC_RT1017_SDCA_SDW=m
CONFIG_SND_SOC_RT1308=m
CONFIG_SND_SOC_RT1308_SDW=m
CONFIG_SND_SOC_RT1316_SDW=m
@@ -6893,6 +6952,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE=m
CONFIG_SND_SOC_SOF_AMD_REMBRANDT=m
CONFIG_SND_SOC_SOF_AMD_RENOIR=m
CONFIG_SND_SOC_SOF_AMD_TOPLEVEL=m
+CONFIG_SND_SOC_SOF_AMD_VANGOGH=m
CONFIG_SND_SOC_SOF_APOLLOLAKE=m
CONFIG_SND_SOC_SOF_BAYTRAIL=m
CONFIG_SND_SOC_SOF_BROADWELL=m
@@ -6912,6 +6972,7 @@ CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
CONFIG_SND_SOC_SOF_JASPERLAKE=m
CONFIG_SND_SOC_SOF_KABYLAKE=m
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
CONFIG_SND_SOC_SOF_MERRIFIELD=m
CONFIG_SND_SOC_SOF_METEORLAKE=m
# CONFIG_SND_SOC_SOF_MT8195 is not set
@@ -6984,6 +7045,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
CONFIG_SND_SOC_TS3A227E=m
@@ -7117,6 +7179,7 @@ CONFIG_SPI_AX88796C=m
# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_CADENCE_QUADSPI is not set
# CONFIG_SPI_CADENCE_XSPI is not set
+# CONFIG_SPI_CS42L43 is not set
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
CONFIG_SPI_DLN2=m
@@ -7258,6 +7321,7 @@ CONFIG_SURFACE_PRO3_BUTTON=m
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_SWIOTLB=y
# CONFIG_SW_SYNC is not set
CONFIG_SX9310=m
@@ -7368,6 +7432,7 @@ CONFIG_TEST_CPUMASK=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
@@ -7449,6 +7514,8 @@ CONFIG_TIFM_7XX1=m
CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m
+# CONFIG_TI_ICSSG_PRUETH is not set
+CONFIG_TI_ICSS_IEP=m
CONFIG_TI_LMP92064=m
CONFIG_TIME_KUNIT_TEST=m
CONFIG_TIME_NS=y
@@ -7481,6 +7548,7 @@ CONFIG_TLS=m
CONFIG_TMP117=m
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_QUOTA=y
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
CONFIG_TOPSTAR_LAPTOP=m
@@ -7530,6 +7598,7 @@ CONFIG_TOUCHSCREEN_IMAGIS=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
CONFIG_TOUCHSCREEN_INEXIO=m
CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_IQS7211=m
# CONFIG_TOUCHSCREEN_MAX11801 is not set
CONFIG_TOUCHSCREEN_MCS5000=m
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7731,6 +7800,7 @@ CONFIG_USB_CHIPIDEA_IMX=m
# CONFIG_USB_CHIPIDEA is not set
CONFIG_USB_CHIPIDEA_MSM=m
CONFIG_USB_CHIPIDEA_PCI=m
+CONFIG_USB_CONFIGFS_F_MIDI2=y
# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
# CONFIG_USB_CONN_GPIO is not set
CONFIG_USB_CXACRU=m
@@ -7743,9 +7813,11 @@ CONFIG_USB_DSBR=m
# CONFIG_USB_DWC2_PERIPHERAL is not set
# CONFIG_USB_DWC3_GADGET is not set
# CONFIG_USB_DWC3_HAPS is not set
-# CONFIG_USB_DWC3_HOST is not set
-# CONFIG_USB_DWC3 is not set
+CONFIG_USB_DWC3_HOST=y
+CONFIG_USB_DWC3=m
# CONFIG_USB_DWC3_OF_SIMPLE is not set
+CONFIG_USB_DWC3_PCI=m
+# CONFIG_USB_DWC3_ULPI is not set
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_EHCI_FSL is not set
# CONFIG_USB_EHCI_HCD_PLATFORM is not set
@@ -8070,6 +8142,8 @@ CONFIG_VETH=m
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=m
CONFIG_VFIO_CONTAINER=y
+# CONFIG_VFIO_DEVICE_CDEV is not set
+CONFIG_VFIO_GROUP=y
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
CONFIG_VFIO_MDEV=m
@@ -8142,8 +8216,12 @@ CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_DS90UB913=m
+CONFIG_VIDEO_DS90UB953=m
+CONFIG_VIDEO_DS90UB960=m
# CONFIG_VIDEO_DT3155 is not set
CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9719=m
CONFIG_VIDEO_DW9768=m
CONFIG_VIDEO_DW9807_VCM=m
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -8541,6 +8619,7 @@ CONFIG_X86_SGX_KVM=y
CONFIG_X86_SGX=y
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
CONFIG_X86_UMIP=y
+CONFIG_X86_USER_SHADOW_STACK=y
CONFIG_X86_UV=y
# CONFIG_X86_VERBOSE_BOOTUP is not set
# CONFIG_X86_VSMP is not set
@@ -8573,6 +8652,7 @@ CONFIG_XEN_NETDEV_BACKEND=m
CONFIG_XEN_NETDEV_FRONTEND=m
CONFIG_XEN_PCIDEV_BACKEND=m
CONFIG_XEN_PCIDEV_FRONTEND=m
+CONFIG_XEN_PRIVCMD_IRQFD=y
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_BACKEND is not set
# CONFIG_XEN_PVCALLS_FRONTEND is not set
@@ -8603,6 +8683,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index db1d427e9..38a7bec5b 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -134,7 +134,7 @@ CONFIG_ACPI=y
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
-# CONFIG_ADDRESS_MASKING is not set
+CONFIG_ADDRESS_MASKING=y
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -225,7 +225,8 @@ CONFIG_AMD_MEM_ENCRYPT=y
CONFIG_AMD_NUMA=y
CONFIG_AMD_PHY=m
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
+# CONFIG_AMD_PMF_DEBUG is not set
+CONFIG_AMD_PMF=m
CONFIG_AMD_PTDMA=m
CONFIG_AMD_SFH_HID=m
# CONFIG_AMDTEE is not set
@@ -842,6 +843,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -860,6 +862,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -906,6 +909,8 @@ CONFIG_CPU_UNRET_ENTRY=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -958,6 +963,7 @@ CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA20_X86_64=y
CONFIG_CRYPTO_CMAC=y
@@ -1054,6 +1060,7 @@ CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
+# CONFIG_CRYPTO_POLY1305_P10 is not set
CONFIG_CRYPTO_POLY1305_X86_64=y
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
@@ -1280,6 +1287,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1302,6 +1310,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1427,6 +1436,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MALI_DISPLAY is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1500,6 +1510,7 @@ CONFIG_DRM_SIMPLEDRM=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1765,6 +1776,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1954,6 +1966,7 @@ CONFIG_GPIO_AMDPT=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+# CONFIG_GPIO_DS4520 is not set
# CONFIG_GPIO_DWAPB is not set
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -2076,6 +2089,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2240,7 +2254,6 @@ CONFIG_HW_RANDOM_AMD=m
CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
# CONFIG_HW_RANDOM_BA431 is not set
# CONFIG_HW_RANDOM_CCTRNG is not set
-CONFIG_HW_RANDOM_HISI=y
# CONFIG_HW_RANDOM_HISTB is not set
CONFIG_HW_RANDOM_INTEL=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -2278,6 +2291,7 @@ CONFIG_I2C_AMD756_S4882=m
CONFIG_I2C_AMD8111=m
# CONFIG_I2C_AMD_MP2 is not set
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
@@ -2637,6 +2651,7 @@ CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_INTEL_TXT=y
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
CONFIG_INTEL_VBTN=m
+# CONFIG_INTEL_VSC is not set
CONFIG_INTEL_VSEC=m
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
@@ -2668,7 +2683,7 @@ CONFIG_IOSCHED_BFQ=y
CONFIG_IOSF_MBI=y
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2754,6 +2769,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2831,6 +2847,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -2974,10 +2991,11 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD=m
CONFIG_KVM_AMD_SEV=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
@@ -2986,6 +3004,7 @@ CONFIG_KVM_GUEST=y
CONFIG_KVM_INTEL=m
CONFIG_KVM=m
CONFIG_KVM_MMU_AUDIT=y
+# CONFIG_KVM_PROVE_MMU is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
# CONFIG_KVM_XEN is not set
@@ -3056,6 +3075,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
@@ -3199,7 +3219,9 @@ CONFIG_MANA_INFINIBAND=m
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3241,9 +3263,11 @@ CONFIG_MAXSMP=y
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3295,6 +3319,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3329,6 +3354,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3484,6 +3511,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3774,6 +3802,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4193,6 +4222,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4242,6 +4272,7 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
CONFIG_NVMEM_SYSFS=y
@@ -4286,6 +4317,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4370,6 +4402,7 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -4469,6 +4502,7 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_EUSB2_REPEATER is not set
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
# CONFIG_PHY_QCOM_SGMII_ETH is not set
@@ -4478,6 +4512,8 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
CONFIG_PHYSICAL_ALIGN=0x200000
CONFIG_PHYSICAL_START=0x1000000
# CONFIG_PHY_TUSB1210 is not set
@@ -4645,6 +4681,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4663,6 +4700,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_VMW=m
CONFIG_PTP_1588_CLOCK=y
@@ -4761,6 +4799,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -4805,12 +4844,14 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
+# CONFIG_REGULATOR_AW37503 is not set
# CONFIG_REGULATOR_DA9210 is not set
# CONFIG_REGULATOR_DA9211 is not set
# CONFIG_REGULATOR_DEBUG is not set
@@ -4827,6 +4868,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_LTC3589 is not set
# CONFIG_REGULATOR_LTC3676 is not set
# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8952 is not set
@@ -4839,9 +4881,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RT4803 is not set
# CONFIG_REGULATOR_RT5739 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_SY8106A is not set
# CONFIG_REGULATOR_TPS51632 is not set
# CONFIG_REGULATOR_TPS62360 is not set
@@ -4875,7 +4919,6 @@ CONFIG_RETPOLINE=y
# CONFIG_RFKILL_GPIO is not set
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -5269,6 +5312,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5278,6 +5322,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5355,6 +5400,7 @@ CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
CONFIG_SENSORS_I5500=m
CONFIG_SENSORS_I5K_AMB=m
CONFIG_SENSORS_IBMAEM=m
@@ -5739,6 +5785,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=0
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
# CONFIG_SND_HDA_TEGRA is not set
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -5849,7 +5898,9 @@ CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
CONFIG_SND_SOC_AMD_YC_MACH=m
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -5866,7 +5917,7 @@ CONFIG_SND_SOC_CS35L41_SPI=m
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
+CONFIG_SND_SOC_CS35L56_SDW=m
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -5931,6 +5982,7 @@ CONFIG_SND_SOC_HDAC_HDMI=m
CONFIG_SND_SOC_INTEL_AVS=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -5941,6 +5993,7 @@ CONFIG_SND_SOC_INTEL_AVS=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
@@ -6061,6 +6114,7 @@ CONFIG_SND_SOC_RL6231=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
CONFIG_SND_SOC_RT1308=m
CONFIG_SND_SOC_RT1308_SDW=m
CONFIG_SND_SOC_RT1316_SDW=m
@@ -6120,6 +6174,7 @@ CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
CONFIG_SND_SOC_SOF_JASPERLAKE=m
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
CONFIG_SND_SOC_SOF_MERRIFIELD=m
CONFIG_SND_SOC_SOF_METEORLAKE=m
# CONFIG_SND_SOC_SOF_OF is not set
@@ -6190,6 +6245,7 @@ CONFIG_SND_SOC_SSM4567=m
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
CONFIG_SND_SOC_TS3A227E=m
@@ -6429,6 +6485,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_SWIOTLB=y
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
@@ -6534,6 +6591,7 @@ CONFIG_TEST_CPUMASK=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
@@ -6645,6 +6703,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -6693,6 +6752,7 @@ CONFIG_TOUCHSCREEN_ELO=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7199,8 +7259,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7530,6 +7594,7 @@ CONFIG_X86_SGX_KVM=y
CONFIG_X86_SGX=y
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
CONFIG_X86_UMIP=y
+CONFIG_X86_USER_SHADOW_STACK=y
CONFIG_X86_UV=y
# CONFIG_X86_VERBOSE_BOOTUP is not set
# CONFIG_X86_VSMP is not set
@@ -7579,6 +7644,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config
index 36ee1a82a..bf34f743f 100644
--- a/kernel-x86_64-rt-debug-rhel.config
+++ b/kernel-x86_64-rt-debug-rhel.config
@@ -134,7 +134,7 @@ CONFIG_ACPI=y
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
-# CONFIG_ADDRESS_MASKING is not set
+CONFIG_ADDRESS_MASKING=y
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -225,7 +225,8 @@ CONFIG_AMD_MEM_ENCRYPT=y
CONFIG_AMD_NUMA=y
CONFIG_AMD_PHY=m
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
+CONFIG_AMD_PMF_DEBUG=y
+CONFIG_AMD_PMF=m
CONFIG_AMD_PTDMA=m
CONFIG_AMD_SFH_HID=m
# CONFIG_AMDTEE is not set
@@ -842,6 +843,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -860,6 +862,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -907,6 +910,8 @@ CONFIG_CRAMFS_BLOCKDEV=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -959,6 +964,7 @@ CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA20_X86_64=y
CONFIG_CRYPTO_CMAC=y
@@ -1055,6 +1061,7 @@ CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
+# CONFIG_CRYPTO_POLY1305_P10 is not set
CONFIG_CRYPTO_POLY1305_X86_64=y
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
@@ -1290,6 +1297,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1312,6 +1320,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1437,6 +1446,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MALI_DISPLAY is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1510,6 +1520,7 @@ CONFIG_DRM_SIMPLEDRM=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1819,6 +1830,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -2009,6 +2021,7 @@ CONFIG_GPIO_AMDPT=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+# CONFIG_GPIO_DS4520 is not set
# CONFIG_GPIO_DWAPB is not set
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -2132,6 +2145,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2296,7 +2310,6 @@ CONFIG_HW_RANDOM_AMD=m
CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
# CONFIG_HW_RANDOM_BA431 is not set
# CONFIG_HW_RANDOM_CCTRNG is not set
-CONFIG_HW_RANDOM_HISI=y
# CONFIG_HW_RANDOM_HISTB is not set
CONFIG_HW_RANDOM_INTEL=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -2334,6 +2347,7 @@ CONFIG_I2C_AMD756_S4882=m
CONFIG_I2C_AMD8111=m
# CONFIG_I2C_AMD_MP2 is not set
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
@@ -2693,6 +2707,7 @@ CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_INTEL_TXT=y
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
CONFIG_INTEL_VBTN=m
+# CONFIG_INTEL_VSC is not set
CONFIG_INTEL_VSEC=m
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
@@ -2724,7 +2739,7 @@ CONFIG_IOSCHED_BFQ=y
CONFIG_IOSF_MBI=y
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2810,6 +2825,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2887,6 +2903,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -3034,10 +3051,11 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD=m
CONFIG_KVM_AMD_SEV=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
@@ -3046,6 +3064,7 @@ CONFIG_KVM_GUEST=y
CONFIG_KVM_INTEL=m
CONFIG_KVM=m
CONFIG_KVM_MMU_AUDIT=y
+CONFIG_KVM_PROVE_MMU=y
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
# CONFIG_KVM_XEN is not set
@@ -3116,6 +3135,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
@@ -3259,7 +3279,9 @@ CONFIG_MANA_INFINIBAND=m
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3301,9 +3323,11 @@ CONFIG_MAXSMP=y
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3360,6 +3384,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3394,6 +3419,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3549,6 +3576,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3839,6 +3867,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4258,6 +4287,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4307,6 +4337,7 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
CONFIG_NVMEM_SYSFS=y
@@ -4351,6 +4382,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+CONFIG_OVERLAY_FS_DEBUG=y
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4436,6 +4468,7 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -4535,6 +4568,7 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_EUSB2_REPEATER is not set
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
# CONFIG_PHY_QCOM_SGMII_ETH is not set
@@ -4544,6 +4578,8 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
CONFIG_PHYSICAL_ALIGN=0x200000
CONFIG_PHYSICAL_START=0x1000000
# CONFIG_PHY_TUSB1210 is not set
@@ -4716,6 +4752,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4734,6 +4771,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_VMW=m
CONFIG_PTP_1588_CLOCK=y
@@ -4832,6 +4870,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -4879,12 +4918,14 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
+# CONFIG_REGULATOR_AW37503 is not set
# CONFIG_REGULATOR_DA9210 is not set
# CONFIG_REGULATOR_DA9211 is not set
# CONFIG_REGULATOR_DEBUG is not set
@@ -4901,6 +4942,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_LTC3589 is not set
# CONFIG_REGULATOR_LTC3676 is not set
# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8952 is not set
@@ -4913,9 +4955,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RT4803 is not set
# CONFIG_REGULATOR_RT5739 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_SY8106A is not set
# CONFIG_REGULATOR_TPS51632 is not set
# CONFIG_REGULATOR_TPS62360 is not set
@@ -4949,7 +4993,6 @@ CONFIG_RETPOLINE=y
# CONFIG_RFKILL_GPIO is not set
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -5343,6 +5386,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5352,6 +5396,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5429,6 +5474,7 @@ CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
CONFIG_SENSORS_I5500=m
CONFIG_SENSORS_I5K_AMB=m
CONFIG_SENSORS_IBMAEM=m
@@ -5815,6 +5861,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=0
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
# CONFIG_SND_HDA_TEGRA is not set
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -5926,7 +5975,9 @@ CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
CONFIG_SND_SOC_AMD_YC_MACH=m
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -5943,7 +5994,7 @@ CONFIG_SND_SOC_CS35L41_SPI=m
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
+CONFIG_SND_SOC_CS35L56_SDW=m
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -6008,6 +6059,7 @@ CONFIG_SND_SOC_HDAC_HDMI=m
CONFIG_SND_SOC_INTEL_AVS=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -6018,6 +6070,7 @@ CONFIG_SND_SOC_INTEL_AVS=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
@@ -6138,6 +6191,7 @@ CONFIG_SND_SOC_RL6231=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
CONFIG_SND_SOC_RT1308=m
CONFIG_SND_SOC_RT1308_SDW=m
CONFIG_SND_SOC_RT1316_SDW=m
@@ -6198,6 +6252,7 @@ CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
CONFIG_SND_SOC_SOF_JASPERLAKE=m
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
CONFIG_SND_SOC_SOF_MERRIFIELD=m
CONFIG_SND_SOC_SOF_METEORLAKE=m
# CONFIG_SND_SOC_SOF_OF is not set
@@ -6268,6 +6323,7 @@ CONFIG_SND_SOC_SSM4567=m
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_BUILD=y
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
CONFIG_SND_SOC_TS3A227E=m
@@ -6507,6 +6563,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_SWIOTLB=y
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
@@ -6612,6 +6669,7 @@ CONFIG_TEST_FPU=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIST_SORT=m
@@ -6723,6 +6781,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -6771,6 +6830,7 @@ CONFIG_TOUCHSCREEN_ELO=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7278,8 +7338,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7611,6 +7675,7 @@ CONFIG_X86_SGX=y
CONFIG_X86_SMAP=y
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
CONFIG_X86_UMIP=y
+CONFIG_X86_USER_SHADOW_STACK=y
CONFIG_X86_UV=y
# CONFIG_X86_VERBOSE_BOOTUP is not set
# CONFIG_X86_VSMP is not set
@@ -7660,6 +7725,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config
index aabc4f32f..9547b32b8 100644
--- a/kernel-x86_64-rt-rhel.config
+++ b/kernel-x86_64-rt-rhel.config
@@ -134,7 +134,7 @@ CONFIG_ACPI=y
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
# CONFIG_ADA4250 is not set
-# CONFIG_ADDRESS_MASKING is not set
+CONFIG_ADDRESS_MASKING=y
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
@@ -225,7 +225,8 @@ CONFIG_AMD_MEM_ENCRYPT=y
CONFIG_AMD_NUMA=y
CONFIG_AMD_PHY=m
CONFIG_AMD_PMC=m
-# CONFIG_AMD_PMF is not set
+# CONFIG_AMD_PMF_DEBUG is not set
+CONFIG_AMD_PMF=m
CONFIG_AMD_PTDMA=m
CONFIG_AMD_SFH_HID=m
# CONFIG_AMDTEE is not set
@@ -842,6 +843,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI544 is not set
# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_VC3 is not set
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -860,6 +862,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
+# CONFIG_COPS is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_COREDUMP=y
@@ -907,6 +910,8 @@ CONFIG_CRAMFS_BLOCKDEV=y
# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_HOTPLUG=y
+CONFIG_CRASH_MAX_MEMORY_RANGES=8192
CONFIG_CRC16=y
# CONFIG_CRC32_BIT is not set
# CONFIG_CRC32_SARWATE is not set
@@ -959,6 +964,7 @@ CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
+# CONFIG_CRYPTO_CHACHA20_P10 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA20_X86_64=y
CONFIG_CRYPTO_CMAC=y
@@ -1055,6 +1061,7 @@ CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
+# CONFIG_CRYPTO_POLY1305_P10 is not set
CONFIG_CRYPTO_POLY1305_X86_64=y
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
CONFIG_CRYPTO_RMD160=m
@@ -1282,6 +1289,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_DMA_NUMA_CMA=y
# CONFIG_DMA_PERNUMA_CMA is not set
# CONFIG_DMAPOOL_TEST is not set
# CONFIG_DMARD06 is not set
@@ -1304,6 +1312,7 @@ CONFIG_DMIID=y
CONFIG_DM_INTEGRITY=m
CONFIG_DMI_SYSFS=y
CONFIG_DMI=y
+# CONFIG_DM_KUNIT_TEST is not set
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_LOG_WRITES=m
CONFIG_DM_MIRROR=m
@@ -1429,6 +1438,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LONTIUM_LT9211 is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_LOONGSON is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MALI_DISPLAY is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1502,6 +1512,7 @@ CONFIG_DRM_SIMPLEDRM=y
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TTM_KUNIT_TEST is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_USE_DYNAMIC_DEBUG=y
# CONFIG_DRM_VBOXVIDEO is not set
@@ -1803,6 +1814,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
+CONFIG_FB_DEVICE=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
@@ -1993,6 +2005,7 @@ CONFIG_GPIO_AMDPT=m
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_CDEV=y
+# CONFIG_GPIO_DS4520 is not set
# CONFIG_GPIO_DWAPB is not set
# CONFIG_GPIO_ELKHARTLAKE is not set
# CONFIG_GPIO_EXAR is not set
@@ -2116,6 +2129,7 @@ CONFIG_HID_GENERIC=y
CONFIG_HID_GFRM=m
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
CONFIG_HID_GREENASIA=m
CONFIG_HID_GT683R=m
CONFIG_HID_GYRATION=m
@@ -2280,7 +2294,6 @@ CONFIG_HW_RANDOM_AMD=m
CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
# CONFIG_HW_RANDOM_BA431 is not set
# CONFIG_HW_RANDOM_CCTRNG is not set
-CONFIG_HW_RANDOM_HISI=y
# CONFIG_HW_RANDOM_HISTB is not set
CONFIG_HW_RANDOM_INTEL=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -2318,6 +2331,7 @@ CONFIG_I2C_AMD756_S4882=m
CONFIG_I2C_AMD8111=m
# CONFIG_I2C_AMD_MP2 is not set
# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_ATR is not set
# CONFIG_I2C_CADENCE is not set
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
@@ -2677,6 +2691,7 @@ CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_INTEL_TXT=y
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
CONFIG_INTEL_VBTN=m
+# CONFIG_INTEL_VSC is not set
CONFIG_INTEL_VSEC=m
# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
CONFIG_INTEL_WMI_THUNDERBOLT=m
@@ -2708,7 +2723,7 @@ CONFIG_IOSCHED_BFQ=y
CONFIG_IOSF_MBI=y
CONFIG_IOSM=m
# CONFIG_IO_STRICT_DEVMEM is not set
-# CONFIG_IO_URING is not set
+CONFIG_IO_URING=y
# CONFIG_IP5XXX_POWER is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
@@ -2794,6 +2809,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
+# CONFIG_IPU_BRIDGE is not set
CONFIG_IPV6_GRE=m
# CONFIG_IPV6_ILA is not set
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
@@ -2871,6 +2887,7 @@ CONFIG_IR_RC6_DECODER=m
# CONFIG_IR_RCMM_DECODER is not set
CONFIG_IR_REDRAT3=m
CONFIG_IR_SANYO_DECODER=m
+# CONFIG_IRSD200 is not set
# CONFIG_IR_SERIAL is not set
CONFIG_IR_SERIAL_TRANSMITTER=y
# CONFIG_IR_SHARP_DECODER is not set
@@ -3014,10 +3031,11 @@ CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_KUNIT_ALL_TESTS=m
CONFIG_KUNIT_DEBUGFS=y
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
CONFIG_KUNIT_EXAMPLE_TEST=m
CONFIG_KUNIT=m
CONFIG_KUNIT_TEST=m
+# CONFIG_KUNPENG_HCCS is not set
CONFIG_KVM_AMD=m
CONFIG_KVM_AMD_SEV=y
# CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set
@@ -3026,6 +3044,7 @@ CONFIG_KVM_GUEST=y
CONFIG_KVM_INTEL=m
CONFIG_KVM=m
CONFIG_KVM_MMU_AUDIT=y
+# CONFIG_KVM_PROVE_MMU is not set
CONFIG_KVM_SMM=y
# CONFIG_KVM_WERROR is not set
# CONFIG_KVM_XEN is not set
@@ -3096,6 +3115,7 @@ CONFIG_LEDS_MLXCPLD=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA995X is not set
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
@@ -3239,7 +3259,9 @@ CONFIG_MANA_INFINIBAND=m
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z16 is not set
CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88Q2XXX_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
+CONFIG_MARVELL_GTI_WDT=y
CONFIG_MARVELL_PHY=m
# CONFIG_MATOM is not set
# CONFIG_MAX1027 is not set
@@ -3281,9 +3303,11 @@ CONFIG_MAXSMP=y
# CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set
# CONFIG_MCP4725 is not set
+# CONFIG_MCP4728 is not set
# CONFIG_MCP4922 is not set
# CONFIG_MCTP is not set
CONFIG_MD_AUTODETECT=y
+CONFIG_MD_BITMAP_FILE=y
# CONFIG_MD_CLUSTER is not set
CONFIG_MD_FAULTY=m
CONFIG_MDIO_BCM_UNIMAC=m
@@ -3340,6 +3364,7 @@ CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
+CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y
@@ -3374,6 +3399,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CS42L43_I2C is not set
+# CONFIG_MFD_CS42L43_SDW is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9055 is not set
@@ -3529,6 +3556,7 @@ CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_MACSEC=y
CONFIG_MLX5_MPFS=y
CONFIG_MLX5_SF=y
CONFIG_MLX5_SW_STEERING=y
@@ -3819,6 +3847,7 @@ CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_CLS=y
CONFIG_NETCONSOLE_DYNAMIC=y
+# CONFIG_NETCONSOLE_EXTENDED_LOG is not set
CONFIG_NETCONSOLE=m
CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
@@ -4238,6 +4267,7 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_ROMAN=m
CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UCS2_UTILS=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NMI_CHECK_CPU is not set
@@ -4287,6 +4317,7 @@ CONFIG_NVME_FC=m
# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
# CONFIG_NVMEM_QCOM_QFPROM is not set
+# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
CONFIG_NVMEM_SYSFS=y
@@ -4331,6 +4362,7 @@ CONFIG_OPENVSWITCH_VXLAN=m
CONFIG_OSF_PARTITION=y
CONFIG_OSNOISE_TRACER=y
CONFIG_OVERFLOW_KUNIT_TEST=m
+# CONFIG_OVERLAY_FS_DEBUG is not set
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_METACOPY is not set
@@ -4415,6 +4447,7 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_PCI200SYN is not set
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
# CONFIG_PCIE_ALTERA is not set
@@ -4514,6 +4547,7 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_EUSB2_REPEATER is not set
# CONFIG_PHY_QCOM_IPQ4019_USB is not set
# CONFIG_PHY_QCOM_IPQ806X_USB is not set
+# CONFIG_PHY_QCOM_M31_USB is not set
# CONFIG_PHY_QCOM_QMP is not set
# CONFIG_PHY_QCOM_QUSB2 is not set
# CONFIG_PHY_QCOM_SGMII_ETH is not set
@@ -4523,6 +4557,8 @@ CONFIG_PHYLINK=m
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
# CONFIG_PHY_QCOM_USB_SS is not set
+# CONFIG_PHY_RTK_RTD_USB2PHY is not set
+# CONFIG_PHY_RTK_RTD_USB3PHY is not set
CONFIG_PHYSICAL_ALIGN=0x200000
CONFIG_PHYSICAL_START=0x1000000
# CONFIG_PHY_TUSB1210 is not set
@@ -4694,6 +4730,7 @@ CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_PSI=y
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_COMPRESS=y
# CONFIG_PSTORE_CONSOLE is not set
CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
@@ -4712,6 +4749,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
# CONFIG_PTP_1588_CLOCK_INES is not set
CONFIG_PTP_1588_CLOCK_KVM=m
+# CONFIG_PTP_1588_CLOCK_MOCK is not set
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_VMW=m
CONFIG_PTP_1588_CLOCK=y
@@ -4810,6 +4848,7 @@ CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_KSTACK_OFFSET=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_RANDOMIZE_MEMORY=y
+# CONFIG_RANDOM_KMALLOC_CACHES is not set
CONFIG_RANDOM_TRUST_BOOTLOADER=y
CONFIG_RANDOM_TRUST_CPU=y
# CONFIG_RANDSTRUCT_FULL is not set
@@ -4857,12 +4896,14 @@ CONFIG_RD_ZSTD=y
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_REGMAP_BUILD is not set
CONFIG_REGMAP_KUNIT=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
+# CONFIG_REGULATOR_AW37503 is not set
# CONFIG_REGULATOR_DA9210 is not set
# CONFIG_REGULATOR_DA9211 is not set
# CONFIG_REGULATOR_DEBUG is not set
@@ -4879,6 +4920,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_LTC3589 is not set
# CONFIG_REGULATOR_LTC3676 is not set
# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX77857 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8952 is not set
@@ -4891,9 +4933,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_QCOM_REFGEN is not set
# CONFIG_REGULATOR_RAA215300 is not set
# CONFIG_REGULATOR_RT4803 is not set
# CONFIG_REGULATOR_RT5739 is not set
+# CONFIG_REGULATOR_RTQ2208 is not set
# CONFIG_REGULATOR_SY8106A is not set
# CONFIG_REGULATOR_TPS51632 is not set
# CONFIG_REGULATOR_TPS62360 is not set
@@ -4927,7 +4971,6 @@ CONFIG_RETPOLINE=y
# CONFIG_RFKILL_GPIO is not set
CONFIG_RFKILL_INPUT=y
CONFIG_RFKILL=m
-CONFIG_RH_DISABLE_DEPRECATED=y
CONFIG_RHEL_DIFFERENCES=y
# CONFIG_RICHTEK_RTQ6056 is not set
CONFIG_RING_BUFFER_BENCHMARK=m
@@ -5321,6 +5364,7 @@ CONFIG_SECURITY_PATH=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEBUG is not set
CONFIG_SECURITY_SELINUX_DEVELOP=y
# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
@@ -5330,6 +5374,7 @@ CONFIG_SECURITY_SELINUX=y
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_YAMA=y
+# CONFIG_SEL3350_PLATFORM is not set
# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SENSIRION_SGP40 is not set
@@ -5407,6 +5452,7 @@ CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
# CONFIG_SENSORS_HP_WMI is not set
+# CONFIG_SENSORS_HS3001 is not set
CONFIG_SENSORS_I5500=m
CONFIG_SENSORS_I5K_AMB=m
CONFIG_SENSORS_IBMAEM=m
@@ -5793,6 +5839,9 @@ CONFIG_SND_HDA_PREALLOC_SIZE=0
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
# CONFIG_SND_HDA_TEGRA is not set
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -5903,7 +5952,9 @@ CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
CONFIG_SND_SOC_AMD_YC_MACH=m
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_ARNDALE is not set
+# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_BD28623 is not set
# CONFIG_SND_SOC_BT_SCO is not set
@@ -5920,7 +5971,7 @@ CONFIG_SND_SOC_CS35L41_SPI=m
# CONFIG_SND_SOC_CS35L45_I2C is not set
# CONFIG_SND_SOC_CS35L45_SPI is not set
# CONFIG_SND_SOC_CS35L56_I2C is not set
-# CONFIG_SND_SOC_CS35L56_SDW is not set
+CONFIG_SND_SOC_CS35L56_SDW=m
# CONFIG_SND_SOC_CS35L56_SPI is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
@@ -5985,6 +6036,7 @@ CONFIG_SND_SOC_HDAC_HDMI=m
CONFIG_SND_SOC_INTEL_AVS=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A is not set
@@ -5995,6 +6047,7 @@ CONFIG_SND_SOC_INTEL_AVS=m
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT274 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT286 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT298 is not set
+# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682 is not set
# CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567 is not set
CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
@@ -6115,6 +6168,7 @@ CONFIG_SND_SOC_RL6231=m
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set
# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set
+# CONFIG_SND_SOC_RT1017_SDCA_SDW is not set
CONFIG_SND_SOC_RT1308=m
CONFIG_SND_SOC_RT1308_SDW=m
CONFIG_SND_SOC_RT1316_SDW=m
@@ -6174,6 +6228,7 @@ CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
CONFIG_SND_SOC_SOF_JASPERLAKE=m
# CONFIG_SND_SOC_SOF_KABYLAKE is not set
+CONFIG_SND_SOC_SOF_LUNARLAKE=m
CONFIG_SND_SOC_SOF_MERRIFIELD=m
CONFIG_SND_SOC_SOF_METEORLAKE=m
# CONFIG_SND_SOC_SOF_OF is not set
@@ -6244,6 +6299,7 @@ CONFIG_SND_SOC_SSM4567=m
# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
# CONFIG_SND_SOC_TLV320AIC3X is not set
# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+# CONFIG_SND_SOC_TOPOLOGY_BUILD is not set
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
# CONFIG_SND_SOC_TPA6130A2 is not set
CONFIG_SND_SOC_TS3A227E=m
@@ -6483,6 +6539,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
# CONFIG_SUSPEND_SKIP_SYNC is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
+# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_SWIOTLB=y
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
@@ -6588,6 +6645,7 @@ CONFIG_TEST_CPUMASK=m
# CONFIG_TEST_HEXDUMP is not set
CONFIG_TEST_HMM=m
# CONFIG_TEST_IDA is not set
+CONFIG_TEST_IOV_ITER=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
@@ -6699,6 +6757,7 @@ CONFIG_TLS=m
# CONFIG_TMP117 is not set
CONFIG_TMPFS_INODE64=y
CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TMPFS_QUOTA is not set
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS=y
# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
@@ -6747,6 +6806,7 @@ CONFIG_TOUCHSCREEN_ELO=m
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_IQS7211 is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -7254,8 +7314,12 @@ CONFIG_VIDEO_CX88_DVB=m
# CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_DS90UB913 is not set
+# CONFIG_VIDEO_DS90UB953 is not set
+# CONFIG_VIDEO_DS90UB960 is not set
# CONFIG_VIDEO_DT3155 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9719 is not set
# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -7587,6 +7651,7 @@ CONFIG_X86_SGX=y
CONFIG_X86_SMAP=y
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
CONFIG_X86_UMIP=y
+CONFIG_X86_USER_SHADOW_STACK=y
CONFIG_X86_UV=y
# CONFIG_X86_VERBOSE_BOOTUP is not set
# CONFIG_X86_VSMP is not set
@@ -7636,6 +7701,7 @@ CONFIG_XFRM=y
# CONFIG_XFS_DEBUG is not set
CONFIG_XFS_FS=m
# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_ONLINE_SCRUB_STATS is not set
CONFIG_XFS_ONLINE_SCRUB=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_QUOTA=y
diff --git a/kernel.spec b/kernel.spec
index 93c628d52..37b360af5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -160,18 +160,18 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
# define buildid .local
-%define specrpmversion 6.5.12
-%define specversion 6.5.12
-%define patchversion 6.5
-%define pkgrelease 300
+%define specrpmversion 6.6.2
+%define specversion 6.6.2
+%define patchversion 6.6
+%define pkgrelease 201
%define kversion 6
-%define tarfile_release 6.5.12
+%define tarfile_release 6.6.2
# This is needed to do merge window version magic
-%define patchlevel 5
+%define patchlevel 6
# This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 300%{?buildid}%{?dist}
+%define specrelease 201%{?buildid}%{?dist}
# This defines the kabi tarball version
-%define kabiversion 6.5.12
+%define kabiversion 6.6.2
# If this variable is set to 1, a bpf selftests build failure will cause a
# fatal kernel package build error
@@ -187,25 +187,30 @@ Summary: The Linux kernel
# should not be exported to RPM provides
%global __provides_exclude_from ^%{_libexecdir}/kselftests
-# The following build options are enabled by default, but may become disabled
-# by later architecture-specific checks. These can also be disabled by using
-# --without <opt> in the rpmbuild command, or by forcing these values to 0.
+# The following build options are (mostly) enabled by default, but may become
+# enabled/disabled by later architecture-specific checks.
+# Where disabled by default, they can be enabled by using --with <opt> in the
+# rpmbuild command, or by forcing these values to 1.
+# Where enabled by default, they can be disabled by using --without <opt> in
+# the rpmbuild command, or by forcing these values to 0.
#
# standard kernel
%define with_up %{?_without_up: 0} %{?!_without_up: 1}
+# build the base variants
+%define with_base %{?_without_base: 0} %{?!_without_base: 1}
# build also debug variants
%define with_debug %{?_without_debug: 0} %{?!_without_debug: 1}
# kernel-zfcpdump (s390 specific kernel for zfcpdump)
%define with_zfcpdump %{?_without_zfcpdump: 0} %{?!_without_zfcpdump: 1}
# kernel-16k (aarch64 kernel with 16K page_size)
-%define with_arm64_16k %{?_without_arm64_16k: 0} %{?!_without_arm64_16k: 1}
+%define with_arm64_16k %{?_with_arm64_16k: 1} %{?!_with_arm64_16k: 0}
# kernel-64k (aarch64 kernel with 64K page_size)
%define with_arm64_64k %{?_without_arm64_64k: 0} %{?!_without_arm64_64k: 1}
# kernel-rt (x86_64 and aarch64 only PREEMPT_RT enabled kernel)
%define with_realtime %{?_with_realtime: 1} %{?!_with_realtime: 0}
# Supported variants
-# (base) with_debug with_gcov
+# with_base with_debug with_gcov
# up X X X
# zfcpdump X X
# arm64_16k X X X
@@ -298,16 +303,11 @@ 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
%endif
-# No arm64-16k flavor for now
-%define with_arm64_16k 0
-
%if %{with_verbose}
%define make_opts V=1
%else
@@ -399,6 +399,7 @@ Summary: The Linux kernel
# if requested, only build debug kernel
%if %{with_dbgonly}
+%define with_base 0
%define with_vdso_install 0
%define with_perf 0
%define with_tools 0
@@ -445,9 +446,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
@@ -469,6 +470,8 @@ Summary: The Linux kernel
%endif
%endif
+%define all_configs %{name}-%{specrpmversion}-*.config
+
# don't build noarch kernels or headers (duh)
%ifarch noarch
%define with_up 0
@@ -480,7 +483,6 @@ Summary: The Linux kernel
%define with_bpftool 0
%define with_selftests 0
%define with_debug 0
-%define all_arch_configs %{name}-%{specrpmversion}-*.config
%endif
# sparse blows up on ppc
@@ -509,13 +511,11 @@ Summary: The Linux kernel
%ifarch i686
%define asmarch x86
%define hdrarch i386
-%define all_arch_configs %{name}-%{specrpmversion}-i?86*.config
%define kernel_image arch/x86/boot/bzImage
%endif
%ifarch x86_64
%define asmarch x86
-%define all_arch_configs %{name}-%{specrpmversion}-x86_64*.config
%define kernel_image arch/x86/boot/bzImage
%endif
@@ -526,19 +526,16 @@ Summary: The Linux kernel
%define kernel_image vmlinux
%define kernel_image_elf 1
%define use_vdso 0
-%define all_arch_configs %{name}-%{specrpmversion}-ppc64le*.config
%endif
%ifarch s390x
%define asmarch s390
%define hdrarch s390
-%define all_arch_configs %{name}-%{specrpmversion}-s390x.config
%define kernel_image arch/s390/boot/bzImage
%define vmlinux_decompressor arch/s390/boot/vmlinux
%endif
%ifarch aarch64
-%define all_arch_configs %{name}-%{specrpmversion}-aarch64*.config
%define asmarch arm64
%define hdrarch arm64
%define make_target vmlinuz.efi
@@ -606,22 +603,22 @@ Summary: The Linux kernel
%endif
# short-hand for "are we building base/non-debug variants of ...?"
-%if %{with_up} && !%{with_dbgonly}
+%if %{with_up} && %{with_base}
%define with_up_base 1
%else
%define with_up_base 0
%endif
-%if %{with_realtime} && !%{with_dbgonly}
+%if %{with_realtime} && %{with_base}
%define with_realtime_base 1
%else
%define with_realtime_base 0
%endif
-%if %{with_arm64_16k} && !%{with_dbgonly}
+%if %{with_arm64_16k} && %{with_base}
%define with_arm64_16k_base 1
%else
%define with_arm64_16k_base 0
%endif
-%if %{with_arm64_64k} && !%{with_dbgonly}
+%if %{with_arm64_64k} && %{with_base}
%define with_arm64_64k_base 1
%else
%define with_arm64_64k_base 0
@@ -636,7 +633,7 @@ Summary: The Linux kernel
Name: %{package_name}
-License: GPLv2 and Redistributable, no modification permitted
+License: ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-2-Clause) AND ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-3-Clause) AND ((GPL-2.0-only WITH Linux-syscall-note) OR CDDL-1.0) AND ((GPL-2.0-only WITH Linux-syscall-note) OR Linux-OpenIB) AND ((GPL-2.0-only WITH Linux-syscall-note) OR MIT) AND ((GPL-2.0-or-later WITH Linux-syscall-note) OR BSD-3-Clause) AND ((GPL-2.0-or-later WITH Linux-syscall-note) OR MIT) AND BSD-2-Clause AND BSD-3-Clause AND BSD-3-Clause-Clear AND GFDL-1.1-no-invariants-or-later AND GPL-1.0-or-later AND (GPL-1.0-or-later OR BSD-3-Clause) AND (GPL-1.0-or-later WITH Linux-syscall-note) AND GPL-2.0-only AND (GPL-2.0-only OR Apache-2.0) AND (GPL-2.0-only OR BSD-2-Clause) AND (GPL-2.0-only OR BSD-3-Clause) AND (GPL-2.0-only OR CDDL-1.0) AND (GPL-2.0-only OR GFDL-1.1-no-invariants-or-later) AND (GPL-2.0-only OR GFDL-1.2-no-invariants-only) AND (GPL-2.0-only WITH Linux-syscall-note) AND GPL-2.0-or-later AND (GPL-2.0-or-later OR BSD-2-Clause) AND (GPL-2.0-or-later OR BSD-3-Clause) AND (GPL-2.0-or-later OR CC-BY-4.0) AND (GPL-2.0-or-later WITH GCC-exception-2.0) AND (GPL-2.0-or-later WITH Linux-syscall-note) AND ISC AND LGPL-2.0-or-later AND (LGPL-2.0-or-later OR BSD-2-Clause) AND (LGPL-2.0-or-later WITH Linux-syscall-note) AND LGPL-2.1-only AND (LGPL-2.1-only OR BSD-2-Clause) AND (LGPL-2.1-only WITH Linux-syscall-note) AND LGPL-2.1-or-later AND (LGPL-2.1-or-later WITH Linux-syscall-note) AND (Linux-OpenIB OR GPL-2.0-only) AND (Linux-OpenIB OR GPL-2.0-only OR BSD-2-Clause) AND Linux-man-pages-copyleft AND MIT AND (MIT OR Apache-2.0) AND (MIT OR GPL-2.0-only) AND (MIT OR GPL-2.0-or-later) AND (MIT OR LGPL-2.1-only) AND (MPL-1.1 OR GPL-2.0-only) AND (X11 OR GPL-2.0-only) AND (X11 OR GPL-2.0-or-later) AND Zlib AND (copyleft-next-0.3.1 OR GPL-2.0-or-later)
URL: https://www.kernel.org/
Version: %{specrpmversion}
Release: %{pkg_release}
@@ -665,7 +662,6 @@ BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex, gcc-c++
BuildRequires: net-tools, hostname, bc, elfutils-devel
BuildRequires: dwarves
BuildRequires: python3-devel
-BuildRequires: gcc-plugin-devel
BuildRequires: kernel-rpm-macros
# glibc-static is required for a consistent build environment (specifically
# CONFIG_CC_CAN_LINK_STATIC=y).
@@ -789,7 +785,7 @@ BuildRequires: binutils
BuildRequires: lvm2
BuildRequires: systemd-boot-unsigned
# For systemd-stub and systemd-pcrphase
-BuildRequires: systemd-udev
+BuildRequires: systemd-udev >= 252-1
# For TPM operations in UKI initramfs
BuildRequires: tpm2-tools
%endif
@@ -912,7 +908,14 @@ Source65: filter-s390x.sh.fedora
Source66: filter-modules.sh.fedora
%endif
-Source75: partial-kgcov-snip.config
+Source70: partial-kgcov-snip.config
+Source71: partial-kgcov-debug-snip.config
+Source72: partial-clang-snip.config
+Source73: partial-clang-debug-snip.config
+Source74: partial-clang_lto-x86_64-snip.config
+Source75: partial-clang_lto-x86_64-debug-snip.config
+Source76: partial-clang_lto-aarch64-snip.config
+Source77: partial-clang_lto-aarch64-debug-snip.config
Source80: generate_all_configs.sh
Source81: process_configs.sh
@@ -940,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
@@ -1070,7 +1073,6 @@ Epoch: %{gemini}
%endif
Summary: Performance monitoring for the Linux kernel
Requires: bzip2
-License: GPLv2
%description -n perf
This package contains the perf tool, which enables performance monitoring
of the Linux kernel.
@@ -1120,7 +1122,6 @@ This package provides debug information for the perf python bindings.
%if %{with_tools}
%package -n %{package_name}-tools
Summary: Assortment of tools for the Linux kernel
-License: GPLv2
%ifarch %{cpupowerarchs}
Provides: cpupowerutils = 1:009-0.6.p1
Obsoletes: cpupowerutils < 1:009-0.6.p1
@@ -1138,14 +1139,12 @@ and the supporting documentation.
%package -n %{package_name}-tools-libs
Summary: Libraries for the kernels-tools
-License: GPLv2
%description -n %{package_name}-tools-libs
This package contains the libraries built from the tools/ directory
from the kernel source.
%package -n %{package_name}-tools-libs-devel
Summary: Assortment of tools for the Linux kernel
-License: GPLv2
Requires: %{package_name}-tools = %{version}-%{release}
%ifarch %{cpupowerarchs}
Provides: cpupowerutils-devel = 1:009-0.6.p1
@@ -1184,7 +1183,6 @@ and root causes of unexpected results.
%package -n rv
Summary: RV: Runtime Verification
-License: GPLv2
%description -n rv
Runtime Verification (RV) is a lightweight (yet rigorous) method that
complements classical exhaustive verification techniques (such as model
@@ -1202,7 +1200,6 @@ analysing the logical and timing behavior of Linux.
%package -n bpftool
Summary: Inspection and simple manipulation of eBPF programs and maps
-License: GPLv2
Version: %{bpftoolversion}
%description -n bpftool
This package contains the bpftool, which allows inspection and simple
@@ -1230,7 +1227,6 @@ This package provides debug information for the bpftool package.
%package selftests-internal
Summary: Kernel samples and selftests
-License: GPLv2
Requires: binutils, bpftool, iproute-tc, nmap-ncat, python3, fuse-libs
%description selftests-internal
Kernel sample programs and selftests.
@@ -1513,7 +1509,7 @@ Provides: installonlypkg(kernel)\
Provides: kernel-%{?1:%{1}-}uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
Requires(pre): %{kernel_prereq}\
-Requires(pre): systemd\
+Requires(pre): systemd >= 254-1\
%endif\
%endif\
%if %{with_gcov}\
@@ -1775,30 +1771,56 @@ cp $RPM_SOURCE_DIR/%{name}-*.config .
cp %{SOURCE80} .
# merge.py
cp %{SOURCE3000} .
-# kernel-local
-cp %{SOURCE3001} .
+# kernel-local - rename and copy for partial snippet config process
+cp %{SOURCE3001} partial-kernel-local-snip.config
+cp %{SOURCE3001} partial-kernel-local-debug-snip.config
FLAVOR=%{primary_target} SPECPACKAGE_NAME=%{name} SPECVERSION=%{specversion} SPECRPMVERSION=%{specrpmversion} ./generate_all_configs.sh %{debugbuildsenabled}
-# Merge in any user-provided local config option changes
-%ifnarch %nobuildarches
-for i in %{all_arch_configs}
-do
- mv $i $i.tmp
- ./merge.py %{SOURCE3001} $i.tmp > $i
+# Collect custom defined config options
+PARTIAL_CONFIGS=""
%if %{with_gcov}
- echo "Merging with gcov options"
- cat %{SOURCE75}
- mv $i $i.tmp
- ./merge.py %{SOURCE75} $i.tmp > $i
+PARTIAL_CONFIGS="$PARTIAL_CONFIGS %{SOURCE70} %{SOURCE71}"
%endif
- rm $i.tmp
-done
+%if %{with toolchain_clang}
+PARTIAL_CONFIGS="$PARTIAL_CONFIGS %{SOURCE72} %{SOURCE73}"
%endif
-
%if %{with clang_lto}
-for i in *aarch64*.config *x86_64*.config; do
- sed -i 's/# CONFIG_LTO_CLANG_THIN is not set/CONFIG_LTO_CLANG_THIN=y/' $i
- sed -i 's/CONFIG_LTO_NONE=y/# CONFIG_LTO_NONE is not set/' $i
+PARTIAL_CONFIGS="$PARTIAL_CONFIGS %{SOURCE74} %{SOURCE75} %{SOURCE76} %{SOURCE77}"
+%endif
+PARTIAL_CONFIGS="$PARTIAL_CONFIGS partial-kernel-local-snip.config partial-kernel-local-debug-snip.config"
+
+GetArch()
+{
+ case "$1" in
+ *aarch64*) echo "aarch64" ;;
+ *ppc64le*) echo "ppc64le" ;;
+ *s390x*) echo "s390x" ;;
+ *x86_64*) echo "x86_64" ;;
+ # no arch, apply everywhere
+ *) echo "" ;;
+ esac
+}
+
+# Merge in any user-provided local config option changes
+%ifnarch %nobuildarches
+for i in %{all_configs}
+do
+ kern_arch="$(GetArch $i)"
+ kern_debug="$(echo $i | grep -q debug && echo "debug" || echo "")"
+
+ for j in $PARTIAL_CONFIGS
+ do
+ part_arch="$(GetArch $j)"
+ part_debug="$(echo $j | grep -q debug && echo "debug" || echo "")"
+
+ # empty arch means apply to all arches
+ if [ "$part_arch" == "" -o "$part_arch" == "$kern_arch" ] && [ "$part_debug" == "$kern_debug" ]
+ then
+ mv $i $i.tmp
+ ./merge.py $j $i.tmp > $i
+ fi
+ done
+ rm -f $i.tmp
done
%endif
@@ -2150,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
@@ -2169,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
@@ -2724,12 +2746,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}
@@ -2797,33 +2821,16 @@ find Documentation -type d | xargs chmod u+w
#
# Don't sign modules for the zfcpdump variant as it is monolithic.
-# TODO - this needs to be fixed in same way as we have it in c9s
%define __modsign_install_post \
if [ "%{signmodules}" -eq "1" ]; then \
- if [ "%{with_up_base}" -ne "0" ]; then \
- %{modsign_cmd} certs/signing_key.pem.sign certs/signing_key.x509.sign $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/ \
- fi \
- if [ "%{with_up}" -ne "0" ] && [ "%{with_debug}" -ne "0" ]; then \
- %{modsign_cmd} certs/signing_key.pem.sign+debug certs/signing_key.x509.sign+debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+debug/ \
- fi \
- if [ "%{with_realtime_base}" -ne "0" ]; then \
- %{modsign_cmd} certs/signing_key.pem.sign+rt certs/signing_key.x509.sign+rt $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+rt/ \
- fi \
- if [ "%{with_realtime}" -ne "0" ] && [ "%{with_debug}" -ne "0" ]; then \
- %{modsign_cmd} certs/signing_key.pem.sign+rt-debug certs/signing_key.x509.sign+rt-debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+rt-debug/ \
- fi \
- if [ "%{with_arm64_16k_base}" -ne "0" ]; then \
- %{modsign_cmd} certs/signing_key.pem.sign+16k certs/signing_key.x509.sign+16k $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+16k/ \
- fi \
- if [ "%{with_arm64_16k}" -ne "0" ] && [ "%{with_debug}" -ne "0" ]; then \
- %{modsign_cmd} certs/signing_key.pem.sign+16k-debug certs/signing_key.x509.sign+16k-debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+16k-debug/ \
- fi \
- if [ "%{with_arm64_64k_base}" -ne "0" ]; then \
- %{modsign_cmd} certs/signing_key.pem.sign+64k certs/signing_key.x509.sign+64k $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+64k/ \
- fi \
- if [ "%{with_arm64_64k}" -ne "0" ] && [ "%{with_debug}" -ne "0" ]; then \
- %{modsign_cmd} certs/signing_key.pem.sign+64k-debug certs/signing_key.x509.sign+64k-debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+64k-debug/ \
- fi \
+ echo "Signing kernel modules ..." \
+ modules_dirs="$(shopt -s nullglob; echo $RPM_BUILD_ROOT/lib/modules/%{KVERREL}*)" \
+ for modules_dir in $modules_dirs; do \
+ variant_suffix="${modules_dir#$RPM_BUILD_ROOT/lib/modules/%{KVERREL}}" \
+ [ "$variant_suffix" == "+zfcpdump" ] && continue \
+ echo "Signing modules for %{KVERREL}${variant_suffix}" \
+ %{modsign_cmd} certs/signing_key.pem.sign${variant_suffix} certs/signing_key.x509.sign${variant_suffix} $modules_dir/ \
+ done \
fi \
if [ "%{zipmodules}" -eq "1" ]; then \
echo "Compressing kernel modules ..." \
@@ -2932,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
@@ -3471,7 +3478,7 @@ fi\
%ifarch %{cpupowerarchs}
%files -n %{package_name}-tools-libs
-%{_libdir}/libcpupower.so.0
+%{_libdir}/libcpupower.so.1
%{_libdir}/libcpupower.so.0.0.1
%files -n %{package_name}-tools-libs-devel
@@ -3702,210 +3709,336 @@ fi\
#
#
%changelog
-* Mon Nov 20 2023 Augusto Caringi <acaringi(a)redhat.com> [6.5.12-0]
+* Wed Nov 22 2023 Justin M. Forbes <jforbes(a)fedoraproject.org> [6.6.2-201]
+- Turn on USB_DWC3 for Fedora (rhbz 2250955) (Justin M. Forbes)
+- Revert "netfilter: nf_tables: remove catchall element in GC sync path" (Justin M. Forbes)
+- More BugsFixed (Justin M. Forbes)
+- netfilter: nf_tables: remove catchall element in GC sync path (Pablo Neira Ayuso)
+- frop the build number back to 200 for fedora-srpm.sh (Justin M. Forbes)
+- ACPI: video: Use acpi_device_fix_up_power_children() (Hans de Goede)
+- ACPI: PM: Add acpi_device_fix_up_power_children() function (Hans de Goede)
+
+* Mon Nov 20 2023 Justin M. Forbes <jforbes(a)fedoraproject.org> [6.6.2-0]
- Add bug for AMD ACPI alarm (Justin M. Forbes)
- rtc: cmos: Use ACPI alarm for non-Intel x86 systems too (Mario Limonciello)
-- Linux v6.5.12
-
-* Wed Nov 08 2023 Augusto Caringi <acaringi(a)redhat.com> [6.5.11-0]
-- Linux v6.5.11
+- Add bluetooth fixes to BugsFixed (Justin M. Forbes)
+- Drop F37 from release targets as it will not rebase to 6.6 (Justin M. Forbes)
+- Linux v6.6.2
-* Thu Nov 02 2023 Justin M. Forbes <jforbes(a)fedoraproject.org> [6.5.10-0]
-- Linux v6.5.10
-
-* Wed Oct 25 2023 Augusto Caringi <acaringi(a)redhat.com> [6.5.9-0]
+* Wed Nov 08 2023 Justin M. Forbes <jforbes(a)fedoraproject.org> [6.6.1-0]
+- drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set (Javier Martinez Canillas)
+- Added required files for rebase (Augusto Caringi)
+- Reset RHEL_RELEASE for rebase (Justin M. Forbes)
+- [Scheduled job] Catch config mismatches early during upstream merge (Don Zickus)
+- redhat/self-test: Update data for KABI xz change (Prarit Bhargava)
+- redhat/scripts: Switch KABI tarballs to xz (Prarit Bhargava)
+- redhat/kernel.spec.template: Switch KABI compression to xz (Prarit Bhargava)
+- redhat: self-test: Use a more complete SRPM file suffix (Andrew Halaney)
+- redhat: makefile: remove stray rpmbuild --without (Eric Chanudet)
+- Linux v6.6.1
+
+* Mon Oct 30 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-61]
+- Linux v6.6.0
+
+* Sun Oct 29 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc7.2af9b20dbb39.60]
+- Linux v6.6.0-0.rc7.2af9b20dbb39
+
+* Sat Oct 28 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc7.56567a20b22b.59]
+- Consolidate configs into common for 6.6 (Justin M. Forbes)
+- Linux v6.6.0-0.rc7.56567a20b22b
+
+* Fri Oct 27 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc7.750b95887e56.58]
+- Linux v6.6.0-0.rc7.750b95887e56
+
+* Thu Oct 26 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc7.611da07b89fd.57]
- Updated Fedora configs (Justin M. Forbes)
-- Add UFSHCD bug to BugsFixed (Justin M. Forbes)
- Turn on UFSHCD for Fedora x86 (Justin M. Forbes)
+- Linux v6.6.0-0.rc7.611da07b89fd
+
+* Wed Oct 25 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc7.4f82870119a4.56]
- redhat: configs: generic: x86: Disable CONFIG_VIDEO_OV01A10 for x86 platform (Hans de Goede)
-- Linux v6.5.9
+- Linux v6.6.0-0.rc7.4f82870119a4
+
+* Tue Oct 24 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc7.d88520ad73b7.55]
+- redhat: remove pending-rhel CONFIG_XFS_ASSERT_FATAL file (Patrick Talbert)
+- New configs in fs/xfs (Fedora Kernel Team)
+- crypto: rng - Override drivers/char/random in FIPS mode (Herbert Xu)
+- random: Add hook to override device reads and getrandom(2) (Herbert Xu)
+- Linux v6.6.0-0.rc7.d88520ad73b7
+
+* Mon Oct 23 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc7.54]
+- Linux v6.6.0-0.rc7
+
+* Sun Oct 22 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc6.1acfd2bd3f0d.53]
+- Linux v6.6.0-0.rc6.1acfd2bd3f0d
+
+* Sat Oct 21 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc6.9c5d00cb7b6b.52]
+- Linux v6.6.0-0.rc6.9c5d00cb7b6b
+
+* Fri Oct 20 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc6.ce55c22ec8b2.51]
+- redhat/configs: share CONFIG_ARM64_ERRATUM_2966298 between rhel and fedora (Mark Salter)
+- configs: Remove S390 IOMMU config options that no longer exist (Jerry Snitselaar)
+- redhat: docs: clarify where bugs and issues are created (Scott Weaver)
+- redhat/scripts/rh-dist-git.sh does not take any arguments: fix error message (Denys Vlasenko)
+- Add target_branch for gen_config_patches.sh (Don Zickus)
+- Linux v6.6.0-0.rc6.ce55c22ec8b2
+
+* Thu Oct 19 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc6.dd72f9c7e512.50]
+- Linux v6.6.0-0.rc6.dd72f9c7e512
+
+* Wed Oct 18 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc6.06dc10eae55b.49]
+- Linux v6.6.0-0.rc6.06dc10eae55b
+
+* Tue Oct 17 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc6.213f891525c2.48]
+- redhat: disable kunit by default (Nico Pache)
+- redhat/configs: enable the AMD_PMF driver for RHEL (David Arcari)
+- Make CONFIG_ADDRESS_MASKING consistent between fedora and rhel (Chris von Recklinghausen)
+- CI: add ark-latest baseline job to tag cki-gating for successful pipelines (Michael Hofmann)
+- CI: provide child pipelines for CKI container image gating (Michael Hofmann)
+- CI: allow to run as child pipeline (Michael Hofmann)
+- CI: provide descriptive pipeline name for scheduled pipelines (Michael Hofmann)
+- CI: use job templates for variant variables (Michael Hofmann)
+- redhat/kernel.spec.template: simplify __modsign_install_post (Jan Stancek)
+- Linux v6.6.0-0.rc6.213f891525c2
+
+* Mon Oct 16 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc6.47]
+- Linux v6.6.0-0.rc6
+
+* Sun Oct 15 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc5.9a3dad63edbe.46]
+- Fedora filter updates after configs (Justin M. Forbes)
+- Fedora configs for 6.6 (Justin M. Forbes)
+- Linux v6.6.0-0.rc5.9a3dad63edbe
+
+* Sat Oct 14 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc5.727fb8376504.45]
+- Linux v6.6.0-0.rc5.727fb8376504
+
+* Fri Oct 13 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc5.10a6e5feccb8.44]
+- Linux v6.6.0-0.rc5.10a6e5feccb8
+
+* Thu Oct 12 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc5.401644852d0b.43]
+- Linux v6.6.0-0.rc5.401644852d0b
+
+* Wed Oct 11 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc5.1c8b86a3799f.42]
+- Linux v6.6.0-0.rc5.1c8b86a3799f
+
+* Tue Oct 10 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc5.41]
+- redhat/configs: Freescale Layerscape SoC family (Steve Best)
+- Add clang MR/baseline pipelines (Michael Hofmann)
+
+* Mon Oct 09 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc5.40]
+- CI: Remove unused kpet_tree_family (Nikolai Kondrashov)
+- Linux v6.6.0-0.rc5
+
+* Sun Oct 08 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc4.b9ddbb0cde2a.39]
+- Linux v6.6.0-0.rc4.b9ddbb0cde2a
+
+* Sat Oct 07 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc4.82714078aee4.38]
+- Linux v6.6.0-0.rc4.82714078aee4
+
+* Fri Oct 06 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc4.b78b18fb8ee1.37]
+- Add clang config framework (Don Zickus)
+- Apply partial snippet configs to all configs (Don Zickus)
+- Remove unpackaged kgcov config files (Don Zickus)
+- redhat/configs: enable missing Kconfig options for Qualcomm RideSX4 (Brian Masney)
+- enable CONFIG_ADDRESS_MASKING for x86_64 (Chris von Recklinghausen)
+- Linux v6.6.0-0.rc4.b78b18fb8ee1
-* Fri Oct 20 2023 Augusto Caringi <acaringi(a)redhat.com> [6.5.8-0]
-- Linux v6.5.8
+* Thu Oct 05 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc4.3006adf3be79.36]
+- Linux v6.6.0-0.rc4.3006adf3be79
-* Tue Oct 10 2023 Augusto Caringi <acaringi(a)redhat.com> [6.5.7-0]
-- common: aarch64: enable CONFIG_ARM64_ERRATUM_2966298 (Augusto Caringi)
-- Linux v6.5.7
+* Wed Oct 04 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc4.cbf3a2cb156a.35]
+- Linux v6.6.0-0.rc4.cbf3a2cb156a
-* Fri Oct 06 2023 Augusto Caringi <acaringi(a)redhat.com> [6.5.6-0]
-- power: supply: core: Use blocking_notifier_call_chain to avoid RCU complaint (Kai-Heng Feng)
-- Revert "Add linux-next specific files for 20231004" (Justin M. Forbes)
-- redhat/configs: enable missing Kconfig options for Qualcomm RideSX4 (Brian Masney)
-- add a couple of CVEs to BugsFixed (Justin M. Forbes)
-- Add another F39 FE bug to BugsFixed (Justin M. Forbes)
-- Add linux-next specific files for 20231004 (Stephen Rothwell)
+* Tue Oct 03 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc4.ce36c8b14987.34]
- common: aarch64: enable NXP Flex SPI (Peter Robinson)
+- Linux v6.6.0-0.rc4.ce36c8b14987
+
+* Mon Oct 02 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc4.33]
+- Linux v6.6.0-0.rc4
+
+* Sun Oct 01 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc3.e402b08634b3.32]
+- Linux v6.6.0-0.rc3.e402b08634b3
+
+* Sat Sep 30 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc3.9f3ebbef746f.31]
- fedora: Switch TI_SCI_CLK and TI_SCI_PM_DOMAINS symbols to built-in (Javier Martinez Canillas)
-- Add bug for amdgpu to BugsFixed for 6.5.6 (Justin M. Forbes)
-- drm/amdgpu: set completion status as preempted for the resubmission (Jiadong Zhu)
-- Add CVE-2023-42756 to BugsFixed for 6.5.6 (Justin M. Forbes)
-- Linux v6.5.6
-
-* Sat Sep 23 2023 Justin M. Forbes <jforbes(a)fedoraproject.org> [6.5.5-0]
-- iommu/apple-dart: Handle DMA_FQ domains in attach_dev() (Hector Martin)
-- Note fix for atomic locking in BugsFixed (Justin M. Forbes)
-- locking/atomic: scripts: fix fallback ifdeffery (Mark Rutland)
+- Linux v6.6.0-0.rc3.9f3ebbef746f
+
+* Fri Sep 29 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc3.9ed22ae6be81.30]
+- Linux v6.6.0-0.rc3.9ed22ae6be81
+
+* Thu Sep 28 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc3.633b47cb009d.29]
+- Linux v6.6.0-0.rc3.633b47cb009d
+
+* Wed Sep 27 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc3.0e945134b680.28]
+- kernel.spec: adjust build option comment (Michael Hofmann)
+- kernel.spec: allow to enable arm64_16k variant (Michael Hofmann)
+- gitlab-ci: enable build-only pipelines for Rawhide/16k/aarch64 (Michael Hofmann)
+- kernel.spec.template: Fix --without bpftool (Prarit Bhargava)
+- redhat/configs: NXP BBNSM Power Key Driver (Steve Best)
+- redhat/self-test: Update data for cross compile fields (Prarit Bhargava)
+- redhat/Makefile.cross: Add message for disabled subpackages (Prarit Bhargava)
+- redhat/Makefile.cross: Update cross targets with disabled subpackages (Prarit Bhargava)
+- Linux v6.6.0-0.rc3.0e945134b680
+
+* Tue Sep 26 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc3.27]
+- Remove XFS_ASSERT_FATAL from pending-fedora (Justin M. Forbes)
+
+* Mon Sep 25 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc3.26]
+- Change default pending for XFS_ONLINE_SCRUB_STATSas it now selects XFS_DEBUG (Justin M. Forbes)
+- Linux v6.6.0-0.rc3
+
+* Sun Sep 24 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc2.3aba70aed91f.25]
+- Linux v6.6.0-0.rc2.3aba70aed91f
+
+* Sat Sep 23 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc2.d90b0276af8f.24]
+- Linux v6.6.0-0.rc2.d90b0276af8f
+
+* Fri Sep 22 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc2.27bbf45eae9c.23]
+- gitlab-ci: use --with debug/base to select kernel variants (Michael Hofmann)
+- kernel.spec: add rpmbuild --without base option (Michael Hofmann)
+- Linux v6.6.0-0.rc2.27bbf45eae9c
+
+* Thu Sep 21 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc2.42dc814987c1.22]
- redhat: spec: Fix typo for kernel_variant_preun for 16k-debug flavor (Neal Gompa)
-- Fix installreq for UKI (Justin M. Forbes)
-- Add btrfs bug to BugsFixed for 6.5.5 (Justin M. Forbes)
-- btrfs: adjust overcommit logic when very close to full (Josef Bacik)
-- btrfs: properly report 0 avail for very full file systems (Josef Bacik)
-- Linux v6.5.5
-
-* Tue Sep 19 2023 Justin M. Forbes <jforbes(a)fedoraproject.org> [6.5.4-0]
-- Add F38 and F37 as release targets (Justin M. Forbes)
-- Add NFS bug fix for 6.5.4 (Justin M. Forbes)
-- selinux: fix handling of empty opts in selinux_fs_context_submount() (Ondrej Mosnacek)
+- Linux v6.6.0-0.rc2.42dc814987c1
+
+* Tue Sep 19 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc2.2cf0f7156238.21]
+- Linux v6.6.0-0.rc2.2cf0f7156238
+
+* Mon Sep 18 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc2.20]
+- Linux v6.6.0-0.rc2
+
+* Sun Sep 17 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc1.f0b0d403eabb.19]
+- Linux v6.6.0-0.rc1.f0b0d403eabb
+
+* Sat Sep 16 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc1.57d88e8a5974.18]
+- Linux v6.6.0-0.rc1.57d88e8a5974
+
+* Fri Sep 15 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc1.9fdfb15a3dbf.17]
- Turn off appletalk for fedora (Justin M. Forbes)
-- Linux v6.5.4
+- Linux v6.6.0-0.rc1.9fdfb15a3dbf
-* Wed Sep 13 2023 Justin M. Forbes <jforbes(a)fedoraproject.org> [6.5.3-0]
-- Revert "misc: rtsx: judge ASPM Mode to set PETXCFG Reg" (Justin M. Forbes)
-- Config updates for 6.5.3 (Justin M. Forbes)
-- Fix up buildReqs for UKI (Justin M. Forbes)
-- Linux v6.5.3
+* Thu Sep 14 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc1.aed8aee11130.16]
+- Linux v6.6.0-0.rc1.aed8aee11130
-* Wed Sep 06 2023 Justin M. Forbes <jforbes(a)fedoraproject.org> [6.5.2-0]
-- Move squashfs to kernel-modules-core (Justin M. Forbes)
-- Add TPM bug to BugsFixed (Justin M. Forbes)
-- tpm: Enable hwrng only for Pluton on AMD CPUs (Jarkko Sakkinen)
-- Linux v6.5.2
+* Wed Sep 13 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc1.3669558bdf35.15]
+- Linux v6.6.0-0.rc1.3669558bdf35
+
+* Tue Sep 12 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc1.14]
+- New configs in drivers/media (Fedora Kernel Team)
+- redhat/docs: Add a mention of bugzilla for bugs (Prarit Bhargava)
+- Fix the fixup of Fedora release (Don Zickus)
-* Sat Sep 02 2023 Justin M. Forbes <jforbes(a)fedoraproject.org> [6.5.1-0]
-- erofs: ensure that the post-EOF tails are all zeroed (Gao Xiang)
-- Add bug to BugsFixed (Justin M. Forbes)
+* Mon Sep 11 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc1.13]
+- Linux v6.6.0-0.rc1
+
+* Sun Sep 10 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc0.535a265d7f0d.12]
+- Linux v6.6.0-0.rc0.535a265d7f0d
+
+* Sat Sep 09 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc0.6099776f9f26.11]
+- Linux v6.6.0-0.rc0.6099776f9f26
+
+* Fri Sep 08 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc0.a48fa7efaf11.10]
+- Linux v6.6.0-0.rc0.a48fa7efaf11
+
+* Thu Sep 07 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc0.7ba2090ca64e.9]
+- Fix Fedora release scheduled job (Don Zickus)
+- Move squashfs to kernel-modules-core (Justin M. Forbes)
+- redhat: Explicitly disable CONFIG_COPS (Vitaly Kuznetsov)
+- redhat: Add dist-check-licenses target (Vitaly Kuznetsov)
+- redhat: Introduce "Verify SPDX-License-Identifier tags" selftest (Vitaly Kuznetsov)
+- redhat: Use kspdx-tool output for the License: field (Vitaly Kuznetsov)
+- Linux v6.6.0-0.rc0.7ba2090ca64e
+
+* Wed Sep 06 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc0.65d6e954e378.8]
+- Rename pipeline repo branch and DW tree names (Michael Hofmann)
+- Adjust comments that refer to ARK in a Rawhide context (Michael Hofmann)
+- Rename variable names starting with ark- to rawhide- (Michael Hofmann)
+- Rename trigger-ark to trigger-rawhide (Michael Hofmann)
+- Fix up config mismatches for Fedora (Justin M. Forbes)
+- Linux v6.6.0-0.rc0.65d6e954e378
+
+* Tue Sep 05 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc0.3f86ed6ec0b3.7]
+- redhat/configs: Texas Instruments Inc. K3 multicore SoC architecture (Steve Best)
+- Linux v6.6.0-0.rc0.3f86ed6ec0b3
+
+* Mon Sep 04 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc0.708283abf896.6]
+- Linux v6.6.0-0.rc0.708283abf896
+
+* Sun Sep 03 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc0.92901222f83d.5]
+- Flip CONFIG_VIDEO_V4L2_SUBDEV_API in pending RHEL due to mismatch (Justin M. Forbes)
+- Linux v6.6.0-0.rc0.92901222f83d
+
+* Sat Sep 02 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc0.0468be89b3fa.4]
+- CONFIG_HW_RANDOM_HISI: move to common and set to m (Scott Weaver)
- Turn off CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE for Fedora s390x (Justin M. Forbes)
-- drm/msm/a690: Switch to a660_gmu.bin (Rob Clark)
-- drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set (Javier Martinez Canillas)
-- Turn E1000 back on (Justin M. Forbes)
-- Set up variables and scripts for Fedora stable (Justin M. Forbes)
-- Update self-test data (Justin M. Forbes)
+- Linux v6.6.0-0.rc0.0468be89b3fa
+
+* Fri Sep 01 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc0.99d99825fc07.3.eln130]
+- Disable tests for ELN realtime pipelines (Michael Hofmann)
+- New configs in mm/Kconfig (Fedora Kernel Team)
+- Flip CONFIG_SND_SOC_CS35L56_SDW to m and clean up (Justin M. Forbes)
+- Add drm_exec_test to mod-internal.list (Thorsten Leemhuis)
+- Add new pending entry for CONFIG_SND_SOC_CS35L56_SDW to fix mismatch (Justin M. Forbes)
+- Linux v6.6.0-0.rc0.99d99825fc07
+
+* Thu Aug 31 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc0.b97d64c72259.2.eln130]
+- Fix tarball creation logic (Don Zickus)
+- redhat: bump libcpupower soname to match upstream (Patrick Talbert)
+- Turn on MEMFD_CREATE in pending as it is selected by CONFIG_TMPFS (Justin M. Forbes)
+- Linux v6.6.0-0.rc0.b97d64c72259
+
+* Wed Aug 30 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc0.6c1b980a7e79.1.eln130]
+- redhat: drop unneeded build-time dependency gcc-plugin-devel (Coiby Xu)
+- Reset RHEL release and trim changelog after rebase (Justin M. Forbes)
+- Linux v6.6.0-0.rc0.6c1b980a7e79
+
+* Tue Aug 29 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.6.0-0.rc0.1c59d383390f.59.eln130]
- all: x86: move wayward x86 specific config home (Peter Robinson)
- all: de-dupe non standard config options (Peter Robinson)
- all: x86: clean up microcode loading options (Peter Robinson)
- common: remove unnessary CONFIG_SND_MESON_AXG* (Peter Robinson)
-- Linux v6.5.1
-
-* Mon Aug 28 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-58.eln130]
- redhat: Fix UKI install with systemd >= 254 (Vitaly Kuznetsov)
- redhat: Use named parameters for kernel_variant_posttrans()/kernel_variant_preun() (Vitaly Kuznetsov)
-
-* Mon Aug 28 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-57.eln130]
-- Linux v6.5.0
-
-* Sun Aug 27 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc7.28f20a19294d.56.eln130]
-- Linux v6.5.0-0.rc7.28f20a19294d
-
-* Sat Aug 26 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc7.7d2f353b2682.55.eln130]
- redhat/kernel.spec.template: update compression variables to support zstd (Brian Masney)
-- Linux v6.5.0-0.rc7.7d2f353b2682
-
-* Fri Aug 25 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc7.4f9e7fabf864.54.eln130]
-- Linux v6.5.0-0.rc7.4f9e7fabf864
-
-* Thu Aug 24 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc7.93f5de5f648d.53.eln130]
- Consolidate configs to common for 6.5 (Justin M. Forbes)
- Remove unused config entry for Fedora (Justin M. Forbes)
-- Linux v6.5.0-0.rc7.93f5de5f648d
-
-* Wed Aug 23 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc7.89bf6209cad6.52.eln130]
- redhat/self-test: Remove rpmlint test (Prarit Bhargava)
- Remove the armv7 config directory from Fedora again (Justin M. Forbes)
- Enable CONFIG_EXPERT for both RHEL and Fedora (Justin M. Forbes)
-- Linux v6.5.0-0.rc7.89bf6209cad6
-
-* Tue Aug 22 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc7.f7757129e3de.51.eln130]
- redhat/configs: Enable CONFIG_DEVICE_PRIVATE on aarch64 (David Hildenbrand) [2231407]
- redhat/configs: disable CONFIG_ROCKCHIP_ERRATUM_3588001 for RHEL (Mark Salter)
- redhat: shellcheck fixes (Prarit Bhargava)
-
-* Mon Aug 21 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc7.f7757129e3de.50.el130]
-- Linux v6.5.0-0.rc7.f7757129e3de
-
-* Sun Aug 20 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc6.b320441c04c9.49.el130]
-- Linux v6.5.0-0.rc6.b320441c04c9
-
-* Sat Aug 19 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc6.4e7ffde6984a.48.el130]
-- Linux v6.5.0-0.rc6.4e7ffde6984a
-
-* Fri Aug 18 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc6.0e8860d2125f.47.el130]
- redhat/configs: enable tegra114 SPI (Mark Salter)
-- Linux v6.5.0-0.rc6.0e8860d2125f
-
-* Thu Aug 17 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc6.4853c74bd7ab.46.el130]
- all: properly cleanup firewire once and for all (Peter Robinson)
- Fix up filters for Fedora (Justin M. Forbes)
-
-* Wed Aug 16 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc6.4853c74bd7ab.45.el130]
- New configs in arch/x86 (Fedora Kernel Team)
- Add an armv7 directory back for the Fedora configs (Justin M. Forbes)
- Fedora 6.5 config updates (Justin M. Forbes)
- Turn off DMABUF_SYSFS_STATS (Justin M. Forbes)
-- Linux v6.5.0-0.rc6.4853c74bd7ab
-
-* Tue Aug 15 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc6.91aa6c412d7f.44.el130]
- CI: rawhide_release: switch to using script to push (Don Zickus)
- redhat/self-test: Update self-test data (Prarit Bhargava)
- redhat/scripts/cross-compile: Update download_cross.sh (Prarit Bhargava)
- redhat/Makefile.cross: Remove ARCH selection code (Prarit Bhargava)
- redhat/Makefile.cross: Update script (Prarit Bhargava)
- Fix interruptible non MR jobs (Michael Hofmann)
-- Linux v6.5.0-0.rc6.91aa6c412d7f
-
-* Mon Aug 14 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc6.43.el127]
-- Linux v6.5.0-0.rc6
-
-* Sun Aug 13 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc5.a785fd28d31f.42.el127]
- all: run evaluate_configs to de-dupe merged aarch64 (Peter Robinson)
- all: arm: merge the arm and arm/aarch64 (Peter Robinson)
- fedora: remove ARMv7 AKA armhfp configurations (Peter Robinson)
- fedora: remove ARMv7 AKA armhfp support (Peter Robinson)
-- Linux v6.5.0-0.rc5.a785fd28d31f
-
-* Sat Aug 12 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc5.f8de32cc060b.41.el127]
-- Linux v6.5.0-0.rc5.f8de32cc060b
-
-* Fri Aug 11 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc5.25aa0bebba72.40.el127]
- redhat/configs: enable CONFIG_VIRTIO_MEM on aarch64 (David Hildenbrand) [2044155]
- redhat/configs: enable CONFIG_MEMORY_HOTREMOVE aarch64 (David Hildenbrand) [2062054]
- redhat: Add arm64-16k kernel flavor scaffold for 16K page-size'd AArch64 (Neal Gompa)
- fedora: enable i3c on aarch64 (Peter Robinson)
-- Linux v6.5.0-0.rc5.25aa0bebba72
-
-* Thu Aug 10 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc5.374a7f47bf40.39.el127]
- redhat/configs: Remove `CONFIG_HZ_1000 is not set` for aarch64 (Enric Balletbo i Serra)
-- Linux v6.5.0-0.rc5.374a7f47bf40
-
-* Wed Aug 09 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc5.13b937206866.38.el127]
- redhat/configs: turn on the framework for SPI NOR for ARM (Steve Best)
- configs: add new ChromeOS UART driver (Mark Langsdorf)
- configs: add new ChromeOS Human Presence Sensor (Mark Langsdorf)
- redhat/configs: Enable CONFIG_NVIDIA_WMI_EC_BACKLIGHT for both Fedora and RHEL (Kate Hsuan)
-- Linux v6.5.0-0.rc5.13b937206866
-
-* Tue Aug 08 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc5.14f9643dc90a.37.el127]
- redhat/configs: Texas Instruments INA3221 driver (Steve Best)
-- Linux v6.5.0-0.rc5.14f9643dc90a
-
-* Mon Aug 07 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc5.36.el127]
-- Linux v6.5.0-0.rc5
-
-* Sun Aug 06 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc4.f0ab9f34e59e.35.el127]
-- Linux v6.5.0-0.rc4.f0ab9f34e59e
-
-* Sat Aug 05 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc4.024ff300db33.34.el127]
- arm: i.MX: Some minor NXP i.MX cleanups (Peter Robinson)
-- Linux v6.5.0-0.rc4.024ff300db33
-
-* Fri Aug 04 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc4.c1a515d3c027.33.el127]
-- Linux v6.5.0-0.rc4.c1a515d3c027
-
-* Thu Aug 03 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc4.ec351c8f2e62.32.el127]
- Description: Set config for Tegra234 pinctrl driver (Joel Slebodnick)
- Update RPM Scriptlet for kernel-install Changes (Jonathan Steffan)
-- Linux v6.5.0-0.rc4.ec351c8f2e62
-
-* Wed Aug 02 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc4.31.el127]
- [CI] add exit 0 to the end of CI scripts (Don Zickus)
- redhat: configs: Disable CONFIG_CRYPTO_STATS since performance issue for storage (Kate Hsuan) [2227793]
- Remove obsolete variable from gitlab-ci.yml (Ondrej Kinst)
@@ -3917,89 +4050,33 @@ fi\
- CI: ark-create-release: Add a robust check if nothing changed (Don Zickus)
- CI: Remove legacy tag check cruft (Don Zickus)
- CI: Introduce simple environment script (Don Zickus)
-
-* Mon Jul 31 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc4.30.el127]
-- Linux v6.5.0-0.rc4
-
-* Sun Jul 30 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc3.d31e3792919e.29.el127]
-- Linux v6.5.0-0.rc3.d31e3792919e
-
-* Sat Jul 29 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc3.ffabf7c73176.28.el127]
-- Linux v6.5.0-0.rc3.ffabf7c73176
-
-* Fri Jul 28 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc3.57012c57536f.27.el127]
-- Linux v6.5.0-0.rc3.57012c57536f
-
-* Thu Jul 27 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc3.0a8db05b571a.26.el127]
- redhat/configs: Disable FIREWIRE for RHEL (Prarit Bhargava)
-- Linux v6.5.0-0.rc3.0a8db05b571a
-
-* Wed Jul 26 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc3.18b44bc5a672.25.el127]
- redhat/scripts/rh-dist-git.sh: print list of uploaded files (Denys Vlasenko)
- redhat/scripts/expand_srpm.sh: add missing function, robustify (Denys Vlasenko)
- redhat: Enable HSR and PRP (Felix Maurer)
-- Linux v6.5.0-0.rc3.18b44bc5a672
-
-* Tue Jul 25 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc3.0b5547c51827.24.el127]
- redhat/scripts/rh-dist-git.sh: fix outdated message and comment (Denys Vlasenko)
- redhat/configs: Disable CONFIG_I8K (Prarit Bhargava)
- Make sure posttrans script doesn't fail if restorecon is not installed (Daan De Meyer)
-- Linux v6.5.0-0.rc3.0b5547c51827
-
-* Mon Jul 24 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc3.23.el127]
-- Linux v6.5.0-0.rc3
-
-* Sun Jul 23 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc2.c2782531397f.22.el127]
-- Linux v6.5.0-0.rc2.c2782531397f
-
-* Sat Jul 22 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc2.d192f5382581.21.el127]
- Update filters for new config items (Justin M. Forbes)
- More Fedora 6.5 configs (Justin M. Forbes)
-- Linux v6.5.0-0.rc2.d192f5382581
-
-* Fri Jul 21 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc2.f7e3a1bafdea.20.el127]
- redhat/configs: disable pre-UVC cameras for RHEL on aarch64 (Dean Nelson)
- redhat/configs: enable CONFIG_MEDIA_SUPPORT for RHEL on aarch64 (Dean Nelson)
-- Linux v6.5.0-0.rc2.f7e3a1bafdea
-
-* Thu Jul 20 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc2.bfa3037d8280.19.el127]
- move ownership of /lib/modules/<ver>/ to kernel-core (Thorsten Leemhuis)
- Let kernel-modules-core own the files depmod generates. (Thorsten Leemhuis)
- redhat: configs: Enable CONFIG_TYPEC_STUSB160X for rhel on aarch64 (Desnes Nunes)
- Add filters for ptp_dfl_tod on Fedora (Justin M. Forbes)
-- Linux v6.5.0-0.rc2.bfa3037d8280
-
-* Wed Jul 19 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc2.ccff6d117d8d.18.el127]
- Fedora 6.5 configs part 1 (Justin M. Forbes)
- fedora: enable CONFIG_ZYNQMP_IPI_MBOX as a builtin in pending-fedora (Patrick Talbert)
- fedora: arm: some minor updates (Peter Robinson)
- fedora: bluetooth: enable AOSP extensions (Peter Robinson)
-- Linux v6.5.0-0.rc2.ccff6d117d8d
-
-* Mon Jul 17 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc2.17.el127]
-- Linux v6.5.0-0.rc2
-
-* Sun Jul 16 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc1.831fe284d827.16.el127]
- fedora: wifi: tweak ZYDAS WiFI config options (Peter Robinson)
-- Linux v6.5.0-0.rc1.831fe284d827
-
-* Sat Jul 15 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc1.b6e6cc1f78c7.15.el127]
- scsi: sd: Add "probe_type" module parameter to allow synchronous probing (Ewan D. Milne) [2140017]
- redhat/configs: allow IMA to use MOK keys (Coiby Xu)
-- Linux v6.5.0-0.rc1.b6e6cc1f78c7
-
-* Fri Jul 14 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc1.4b810bf037e5.14.el127]
-- Linux v6.5.0-0.rc1.4b810bf037e5
-
-* Thu Jul 13 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc1.eb26cbb1a754.13.el127]
- Simplify documentation jobs (Michael Hofmann)
- Auto-cancel pipelines only on MRs (Michael Hofmann)
- CI: Call script directly (Don Zickus)
- CI: Remove stale TAG and Makefile cruft (Don Zickus)
- CI: Move os-build tracking to common area (Don Zickus)
-- Linux v6.5.0-0.rc1.eb26cbb1a754
-
-* Tue Jul 11 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc1.3f01e9fed845.12.el127]
- redhat: use the eln builder for daily jobs (Patrick Talbert)
- redhat: set CONFIG_XILINX_WINDOW_WATCHDOG as disabled in pending (Patrick Talbert)
- Add baseline ARK/ELN pipelines (Michael Hofmann)
@@ -4016,22 +4093,10 @@ fi\
- Change pathfix.py to %%py3_shebang_fix (Justin M. Forbes)
- Turn on NET_VENDOR_QUALCOMM for Fedora to enable rmnet (Justin M. Forbes)
- redhat: add intel-m10-bmc-hwmon to filter-modules singlemods list (Patrick Talbert)
-- Linux v6.5.0-0.rc1.3f01e9fed845
-
-* Thu Jul 06 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc0.c17414a273b8.11]
- fedira: enable pending-fedora CONFIG_CPUFREQ_DT_PLATDEV as a module (Patrick Talbert)
-- Linux v6.5.0-0.rc0.c17414a273b8
-
-* Wed Jul 05 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc0.d528014517f2.10]
- redhat: fix the 'eln BUILD_TARGET' self-test (Patrick Talbert)
- redhat: update the self-test-data (Patrick Talbert)
- redhat: remove trailing space in dist-dump-variables output (Patrick Talbert)
-- Linux v6.5.0-0.rc0.d528014517f2
-
-* Tue Jul 04 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc0.24be4d0b46bb.9]
-- Linux v6.5.0-0.rc0.24be4d0b46bb
-
-* Mon Jul 03 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc0.a901a3568fd2.8]
- Allow ELN pipelines failures (Michael Hofmann)
- Enable cs-like CI (Michael Hofmann)
- Allow to auto-cancel redundant pipelines (Michael Hofmann)
@@ -4041,20 +4106,8 @@ fi\
- redhat: allow dbgonly cross builds (Jan Stancek)
- redhat/configs: Clean up x86-64 call depth tracking configs (Waiman Long)
- redhat: move SND configs from pending-rhel to rhel (Patrick Talbert)
-- Linux v6.5.0-0.rc0.a901a3568fd2
-
-* Sun Jul 02 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc0.995b406c7e97.7]
-- Linux v6.5.0-0.rc0.995b406c7e97
-
-* Sat Jul 01 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc0.a507db1d8fdc.6]
- Fix up armv7 configs for Fedora (Justin M. Forbes)
- redhat: Set pending-rhel x86 values for various SND configs (Patrick Talbert)
-- Linux v6.5.0-0.rc0.a507db1d8fdc
-
-* Fri Jun 30 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc0.e55e5df193d2.5]
-- Linux v6.5.0-0.rc0.e55e5df193d2
-
-* Fri Jun 30 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc0.3a8a670eeeaa.4]
- redhat: update self-test data (Patrick Talbert)
- redhat: ignore SPECBPFTOOLVERSION/bpftoolversion in self-test create-data.sh (Patrick Talbert)
- fedora/rhel: Move I2C_DESIGNWARE_PLATFORM, I2C_SLAVE, & GPIOLIB from pending (Patrick Talbert)
@@ -4062,25 +4115,15 @@ fi\
- fedora: Enable CONFIG_SPI_SLAVE (Patrick Talbert)
- fedora/rhel: enable I2C_DESIGNWARE_PLATFORM, I2C_SLAVE, and GPIOLIB (Patrick Talbert)
- fedora: Enable CONFIG_SPI_SLAVE in fedora-pending (Patrick Talbert)
-
-* Thu Jun 29 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc0.3a8a670eeeaa.3]
- redhat: remove extra + (plus) from meta package Requires definitions (Patrick Talbert)
-- Linux v6.5.0-0.rc0.3a8a670eeeaa
-
-* Wed Jun 28 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc0.6aeadf7896bf.2]
- Add intel-m10-bmc-hwmon to singlemods (Thorsten Leemhuis)
- Add hid-uclogic-test to mod-internal.list (Thorsten Leemhuis)
- Add checksum_kunit.ko to mod-internal.list (Thorsten Leemhuis)
- Add strcat_kunit to mod-internal.list (Thorsten Leemhuis)
- Add input_test to mod-intenal.list (Thorsten Leemhuis)
-- Linux v6.5.0-0.rc0.6aeadf7896bf
-
-* Wed Jun 28 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc0.1ef6663a587b.1]
- Revert "Remove EXPERT from ARCH_FORCE_MAX_ORDER for aarch64" (Justin M. Forbes)
- Reset the release number and dedup the changelog after rebase (Justin M. Forbes)
- Fix up rebase issue with CONFIG_ARCH_FORCE_MAX_ORDER (Justin M. Forbes)
-
-* Tue Jun 27 2023 Fedora Kernel Team <kernel-team(a)fedoraproject.org> [6.5.0-0.rc0.1ef6663a587b.60]
- redhat/kernel.spec.template: Disable 'extracting debug info' messages (Prarit Bhargava)
- kernel/rh_messages.c: Another gcc12 warning on redundant NULL test (Florian Weimer) [2216678]
- redhat: fix signing for realtime and arm64_64k non-debug variants (Jan Stancek)
@@ -4114,7 +4157,6 @@ fi\
- redhat: do not package *.mod.c generated files (Denys Vlasenko)
- ALSA configuration changes for ARK/RHEL 9.3 (Jaroslav Kysela)
- spec: remove resolve_btfids from kernel-devel (Viktor Malik)
-- tools/resolve_btfids: Fix setting HOSTCFLAGS (Viktor Malik)
- Fix typo in filter-modules (Justin M. Forbes)
- redhat/configs: Enable CONFIG_INIT_STACK_ALL_ZERO for RHEL (Josh Poimboeuf)
- Remove CONFIG_ARCH_FORCE_MAX_ORDER for aarch64 (Justin M. Forbes)
@@ -5972,8 +6014,7 @@ fi\
- [initial commit] Add scripts (Laura Abbott)
- [initial commit] Add configs (Laura Abbott)
- [initial commit] Add Makefiles (Laura Abbott)
-- Linux v6.5.0-0.rc0.1ef6663a587b
-
+- Linux v6.6.0-0.rc0.1c59d383390f
###
# The following Emacs magic makes C-c C-e use UTC dates.
diff --git a/mod-internal.list b/mod-internal.list
index f4c669201..1d535d836 100644
--- a/mod-internal.list
+++ b/mod-internal.list
@@ -12,6 +12,7 @@ drm_cmdline_parser_test
drm_connector_test
drm_damage_helper_test
drm_dp_mst_helper_test
+drm_exec_test
drm_format_helper_test
drm_format_test
drm_framebuffer_test
diff --git a/partial-clang-debug-snip.config b/partial-clang-debug-snip.config
new file mode 100644
index 000000000..19fa1520e
--- /dev/null
+++ b/partial-clang-debug-snip.config
@@ -0,0 +1,3 @@
+# clang
+CONFIG_KASAN_STACK=y
+# CONFIG_KMSAN is not set
diff --git a/partial-clang-snip.config b/partial-clang-snip.config
new file mode 100644
index 000000000..841c19dcb
--- /dev/null
+++ b/partial-clang-snip.config
@@ -0,0 +1,3 @@
+# clang
+# CONFIG_KASAN_STACK is not set
+# CONFIG_KMSAN is not set
diff --git a/partial-clang_lto-aarch64-debug-snip.config b/partial-clang_lto-aarch64-debug-snip.config
new file mode 100644
index 000000000..0178f37de
--- /dev/null
+++ b/partial-clang_lto-aarch64-debug-snip.config
@@ -0,0 +1,3 @@
+# clang_lto
+CONFIG_KASAN_STACK=y
+# CONFIG_KMSAN is not set
diff --git a/partial-clang_lto-aarch64-snip.config b/partial-clang_lto-aarch64-snip.config
new file mode 100644
index 000000000..9e30765c4
--- /dev/null
+++ b/partial-clang_lto-aarch64-snip.config
@@ -0,0 +1,5 @@
+# clang_lto
+# CONFIG_KASAN_STACK is not set
+# CONFIG_KMSAN is not set
+CONFIG_LTO_CLANG_THIN=y
+# CONFIG_LTO_NONE is not set
diff --git a/partial-clang_lto-x86_64-debug-snip.config b/partial-clang_lto-x86_64-debug-snip.config
new file mode 100644
index 000000000..0178f37de
--- /dev/null
+++ b/partial-clang_lto-x86_64-debug-snip.config
@@ -0,0 +1,3 @@
+# clang_lto
+CONFIG_KASAN_STACK=y
+# CONFIG_KMSAN is not set
diff --git a/partial-clang_lto-x86_64-snip.config b/partial-clang_lto-x86_64-snip.config
new file mode 100644
index 000000000..9e30765c4
--- /dev/null
+++ b/partial-clang_lto-x86_64-snip.config
@@ -0,0 +1,5 @@
+# clang_lto
+# CONFIG_KASAN_STACK is not set
+# CONFIG_KMSAN is not set
+CONFIG_LTO_CLANG_THIN=y
+# CONFIG_LTO_NONE is not set
diff --git a/partial-kgcov-debug-snip.config b/partial-kgcov-debug-snip.config
new file mode 100644
index 000000000..fb373597e
--- /dev/null
+++ b/partial-kgcov-debug-snip.config
@@ -0,0 +1,4 @@
+# kgcov
+CONFIG_GCOV_KERNEL=y
+CONFIG_GCOV_PROFILE_ALL=y
+# CONFIG_GCOV_PROFILE_FTRACE is not set
diff --git a/patch-6.5-redhat.patch b/patch-6.6-redhat.patch
similarity index 72%
rename from patch-6.5-redhat.patch
rename to patch-6.6-redhat.patch
index cb273af5e..50b6ea994 100644
--- a/patch-6.5-redhat.patch
+++ b/patch-6.6-redhat.patch
@@ -1,47 +1,47 @@
- Makefile | 12 ++
+ Makefile | 20 ++-
arch/s390/include/asm/ipl.h | 1 +
arch/s390/kernel/ipl.c | 5 +
arch/s390/kernel/setup.c | 4 +
- arch/x86/kernel/setup.c | 22 ++--
- drivers/acpi/apei/hest.c | 8 ++
- drivers/acpi/irq.c | 17 ++-
+ arch/x86/kernel/setup.c | 22 ++-
+ drivers/acpi/acpi_video.c | 2 +-
+ drivers/acpi/apei/hest.c | 8 +
+ drivers/acpi/device_pm.c | 13 ++
+ drivers/acpi/irq.c | 17 +-
drivers/acpi/scan.c | 9 ++
drivers/ata/libahci.c | 18 +++
- drivers/char/ipmi/ipmi_dmi.c | 15 +++
- drivers/char/ipmi/ipmi_msghandler.c | 16 ++-
+ drivers/char/ipmi/ipmi_dmi.c | 15 ++
+ drivers/char/ipmi/ipmi_msghandler.c | 16 +-
drivers/firmware/efi/Makefile | 1 +
- drivers/firmware/efi/efi.c | 124 +++++++++++++++------
- drivers/firmware/efi/secureboot.c | 38 +++++++
+ drivers/firmware/efi/efi.c | 124 +++++++++++----
+ drivers/firmware/efi/secureboot.c | 38 +++++
drivers/firmware/sysfb.c | 18 ++-
- drivers/hid/hid-rmi.c | 66 -----------
- drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 ++++
- drivers/input/rmi4/rmi_driver.c | 124 ++++++++++++---------
- drivers/iommu/iommu.c | 22 ++++
- drivers/misc/cardreader/rts5228.c | 6 +
- drivers/misc/cardreader/rts5260.c | 6 +
- drivers/misc/cardreader/rts5261.c | 6 +
- drivers/nvme/host/core.c | 22 +++-
- drivers/nvme/host/multipath.c | 19 ++--
- drivers/nvme/host/nvme.h | 4 +
- drivers/pci/quirks.c | 24 ++++
+ drivers/hid/hid-rmi.c | 66 --------
+ drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 +++
+ drivers/input/rmi4/rmi_driver.c | 124 +++++++++------
+ drivers/iommu/iommu.c | 22 +++
+ drivers/pci/quirks.c | 24 +++
drivers/rtc/rtc-cmos.c | 18 ++-
drivers/scsi/sd.c | 10 ++
- drivers/usb/core/hub.c | 7 ++
- fs/btrfs/space-info.c | 17 +++
- include/linux/efi.h | 22 ++--
+ drivers/usb/core/hub.c | 7 +
+ include/acpi/acpi_bus.h | 1 +
+ include/linux/efi.h | 22 ++-
include/linux/lsm_hook_defs.h | 2 +
+ include/linux/module.h | 1 +
+ include/linux/rh_kabi.h | 172 +++++++++++++++++++++
include/linux/rmi.h | 1 +
include/linux/security.h | 5 +
+ kernel/module/main.c | 2 +
kernel/module/signing.c | 9 +-
+ scripts/mod/modpost.c | 8 +
scripts/tags.sh | 2 +
security/integrity/platform_certs/load_uefi.c | 6 +-
- security/lockdown/Kconfig | 13 +++
+ security/lockdown/Kconfig | 13 ++
security/lockdown/lockdown.c | 1 +
security/security.c | 12 ++
- 40 files changed, 561 insertions(+), 190 deletions(-)
+ 40 files changed, 696 insertions(+), 182 deletions(-)
diff --git a/Makefile b/Makefile
-index a6e152146028..af6bab938da2 100644
+index 03c52108af62..66048c4637d1 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -63,6 +63,21 @@ index a6e152146028..af6bab938da2 100644
# We are using a recursive build, so we need to do a little thinking
# to get the ordering right.
#
+@@ -1250,7 +1262,13 @@ define filechk_version.h
+ ((c) > 255 ? 255 : (c)))'; \
+ echo \#define LINUX_VERSION_MAJOR $(VERSION); \
+ echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \
+- echo \#define LINUX_VERSION_SUBLEVEL $(SUBLEVEL)
++ echo \#define LINUX_VERSION_SUBLEVEL $(SUBLEVEL); \
++ echo '#define RHEL_MAJOR $(RHEL_MAJOR)'; \
++ echo '#define RHEL_MINOR $(RHEL_MINOR)'; \
++ echo '#define RHEL_RELEASE_VERSION(a,b) (((a) << 8) + (b))'; \
++ echo '#define RHEL_RELEASE_CODE \
++ $(shell expr $(RHEL_MAJOR) \* 256 + $(RHEL_MINOR))'; \
++ echo '#define RHEL_RELEASE "$(RHEL_RELEASE)"'
+ endef
+
+ $(version_h): PATCHLEVEL := $(or $(PATCHLEVEL), 0)
diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h
index b0d00032479d..afb9544fb007 100644
--- a/arch/s390/include/asm/ipl.h
@@ -76,10 +91,10 @@ index b0d00032479d..afb9544fb007 100644
/*
* DIAG 308 support
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
-index dfcb2b563e2b..29e3f1b4bd00 100644
+index 05e51666db03..454a33b77878 100644
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
-@@ -2535,3 +2535,8 @@ int ipl_report_free(struct ipl_report *report)
+@@ -2519,3 +2519,8 @@ int ipl_report_free(struct ipl_report *report)
}
#endif
@@ -89,7 +104,7 @@ index dfcb2b563e2b..29e3f1b4bd00 100644
+ return !!ipl_secure_flag;
+}
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
-index 00d76448319d..e679d13303e3 100644
+index de6ad0fb2328..5cc2758be027 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -49,6 +49,7 @@
@@ -111,7 +126,7 @@ index 00d76448319d..e679d13303e3 100644
/* boot_command_line has been already set up in early.c */
*cmdline_p = boot_command_line;
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index aa0df37c1fe7..04f1de50e058 100644
+index b098b1fa2470..a159419e60df 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -21,6 +21,7 @@
@@ -122,7 +137,7 @@ index aa0df37c1fe7..04f1de50e058 100644
#include <linux/usb/xhci-dbgp.h>
#include <linux/static_call.h>
#include <linux/swiotlb.h>
-@@ -1027,6 +1028,13 @@ void __init setup_arch(char **cmdline_p)
+@@ -1028,6 +1029,13 @@ void __init setup_arch(char **cmdline_p)
if (efi_enabled(EFI_BOOT))
efi_init();
@@ -136,7 +151,7 @@ index aa0df37c1fe7..04f1de50e058 100644
reserve_ibft_region();
dmi_setup();
-@@ -1188,19 +1196,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -1189,19 +1197,7 @@ void __init setup_arch(char **cmdline_p)
/* Allocate bigger log buffer */
setup_log_buf(1);
@@ -157,6 +172,19 @@ index aa0df37c1fe7..04f1de50e058 100644
reserve_initrd();
+diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c
+index b411948594ff..4e868454b38d 100644
+--- a/drivers/acpi/acpi_video.c
++++ b/drivers/acpi/acpi_video.c
+@@ -2031,7 +2031,7 @@ static int acpi_video_bus_add(struct acpi_device *device)
+ * HP ZBook Fury 16 G10 requires ACPI video's child devices have _PS0
+ * evaluated to have functional panel brightness control.
+ */
+- acpi_device_fix_up_power_extended(device);
++ acpi_device_fix_up_power_children(device);
+
+ pr_info("%s [%s] (multi-head: %s rom: %s post: %s)\n",
+ ACPI_VIDEO_DEVICE_NAME, acpi_device_bid(device),
diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
index 6aef1ee5e1bd..8f146b1b4972 100644
--- a/drivers/acpi/apei/hest.c
@@ -176,6 +204,30 @@ index 6aef1ee5e1bd..8f146b1b4972 100644
hest_hdr = (struct acpi_hest_header *)(hest_tab + 1);
for (i = 0; i < hest_tab->error_source_count; i++) {
len = hest_esrc_len(hest_hdr);
+diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
+index f007116a8427..3b4d048c4941 100644
+--- a/drivers/acpi/device_pm.c
++++ b/drivers/acpi/device_pm.c
+@@ -397,6 +397,19 @@ void acpi_device_fix_up_power_extended(struct acpi_device *adev)
+ }
+ EXPORT_SYMBOL_GPL(acpi_device_fix_up_power_extended);
+
++/**
++ * acpi_device_fix_up_power_children - Force a device's children into D0.
++ * @adev: Parent device object whose children's power state is to be fixed up.
++ *
++ * Call acpi_device_fix_up_power() for @adev's children so long as they
++ * are reported as present and enabled.
++ */
++void acpi_device_fix_up_power_children(struct acpi_device *adev)
++{
++ acpi_dev_for_each_child(adev, fix_up_power_if_applicable, NULL);
++}
++EXPORT_SYMBOL_GPL(acpi_device_fix_up_power_children);
++
+ int acpi_device_update_power(struct acpi_device *device, int *state_p)
+ {
+ int state;
diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c
index 1687483ff319..390b67f19181 100644
--- a/drivers/acpi/irq.c
@@ -220,10 +272,10 @@ index 1687483ff319..390b67f19181 100644
return ctx.rc;
}
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
-index 87e385542576..7e9de6e3eb9f 100644
+index 691d4b7686ee..433ff7d8a844 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
-@@ -1749,6 +1749,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
+@@ -1752,6 +1752,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
if (!acpi_match_device_ids(device, ignore_serial_bus_ids))
return false;
@@ -240,7 +292,7 @@ index 87e385542576..7e9de6e3eb9f 100644
acpi_dev_get_resources(device, &resource_list,
acpi_check_serial_bus_slave,
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
-index a6212f6d3796..1bd84617d751 100644
+index f1263364fa97..24ac410f4366 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -729,6 +729,24 @@ int ahci_stop_engine(struct ata_port *ap)
@@ -342,7 +394,7 @@ index e489fefd23da..f2dfae764fb5 100644
obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o
obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
-index 9cfac61812f6..a8462d3bd33c 100644
+index 1974f0ad32ba..6ba6391494ec 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -32,6 +32,7 @@
@@ -353,7 +405,7 @@ index 9cfac61812f6..a8462d3bd33c 100644
#include <asm/early_ioremap.h>
-@@ -957,40 +958,101 @@ int efi_mem_type(unsigned long phys_addr)
+@@ -983,40 +984,101 @@ int efi_mem_type(unsigned long phys_addr)
}
#endif
@@ -669,10 +721,10 @@ index 84e7ba5314d3..efc96776f761 100644
data->xport.ops = &hid_rmi_ops;
diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c
-index 7e307022303a..c68d7da67148 100644
+index 77b0271ce6eb..96f60c139c4a 100644
--- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
-@@ -9,6 +9,7 @@
+@@ -10,6 +10,7 @@
#include <linux/init.h>
#include <linux/types.h>
#include <linux/device.h>
@@ -680,7 +732,7 @@ index 7e307022303a..c68d7da67148 100644
#include <linux/io.h>
#include <linux/err.h>
#include <linux/fs.h>
-@@ -2265,6 +2266,16 @@ static const struct amba_id etm4_ids[] = {
+@@ -2303,6 +2304,16 @@ static const struct amba_id etm4_ids[] = {
{},
};
@@ -697,7 +749,7 @@ index 7e307022303a..c68d7da67148 100644
MODULE_DEVICE_TABLE(amba, etm4_ids);
static struct amba_driver etm4x_amba_driver = {
-@@ -2298,6 +2309,11 @@ static int __init etm4x_init(void)
+@@ -2372,6 +2383,11 @@ static int __init etm4x_init(void)
{
int ret;
@@ -709,7 +761,7 @@ index 7e307022303a..c68d7da67148 100644
ret = etm4_pm_setup();
/* etm4_pm_setup() does its own cleanup - exit on error */
-@@ -2324,6 +2340,9 @@ static int __init etm4x_init(void)
+@@ -2398,6 +2414,9 @@ static int __init etm4x_init(void)
static void __exit etm4x_exit(void)
{
@@ -912,7 +964,7 @@ index 258d5fe3d395..f7298e3dc8f3 100644
if (data->f01_container->dev.driver) {
/* Driver already bound, so enable ATTN now. */
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
-index cabeb5bd3e41..25ef4e9cc34a 100644
+index c146378c7d03..f9e8d35eaccc 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -8,6 +8,7 @@
@@ -923,7 +975,7 @@ index cabeb5bd3e41..25ef4e9cc34a 100644
#include <linux/kernel.h>
#include <linux/bits.h>
#include <linux/bug.h>
-@@ -2819,6 +2820,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat)
+@@ -2931,6 +2932,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat)
}
EXPORT_SYMBOL_GPL(iommu_dev_disable_feature);
@@ -951,198 +1003,11 @@ index cabeb5bd3e41..25ef4e9cc34a 100644
/**
* iommu_setup_default_domain - Set the default_domain for the group
* @group: Group to change
-diff --git a/drivers/misc/cardreader/rts5228.c b/drivers/misc/cardreader/rts5228.c
-index 0c7f10bcf6f1..4ca9da411ebb 100644
---- a/drivers/misc/cardreader/rts5228.c
-+++ b/drivers/misc/cardreader/rts5228.c
-@@ -400,6 +400,12 @@ static void rts5228_init_from_cfg(struct rtsx_pcr *pcr)
- if (option->ltr_enabled)
- rtsx_set_ltr_latency(pcr, option->ltr_active_latency);
- }
-+
-+ if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN
-+ | PM_L1_1_EN | PM_L1_2_EN))
-+ option->force_clkreq_0 = false;
-+ else
-+ option->force_clkreq_0 = true;
- }
-
- static int rts5228_extra_init_hw(struct rtsx_pcr *pcr)
-diff --git a/drivers/misc/cardreader/rts5260.c b/drivers/misc/cardreader/rts5260.c
-index d2d3a6ccb8f7..0cef0808b1f1 100644
---- a/drivers/misc/cardreader/rts5260.c
-+++ b/drivers/misc/cardreader/rts5260.c
-@@ -488,6 +488,12 @@ static void rts5260_init_from_cfg(struct rtsx_pcr *pcr)
- if (option->ltr_enabled)
- rtsx_set_ltr_latency(pcr, option->ltr_active_latency);
- }
-+
-+ if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN
-+ | PM_L1_1_EN | PM_L1_2_EN))
-+ option->force_clkreq_0 = false;
-+ else
-+ option->force_clkreq_0 = true;
- }
-
- static int rts5260_extra_init_hw(struct rtsx_pcr *pcr)
-diff --git a/drivers/misc/cardreader/rts5261.c b/drivers/misc/cardreader/rts5261.c
-index 67252512a132..3236a82feca5 100644
---- a/drivers/misc/cardreader/rts5261.c
-+++ b/drivers/misc/cardreader/rts5261.c
-@@ -460,6 +460,12 @@ static void rts5261_init_from_cfg(struct rtsx_pcr *pcr)
- if (option->ltr_enabled)
- rtsx_set_ltr_latency(pcr, option->ltr_active_latency);
- }
-+
-+ if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN
-+ | PM_L1_1_EN | PM_L1_2_EN))
-+ option->force_clkreq_0 = false;
-+ else
-+ option->force_clkreq_0 = true;
- }
-
- static int rts5261_extra_init_hw(struct rtsx_pcr *pcr)
-diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index 21783aa2ee8e..f2f9bdb3e0c8 100644
---- a/drivers/nvme/host/core.c
-+++ b/drivers/nvme/host/core.c
-@@ -251,6 +251,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
-
- static blk_status_t nvme_error_status(u16 status)
- {
-+ if (unlikely(status & NVME_SC_DNR))
-+ return BLK_STS_TARGET;
-+
- switch (status & 0x7ff) {
- case NVME_SC_SUCCESS:
- return BLK_STS_OK;
-@@ -341,6 +344,7 @@ enum nvme_disposition {
- COMPLETE,
- RETRY,
- FAILOVER,
-+ FAILUP,
- AUTHENTICATE,
- };
-
-@@ -352,15 +356,16 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req)
- if ((nvme_req(req)->status & 0x7ff) == NVME_SC_AUTH_REQUIRED)
- return AUTHENTICATE;
-
-- if (blk_noretry_request(req) ||
-+ if ((req->cmd_flags & (REQ_FAILFAST_DEV | REQ_FAILFAST_DRIVER)) ||
- (nvme_req(req)->status & NVME_SC_DNR) ||
- nvme_req(req)->retries >= nvme_max_retries)
- return COMPLETE;
-
-- if (req->cmd_flags & REQ_NVME_MPATH) {
-+ if (req->cmd_flags & (REQ_NVME_MPATH | REQ_FAILFAST_TRANSPORT)) {
- if (nvme_is_path_error(nvme_req(req)->status) ||
- blk_queue_dying(req->q))
-- return FAILOVER;
-+ return (req->cmd_flags & REQ_NVME_MPATH) ?
-+ FAILOVER : FAILUP;
- } else {
- if (blk_queue_dying(req->q))
- return COMPLETE;
-@@ -390,6 +395,14 @@ static inline void nvme_end_req(struct request *req)
- blk_mq_end_request(req, status);
- }
-
-+static inline void nvme_failup_req(struct request *req)
-+{
-+ nvme_update_ana(req);
-+
-+ nvme_req(req)->status = NVME_SC_HOST_PATH_ERROR;
-+ nvme_end_req(req);
-+}
-+
- void nvme_complete_rq(struct request *req)
- {
- struct nvme_ctrl *ctrl = nvme_req(req)->ctrl;
-@@ -419,6 +432,9 @@ void nvme_complete_rq(struct request *req)
- case FAILOVER:
- nvme_failover_req(req);
- return;
-+ case FAILUP:
-+ nvme_failup_req(req);
-+ return;
- case AUTHENTICATE:
- #ifdef CONFIG_NVME_AUTH
- queue_work(nvme_wq, &ctrl->dhchap_auth_work);
-diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
-index 0a88d7bdc5e3..967bb3a85889 100644
---- a/drivers/nvme/host/multipath.c
-+++ b/drivers/nvme/host/multipath.c
-@@ -80,14 +80,10 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys)
- blk_freeze_queue_start(h->disk->queue);
- }
-
--void nvme_failover_req(struct request *req)
-+void nvme_update_ana(struct request *req)
- {
- struct nvme_ns *ns = req->q->queuedata;
- u16 status = nvme_req(req)->status & 0x7ff;
-- unsigned long flags;
-- struct bio *bio;
--
-- nvme_mpath_clear_current_path(ns);
-
- /*
- * If we got back an ANA error, we know the controller is alive but not
-@@ -98,6 +94,16 @@ void nvme_failover_req(struct request *req)
- set_bit(NVME_NS_ANA_PENDING, &ns->flags);
- queue_work(nvme_wq, &ns->ctrl->ana_work);
- }
-+}
-+
-+void nvme_failover_req(struct request *req)
-+{
-+ struct nvme_ns *ns = req->q->queuedata;
-+ unsigned long flags;
-+ struct bio *bio;
-+
-+ nvme_mpath_clear_current_path(ns);
-+ nvme_update_ana(req);
-
- spin_lock_irqsave(&ns->head->requeue_lock, flags);
- for (bio = req->bio; bio; bio = bio->bi_next) {
-@@ -912,8 +918,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
- int error = 0;
-
- /* check if multipath is enabled and we have the capability */
-- if (!multipath || !ctrl->subsys ||
-- !(ctrl->subsys->cmic & NVME_CTRL_CMIC_ANA))
-+ if (!ctrl->subsys || !(ctrl->subsys->cmic & NVME_CTRL_CMIC_ANA))
- return 0;
-
- if (!ctrl->max_namespaces ||
-diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
-index f35647c470af..e57357f23306 100644
---- a/drivers/nvme/host/nvme.h
-+++ b/drivers/nvme/host/nvme.h
-@@ -885,6 +885,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys);
- void nvme_mpath_start_freeze(struct nvme_subsystem *subsys);
- void nvme_mpath_default_iopolicy(struct nvme_subsystem *subsys);
- void nvme_failover_req(struct request *req);
-+void nvme_update_ana(struct request *req);
- void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl);
- int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head);
- void nvme_mpath_add_disk(struct nvme_ns *ns, __le32 anagrpid);
-@@ -923,6 +924,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl)
- static inline void nvme_failover_req(struct request *req)
- {
- }
-+static inline void nvme_update_ana(struct request *req)
-+{
-+}
- static inline void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl)
- {
- }
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index eb65170b97ff..e8b906b6ffbf 100644
+index e3e915329510..929ca9fa61a7 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
-@@ -4408,6 +4408,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
+@@ -4410,6 +4410,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9084,
quirk_bridge_cavm_thrx2_pcie_root);
@@ -1174,7 +1039,7 @@ index eb65170b97ff..e8b906b6ffbf 100644
* Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero)
* class code. Fix it.
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
-index c9416fe8542d..aafb1efe7915 100644
+index 228fb2d11c70..696cfa7025de 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -818,18 +818,24 @@ static void rtc_wake_off(struct device *dev)
@@ -1209,10 +1074,10 @@ index c9416fe8542d..aafb1efe7915 100644
}
#else
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
-index c4babb16dac7..9c9342e0c055 100644
+index 6effa13039f3..fbfbd542b858 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
-@@ -130,6 +130,14 @@ static const char *sd_cache_types[] = {
+@@ -118,6 +118,14 @@ static const char *sd_cache_types[] = {
"write back, no read (daft)"
};
@@ -1227,7 +1092,7 @@ index c4babb16dac7..9c9342e0c055 100644
static void sd_set_flush_flag(struct scsi_disk *sdkp)
{
bool wc = false, fua = false;
-@@ -4057,6 +4065,8 @@ static int __init init_sd(void)
+@@ -4045,6 +4053,8 @@ static int __init init_sd(void)
goto err_out_class;
}
@@ -1237,10 +1102,10 @@ index c4babb16dac7..9c9342e0c055 100644
if (err)
goto err_out_driver;
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index f2c561ae4bfe..36805f1c5786 100644
+index 0ff47eeffb49..005b8c595c60 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
-@@ -5824,6 +5824,13 @@ static void hub_event(struct work_struct *work)
+@@ -5782,6 +5782,13 @@ static void hub_event(struct work_struct *work)
(u16) hub->change_bits[0],
(u16) hub->event_bits[0]);
@@ -1254,39 +1119,23 @@ index f2c561ae4bfe..36805f1c5786 100644
/* Lock the device, then check to see if we were
* disconnected while waiting for the lock to succeed. */
usb_lock_device(hdev);
-diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c
-index ba5322fe34f5..35d084c52f2d 100644
---- a/fs/btrfs/space-info.c
-+++ b/fs/btrfs/space-info.c
-@@ -365,6 +365,23 @@ static u64 calc_available_free_space(struct btrfs_fs_info *fs_info,
- factor = btrfs_bg_type_to_factor(profile);
- avail = div_u64(avail, factor);
-
-+ /*
-+ * Since data allocations immediately use block groups as part of the
-+ * reservation, because we assume that data reservations will == actual
-+ * usage, we could potentially overcommit and then immediately have that
-+ * available space used by a data allocation, which could put us in a
-+ * bind when we get close to filling the file system.
-+ *
-+ * To handle this simply remove 1G (which is our current maximum chunk
-+ * allocation size) from the available space. If we are relatively
-+ * empty this won't affect our ability to overcommit much, and if we're
-+ * very close to full it'll keep us from getting into a position where
-+ * we've given ourselves very little metadata wiggle room.
-+ */
-+ if (avail < SZ_1G)
-+ return 0;
-+ avail -= SZ_1G;
-+
- /*
- * If we aren't flushing all things, let us overcommit up to
- * 1/2th of the space. If we can flush, don't let us overcommit
+diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
+index 254685085c82..0b7eab0ef7d7 100644
+--- a/include/acpi/acpi_bus.h
++++ b/include/acpi/acpi_bus.h
+@@ -539,6 +539,7 @@ int acpi_device_set_power(struct acpi_device *device, int state);
+ int acpi_bus_init_power(struct acpi_device *device);
+ int acpi_device_fix_up_power(struct acpi_device *device);
+ void acpi_device_fix_up_power_extended(struct acpi_device *adev);
++void acpi_device_fix_up_power_children(struct acpi_device *adev);
+ int acpi_bus_update_power(acpi_handle handle, int *state_p);
+ int acpi_device_update_power(struct acpi_device *device, int *state_p);
+ bool acpi_bus_power_manageable(acpi_handle handle);
diff --git a/include/linux/efi.h b/include/linux/efi.h
-index ab088c662e88..f974f9d9a7c5 100644
+index 80b21d1c6eaf..b66c0683f2fc 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
-@@ -43,6 +43,8 @@
+@@ -44,6 +44,8 @@ struct screen_info;
#define EFI_ABORTED (21 | (1UL << (BITS_PER_LONG-1)))
#define EFI_SECURITY_VIOLATION (26 | (1UL << (BITS_PER_LONG-1)))
@@ -1337,7 +1186,7 @@ index ab088c662e88..f974f9d9a7c5 100644
/*
* Variable Attributes
@@ -1133,13 +1148,6 @@ static inline bool efi_runtime_disabled(void) { return true; }
- extern void efi_call_virt_check_flags(unsigned long flags, const char *call);
+ extern void efi_call_virt_check_flags(unsigned long flags, const void *caller);
extern unsigned long efi_call_virt_save_flags(void);
-enum efi_secureboot_mode {
@@ -1351,7 +1200,7 @@ index ab088c662e88..f974f9d9a7c5 100644
enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var)
{
diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h
-index af796986baee..83e1cb0ca159 100644
+index ac962c4cb44b..d0cedef6859c 100644
--- a/include/linux/lsm_hook_defs.h
+++ b/include/linux/lsm_hook_defs.h
@@ -405,6 +405,8 @@ LSM_HOOK(void, LSM_RET_VOID, bpf_prog_free_security, struct bpf_prog_aux *aux)
@@ -1363,6 +1212,196 @@ index af796986baee..83e1cb0ca159 100644
#ifdef CONFIG_PERF_EVENTS
LSM_HOOK(int, 0, perf_event_open, struct perf_event_attr *attr, int type)
+diff --git a/include/linux/module.h b/include/linux/module.h
+index a98e188cf37b..2eef4246c2c9 100644
+--- a/include/linux/module.h
++++ b/include/linux/module.h
+@@ -418,6 +418,7 @@ struct module {
+ struct module_attribute *modinfo_attrs;
+ const char *version;
+ const char *srcversion;
++ const char *rhelversion;
+ struct kobject *holders_dir;
+
+ /* Exported symbols */
+diff --git a/include/linux/rh_kabi.h b/include/linux/rh_kabi.h
+new file mode 100644
+index 000000000000..e0d3353802bb
+--- /dev/null
++++ b/include/linux/rh_kabi.h
+@@ -0,0 +1,172 @@
++/*
++ * rh_kabi.h - Red Hat kABI abstraction header
++ *
++ * Copyright (c) 2014 Don Zickus
++ * Copyright (c) 2015-2017 Jiri Benc
++ * Copyright (c) 2015 Sabrina Dubroca, Hannes Frederic Sowa
++ * Copyright (c) 2016-2018 Prarit Bhargava
++ * Copyright (c) 2017 Paolo Abeni, Larry Woodman
++ *
++ * This file is released under the GPLv2.
++ * See the file COPYING for more details.
++ *
++ * These kabi macros hide the changes from the kabi checker and from the
++ * process that computes the exported symbols' checksums.
++ * They have 2 variants: one (defined under __GENKSYMS__) used when
++ * generating the checksums, and the other used when building the kernel's
++ * binaries.
++ *
++ * The use of these macros does not guarantee that the usage and modification
++ * of code is correct. As with all Red Hat only changes, an engineer must
++ * explain why the use of the macro is valid in the patch containing the
++ * changes.
++ *
++ */
++
++#ifndef _LINUX_RH_KABI_H
++#define _LINUX_RH_KABI_H
++
++#include <linux/compiler.h>
++#include <linux/stringify.h>
++
++/*
++ * RH_KABI_CONST
++ * Adds a new const modifier to a function parameter preserving the old
++ * checksum.
++ *
++ * RH_KABI_DEPRECATE
++ * Mark the element as deprecated and make it unusable by modules while
++ * preserving kABI checksums.
++ *
++ * RH_KABI_DEPRECATE_FN
++ * Mark the function pointer as deprecated and make it unusable by modules
++ * while preserving kABI checksums.
++ *
++ * RH_KABI_EXTEND
++ * Simple macro for adding a new element to a struct.
++ *
++ * Warning: only use if a hole exists for _all_ arches. Use pahole to verify.
++ *
++ * RH_KABI_FILL_HOLE
++ * Simple macro for filling a hole in a struct.
++ *
++ * RH_KABI_RENAME
++ * Simple macro for renaming an element without changing its type. This
++ * macro can be used in bitfields, for example.
++ *
++ * NOTE: does not include the final ';'
++ *
++ * RH_KABI_REPLACE
++ * Simple replacement of _orig with a union of _orig and _new.
++ *
++ * The RH_KABI_REPLACE* macros attempt to add the ability to use the '_new'
++ * element while preserving size alignment with the '_orig' element.
++ *
++ * The #ifdef __GENKSYMS__ preserves the kABI agreement, while the anonymous
++ * union structure preserves the size alignment (assuming the '_new' element
++ * is not bigger than the '_orig' element).
++ *
++ * RH_KABI_REPLACE_UNSAFE
++ * Unsafe version of RH_KABI_REPLACE. Only use for typedefs.
++ *
++ * RH_KABI_FORCE_CHANGE
++ * Force change of the symbol checksum. The argument of the macro is a
++ * version for cases we need to do this more than once.
++ *
++ * This macro does the opposite: it changes the symbol checksum without
++ * actually changing anything about the exported symbol. It is useful for
++ * symbols that are not whitelisted, we're changing them in an
++ * incompatible way and want to prevent 3rd party modules to silently
++ * corrupt memory. Instead, by changing the symbol checksum, such modules
++ * won't be loaded by the kernel. This macro should only be used as a
++ * last resort when all other KABI workarounds have failed.
++ *
++ * NOTE
++ * Don't use ';' after these macros as it messes up the kABI checker by
++ * changing what the resulting token string looks like. Instead let this
++ * macro add the ';' so it can be properly hidden from the kABI checker
++ * (mainly for RH_KABI_EXTEND, but applied to all macros for uniformity).
++ *
++ */
++#ifdef __GENKSYMS__
++
++# define RH_KABI_CONST
++# define RH_KABI_EXTEND(_new)
++# define RH_KABI_FILL_HOLE(_new)
++# define RH_KABI_FORCE_CHANGE(ver) __attribute__((rh_kabi_change ## ver))
++# define RH_KABI_RENAME(_orig, _new) _orig
++
++# define _RH_KABI_DEPRECATE(_type, _orig) _type _orig
++# define _RH_KABI_DEPRECATE_FN(_type, _orig, _args...) _type (*_orig)(_args)
++# define _RH_KABI_REPLACE(_orig, _new) _orig
++# define _RH_KABI_REPLACE_UNSAFE(_orig, _new) _orig
++
++#else
++
++# define RH_KABI_ALIGN_WARNING ". Disable CONFIG_RH_KABI_SIZE_ALIGN_CHECKS if debugging."
++
++# define RH_KABI_CONST const
++# define RH_KABI_EXTEND(_new) _new;
++# define RH_KABI_FILL_HOLE(_new) _new;
++# define RH_KABI_FORCE_CHANGE(ver)
++# define RH_KABI_RENAME(_orig, _new) _new
++
++
++#if IS_BUILTIN(CONFIG_RH_KABI_SIZE_ALIGN_CHECKS)
++# define __RH_KABI_CHECK_SIZE_ALIGN(_orig, _new) \
++ union { \
++ _Static_assert(sizeof(struct{_new;}) <= sizeof(struct{_orig;}), \
++ __FILE__ ":" __stringify(__LINE__) ": " __stringify(_new) " is larger than " __stringify(_orig) RH_KABI_ALIGN_WARNING); \
++ _Static_assert(__alignof__(struct{_new;}) <= __alignof__(struct{_orig;}), \
++ __FILE__ ":" __stringify(__LINE__) ": " __stringify(_orig) " is not aligned the same as " __stringify(_new) RH_KABI_ALIGN_WARNING); \
++ }
++#else
++# define __RH_KABI_CHECK_SIZE_ALIGN(_orig, _new)
++#endif
++
++# define _RH_KABI_DEPRECATE(_type, _orig) _type rh_reserved_##_orig
++# define _RH_KABI_DEPRECATE_FN(_type, _orig, _args...) \
++ _type (* rh_reserved_##_orig)(_args)
++# define _RH_KABI_REPLACE(_orig, _new) \
++ union { \
++ _new; \
++ struct { \
++ _orig; \
++ } __UNIQUE_ID(rh_kabi_hide); \
++ __RH_KABI_CHECK_SIZE_ALIGN(_orig, _new); \
++ }
++# define _RH_KABI_REPLACE_UNSAFE(_orig, _new) _new
++
++#endif /* __GENKSYMS__ */
++
++/* semicolon added wrappers for the RH_KABI_REPLACE macros */
++# define RH_KABI_DEPRECATE(_type, _orig) _RH_KABI_DEPRECATE(_type, _orig);
++# define RH_KABI_DEPRECATE_FN(_type, _orig, _args...) \
++ _RH_KABI_DEPRECATE_FN(_type, _orig, _args);
++# define RH_KABI_REPLACE(_orig, _new) _RH_KABI_REPLACE(_orig, _new);
++# define RH_KABI_REPLACE_UNSAFE(_orig, _new) _RH_KABI_REPLACE_UNSAFE(_orig, _new);
++/*
++ * Macro for breaking up a random element into two smaller chunks using an
++ * anonymous struct inside an anonymous union.
++ */
++# define RH_KABI_REPLACE2(orig, _new1, _new2) RH_KABI_REPLACE(orig, struct{ _new1; _new2;})
++
++# define RH_KABI_RESERVE(n) _RH_KABI_RESERVE(n);
++/*
++ * Simple wrappers to replace standard Red Hat reserved elements.
++ */
++# define RH_KABI_USE(n, _new) RH_KABI_REPLACE(_RH_KABI_RESERVE(n), _new)
++/*
++ * Macros for breaking up a reserved element into two smaller chunks using
++ * an anonymous struct inside an anonymous union.
++ */
++# define RH_KABI_USE2(n, _new1, _new2) RH_KABI_REPLACE(_RH_KABI_RESERVE(n), struct{ _new1; _new2; })
++
++/*
++ * We tried to standardize on Red Hat reserved names. These wrappers
++ * leverage those common names making it easier to read and find in the
++ * code.
++ */
++# define _RH_KABI_RESERVE(n) unsigned long rh_reserved##n
++
++#endif /* _LINUX_RH_KABI_H */
diff --git a/include/linux/rmi.h b/include/linux/rmi.h
index ab7eea01ab42..fff7c5f737fc 100644
--- a/include/linux/rmi.h
@@ -1376,10 +1415,10 @@ index ab7eea01ab42..fff7c5f737fc 100644
int rmi_register_transport_device(struct rmi_transport_dev *xport);
diff --git a/include/linux/security.h b/include/linux/security.h
-index bac98ea18f78..28abed10b583 100644
+index 5f16eecde00b..974be25cfa70 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
-@@ -483,6 +483,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen);
+@@ -484,6 +484,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen);
int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen);
int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen);
int security_locked_down(enum lockdown_reason what);
@@ -1387,7 +1426,7 @@ index bac98ea18f78..28abed10b583 100644
#else /* CONFIG_SECURITY */
static inline int call_blocking_lsm_notifier(enum lsm_event event, void *data)
-@@ -1394,6 +1395,10 @@ static inline int security_locked_down(enum lockdown_reason what)
+@@ -1395,6 +1396,10 @@ static inline int security_locked_down(enum lockdown_reason what)
{
return 0;
}
@@ -1398,6 +1437,26 @@ index bac98ea18f78..28abed10b583 100644
#endif /* CONFIG_SECURITY */
#if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
+diff --git a/kernel/module/main.c b/kernel/module/main.c
+index 98fedfdb8db5..a21921f880e1 100644
+--- a/kernel/module/main.c
++++ b/kernel/module/main.c
+@@ -528,6 +528,7 @@ static struct module_attribute modinfo_##field = { \
+
+ MODINFO_ATTR(version);
+ MODINFO_ATTR(srcversion);
++MODINFO_ATTR(rhelversion);
+
+ static struct {
+ char name[MODULE_NAME_LEN + 1];
+@@ -980,6 +981,7 @@ struct module_attribute *modinfo_attrs[] = {
+ &module_uevent,
+ &modinfo_version,
+ &modinfo_srcversion,
++ &modinfo_rhelversion,
+ &modinfo_initstate,
+ &modinfo_coresize,
+ #ifdef CONFIG_ARCH_WANTS_MODULES_DATA_IN_VMALLOC
diff --git a/kernel/module/signing.c b/kernel/module/signing.c
index a2ff4242e623..f0d2be1ee4f1 100644
--- a/kernel/module/signing.c
@@ -1421,6 +1480,39 @@ index a2ff4242e623..f0d2be1ee4f1 100644
}
int module_sig_check(struct load_info *info, int flags)
+diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
+index b3dee80497cb..3715db3f99d4 100644
+--- a/scripts/mod/modpost.c
++++ b/scripts/mod/modpost.c
+@@ -23,6 +23,7 @@
+ #include "modpost.h"
+ #include "../../include/linux/license.h"
+ #include "../../include/linux/module_symbol.h"
++#include "../../include/generated/uapi/linux/version.h"
+
+ static bool module_enabled;
+ /* Are we using CONFIG_MODVERSIONS? */
+@@ -2088,6 +2089,12 @@ static void write_buf(struct buffer *b, const char *fname)
+ }
+ }
+
++static void add_rhelversion(struct buffer *b, struct module *mod)
++{
++ buf_printf(b, "MODULE_INFO(rhelversion, \"%d.%d\");\n", RHEL_MAJOR,
++ RHEL_MINOR);
++}
++
+ static void write_if_changed(struct buffer *b, const char *fname)
+ {
+ char *tmp;
+@@ -2148,6 +2155,7 @@ static void write_mod_c_file(struct module *mod)
+ add_depends(&buf, mod);
+ add_moddevtable(&buf, mod);
+ add_srcversion(&buf, mod);
++ add_rhelversion(&buf, mod);
+
+ ret = snprintf(fname, sizeof(fname), "%s.mod.c", mod->name);
+ if (ret >= sizeof(fname)) {
diff --git a/scripts/tags.sh b/scripts/tags.sh
index a70d43723146..56d06b04f752 100755
--- a/scripts/tags.sh
@@ -1495,10 +1587,10 @@ index 68d19632aeb7..ef348935b6ff 100644
static int __init lockdown_lsm_init(void)
diff --git a/security/security.c b/security/security.c
-index 549104a447e3..73670798f075 100644
+index 23b129d482a7..55d0fe0d121b 100644
--- a/security/security.c
+++ b/security/security.c
-@@ -5198,6 +5198,18 @@ int security_locked_down(enum lockdown_reason what)
+@@ -5230,6 +5230,18 @@ int security_locked_down(enum lockdown_reason what)
}
EXPORT_SYMBOL(security_locked_down);
diff --git a/rpminspect.yaml b/rpminspect.yaml
index 8b160a452..b4e599a88 100644
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@@ -23,7 +23,7 @@ emptyrpm:
patches:
ignore_list:
- linux-kernel-test.patch
- - patch-6.5-redhat.patch
+ - patch-6.6-redhat.patch
runpath:
ignore:
diff --git a/sources b/sources
index c835fbc99..20194e383 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,5 @@
-SHA512 (linux-6.5.12.tar.xz) = 9953738058a9a333417070e99c3ab7e0ce0c72726c9e80e863dc2606de01bed03319fd47dc1195285ce69c157cbee84b77a6f7c74c735519ca92bff3ac4d3a19
SHA512 (kernel-abi-stablelists-6.5.12.tar.bz2) = 7130ba0d72e398ae63bd0192e5e765885d8b932ff10c22f214821387588c358a21c8460561993baab0e5cd48afbad08db822cc49e5e3ae2d927b328de2072e7a
SHA512 (kernel-kabi-dw-6.5.12.tar.bz2) = 7fc7372de576d1f3602abe70483edf30cf635a6d4175261bb44e1b7d4b413bc045b1e2affc0dbe6bf710a7c10b4a5c26c7fd47d8b8e7fe4bee2a25e2fd80b13a
+SHA512 (linux-6.6.2.tar.xz) = 202683efebc3db663fbb095626e54c33efeff239894f34f5d814bee2e2b87a2ac85ac768cea33e31f6b44a01b4185b0ef384e67d812898ed6953f7089d551335
+SHA512 (kernel-abi-stablelists-6.6.2.tar.xz) = d3eefbc40b0c3ae7dbacee282d0f2f541c86c433d8b6c14d597c10512e995a282fb8d66886e32ff8f92be36417dc5d17c8a8426c452aa927477bef6bf8ed38ba
+SHA512 (kernel-kabi-dw-6.6.2.tar.xz) = 8ca309116cffac10c74f0103aa996f2ebd59f5f3eed40b4d95bad245ff363d6a5ce0ec973b6d3f48c21ce50a391314215d4776745e01f44072b0a7e4519d5e12
1
0
List of packages currently excluding arches (1133)
===========================================
- 0ad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- 90-Second-Portraits
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- BareBonesBrowserLaunch
ExclusiveArch: %{java_arches} noarch
- CFR
ExclusiveArch: %{java_arches} noarch
- CardManager
ExclusiveArch: %{java_arches} noarch
- GAPDoc
ExclusiveArch: %{gap_arches} noarch
- GoldenCheetah
ExclusiveArch: %{qt5_qtwebengine_arches}
- GtkAda
ExclusiveArch: %{GPRbuild_arches}
- GtkAda3
ExclusiveArch: %{GPRbuild_arches}
- IPAddress
ExclusiveArch: %{java_arches} noarch
- Mars
ExclusiveArch: %{java_arches} noarch
- OpenColorIO
ExclusiveArch: x86_64 ppc64le
- OpenImageIO
ExclusiveArch: x86_64 ppc64le
- OpenMolcas
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- OpenStego
ExclusiveArch: %{java_arches} noarch
- PragmARC
ExclusiveArch: %{GPRbuild_arches}
- R-V8
ExclusiveArch: %{nodejs_arches}
- R-rJava
ExclusiveArch: %{java_arches}
- RdRand
ExclusiveArch: %{ix86} x86_64
- RediSearch
ExclusiveArch: x86_64
- SLOF
ExclusiveArch: ppc64le
- YafaRay
ExclusiveArch: %{ix86} x86_64
- aardvark-dns
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- accel-config
ExclusiveArch: %{ix86} x86_64
- acpid
ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64
- ahven
ExclusiveArch: %{GPRbuild_arches}
- algobox
ExclusiveArch: %{qt5_qtwebengine_arches}
- american-fuzzy-lop
ExclusiveArch: %{ix86} x86_64 s390x
- anet
ExclusiveArch: %{GPRbuild_arches}
- ant
ExclusiveArch: %{java_arches} noarch
- ant-antunit
ExclusiveArch: %{java_arches} noarch
- ant-contrib
ExclusiveArch: %{java_arches} noarch
- antlr
ExclusiveArch: %{java_arches}
- antlr3
ExclusiveArch: %{java_arches}
- antlr4-project
ExclusiveArch: %{java_arches}
- antlrworks
ExclusiveArch: %{java_arches} noarch
- aopalliance
ExclusiveArch: %{java_arches} noarch
- apache-commons-beanutils
ExclusiveArch: %{java_arches} noarch
- apache-commons-cli
ExclusiveArch: %{java_arches} noarch
- apache-commons-codec
ExclusiveArch: %{java_arches} noarch
- apache-commons-collections
ExclusiveArch: %{java_arches} noarch
- apache-commons-collections4
ExclusiveArch: %{java_arches} noarch
- apache-commons-compress
ExclusiveArch: %{java_arches} noarch
- apache-commons-configuration
ExclusiveArch: %{java_arches} noarch
- apache-commons-digester
ExclusiveArch: %{java_arches} noarch
- apache-commons-exec
ExclusiveArch: %{java_arches} noarch
- apache-commons-io
ExclusiveArch: %{java_arches} noarch
- apache-commons-jexl
ExclusiveArch: %{java_arches} noarch
- apache-commons-jxpath
ExclusiveArch: %{java_arches} noarch
- apache-commons-lang3
ExclusiveArch: %{java_arches} noarch
- apache-commons-logging
ExclusiveArch: %{java_arches} noarch
- apache-commons-math
ExclusiveArch: %{java_arches} noarch
- apache-commons-modeler
ExclusiveArch: %{java_arches} noarch
- apache-commons-net
ExclusiveArch: %{java_arches} noarch
- apache-commons-parent
ExclusiveArch: %{java_arches} noarch
- apache-commons-pool
ExclusiveArch: %{java_arches} noarch
- apache-commons-vfs
ExclusiveArch: %{java_arches} noarch
- apache-ivy
ExclusiveArch: %{java_arches} noarch
- apache-parent
ExclusiveArch: %{java_arches} noarch
- apache-resource-bundles
ExclusiveArch: %{java_arches} noarch
- apache-sshd
ExclusiveArch: %{java_arches} noarch
- apiguardian
ExclusiveArch: %{java_arches} noarch
- apmd
ExclusiveArch: %{ix86}
- appstream-generator
ExclusiveArch: %{ldc_arches}
- aqute-bnd
ExclusiveArch: %{java_arches} noarch
- args4j
ExclusiveArch: %{java_arches} noarch
- arianna
ExclusiveArch: %{qt5_qtwebengine_arches}
- arm-trusted-firmware
ExclusiveArch: aarch64
- asmjit
ExclusiveArch: aarch64 x86_64
- assertj-core
ExclusiveArch: %{java_arches} noarch
- atinject
ExclusiveArch: %{java_arches} noarch
- aunit
ExclusiveArch: %GPRbuild_arches
- auto
ExclusiveArch: %{java_arches} noarch
- autolink-java
ExclusiveArch: noarch %{java_arches}
- avgtime
ExclusiveArch: %{ldc_arches}
- aws
ExclusiveArch: %GPRbuild_arches
- azure-cli
ExclusiveArch: %{java_arches} noarch
- batik
ExclusiveArch: %{java_arches} noarch
- bcal
ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x
- bcc
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
- bcel
ExclusiveArch: %{java_arches} noarch
- bcm283x-firmware
ExclusiveArch: aarch64
- beansbinding
ExclusiveArch: %{java_arches} noarch
- berusky2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips}
- beust-jcommander
ExclusiveArch: %{java_arches} noarch
- bibletime
ExclusiveArch: %{java_arches}
- biosdevname
ExclusiveArch: %{ix86} x86_64
- bless
ExclusiveArch: %mono_arches
- bodhi-server
ExclusiveArch: %{golang_arches_future}
- bolzplatz2006
ExclusiveArch: %{java_arches}
- bouncycastle
ExclusiveArch: %{java_arches} noarch
- box64
ExclusiveArch: aarch64 ppc64le x86_64
- bpftrace
ExclusiveArch: x86_64 %{power64} aarch64 s390x
- brazil
ExclusiveArch: %{java_arches} noarch
- bsf
ExclusiveArch: %{java_arches} noarch
- bsh
ExclusiveArch: %{java_arches} noarch
- build-helper-maven-plugin
ExclusiveArch: %{java_arches} noarch
- buildah
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- byebyebios
ExclusiveArch: x86_64
- byte-buddy
ExclusiveArch: %{java_arches} noarch
- byteman
ExclusiveArch: %{java_arches} noarch
- cachelib
ExclusiveArch: x86_64 aarch64 ppc64le
- caddy
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: %{golang_arches}
- caffe
ExclusiveArch: x86_64 aarch64 ppc64le
- calamares
ExclusiveArch: %{ix86} x86_64 aarch64
- calibre
ExclusiveArch: aarch64 x86_64
- cambozola
ExclusiveArch: %{java_arches} noarch
- canl-java
ExclusiveArch: %{java_arches} noarch
- catatonit
ExclusiveArch: aarch64 ppc64le s390x x86_64
ExclusiveArch: %{golang_arches_future}
- ccdciel
ExclusiveArch: %{fpc_arches}
- cdcollect
ExclusiveArch: %{mono_arches}
- cdi-api
ExclusiveArch: %{java_arches} noarch
- ceph
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- cglib
ExclusiveArch: %{java_arches} noarch
- chromium
ExclusiveArch: x86_64
ExclusiveArch: x86_64 aarch64
- cjdns
ExclusiveArch: %{nodejs_arches}
- classloader-leak-test-framework
ExclusiveArch: %{java_arches} noarch
- classpathless-compiler
ExclusiveArch: %{java_arches} noarch
- clevis-pin-tpm2
ExclusiveArch: %{rust_arches}
- clojure
ExclusiveArch: %{java_arches} noarch
- clojure-core-specs-alpha
ExclusiveArch: %{java_arches} noarch
- clojure-maven-plugin
ExclusiveArch: %{java_arches} noarch
- clojure-spec-alpha
ExclusiveArch: %{java_arches} noarch
- cmospwd
ExclusiveArch: %{ix86} x86_64
- cmrt
ExclusiveArch: %{ix86} x86_64 ia64
- codehaus-parent
ExclusiveArch: %{java_arches} noarch
- colorful
ExclusiveArch: %{fpc_arches}
- colossus
ExclusiveArch: %{java_arches} noarch
- conmon
ExclusiveArch: %{golang_arches_future}
- console-image-viewer
ExclusiveArch: %{java_arches} noarch
- containernetworking-plugins
ExclusiveArch: %{golang_arches}
- coq
ExclusiveArch: %{ocaml_native_compiler}
- cortado
ExclusiveArch: %{java_arches} noarch
- cpu-x
ExclusiveArch: i686 x86_64
- cpufetch
ExclusiveArch: %{arm} aarch64 x86_64 ppc ppc64 ppc64le
- cpuid
ExclusiveArch: %{ix86} x86_64
- cpuinfo
ExclusiveArch: x86_64 aarch64
- cqrlog
ExclusiveArch: %{fpc_arches}
- crash
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- crash-gcore-command
ExclusiveArch: aarch64 ppc64le x86_64
- crash-trace-command
ExclusiveArch: aarch64 ppc64le s390x x86_64
- credentials-fetcher
ExclusiveArch: x86_64 aarch64 s390x
- cri-o
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- cri-tools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- criu
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- crun
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le riscv64 s390x x86_64
- cryptlib
ExclusiveArch: x86_64 aarch64 ppc64le
- crypto-policies
ExclusiveArch: %{java_arches} noarch
- cryptobone
ExclusiveArch: x86_64 ppc64le aarch64
- csslint
ExclusiveArch: %{nodejs_arches} noarch
- daq
ExclusiveArch: x86_64 aarch64
- dbus-sharp
ExclusiveArch: %mono_arches
- dbus-sharp-glib
ExclusiveArch: %mono_arches
- decentxml
ExclusiveArch: %{java_arches} noarch
- deepin-daemon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- deepin-desktop-schemas
ExclusiveArch: %{go_arches}
- directory-maven-plugin
ExclusiveArch: %{java_arches} noarch
- dirgra
ExclusiveArch: %{java_arches} noarch
- disruptor
ExclusiveArch: %{java_arches} noarch
- ditaa
ExclusiveArch: %{java_arches} noarch
- dlm
ExclusiveArch: i686 x86_64
- dmidecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- dmtcp
ExclusiveArch: x86_64
- docker-distribution
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- dogtag-pki
ExclusiveArch: %{java_arches}
- dolphin-emu
ExclusiveArch: x86_64 aarch64
- dom4j
ExclusiveArch: %{java_arches} noarch
- dotnet6.0
ExclusiveArch: aarch64 x86_64 s390x
ExclusiveArch: x86_64
- dotnet7.0
ExclusiveArch: aarch64 ppc64le s390x x86_64
ExclusiveArch: x86_64
- doublecmd
ExclusiveArch: %{ix86} x86_64
- dpdk
ExclusiveArch: x86_64 i686 aarch64 ppc64le
- dub
ExclusiveArch: %{ldc_arches}
- dxvk-native
ExclusiveArch: %{ix86} x86_64
- dyninst
ExclusiveArch: %{ix86} x86_64 ppc64le aarch64
- e3
ExclusiveArch: %{ix86} x86_64
- easymock
ExclusiveArch: %{java_arches} noarch
- ecj
ExclusiveArch: %{java_arches} noarch
- eclipse-swt
ExclusiveArch: %{java_arches}
- ed25519-java
ExclusiveArch: %{java_arches} noarch
- edk2
ExclusiveArch: x86_64 aarch64 riscv64
- efibootmgr
ExclusiveArch: %{efi}
- efifs
ExclusiveArch: %{efi}
- efitools
ExclusiveArch: %{efi}
- efivar
ExclusiveArch: %{efi}
- elk
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- emacs-slime
ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64
- embree
ExclusiveArch: aarch64 x86_64
- embree3
ExclusiveArch: aarch64 x86_64
- enjarify
ExclusiveArch: %{java_arches} noarch
- enki
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
- envytools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- eric
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
- erlang-corba
ExclusiveArch: %{java_arches}
- esmi_ib_library
ExclusiveArch: x86_64
- eth-tools
ExclusiveArch: x86_64
- exec-maven-plugin
ExclusiveArch: %{java_arches} noarch
- external-editor-revived
ExclusiveArch: %{rust_arches}
- extra-enforcer-rules
ExclusiveArch: %{java_arches} noarch
- fasterxml-oss-parent
ExclusiveArch: %{java_arches} noarch
- fb303
ExclusiveArch: x86_64 aarch64 ppc64le
- fbthrift
ExclusiveArch: x86_64 aarch64 ppc64le
- fcitx-libpinyin
ExclusiveArch: %{qt5_qtwebengine_arches}
- fedora-dockerfiles
ExclusiveArch: %{go_arches}
- felix-parent
ExclusiveArch: %{java_arches} noarch
- felix-utils
ExclusiveArch: %{java_arches} noarch
- fernflower
ExclusiveArch: %{java_arches} noarch
- fes
ExclusiveArch: %{ix86} x86_64
- filedrop
ExclusiveArch: %{java_arches} noarch
- firecracker
ExclusiveArch: aarch64 x86_64
- fishbowl
ExclusiveArch: %{java_arches} noarch
- fizz
ExclusiveArch: x86_64 aarch64 ppc64le
- flexmark-java
ExclusiveArch: noarch %{java_arches}
- flocq
ExclusiveArch: %{ocaml_native_compiler}
- florist
ExclusiveArch: %{GPRbuild_arches}
- fluent-bit
ExclusiveArch: x86_64 aarch64
- flute
ExclusiveArch: %{java_arches} noarch
- folly
ExclusiveArch: x86_64 aarch64 ppc64le
- fop
ExclusiveArch: %{java_arches} noarch
- forge-parent
ExclusiveArch: %{java_arches} noarch
- fpc
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc64le
- frama-c
ExclusiveArch: %{ocaml_native_compiler}
- freecol
ExclusiveArch: %{java_arches} noarch
- freemarker
ExclusiveArch: %{java_arches} noarch
- freerouting
ExclusiveArch: %{java_arches} noarch
- frescobaldi
ExclusiveArch: %{qt5_qtwebengine_arches}
- frysk
ExclusiveArch: x86_64 ppc64
- fuse-overlayfs
ExclusiveArch: %{arm64} ppc64le s390x x86_64
- fusesource-pom
ExclusiveArch: %{java_arches} noarch
- fwts
ExclusiveArch: x86_64 %{arm} aarch64 s390x riscv64 %{power64}
- fwupd-efi
ExclusiveArch: x86_64 aarch64
- ga
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- gap
ExclusiveArch: %{gap_arches}
- gap-pkg-ace
ExclusiveArch: %{gap_arches}
- gap-pkg-aclib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-alnuth
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-atlasrep
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-autodoc
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-automata
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-autpgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-browse
ExclusiveArch: %{gap_arches}
- gap-pkg-caratinterface
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-circle
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-cohomolo
ExclusiveArch: %{gap_arches}
- gap-pkg-congruence
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-corelg
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crime
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crisp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crypting
ExclusiveArch: %{gap_arches}
- gap-pkg-cryst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crystcat
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-ctbllib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-curlinterface
ExclusiveArch: %{gap_arches}
- gap-pkg-cvec
ExclusiveArch: %{gap_arches}
- gap-pkg-datastructures
ExclusiveArch: %{gap_arches}
- gap-pkg-design
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-digraphs
ExclusiveArch: %{gap_arches}
- gap-pkg-edim
ExclusiveArch: %{gap_arches}
- gap-pkg-factint
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-ferret
ExclusiveArch: %{gap_arches}
- gap-pkg-fga
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-fining
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-float
ExclusiveArch: %{gap_arches}
- gap-pkg-format
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-forms
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-fr
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-francy
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-gbnp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-genss
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-grape
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-groupoids
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-grpconst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-guava
ExclusiveArch: %{gap_arches}
- gap-pkg-hap
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-hapcryst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-hecke
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-images
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-io
ExclusiveArch: %{gap_arches}
- gap-pkg-irredsol
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-json
ExclusiveArch: %{gap_arches}
- gap-pkg-jupyterkernel
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-jupyterviz
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-laguna
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liealgdb
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liepring
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liering
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-loops
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-lpres
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-mapclass
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-nautytracesinterface
ExclusiveArch: %{gap_arches}
- gap-pkg-nq
ExclusiveArch: %{gap_arches}
- gap-pkg-openmath
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-orb
ExclusiveArch: %{gap_arches}
- gap-pkg-polenta
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-polycyclic
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-polymaking
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-primgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-profiling
ExclusiveArch: %{gap_arches}
- gap-pkg-qpa
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-quagroup
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-radiroot
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-recog
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-repsn
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-resclasses
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-scscp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-semigroups
ExclusiveArch: %{gap_arches}
- gap-pkg-singular
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sla
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-smallgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-smallsemi
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sonata
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sophus
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-spinsym
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-standardff
ExclusiveArch: %{gap_arches}
- gap-pkg-tomlib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-toric
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-transgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-utils
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-uuid
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-xmod
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-zeromqinterface
ExclusiveArch: %{gap_arches}
- gappalib-coq
ExclusiveArch: %{ocaml_native_compiler}
- gbrainy
ExclusiveArch: %mono_arches
- gdb
ExclusiveArch: %{ix86} x86_64
- gdb-exploitable
ExclusiveArch: x86_64 i386
ExclusiveArch: x86_64 noarch
- gearhead1
ExclusiveArch: %{fpc_arches}
- gearhead2
ExclusiveArch: %{fpc_arches}
- ghdl
ExclusiveArch: %{GNAT_arches}
- ghostwriter
ExclusiveArch: %{qt5_qtwebengine_arches}
- gio-sharp
ExclusiveArch: %mono_arches
- gir-to-d
ExclusiveArch: %{ldc_arches}
- git-octopus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- gitqlient
ExclusiveArch: %{qt5_qtwebengine_arches}
- giver
ExclusiveArch: %{mono_arches}
- gkeyfile-sharp
ExclusiveArch: %mono_arches
- glibc32
ExclusiveArch: x86_64
- glibd
ExclusiveArch: %{ldc_arches}
- gnatcoll
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-bindings
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-db
ExclusiveArch: %{GPRbuild_arches}
- gnome-boxes
ExclusiveArch: x86_64
- gnome-desktop-sharp
ExclusiveArch: %mono_arches
- gnome-do
ExclusiveArch: %mono_arches
- gnome-keyring-sharp
ExclusiveArch: %mono_arches
- gnome-rdp
ExclusiveArch: %{mono_arches}
- gnome-sharp
ExclusiveArch: %mono_arches
- gnome-subtitles
ExclusiveArch: %mono_arches
- gnu-efi
ExclusiveArch: %{efi}
- go-bindata
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- godep
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang
ExclusiveArch: %{golang_arches}
- google-gson
ExclusiveArch: %{java_arches} noarch
- google-guice
ExclusiveArch: %{java_arches} noarch
- gotun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: x86_64
- goverlay
ExclusiveArch: %{fpc_arches}
- gprbuild
ExclusiveArch: %{GPRbuild_arches}
- gprolog
ExclusiveArch: x86_64 %{ix86} ppc alpha aarch64
- grafana
ExclusiveArch: %{grafana_arches}
- grafana-pcp
ExclusiveArch: %{grafanapcp_arches}
- gtk-sharp-beans
ExclusiveArch: %mono_arches
- gtk-sharp2
ExclusiveArch: %mono_arches
- gtk-sharp3
ExclusiveArch: %{mono_arches}
- gtkd
ExclusiveArch: %{ldc_arches}
- guava
ExclusiveArch: %{java_arches} noarch
- gudev-sharp
ExclusiveArch: %mono_arches
- guestfs-tools
ExclusiveArch: %{kernel_arches}
- gvisor-tap-vsock
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- hamcrest
ExclusiveArch: %{java_arches} noarch
- harec
ExclusiveArch: x86_64 aarch64
- hawtjni
ExclusiveArch: %{java_arches} noarch
- hedgewars
ExclusiveArch: %{fpc_arches}
- hibernate-jpa-2.0-api
ExclusiveArch: %{java_arches} noarch
- hid4java
ExclusiveArch: %{java_arches} noarch
- hipblas
ExclusiveArch: x86_64
- hipcub
ExclusiveArch: x86_64
- hipify
ExclusiveArch: x86_64
- hsakmt
ExclusiveArch: x86_64 aarch64 ppc64le
- httpcomponents-client
ExclusiveArch: %{java_arches} noarch
- httpcomponents-core
ExclusiveArch: %{java_arches} noarch
- httpcomponents-project
ExclusiveArch: %{java_arches} noarch
- hyena
ExclusiveArch: %{mono_arches}
- hyperscan
ExclusiveArch: x86_64
- hyperv-daemons
ExclusiveArch: i686 x86_64 aarch64
- icaro
ExclusiveArch: %{ix86} x86_64 noarch
- icedtea-web
ExclusiveArch: %{java_arches}
- icu4j
ExclusiveArch: %{java_arches} noarch
- imagej
ExclusiveArch: %{java_arches} noarch
- imhex
ExclusiveArch: x86_64 %{arm64}
- imvirt
ExclusiveArch: %{ix86} x86_64 ia64
- indistarter
ExclusiveArch: %{fpc_arches}
- infinipath-psm
ExclusiveArch: x86_64
- intel-cm-compiler
ExclusiveArch: i686 x86_64
- intel-cmt-cat
ExclusiveArch: x86_64
- intel-compute-runtime
ExclusiveArch: x86_64
- intel-gmmlib
ExclusiveArch: x86_64 i686
- intel-igc
ExclusiveArch: x86_64
- intel-ipp-crypto-mb
ExclusiveArch: x86_64
- intel-ipsec-mb
ExclusiveArch: x86_64
- intel-mediasdk
ExclusiveArch: x86_64
- intel-undervolt
ExclusiveArch: i386 x86_64
- ioport
ExclusiveArch: %{ix86} x86_64
- ipmctl
ExclusiveArch: x86_64
- ispc
ExclusiveArch: x86_64 aarch64
- iucode-tool
ExclusiveArch: %{ix86} x86_64
- iyfct
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- jFormatString
ExclusiveArch: %{java_arches} noarch
- jackson-annotations
ExclusiveArch: %{java_arches} noarch
- jackson-bom
ExclusiveArch: %{java_arches} noarch
- jackson-core
ExclusiveArch: %{java_arches} noarch
- jackson-databind
ExclusiveArch: %{java_arches} noarch
- jackson-dataformats-binary
ExclusiveArch: %{java_arches} noarch
- jackson-dataformats-text
ExclusiveArch: %{java_arches} noarch
- jackson-jaxrs-providers
ExclusiveArch: %{java_arches} noarch
- jackson-modules-base
ExclusiveArch: %{java_arches} noarch
- jackson-parent
ExclusiveArch: %{java_arches} noarch
- jacoco
ExclusiveArch: %{java_arches} noarch
- jacop
ExclusiveArch: %{java_arches} noarch
- jakarta-activation
ExclusiveArch: %{java_arches} noarch
- jakarta-activation1
ExclusiveArch: %{java_arches} noarch
- jakarta-annotations
ExclusiveArch: %{java_arches} noarch
- jakarta-el
ExclusiveArch: %{java_arches} noarch
- jakarta-interceptors
ExclusiveArch: %{java_arches} noarch
- jakarta-json
ExclusiveArch: %{java_arches} noarch
- jakarta-mail
ExclusiveArch: %{java_arches} noarch
- jakarta-mail1
ExclusiveArch: %{java_arches} noarch
- jakarta-oro
ExclusiveArch: %{java_arches} noarch
- jakarta-saaj
ExclusiveArch: %{java_arches} noarch
- jakarta-server-pages
ExclusiveArch: %{java_arches} noarch
- jakarta-servlet
ExclusiveArch: %{java_arches} noarch
- jakarta-xml-ws
ExclusiveArch: %{java_arches} noarch
- janino
ExclusiveArch: %{java_arches} noarch
- jansi
ExclusiveArch: %{java_arches}
- jansi-native
ExclusiveArch: %{java_arches}
- jansi1
ExclusiveArch: %{java_arches} noarch
- java-1.8.0-openjdk
ExclusiveArch: %{java_arches}
- java-1.8.0-openjdk-aarch32
ExclusiveArch: %{arm}
- java-1.8.0-openjdk-portable
ExclusiveArch: %{java_arches}
- java-11-openjdk
ExclusiveArch: %{java_arches}
- java-11-openjdk-portable
ExclusiveArch: %{java_arches}
- java-17-openjdk
ExclusiveArch: %{java_arches}
- java-17-openjdk-portable
ExclusiveArch: %{java_arches}
- java-diff-utils
ExclusiveArch: %{java_arches} noarch
- java-dirq
ExclusiveArch: %{java_arches} noarch
- java-jd-decompiler
ExclusiveArch: %{java_arches} noarch
- java-latest-openjdk
ExclusiveArch: %{java_arches}
- java-latest-openjdk-portable
ExclusiveArch: %{java_arches}
- java-runtime-decompiler
ExclusiveArch: %{java_arches} noarch
- java-scrypt
ExclusiveArch: %{java_arches} noarch
- java_cup
ExclusiveArch: %{java_arches} noarch
- javacc
ExclusiveArch: %{java_arches} noarch
- javacc-maven-plugin
ExclusiveArch: %{java_arches} noarch
- javaewah
ExclusiveArch: %{java_arches} noarch
- javapackages-bootstrap
ExclusiveArch: %{java_arches}
- javaparser
ExclusiveArch: %{java_arches} noarch
- javapoet
ExclusiveArch: %{java_arches} noarch
- javassist
ExclusiveArch: %{java_arches} noarch
- jaxb
ExclusiveArch: %{java_arches} noarch
- jaxb-api
ExclusiveArch: %{java_arches} noarch
- jaxb-api2
ExclusiveArch: %{java_arches} noarch
- jaxb-dtd-parser
ExclusiveArch: %{java_arches} noarch
- jaxb-fi
ExclusiveArch: %{java_arches} noarch
- jaxb-istack-commons
ExclusiveArch: %{java_arches} noarch
- jaxb-stax-ex
ExclusiveArch: %{java_arches} noarch
- jaxen
ExclusiveArch: %{java_arches} noarch
- jboss-jaxrs-2.0-api
ExclusiveArch: %{java_arches} noarch
- jboss-logging
ExclusiveArch: %{java_arches} noarch
- jboss-logging-tools
ExclusiveArch: %{java_arches} noarch
- jboss-parent
ExclusiveArch: %{java_arches} noarch
- jchardet
ExclusiveArch: %{java_arches} noarch
- jcip-annotations
ExclusiveArch: %{java_arches} noarch
- jctools
ExclusiveArch: %{java_arches} noarch
- jcuber
ExclusiveArch: %{java_arches} noarch
- jdeparser
ExclusiveArch: %{java_arches} noarch
- jdepend
ExclusiveArch: %{java_arches} noarch
- jdependency
ExclusiveArch: %{java_arches} noarch
- jdom
ExclusiveArch: %{java_arches} noarch
- jdom2
ExclusiveArch: %{java_arches} noarch
- jedit
ExclusiveArch: %{java_arches} noarch
- jericho-html
ExclusiveArch: %{java_arches} noarch
- jetbrains-annotations
ExclusiveArch: noarch %{java_arches}
- jetty
ExclusiveArch: %{java_arches} noarch
- jflex
ExclusiveArch: %{java_arches} noarch
- jfreechart
ExclusiveArch: %{java_arches} noarch
- jgit
ExclusiveArch: %{java_arches} noarch
- jglobus
ExclusiveArch: %{java_arches} noarch
- jgoodies-common
ExclusiveArch: %{java_arches} noarch
- jgoodies-forms
ExclusiveArch: %{java_arches} noarch
- jgoodies-looks
ExclusiveArch: %{java_arches} noarch
- jigawatts
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- jline
ExclusiveArch: %{java_arches}
- jline2
ExclusiveArch: %{java_arches} noarch
- jmock
ExclusiveArch: %{java_arches} noarch
- jmol
ExclusiveArch: %{java_arches} noarch
- jna
ExclusiveArch: %{java_arches}
- jneuroml-core
ExclusiveArch: %{java_arches} noarch
- jni-inchi
ExclusiveArch: %{java_arches}
- jol
ExclusiveArch: %{java_arches} noarch
- jolokia-jvm-agent
ExclusiveArch: %{java_arches} noarch
- jopt-simple
ExclusiveArch: %{java_arches} noarch
- jorbis
ExclusiveArch: %{java_arches} noarch
- jowl
ExclusiveArch: %{nodejs_arches} noarch
- jpanoramamaker
ExclusiveArch: %{java_arches} noarch
- jsch
ExclusiveArch: %{java_arches} noarch
- jsch-agent-proxy
ExclusiveArch: %{java_arches} noarch
- json_simple
ExclusiveArch: %{java_arches} noarch
- jsoup
ExclusiveArch: %{java_arches} noarch
- jsr-305
ExclusiveArch: %{java_arches} noarch
- jss
ExclusiveArch: %{java_arches}
- jssc
ExclusiveArch: %{java_arches}
- jtidy
ExclusiveArch: %{java_arches} noarch
- julia
ExclusiveArch: x86_64
- junit
ExclusiveArch: %{java_arches} noarch
- junit5
ExclusiveArch: %{java_arches} noarch
- juniversalchardet
ExclusiveArch: %{java_arches} noarch
- jzlib
ExclusiveArch: %{java_arches} noarch
- kaidan
ExclusiveArch: %{qt5_qtwebengine_arches}
- kchmviewer
ExclusiveArch: %{qt5_qtwebengine_arches}
- kernel
ExclusiveArch: noarch x86_64 s390x aarch64 ppc64le
ExclusiveArch: noarch i386 i686 x86_64 s390x aarch64 ppc64le
- keylime-agent-rust
ExclusiveArch: %{rust_arches}
- keyring-ima-signer
ExclusiveArch: %{rust_arches}
- kf5-akonadi-search
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-audiocd-kio
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kblog
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarcore
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarutils
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kitinerary
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-ktnef
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-libkdcraw
ExclusiveArch: x86_64 ppc64le %{arm}
- kicad
ExclusiveArch: x86_64 aarch64 ppc64le
- kiwix-desktop
ExclusiveArch: %{qt5_qtwebengine_arches}
- knot-resolver
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- knotes
ExclusiveArch: x86_64 %{arm}
- kubernetes
ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm}
- laf-plugin
ExclusiveArch: %{java_arches} noarch
- lazarus
ExclusiveArch: %{fpc_arches}
- lazpaint
ExclusiveArch: %{fpc_arches}
- ldapjdk
ExclusiveArch: %{java_arches} noarch
- ldc
ExclusiveArch: %{ldc_arches} ppc64le
- ldc1.32
ExclusiveArch: %{ldc_arches} ppc64le
- libbase
ExclusiveArch: %{java_arches} noarch
- libclc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x
- libcxl
ExclusiveArch: %{power64}
- libdfp
ExclusiveArch: ppc ppc64 ppc64le s390 s390x x86_64
- libdispatch
ExclusiveArch: x86_64 aarch64 ppc64le
- libfonts
ExclusiveArch: %{java_arches} noarch
- libformula
ExclusiveArch: %{java_arches} noarch
- libguestfs
ExclusiveArch: %{kernel_arches}
- libica
ExclusiveArch: s390 s390x
- libipt
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- libkgapi
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- libkrun
ExclusiveArch: x86_64 aarch64
- libkrunfw
ExclusiveArch: x86_64 aarch64
- liblayout
ExclusiveArch: %{java_arches} noarch
- libloader
ExclusiveArch: %{java_arches} noarch
- libnxz
ExclusiveArch: ppc64le
- libocxl
ExclusiveArch: ppc64le
- libpsm2
ExclusiveArch: x86_64
- libquentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- libreoffice-TexMaths
ExclusiveArch: %{java_arches}
- librepository
ExclusiveArch: %{java_arches} noarch
- libretro-desmume2015
ExclusiveArch: i686 x86_64
- librtas
ExclusiveArch: %{power64}
- libserializer
ExclusiveArch: %{java_arches} noarch
- libservicelog
ExclusiveArch: ppc %{power64}
- libsmbios
ExclusiveArch: x86_64 %{ix86}
- libunicode
ExclusiveArch: x86_64 aarch64
- libunwind
ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64
- libva-nvidia-driver
ExclusiveArch: %{x86_64} %{ix86} %{arm64} ppc64le
- libvirt-java
ExclusiveArch: %{java_arches} noarch
- libvma
ExclusiveArch: x86_64 ppc64le ppc64 aarch64
- libvmi
ExclusiveArch: x86_64
- libvpd
ExclusiveArch: %{power64}
- libxsmm
ExclusiveArch: x86_64
- libzdnn
ExclusiveArch: s390x
- libzfcphbaapi
ExclusiveArch: s390 s390x
- libzpc
ExclusiveArch: s390x
- llhttp
ExclusiveArch: %{nodejs_arches}
- log4j
ExclusiveArch: %{java_arches} noarch
- log4net
ExclusiveArch: %mono_arches
- lrmi
ExclusiveArch: %{ix86}
- lsvpd
ExclusiveArch: %{power64}
- luajit
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- lucene
ExclusiveArch: %{java_arches} noarch
- lujavrite
ExclusiveArch: %{java_arches}
- luxcorerender
ExclusiveArch: x86_64
- mactel-boot
ExclusiveArch: x86_64
- magicmirror
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-airnow
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-onthisday
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-singlestock
ExclusiveArch: %{nodejs_arches} noarch
- manifest-tool
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- mariadb-java-client
ExclusiveArch: %{java_arches} noarch
- marked
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- matrix-synapse
ExclusiveArch: %{rust_arches}
- maui-mauikit
ExclusiveArch: %{ix86} s390x aarch64 x86_64
- maven
ExclusiveArch: %{java_arches} noarch
- maven-antrun-plugin
ExclusiveArch: %{java_arches} noarch
- maven-archetype
ExclusiveArch: %{java_arches} noarch
- maven-archiver
ExclusiveArch: %{java_arches} noarch
- maven-artifact-transfer
ExclusiveArch: %{java_arches} noarch
- maven-assembly-plugin
ExclusiveArch: %{java_arches} noarch
- maven-bundle-plugin
ExclusiveArch: %{java_arches} noarch
- maven-clean-plugin
ExclusiveArch: %{java_arches} noarch
- maven-common-artifact-filters
ExclusiveArch: %{java_arches} noarch
- maven-compiler-plugin
ExclusiveArch: %{java_arches} noarch
- maven-dependency-analyzer
ExclusiveArch: %{java_arches} noarch
- maven-dependency-plugin
ExclusiveArch: %{java_arches} noarch
- maven-dependency-tree
ExclusiveArch: %{java_arches} noarch
- maven-doxia
ExclusiveArch: %{java_arches} noarch
- maven-doxia-sitetools
ExclusiveArch: %{java_arches} noarch
- maven-enforcer
ExclusiveArch: %{java_arches} noarch
- maven-file-management
ExclusiveArch: %{java_arches} noarch
- maven-filtering
ExclusiveArch: %{java_arches} noarch
- maven-invoker
ExclusiveArch: %{java_arches} noarch
- maven-invoker-plugin
ExclusiveArch: %{java_arches} noarch
- maven-jar-plugin
ExclusiveArch: %{java_arches} noarch
- maven-mapping
ExclusiveArch: %{java_arches} noarch
- maven-native
ExclusiveArch: %{java_arches} noarch
- maven-parent
ExclusiveArch: %{java_arches} noarch
- maven-patch-plugin
ExclusiveArch: %{java_arches} noarch
- maven-plugin-testing
ExclusiveArch: %{java_arches} noarch
- maven-plugin-tools
ExclusiveArch: %{java_arches} noarch
- maven-remote-resources-plugin
ExclusiveArch: %{java_arches} noarch
- maven-reporting-api
ExclusiveArch: %{java_arches} noarch
- maven-reporting-impl
ExclusiveArch: %{java_arches} noarch
- maven-resolver
ExclusiveArch: %{java_arches} noarch
- maven-resources-plugin
ExclusiveArch: %{java_arches} noarch
- maven-script-interpreter
ExclusiveArch: %{java_arches} noarch
- maven-shade-plugin
ExclusiveArch: %{java_arches} noarch
- maven-shared-incremental
ExclusiveArch: %{java_arches} noarch
- maven-shared-io
ExclusiveArch: %{java_arches} noarch
- maven-shared-utils
ExclusiveArch: %{java_arches} noarch
- maven-source-plugin
ExclusiveArch: %{java_arches} noarch
- maven-surefire
ExclusiveArch: %{java_arches} noarch
- maven-verifier
ExclusiveArch: %{java_arches} noarch
- maven-verifier-plugin
ExclusiveArch: %{java_arches} noarch
- maven-wagon
ExclusiveArch: %{java_arches} noarch
- maxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- mbpfan
ExclusiveArch: x86_64
- mcelog
ExclusiveArch: i686 x86_64
- mcrouter
ExclusiveArch: x86_64 aarch64 ppc64le
- mecab-java
ExclusiveArch: %java_arches
- mediaconch
ExclusiveArch: %{qt5_qtwebengine_arches}
- mellowplayer
ExclusiveArch: %{qt5_qtwebengine_arches}
- memkind
ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64
- memtest86+
ExclusiveArch: x86_64 %{ix86}
- merkuro
ExclusiveArch: %{qt5_qtwebengine_arches}
- microcode_ctl
ExclusiveArch: %{ix86} x86_64
- micropython
ExclusiveArch: %{arm} x86_64 riscv64
- miglayout
ExclusiveArch: %{java_arches} noarch
- mine_detector
ExclusiveArch: %{GPRbuild_arches}
- minetest
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mingw-libidn2
ExclusiveArch: %{ix86} x86_64 %{arm}
- mingw-wine-gecko
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- mkbootdisk
ExclusiveArch: %{ix86} sparc sparc64 x86_64
- moby-engine
ExclusiveArch: %{golang_arches}
- mockito
ExclusiveArch: %{java_arches} noarch
- mod_mono
ExclusiveArch: %mono_arches
- modello
ExclusiveArch: %{java_arches} noarch
- moditect
ExclusiveArch: %{java_arches} noarch
- module-build-service
ExclusiveArch: %{ix86} x86_64 noarch
- modulemaker-maven-plugin
ExclusiveArch: %{java_arches} noarch
- mojo-executor
ExclusiveArch: %{java_arches} noarch
- mojo-parent
ExclusiveArch: %{java_arches} noarch
- mokutil
ExclusiveArch: %{ix86} x86_64 aarch64 %{arm}
- mono
ExclusiveArch: %mono_arches
- mono-addins
ExclusiveArch: %mono_arches
- mono-basic
ExclusiveArch: %{mono_arches}
- mono-bouncycastle
ExclusiveArch: %mono_arches
- mono-cecil
ExclusiveArch: %mono_arches
- mono-cecil-flowanalysis
ExclusiveArch: %mono_arches
- mono-reflection
ExclusiveArch: %mono_arches
- mono-tools
ExclusiveArch: %mono_arches
- mono-zeroconf
ExclusiveArch: %mono_arches
- monodevelop
ExclusiveArch: %mono_arches
- monodevelop-debugger-gdb
ExclusiveArch: %{mono_arches}
- mrrescue
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- msr-tools
ExclusiveArch: %{ix86} x86_64
- mvfst
ExclusiveArch: x86_64 aarch64 ppc64le
- mxparser
ExclusiveArch: %{java_arches} noarch
- mysql-connector-java
ExclusiveArch: %{java_arches} noarch
- mysql-connector-net
ExclusiveArch: %{mono_arches}
- naev
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- naga
ExclusiveArch: %{java_arches} noarch
- nant
ExclusiveArch: %mono_arches
- nativejit
ExclusiveArch: x86_64
- nbc
ExclusiveArch: %{fpc_arches}
- nbdkit
ExclusiveArch: x86_64
- ndesk-dbus
ExclusiveArch: %{mono_arches}
- ndesk-dbus-glib
ExclusiveArch: %{mono_arches}
- nekohtml
ExclusiveArch: %{java_arches} noarch
- netavark
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- newtonsoft-json
ExclusiveArch: %{mono_arches}
- nodejs-acorn-object-spread
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-backbone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bash-language-server
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buble
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cjs-module-lexer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-generic-pool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-less
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-linefix
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nodemon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-packaging
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-replace-require-self
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-underscore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-undici
ExclusiveArch: %{nodejs_arches} noarch
- nodejs18
ExclusiveArch: %{nodejs_arches}
- nodejs20
ExclusiveArch: %{nodejs_arches}
- nom-tam-fits
ExclusiveArch: %{java_arches} noarch
- notify-sharp
ExclusiveArch: %{mono_arches}
- notify-sharp3
ExclusiveArch: %{mono_arches}
- nuget
ExclusiveArch: %{mono_arches}
- numatop
ExclusiveArch: x86_64 ppc64le
- nunit
ExclusiveArch: %{mono_arches}
- nunit2
ExclusiveArch: %{mono_arches}
- nvml
ExclusiveArch: x86_64 ppc64le
- objectweb-asm
ExclusiveArch: %{java_arches} noarch
- objenesis
ExclusiveArch: %{java_arches} noarch
- obs-service-rust2rpm
ExclusiveArch: %{rust_arches} noarch
- oci-seccomp-bpf-hook
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
ExclusiveArch: %{golang_arches_future}
- oidn
ExclusiveArch: x86_64
- olpc-utils
ExclusiveArch: %{ix86} %{arm}
- oneVPL
ExclusiveArch: x86_64
- oneVPL-intel-gpu
ExclusiveArch: x86_64
- oneapi-level-zero
ExclusiveArch: x86_64
- onednn
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- onedrive
ExclusiveArch: %{ldc_arches}
- ongres-scram
ExclusiveArch: %{java_arches} noarch
- ongres-stringprep
ExclusiveArch: %{java_arches} noarch
- opae
ExclusiveArch: x86_64
- opal-prd
ExclusiveArch: ppc64le
- open-vm-tools
ExclusiveArch: x86_64 aarch64
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: x86_64
- openblas
ExclusiveArch: %{openblas_arches}
- openjdk-asmtools
ExclusiveArch: %{java_arches} noarch
- openjdk-asmtools7
ExclusiveArch: %{java_arches} noarch
- openjfx
ExclusiveArch: %{java_arches}
- openjfx8
ExclusiveArch: x86_64
- openlibm
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64}
- openms
ExclusiveArch: %{qt5_qtwebengine_arches}
- openni
ExclusiveArch: x86_64 %{arm}
- openni-primesense
ExclusiveArch: %{ix86} x86_64 %{arm}
- openoffice.org-diafilter
ExclusiveArch: %{java_arches}
- openpgl
ExclusiveArch: aarch64 x86_64
- openssl-ibmca
ExclusiveArch: s390 s390x
- openstack-java-sdk
ExclusiveArch: %{java_arches} noarch
- opentest4j
ExclusiveArch: %{java_arches} noarch
- openvkl
ExclusiveArch: aarch64 x86_64
- optee_client
ExclusiveArch: aarch64
- optee_os
ExclusiveArch: aarch64
- options
ExclusiveArch: %{java_arches} noarch
- orthorobot
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- osgi-annotation
ExclusiveArch: %{java_arches} noarch
- osgi-compendium
ExclusiveArch: %{java_arches} noarch
- osgi-core
ExclusiveArch: %{java_arches} noarch
- pacemaker
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64 %{arm}
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- pageedit
ExclusiveArch: %{qt5_qtwebengine_arches}
- parserng
ExclusiveArch: %{java_arches} noarch
- pasdoc
ExclusiveArch: %{fpc_arches}
- pcc
ExclusiveArch: %{ix86} x86_64
- pcfi
ExclusiveArch: %{java_arches} noarch
- pcm
ExclusiveArch: %{ix86} x86_64
- pcmciautils
ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm}
- pdbg
ExclusiveArch: ppc64le
- pdfbox
ExclusiveArch: %{java_arches} noarch
- pdfmod
ExclusiveArch: %mono_arches
- pdftk-java
ExclusiveArch: %{java_arches} noarch
- pentaho-libxml
ExclusiveArch: %{java_arches} noarch
- pentaho-reporting-flow-engine
ExclusiveArch: %{java_arches} noarch
- perl-Dumbbench
ExclusiveArch: %{ix86} x86_64 noarch
- perl-Parse-DMIDecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- pesign
ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm}
- pesign-test-app
ExclusiveArch: x86_64
- picocli
ExclusiveArch: %{java_arches} noarch
- pinta
ExclusiveArch: %mono_arches
- pioneer
ExclusiveArch: %{ix86} x86_64
- plantuml
ExclusiveArch: %{java_arches} noarch
- plasma-dialer
ExclusiveArch: %{java_arches}
- playonlinux
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- plexus-archiver
ExclusiveArch: %{java_arches} noarch
- plexus-build-api
ExclusiveArch: %{java_arches} noarch
- plexus-build-api0
ExclusiveArch: %{java_arches} noarch
- plexus-cipher
ExclusiveArch: %{java_arches} noarch
- plexus-classworlds
ExclusiveArch: %{java_arches} noarch
- plexus-compiler
ExclusiveArch: %{java_arches} noarch
- plexus-component-api
ExclusiveArch: %{java_arches} noarch
- plexus-components-pom
ExclusiveArch: %{java_arches} noarch
- plexus-containers
ExclusiveArch: %{java_arches} noarch
- plexus-i18n
ExclusiveArch: %{java_arches} noarch
- plexus-interpolation
ExclusiveArch: %{java_arches} noarch
- plexus-io
ExclusiveArch: %{java_arches} noarch
- plexus-languages
ExclusiveArch: %{java_arches} noarch
- plexus-pom
ExclusiveArch: %{java_arches} noarch
- plexus-resources
ExclusiveArch: %{java_arches} noarch
- plexus-sec-dispatcher
ExclusiveArch: %{java_arches} noarch
- plexus-utils
ExclusiveArch: %{java_arches} noarch
- plexus-velocity
ExclusiveArch: %{java_arches} noarch
- podman
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- poppler-sharp
ExclusiveArch: %mono_arches
- popub
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- postgresql-jdbc
ExclusiveArch: %{java_arches} noarch
- powerpc-utils
ExclusiveArch: ppc %{power64}
- powerstat
ExclusiveArch: %{ix86} x86_64
- ppc64-diag
ExclusiveArch: ppc %{power64}
- procyon
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
- proguard
ExclusiveArch: %{java_arches} noarch
- prometheus-jmx-exporter
ExclusiveArch: %{java_arches} noarch
- prometheus-simpleclient-java
ExclusiveArch: %{java_arches} noarch
- proxygen
ExclusiveArch: x86_64 aarch64 ppc64le
- pveclib
ExclusiveArch: ppc %{power64}
- pyqtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- python-ast-monitor
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
- python-cryptography
ExclusiveArch: %{rust_arches}
- python-damo
ExclusiveArch: x86_64 aarch64 ppc64le s390x noarch
- python-etcd
ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- python-javaobj
ExclusiveArch: %{java_arches} noarch
- python-jnius
ExclusiveArch: %{java_arches}
- python-jupyter-polymake
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- python-openoffice
ExclusiveArch: noarch x86_64
- python-pyahocorasick
ExclusiveArch: x86_64 %{arm64} ppc64le
- python-pymoc
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-pyqt6-webengine
ExclusiveArch: aarch64 x86_64
- q4wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- qatengine
ExclusiveArch: x86_64
- qatzip
ExclusiveArch: x86_64
- qbe
ExclusiveArch: x86_64 aarch64
- qcint
ExclusiveArch: x86_64
- qclib
ExclusiveArch: s390 s390x
- qdox
ExclusiveArch: %{java_arches} noarch
- qemu-sanity-check
ExclusiveArch: %{kernel_arches}
- qevercloud
ExclusiveArch: %{qt5_qtwebengine_arches}
- qmapshack
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt4pas
ExclusiveArch: %{fpc_arches}
- qt5-qtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt6-qtwebengine
ExclusiveArch: aarch64 x86_64
- qt6-qtwebview
ExclusiveArch: aarch64 x86_64
- quantum-espresso
ExclusiveArch: x86_64 %{ix86} aarch64 %{power64}
- quentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- rEFInd
ExclusiveArch: %{efi}
- rachota
ExclusiveArch: %{java_arches} noarch
- rear
ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64
- reflections
ExclusiveArch: %{java_arches} noarch
- reg
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- regexp
ExclusiveArch: %{java_arches} noarch
- relaxng-datatype-java
ExclusiveArch: %{java_arches} noarch
- replacer
ExclusiveArch: %{java_arches} noarch
- reptyr
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- rescene
ExclusiveArch: %{mono_arches}
- resteasy
ExclusiveArch: %{java_arches} noarch
- restool
ExclusiveArch: aarch64
- restsharp
ExclusiveArch: %{mono_arches}
- retsnoop
ExclusiveArch: %{rust_arches}
- rhino
ExclusiveArch: %{java_arches} noarch
- river
ExclusiveArch: %{zig_arches}
- rkcommon
ExclusiveArch: x86_64 aarch64
- rocalution
ExclusiveArch: x86_64
- rocblas
ExclusiveArch: x86_64
- rocclr
ExclusiveArch: x86_64
- rocm-compilersupport
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-device-libs
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-rpm-macros
ExclusiveArch: x86_64
- rocm-runtime
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-smi
ExclusiveArch: x86_64 aarch64 ppc64le
- rocminfo
ExclusiveArch: x86_64 aarch64 ppc64le
- rocprim
ExclusiveArch: x86_64
- rocrand
ExclusiveArch: x86_64
- rocsparse
ExclusiveArch: x86_64
- rocthrust
ExclusiveArch: x86_64
- rpm-ostree
ExclusiveArch: %{rust_arches}
- rr
ExclusiveArch: %{ix86} x86_64 aarch64
- rssguard
ExclusiveArch: %{qt6_qtwebengine_arches}
- rstudio
ExclusiveArch: %{java_arches}
- rsyntaxtextarea
ExclusiveArch: %{java_arches} noarch
- rubygem-childprocess
ExclusiveArch: %{ix86} x86_64 noarch
- runc
ExclusiveArch: %{golang_arches_future}
- rundoc
ExclusiveArch: %{java_arches} noarch
- rust
ExclusiveArch: %{rust_arches}
- rust-askalono-cli
ExclusiveArch: %{rust_arches}
- rust-brotli
ExclusiveArch: %{rust_arches}
- rust-compress-tools
ExclusiveArch: %{rust_arches}
- rust-coreos-installer
ExclusiveArch: %{rust_arches}
- rust-ctr
ExclusiveArch: %{rust_arches}
- rust-dashmap4
ExclusiveArch: %{rust_arches}
- rust-deflate
ExclusiveArch: %{rust_arches}
- rust-deflate0.8
ExclusiveArch: %{rust_arches}
- rust-drg
ExclusiveArch: %{rust_arches}
- rust-epoll
ExclusiveArch: %{rust_arches}
- rust-getch
ExclusiveArch: %{rust_arches}
- rust-gzip-header
ExclusiveArch: %{rust_arches}
- rust-hamming
ExclusiveArch: %{rust_arches}
- rust-hidapi
ExclusiveArch: %{rust_arches}
- rust-httparse
ExclusiveArch: %{rust_arches}
- rust-humantime-serde
ExclusiveArch: %{rust_arches}
- rust-hyperlocal
ExclusiveArch: %{rust_arches}
- rust-image0.23
ExclusiveArch: %{rust_arches}
- rust-inflate
ExclusiveArch: %{rust_arches}
- rust-jpeg-decoder0.1
ExclusiveArch: %{rust_arches}
- rust-k9
ExclusiveArch: %{rust_arches}
- rust-krunvm
ExclusiveArch: x86_64 aarch64
- rust-kstring
ExclusiveArch: %{rust_arches}
- rust-kvm-ioctls
ExclusiveArch: x86_64 aarch64
- rust-lebe
ExclusiveArch: %{rust_arches}
- rust-libslirp-sys
ExclusiveArch: %{rust_arches}
- rust-msru
ExclusiveArch: x86_64
- rust-nanorand
ExclusiveArch: %{rust_arches}
- rust-netstat2
ExclusiveArch: %{rust_arches}
- rust-onig
ExclusiveArch: %{rust_arches}
- rust-openat-ext
ExclusiveArch: %{rust_arches}
- rust-os_type
ExclusiveArch: %{rust_arches}
- rust-pager
ExclusiveArch: %{rust_arches}
- rust-pathsearch
ExclusiveArch: %{rust_arches}
- rust-pretty-bytes
ExclusiveArch: %{rust_arches}
- rust-pretty-hex
ExclusiveArch: %{rust_arches}
- rust-primal-bit
ExclusiveArch: %{rust_arches}
- rust-primal-check
ExclusiveArch: %{rust_arches}
- rust-primal-estimate
ExclusiveArch: %{rust_arches}
- rust-procfs0.9
ExclusiveArch: %{rust_arches}
- rust-psl-types
ExclusiveArch: %{rust_arches}
- rust-psm
ExclusiveArch: %{rust_arches}
- rust-pwd
ExclusiveArch: %{rust_arches}
- rust-rand_core
ExclusiveArch: %{rust_arches}
- rust-schemafy_core
ExclusiveArch: %{rust_arches}
- rust-schemafy_lib
ExclusiveArch: %{rust_arches}
- rust-seahash
ExclusiveArch: %{rust_arches}
- rust-serde-big-array
ExclusiveArch: %{rust_arches}
- rust-serde_qs
ExclusiveArch: %{rust_arches}
- rust-serde_yaml0.8
ExclusiveArch: %{rust_arches}
- rust-sev
ExclusiveArch: x86_64
- rust-sevctl
ExclusiveArch: x86_64
- rust-silver
ExclusiveArch: %{rust_arches}
- rust-sinit
ExclusiveArch: %{rust_arches}
- rust-snphost
ExclusiveArch: x86_64
- rust-ssh-key-dir
ExclusiveArch: %{rust_arches}
- rust-stacker
ExclusiveArch: %{rust_arches}
- rust-structopt
ExclusiveArch: %{rust_arches}
- rust-tiff0.6
ExclusiveArch: %{rust_arches}
- rust-totp-lite
ExclusiveArch: %{rust_arches}
- rust-tower-layer
ExclusiveArch: %{rust_arches}
- rust-tpm2-policy
ExclusiveArch: %{rust_arches}
- rust-unicode-normalization
ExclusiveArch: %{rust_arches}
- rust-unicode-xid
ExclusiveArch: %{rust_arches}
- rust-uriparse
ExclusiveArch: %{rust_arches}
- rust-uucore
ExclusiveArch: %{rust_arches}
- rust-varlink_generator
ExclusiveArch: %{rust_arches}
- rust-varlink_parser
ExclusiveArch: %{rust_arches}
- rust-virtio-bindings
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-vmm-sys-util
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-vtparse
ExclusiveArch: %{rust_arches}
- rust-web-ext-native-messaging
ExclusiveArch: %{rust_arches}
- rust-wezterm-color-types
ExclusiveArch: %{rust_arches}
- rust-wezterm-dynamic
ExclusiveArch: %{rust_arches}
- rust-wezterm-dynamic-derive
ExclusiveArch: %{rust_arches}
- rust-zbus1
ExclusiveArch: %{rust_arches}
- rust-zbus_macros1
ExclusiveArch: %{rust_arches}
- rust-zvariant2
ExclusiveArch: %{rust_arches}
- rust-zvariant_derive2
ExclusiveArch: %{rust_arches}
- rutabaga-gfx-ffi
ExclusiveArch: x86_64 aarch64
- sac
ExclusiveArch: %{java_arches} noarch
- safetyblanket
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- sat4j
ExclusiveArch: %{java_arches} noarch
- sbcl
ExclusiveArch: %{ix86} x86_64 aarch64 %{power64}
- sbd
ExclusiveArch: i686 x86_64 s390x aarch64 ppc64le
- sblim-cim-client
ExclusiveArch: %{java_arches} noarch
- sblim-cim-client2
ExclusiveArch: %{java_arches} noarch
- sbsigntools
ExclusiveArch: x86_64 aarch64 %{arm} %{ix86}
- scala
ExclusiveArch: %{java_arches} noarch
- scannotation
ExclusiveArch: %{java_arches} noarch
- sdljava
ExclusiveArch: %{java_arches}
- sdrangel
ExclusiveArch: %{qt5_qtwebengine_arches}
- sdsl-lite
ExclusiveArch: %{power64} x86_64 aarch64
- sdubby
ExclusiveArch: %{efi}
- seabios
ExclusiveArch: x86_64
- seadrive-gui
ExclusiveArch: %{qt5_qtwebengine_arches}
- seafile-client
ExclusiveArch: %{qt5_qtwebengine_arches}
- seamonkey
ExclusiveArch: x86_64
- seqan3
ExclusiveArch: %{power64} x86_64 aarch64
- sequence-library
ExclusiveArch: %{java_arches} noarch
- servicelog
ExclusiveArch: ppc %{power64}
- shaman
ExclusiveArch: %{java_arches} noarch
- sharpfont
ExclusiveArch: %mono_arches
- sharpziplib
ExclusiveArch: %{mono_arches}
- shim
ExclusiveArch: %{efi}
- shim-unsigned-aarch64
ExclusiveArch: aarch64
- shim-unsigned-x64
ExclusiveArch: x86_64
- sigil
ExclusiveArch: %{qt5_qtwebengine_arches}
- sigul
ExclusiveArch: x86_64
- singularity-ce
ExclusiveArch: %{go_arches}
- sisu
ExclusiveArch: %{java_arches} noarch
- sisu-mojos
ExclusiveArch: %{java_arches} noarch
- skopeo
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- skychart
ExclusiveArch: %{fpc_arches}
- slf4j
ExclusiveArch: %{java_arches} noarch
- slirp4netns
ExclusiveArch: %{golang_arches_future}
- snakeyaml
ExclusiveArch: %{java_arches} noarch
- snapd
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x}
- snip
ExclusiveArch: %{java_arches} noarch
- softnet-stat
ExclusiveArch: %{rust_arches}
- soup-sharp
ExclusiveArch: %{mono_arches}
- spacebar
ExclusiveArch: %{java_arches}
- sparkleshare
ExclusiveArch: %{mono_arches}
- spec-version-maven-plugin
ExclusiveArch: %{java_arches} noarch
- spicctrl
ExclusiveArch: %{ix86} x86_64
- spice
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- spice-parent
ExclusiveArch: %{java_arches} noarch
- springlobby
ExclusiveArch: %{ix86} x86_64
- spyder
ExclusiveArch: %{qt5_qtwebengine_arches}
- sqljet
ExclusiveArch: %{java_arches} noarch
- squeekboard
ExclusiveArch: %{rust_arches}
- startdde
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- stats-collect
ExclusiveArch: %{ix86} x86_64 noarch
- statsd
ExclusiveArch: %{nodejs_arches} noarch
- stratis-cli
ExclusiveArch: %{rust_arches} noarch
- stratisd
ExclusiveArch: %{rust_arches}
ExclusiveArch: %{rust_arches}
ExclusiveArch: %{rust_arches}
- string-template-maven-plugin
ExclusiveArch: %{java_arches} noarch
- stringtemplate
ExclusiveArch: %{java_arches} noarch
- stringtemplate4
ExclusiveArch: %{java_arches} noarch
- stripesnoop
ExclusiveArch: %{ix86} x86_64
- subscription-manager-cockpit
ExclusiveArch: %{nodejs_arches} noarch
- supercollider
ExclusiveArch: %{qt5_qtwebengine_arches}
- supermin
ExclusiveArch: %{kernel_arches}
- svnkit
ExclusiveArch: %{java_arches} noarch
- svt-vp9
ExclusiveArch: x86_64
- swift-lang
ExclusiveArch: x86_64 aarch64
- swiftlint
ExclusiveArch: x86_64 aarch64
- swing-layout
ExclusiveArch: %{java_arches} noarch
- sysbench
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64le s390x
- syslinux
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- system-rules
ExclusiveArch: %{java_arches} noarch
- systemd-boot
ExclusiveArch: %efi
- t-digest
ExclusiveArch: %{java_arches} noarch
- taglib-sharp
ExclusiveArch: %{mono_arches}
- tagsoup
ExclusiveArch: %{java_arches} noarch
- tarantool
ExclusiveArch: %{ix86} x86_64
- tboot
ExclusiveArch: %{ix86} x86_64
- tdlib
ExclusiveArch: x86_64 aarch64
- templates_parser
ExclusiveArch: %GPRbuild_arches
- ternimal
ExclusiveArch: %{rust_arches}
- testcloud
ExclusiveArch: %{kernel_arches} noarch
- testng
ExclusiveArch: %{java_arches} noarch
- texlive
ExclusiveArch: %{java_arches} noarch
- thermald
ExclusiveArch: %{ix86} x86_64
- tilix
ExclusiveArch: %{ldc_arches}
- tomboy
ExclusiveArch: %{mono_arches}
- tomcat
ExclusiveArch: %{java_arches} noarch
- tomcat-native
ExclusiveArch: %{java_arches}
- tomcat-taglibs-parent
ExclusiveArch: %{java_arches} noarch
- tomcatjss
ExclusiveArch: %{java_arches} noarch
- torbrowser-launcher
ExclusiveArch: %{ix86} x86_64
- treelayout
ExclusiveArch: %{java_arches} noarch
- trilead-ssh2
ExclusiveArch: %{java_arches} noarch
- truth
ExclusiveArch: %{java_arches} noarch
- tuned-profiles-nfv-host-bin
ExclusiveArch: %{ix86} x86_64
- typescript
ExclusiveArch: %{nodejs_arches} noarch
- uClibc
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
- ucx
ExclusiveArch: aarch64 ppc64le x86_64
- uglify-js
ExclusiveArch: %{nodejs_arches} noarch
- umr
ExclusiveArch: x86_64 aarch64 ppc64le
- unetbootin
ExclusiveArch: %{ix86} x86_64
- univocity-parsers
ExclusiveArch: %{java_arches} noarch
- ursa-major
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- usd
ExclusiveArch: aarch64 x86_64
- v8-314
ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64
- vakzination
ExclusiveArch: %{java_arches}
- valgrind
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
- vboot-utils
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- vecmath1.2
ExclusiveArch: %{java_arches} noarch
- velocity
ExclusiveArch: %{java_arches} noarch
- vim-go
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}}
- vim-syntastic
ExclusiveArch: %{java_arches} noarch
- virt-p2v
ExclusiveArch: x86_64
- virt-v2v
ExclusiveArch: x86_64
- virtiofsd
ExclusiveArch: %{rust_arches}
- virtualbox-guest-additions
ExclusiveArch: i686 x86_64
- vkd3d
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- vmaf
ExclusiveArch: x86_64
- voms-api-java
ExclusiveArch: %{java_arches} noarch
- voms-clients-java
ExclusiveArch: %{java_arches} noarch
- vrq
ExclusiveArch: %{ix86} x86_64
- wangle
ExclusiveArch: x86_64 aarch64 ppc64le
- warsow
ExclusiveArch: %{ix86} x86_64 %{arm}
- warsow-data
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{ix86} x86_64 %{arm}
- wasmedge
ExclusiveArch: x86_64 aarch64
- watchman
ExclusiveArch: x86_64 aarch64 ppc64le
- wdt
ExclusiveArch: x86_64 aarch64 ppc64le
- webkit2-sharp
ExclusiveArch: %mono_arches
- weld-parent
ExclusiveArch: %{java_arches} noarch
- why3
ExclusiveArch: %{ocaml_native_compiler}
- widevine-installer
ExclusiveArch: aarch64
- wine
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86}
- wine-dxvk
ExclusiveArch: %{ix86} x86_64
- winetricks
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- ws-commons-util
ExclusiveArch: %{java_arches} noarch
- wsdl4j
ExclusiveArch: %{java_arches} noarch
- wult
ExclusiveArch: x86_64
- wxMaxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
- x2goclient
ExclusiveArch: x86_64
- x86-simd-sort
ExclusiveArch: x86_64
- xalan-j2
ExclusiveArch: %{java_arches} noarch
- xbean
ExclusiveArch: %{java_arches} noarch
- xbyak
ExclusiveArch: x86_64
- xbyak_aarch64
ExclusiveArch: aarch64
- xe-guest-utilities-latest
ExclusiveArch: %{ix86} x86_64
- xen
ExclusiveArch: x86_64 aarch64
- xerces-j2
ExclusiveArch: %{java_arches} noarch
- xgap
ExclusiveArch: %{gap_arches}
- xml-commons-apis
ExclusiveArch: %{java_arches} noarch
- xml-commons-resolver
ExclusiveArch: %{java_arches} noarch
- xml-maven-plugin
ExclusiveArch: %{java_arches} noarch
- xmlada
ExclusiveArch: %{GPRbuild_arches}
- xmlgraphics-commons
ExclusiveArch: %{java_arches} noarch
- xmlpull
ExclusiveArch: %{java_arches} noarch
- xmlstreambuffer
ExclusiveArch: %{java_arches} noarch
- xmlunit
ExclusiveArch: %{java_arches} noarch
- xmvn
ExclusiveArch: %{java_arches} noarch
- xmvn-connector-ivy
ExclusiveArch: %{java_arches} noarch
- xmvn-generator
ExclusiveArch: %{java_arches}
- xnnpack
ExclusiveArch: x86_64 aarch64
- xorg-x11-drv-armsoc
ExclusiveArch: %{arm} aarch64
- xorg-x11-drv-intel
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-openchrome
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vesa
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vmware
ExclusiveArch: %{ix86} x86_64 ia64
- xsp
ExclusiveArch: %mono_arches
- xstream
ExclusiveArch: %{java_arches} noarch
- xz-java
ExclusiveArch: %{java_arches} noarch
- yarnpkg
ExclusiveArch: %{nodejs_arches} noarch
- zcfan
ExclusiveArch: x86_64
- zeal
ExclusiveArch: aarch64 x86_64
- zenon
ExclusiveArch: %{ocaml_native_compiler}
- zeromq-ada
ExclusiveArch: %{GPRbuild_arches}
- zig
ExclusiveArch: %{zig_arches}
- zlib-ada
ExclusiveArch: %{GPRbuild_arches}
- zlib-ng
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- zola
ExclusiveArch: %{rust_arches}
1
0
21 Nov '23
The package rpms/publican.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/publican.git/commit/?id=52188a38be3….
Change:
+ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit 52188a38be36a7b4062da862c11db95d22b55f3e
Author: Jeff Fearn <jfearn(a)fedoraproject.org>
Date: Wed Nov 22 00:15:11 2023 +0000
Update publican.spec
Skip i686 as there is no Java for fop.
diff --git a/publican.spec b/publican.spec
index 913d195..410cbdd 100644
--- a/publican.spec
+++ b/publican.spec
@@ -1,4 +1,3 @@
-
# Track font name changes
%define RHEL6 %([[ %{?dist}x == .el6[a-z]* ]] && echo 1 || echo 0)
%define RHEL7 %([[ %{?dist}x == .el7[a-z]* ]] && echo 1 || echo 0)
@@ -22,13 +21,15 @@
Name: publican
Version: 4.3.2
-Release: 25%{?dist}
+Release: 26%{?dist}
Summary: Common files and scripts for publishing with DocBook XML
# For a breakdown of the licensing, refer to LICENSE
License: (GPLv2+ or Artistic) and CC0
URL: https://publican.fedorahosted.org
Source0: https://fedorahosted.org/released/publican/Publican-v%{version}.tar.gz
BuildArch: noarch
+ExcludeArch: %{ix86}
+
Provides: publican-common = %{version}
Provides: publican-common-db5 = %{version}
Provides: publican-API = 4.1
@@ -320,6 +321,9 @@ fi
%{wwwdir}/common-db5
%changelog
+* Wed Nov 22 2023 Jeff Fearn <jfearn(a)redhat.com> - 4.3.2-26
+- Rebuild
+
* Fri Jan 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.3.2-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
1
0
21 Nov '23
The package rpms/publican.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/publican.git/commit/?id=fec09ecc18d….
Change:
+ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit fec09ecc18d327e5f74f89dff3f38937af2ba09c
Author: Jeff Fearn <jfearn(a)fedoraproject.org>
Date: Tue Nov 21 23:44:55 2023 +0000
Update p