Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
List overview
Download
scm-commits
September 2021
----- 2024 -----
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
scm-commits@lists.fedoraproject.org
1 participants
19175 discussions
Start a n
N
ew thread
decathorpe pushed to rust-dbus (f35). "Update to version 0.9.4; Fixes RHBZ#2007916"
by notificationsï¼ fedoraproject.org
30 Sep '21
30 Sep '21
Notification time stamped 2021-09-30 21:09:48 UTC From a85a50838f79da0433480b84266efb95dc7a6d46 Mon Sep 17 00:00:00 2001 From: Fabio Valentini <decathorpe(a)gmail.com> Date: Sep 30 2021 20:23:14 +0000 Subject: Update to version 0.9.4; Fixes RHBZ#2007916 --- diff --git a/.gitignore b/.gitignore index 5e17222..3cb6b0b 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /dbus-0.9.1.crate /dbus-0.9.2.crate /dbus-0.9.3.crate +/dbus-0.9.4.crate diff --git a/dbus-fix-metadata.diff b/dbus-fix-metadata.diff index e9a8d16..55aba4c 100644 --- a/dbus-fix-metadata.diff +++ b/dbus-fix-metadata.diff @@ -1,5 +1,5 @@ ---- dbus-0.9.3/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ dbus-0.9.3/Cargo.toml 2021-06-18T09:06:08.491429+00:00 +--- dbus-0.9.4/Cargo.toml 1970-01-01T00:00:00+00:00 ++++ dbus-0.9.4/Cargo.toml 2021-09-30T20:18:46.208507+00:00 @@ -48,8 +48,5 @@ [features] futures = ["futures-util", "futures-channel"] diff --git a/rust-dbus.spec b/rust-dbus.spec index 7b97596..54a21a7 100644 --- a/rust-dbus.spec +++ b/rust-dbus.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 17 +# Generated by rust2rpm 18 # * most tests require a running user and / or system bus %bcond_with check %global debug_package %{nil} @@ -6,7 +6,7 @@ %global crate dbus Name: rust-%{crate} -Version: 0.9.3 +Version: 0.9.4 Release: %autorelease Summary: Bindings to D-Bus diff --git a/sources b/sources index 10e7d39..2f36339 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dbus-0.9.3.crate) = 3f45b0568065c32250ce076efcf2944a1e6a4d3c55cc53a5031949fd70840aa183e01199e12f96131c0c54861d800a97b140ee10889d83ecff7d4ae1338358f5 +SHA512 (dbus-0.9.4.crate) = d8a77c468c54b427d0a901fe60191504c9ae50deab7ec4650237a182436e961d7ce2155b6b7d0f5364de56bad7cade6c0cbaa312e03d87c249340bedd7525467
https://src.fedoraproject.org/rpms/rust-dbus/c/a85a50838f79da0433480b84266e…
1
0
0
0
decathorpe uploaded bumpalo-3.7.1.crate for rpms/rust-bumpalo
by notificationsï¼ fedoraproject.org
30 Sep '21
30 Sep '21
Notification time stamped 2021-09-30 21:06:14 UTC 879bc0993d8ac18cc7af87276aaf7aa042bdaca338c8cc766d5a1822c5675c1852b97467da0f6d5f4721213e3781a195e143b73d21e02ce11600e13e147e943b bumpalo-3.7.1.crate
https://src.fedoraproject.org/lookaside/pkgs/rpms/rust-bumpalo/bumpalo-3.7.…
1
0
0
0
decathorpe pushed to rust-dbus (rawhide). "Update to version 0.9.4; Fixes RHBZ#2007916"
by notificationsï¼ fedoraproject.org
30 Sep '21
30 Sep '21
Notification time stamped 2021-09-30 21:05:24 UTC From a85a50838f79da0433480b84266efb95dc7a6d46 Mon Sep 17 00:00:00 2001 From: Fabio Valentini <decathorpe(a)gmail.com> Date: Sep 30 2021 20:23:14 +0000 Subject: Update to version 0.9.4; Fixes RHBZ#2007916 --- diff --git a/.gitignore b/.gitignore index 5e17222..3cb6b0b 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /dbus-0.9.1.crate /dbus-0.9.2.crate /dbus-0.9.3.crate +/dbus-0.9.4.crate diff --git a/dbus-fix-metadata.diff b/dbus-fix-metadata.diff index e9a8d16..55aba4c 100644 --- a/dbus-fix-metadata.diff +++ b/dbus-fix-metadata.diff @@ -1,5 +1,5 @@ ---- dbus-0.9.3/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ dbus-0.9.3/Cargo.toml 2021-06-18T09:06:08.491429+00:00 +--- dbus-0.9.4/Cargo.toml 1970-01-01T00:00:00+00:00 ++++ dbus-0.9.4/Cargo.toml 2021-09-30T20:18:46.208507+00:00 @@ -48,8 +48,5 @@ [features] futures = ["futures-util", "futures-channel"] diff --git a/rust-dbus.spec b/rust-dbus.spec index 7b97596..54a21a7 100644 --- a/rust-dbus.spec +++ b/rust-dbus.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 17 +# Generated by rust2rpm 18 # * most tests require a running user and / or system bus %bcond_with check %global debug_package %{nil} @@ -6,7 +6,7 @@ %global crate dbus Name: rust-%{crate} -Version: 0.9.3 +Version: 0.9.4 Release: %autorelease Summary: Bindings to D-Bus diff --git a/sources b/sources index 10e7d39..2f36339 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dbus-0.9.3.crate) = 3f45b0568065c32250ce076efcf2944a1e6a4d3c55cc53a5031949fd70840aa183e01199e12f96131c0c54861d800a97b140ee10889d83ecff7d4ae1338358f5 +SHA512 (dbus-0.9.4.crate) = d8a77c468c54b427d0a901fe60191504c9ae50deab7ec4650237a182436e961d7ce2155b6b7d0f5364de56bad7cade6c0cbaa312e03d87c249340bedd7525467
https://src.fedoraproject.org/rpms/rust-dbus/c/a85a50838f79da0433480b84266e…
1
0
0
0
decathorpe pushed to rust-dbus (rawhide). "convert to rpmautospec"
by notificationsï¼ fedoraproject.org
30 Sep '21
30 Sep '21
Notification time stamped 2021-09-30 21:05:24 UTC From 9a241c4fe3aca7b61ee5f3d547906548e0d22c5f Mon Sep 17 00:00:00 2001 From: Fabio Valentini <decathorpe(a)gmail.com> Date: Sep 30 2021 20:18:33 +0000 Subject: convert to rpmautospec --- diff --git a/changelog b/changelog new file mode 100644 index 0000000..0dd9436 --- /dev/null +++ b/changelog @@ -0,0 +1,75 @@ +* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.3-2 +- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+ +* Fri Jun 18 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.9.3-1 +- Update to version 0.9.3. +- Fixes RHBZ#1971756 + +* Tue Feb 23 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.9.2-1 +- Update to version 0.9.2. +- Fixes RHBZ#1931161 + +* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.1-2 +- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+ +* Mon Jan 11 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.9.1-1 +- Update to version 0.9.1. +- Fixes RHBZ#1913040 + +* Sun Oct 25 2020 Fabio Valentini <decathorpe(a)gmail.com> - 0.9.0-1 +- Update to version 0.9.0. + +* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8.4-3 +- Second attempt - Rebuilt for +
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+ +* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8.4-2 +- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+ +* Fri Jun 19 2020 Josh Stone <jistone(a)redhat.com> - 0.8.4-1 +- Update to 0.8.4 + +* Thu May 14 2020 Josh Stone <jistone(a)redhat.com> - 0.8.3-1 +- Update to 0.8.3 + +* Fri Mar 13 2020 Josh Stone <jistone(a)redhat.com> - 0.8.2-1 +- Update to 0.8.2 + +* Fri Feb 21 20:07:15 CET 2020 Igor Raits <ignatenkobrain(a)fedoraproject.org> - 0.8.1-1 +- Update to 0.8.1 + +* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.5-2 +- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+ +* Fri Sep 06 21:27:01 CEST 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.6.5-1 +- Update to 0.6.5 + +* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.4-3 +- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+ +* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.4-2 +- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+ +* Wed Jan 09 2019 Josh Stone <jistone(a)redhat.com> - 0.6.4-1 +- Update to 0.6.4 + +* Fri Nov 02 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.6.3-2 +- Adapt to new packaging + +* Fri Oct 12 2018 Josh Stone <jistone(a)redhat.com> - 0.6.3-1 +- Update to 0.6.3 + +* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.2-2 +- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+ +* Fri Jun 22 2018 Josh Stone <jistone(a)redhat.com> - 0.6.2-1 +- Update to 0.6.2 + +* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.1-3 +- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+ +* Mon Jan 08 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.6.1-2 +- Rebuild for rust-packaging v5 + +* Fri Jan 05 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.6.1-1 +- Initial package diff --git a/rust-dbus.spec b/rust-dbus.spec index 1aca4ee..7b97596 100644 --- a/rust-dbus.spec +++ b/rust-dbus.spec @@ -7,7 +7,7 @@ Name: rust-%{crate} Version: 0.9.3 -Release: 2%{?dist} +Release: %autorelease Summary: Bindings to D-Bus # Upstream license specification: Apache-2.0/MIT @@ -135,78 +135,4 @@ which use "no-string-validation" feature of "%{crate}" crate. %endif %changelog -* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.3-2 -- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
- -* Fri Jun 18 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.9.3-1 -- Update to version 0.9.3. -- Fixes RHBZ#1971756 - -* Tue Feb 23 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.9.2-1 -- Update to version 0.9.2. -- Fixes RHBZ#1931161 - -* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.1-2 -- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
- -* Mon Jan 11 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.9.1-1 -- Update to version 0.9.1. -- Fixes RHBZ#1913040 - -* Sun Oct 25 2020 Fabio Valentini <decathorpe(a)gmail.com> - 0.9.0-1 -- Update to version 0.9.0. - -* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8.4-3 -- Second attempt - Rebuilt for -
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
- -* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8.4-2 -- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
- -* Fri Jun 19 2020 Josh Stone <jistone(a)redhat.com> - 0.8.4-1 -- Update to 0.8.4 - -* Thu May 14 2020 Josh Stone <jistone(a)redhat.com> - 0.8.3-1 -- Update to 0.8.3 - -* Fri Mar 13 2020 Josh Stone <jistone(a)redhat.com> - 0.8.2-1 -- Update to 0.8.2 - -* Fri Feb 21 20:07:15 CET 2020 Igor Raits <ignatenkobrain(a)fedoraproject.org> - 0.8.1-1 -- Update to 0.8.1 - -* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.5-2 -- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
- -* Fri Sep 06 21:27:01 CEST 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.6.5-1 -- Update to 0.6.5 - -* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.4-3 -- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
- -* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.4-2 -- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
- -* Wed Jan 09 2019 Josh Stone <jistone(a)redhat.com> - 0.6.4-1 -- Update to 0.6.4 - -* Fri Nov 02 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.6.3-2 -- Adapt to new packaging - -* Fri Oct 12 2018 Josh Stone <jistone(a)redhat.com> - 0.6.3-1 -- Update to 0.6.3 - -* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.2-2 -- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
- -* Fri Jun 22 2018 Josh Stone <jistone(a)redhat.com> - 0.6.2-1 -- Update to 0.6.2 - -* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.1-3 -- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
- -* Mon Jan 08 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.6.1-2 -- Rebuild for rust-packaging v5 - -* Fri Jan 05 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.6.1-1 -- Initial package +%autochangelog
https://src.fedoraproject.org/rpms/rust-dbus/c/9a241c4fe3aca7b61ee5f3d54790…
1
0
0
0
walters pushed to rpm-ostree (f34). "Backport patch for openshift/os extensions + multiarch"
by notificationsï¼ fedoraproject.org
30 Sep '21
30 Sep '21
Notification time stamped 2021-09-30 20:59:34 UTC From 896f07c9c8068905f285235bcc2c575e882d7e07 Mon Sep 17 00:00:00 2001 From: Colin Walters <walters(a)verbum.org> Date: Sep 30 2021 20:52:33 +0000 Subject: Backport patch for openshift/os extensions + multiarch --- diff --git a/0001-extensions-Add-support-for-per-extension-repos-and-m.patch b/0001-extensions-Add-support-for-per-extension-repos-and-m.patch new file mode 100644 index 0000000..0f3dafe --- /dev/null +++ b/0001-extensions-Add-support-for-per-extension-repos-and-m.patch @@ -0,0 +1,155 @@ +From 9b4b19cda21c84fa68496e1874a31044e099d742 Mon Sep 17 00:00:00 2001 +From: Colin Walters <walters(a)verbum.org> +Date: Wed, 29 Sep 2021 14:33:04 -0400 +Subject: [PATCH] extensions: Add support for per-extension repos and modules + +While we support arch-specific extensions today, the state of +repos and modules are global. Which means if a module-using +extension is only available on one architecture (as is the +case in RHEL8/OCP with the `av` module) then it's not +possible to build on other architectures. + +The most powerful mechanism here is the `arch-include` design +that we have in the treefile, but...since we already have +an architecture filter per extension, it's easier to add +repos and modules per extension. + +Note that the repos and modules are still *global* state, so +we're not supporting actively conflicting extensions right now +still. + +Closes:
https://github.com/coreos/rpm-ostree/issues/3150
+--- + docs/extensions.md | 12 +++++++++++ + rust/src/extensions.rs | 46 ++++++++++++++++++++++++++++++++++++++++++ + rust/src/treefile.rs | 2 +- + 3 files changed, 59 insertions(+), 1 deletion(-) + +diff --git a/docs/extensions.md b/docs/extensions.md +index 9dbc6230..bc3d0d7b 100644 +--- a/docs/extensions.md ++++ b/docs/extensions.md +@@ -55,6 +55,18 @@ extensions: + packages: + - strace + - ltrace ++ # Optional additional repos (still added globally). ++ # The reason use per-extension `repos` and `modules` ++ # is that it more closely groups them (where relevant) ++ # and further these are only added after architecture conditionals ++ # apply, so one can use repositories that only exist ++ # on a particular architecture. ++ repos: ++ - sooper-repo ++ # Optional additional modules (this also affects global state) ++ modules: ++ enable: ++ - sooper:latest + # Optional list of architectures on which this extension + # is valid. These are RPM basearches. If omitted, + # defaults to all architectures. +diff --git a/rust/src/extensions.rs b/rust/src/extensions.rs +index e667f886..df37b792 100644 +--- a/rust/src/extensions.rs ++++ b/rust/src/extensions.rs +@@ -34,6 +34,10 @@ pub struct Extensions { + pub struct Extension { + packages: Vec<String>, + #[serde(skip_serializing_if = "Option::is_none")] ++ repos: Option<Vec<String>>, ++ #[serde(skip_serializing_if = "Option::is_none")] ++ modules: Option<crate::treefile::ModulesConfig>, ++ #[serde(skip_serializing_if = "Option::is_none")] + architectures: Option<Vec<String>>, + #[serde(skip_serializing_if = "Option::is_none")] + match_base_evr: Option<String>, +@@ -74,6 +78,14 @@ fn extensions_load_stream( + .collect(); + + for (_, ext) in parsed.extensions.iter_mut() { ++ // Extend the global extension state with the per-extension repos and modules, ++ // after we've done architecture filtering. ++ if let Some(repos) = parsed.repos.as_mut() { ++ repos.extend(ext.repos.take().unwrap_or_default()); ++ } else { ++ parsed.repos = ext.repos.take(); ++ } ++ crate::treefile::merge_modules(&mut parsed.modules, &mut ext.modules); + if ext.kind == ExtensionKind::OsExtension { + for pkg in &ext.packages { + if base_pkgs.contains_key(pkg.as_str()) { +@@ -264,10 +276,17 @@ extensions: + #[test] + fn basearch_filter() { + let buf = r###" ++repos: ++ - baserepo ++modules: ++ enable: ++ - virt:av + extensions: + bazboo: + packages: + - bazboo ++ repos: ++ - bazboo-repo + architectures: + - x86_64 + dodo: +@@ -276,13 +295,40 @@ extensions: + - dada + architectures: + - s390x ++ foo: ++ modules: ++ enable: ++ - foo:stable ++ packages: ++ - foo ++ repos: ++ - foo-repo ++ architectures: ++ - ppc64le + "###; + let mut input = std::io::BufReader::new(buf.as_bytes()); + let extensions = extensions_load_stream(&mut input, "x86_64", &base_rpmdb()).unwrap(); + assert!(extensions.get_os_extension_packages() == vec!["bazboo"]); ++ assert_eq!(extensions.get_repos().len(), 2); ++ assert_eq!(extensions.get_repos()[1], "bazboo-repo"); ++ let modules = extensions.modules.unwrap(); ++ assert_eq!(modules.enable.unwrap(), vec!["virt:av"]); ++ assert!(modules.install.is_none()); ++ + let mut input = std::io::BufReader::new(buf.as_bytes()); + let extensions = extensions_load_stream(&mut input, "s390x", &base_rpmdb()).unwrap(); + assert!(extensions.get_os_extension_packages() == vec!["dodo", "dada"]); ++ assert_eq!(extensions.get_repos().len(), 1); ++ assert_eq!(extensions.get_repos()[0], "baserepo"); ++ ++ let mut input = std::io::BufReader::new(buf.as_bytes()); ++ let extensions = extensions_load_stream(&mut input, "ppc64le", &base_rpmdb()).unwrap(); ++ assert_eq!(extensions.get_os_extension_packages(), vec!["foo"]); ++ assert_eq!(extensions.get_repos().len(), 2); ++ assert_eq!(extensions.get_repos()[1], "foo-repo"); ++ let modules = extensions.modules.unwrap(); ++ assert_eq!(modules.enable.unwrap(), vec!["foo:stable", "virt:av"]); ++ assert!(modules.install.is_none()); + } + + #[test] +diff --git a/rust/src/treefile.rs b/rust/src/treefile.rs +index 2c9af278..9f6c6581 100644 +--- a/rust/src/treefile.rs ++++ b/rust/src/treefile.rs +@@ -324,7 +324,7 @@ fn merge_hashset_field<T: Eq + std::hash::Hash>( + } + + /// Merge modules fields. +-fn merge_modules(dest: &mut Option<ModulesConfig>, src: &mut Option<ModulesConfig>) { ++pub(crate) fn merge_modules(dest: &mut Option<ModulesConfig>, src: &mut Option<ModulesConfig>) { + if let Some(mut srcv) = src.take() { + if let Some(mut destv) = dest.take() { + merge_vec_field(&mut destv.enable, &mut srcv.enable); +-- +2.31.1 + diff --git a/0001-extensions-support-enabling-installing-modules.patch b/0001-extensions-support-enabling-installing-modules.patch deleted file mode 100644 index e97bc5a..0000000 --- a/0001-extensions-support-enabling-installing-modules.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 25fcebfeb0e63ce395bdbbf710d4c79888e57130 Mon Sep 17 00:00:00 2001 -From: Jonathan Lebon <jonathan(a)jlebon.com> -Date: Thu, 26 Aug 2021 21:42:21 -0400 -Subject: [PATCH] extensions: support enabling/installing modules - -Fix that gap now since RHCOS does use modular packages in its -extensions. This ended up being easier than I thought because we're just -converting to a treefile underneath. ---- - docs/extensions.md | 11 +++++++++++ - rust/src/extensions.rs | 3 +++ - rust/src/treefile.rs | 2 +- - 3 files changed, 15 insertions(+), 1 deletion(-) - -diff --git a/docs/extensions.md b/docs/extensions.md -index a754b185..9dbc6230 100644 ---- a/docs/extensions.md -+++ b/docs/extensions.md -@@ -30,6 +30,17 @@ extension packages and places them in an output directory. - The format of the `extensions.yaml` file is as follow: - - ```yaml -+# Any additional repos to enable on top of treefile repos -+repos: -+ - myrepo -+ -+# Any modules to enable/install -+modules: -+ enable: -+ - foo:bar -+ install: -+ - baz:boo/default -+ - # The top-level object is a dict. The only supported key - # right now is `extensions`, which is a dict of extension - # names to extension objects. -diff --git a/rust/src/extensions.rs b/rust/src/extensions.rs -index ad2fe19b..6cb1a3a6 100644 ---- a/rust/src/extensions.rs -+++ b/rust/src/extensions.rs -@@ -25,6 +25,8 @@ pub struct Extensions { - extensions: HashMap<String, Extension>, - #[serde(skip_serializing_if = "Option::is_none")] - repos: Option<Vec<String>>, -+ #[serde(skip_serializing_if = "Option::is_none")] -+ modules: Option<crate::treefile::ModulesConfig>, - } - - #[derive(Serialize, Deserialize, Debug)] -@@ -162,6 +164,7 @@ impl Extensions { - repos: Some(repos), - packages: Some(self.get_os_extension_packages()), - releasever: src.parsed.releasever.clone(), -+ modules: self.modules.clone(), - ..Default::default() - }; - Ok(Box::new(Treefile::new_from_config(ret, None)?)) -diff --git a/rust/src/treefile.rs b/rust/src/treefile.rs -index 421f2b6c..eeb21a50 100644 ---- a/rust/src/treefile.rs -+++ b/rust/src/treefile.rs -@@ -1290,7 +1290,7 @@ pub(crate) struct RepoPackage { - pub(crate) packages: Vec<String>, - } - --#[derive(Serialize, Deserialize, Debug, Default, PartialEq, Eq)] -+#[derive(Serialize, Deserialize, Debug, Default, PartialEq, Eq, Clone)] - pub(crate) struct ModulesConfig { - #[serde(skip_serializing_if = "Option::is_none")] - pub(crate) enable: Option<Vec<String>>, --- -2.31.1 - diff --git a/rpm-ostree.spec b/rpm-ostree.spec index ea8f7cd..54aa85c 100644 --- a/rpm-ostree.spec +++ b/rpm-ostree.spec @@ -4,13 +4,16 @@ Summary: Hybrid image/package system Name: rpm-ostree Version: 2021.11 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL:
https://github.com/coreos/rpm-ostree
# This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot" # in the upstream git. It also contains vendored Rust sources. Source0:
https://github.com/coreos/rpm-ostree/releases/download/v%{version}/rpm-ostr…
+# For multiarch openshift/os extensions +Patch0: 0001-extensions-Add-support-for-per-extension-repos-and-m.patch + ExclusiveArch: %{rust_arches} BuildRequires: make @@ -221,6 +224,9 @@ $PYTHON autofiles.py > files.devel \ %files devel -f files.devel %changelog +* Thu Sep 30 2021 Colin Walters <walters(a)verbum.org> - 2021.11-3 +- Backport patch for openshift/os extensions + multiarch + * Fri Sep 24 2021 Colin Walters <walters(a)verbum.org> - 2021.11-2 -
https://github.com/coreos/rpm-ostree/releases/tag/v2021.11
https://src.fedoraproject.org/rpms/rpm-ostree/c/896f07c9c8068905f285235bcc2…
1
0
0
0
walters pushed to rpm-ostree (f34). "Merge branch 'main' into f34"
by notificationsï¼ fedoraproject.org
30 Sep '21
30 Sep '21
Notification time stamped 2021-09-30 20:59:34 UTC From 7b8652205a06cc8391ba71519ffa458227903b06 Mon Sep 17 00:00:00 2001 From: Colin Walters <walters(a)verbum.org> Date: Sep 30 2021 20:59:26 +0000 Subject: Merge branch 'main' into f34 --- diff --git a/0001-extensions-Add-support-for-per-extension-repos-and-m.patch b/0001-extensions-Add-support-for-per-extension-repos-and-m.patch new file mode 100644 index 0000000..0f3dafe --- /dev/null +++ b/0001-extensions-Add-support-for-per-extension-repos-and-m.patch @@ -0,0 +1,155 @@ +From 9b4b19cda21c84fa68496e1874a31044e099d742 Mon Sep 17 00:00:00 2001 +From: Colin Walters <walters(a)verbum.org> +Date: Wed, 29 Sep 2021 14:33:04 -0400 +Subject: [PATCH] extensions: Add support for per-extension repos and modules + +While we support arch-specific extensions today, the state of +repos and modules are global. Which means if a module-using +extension is only available on one architecture (as is the +case in RHEL8/OCP with the `av` module) then it's not +possible to build on other architectures. + +The most powerful mechanism here is the `arch-include` design +that we have in the treefile, but...since we already have +an architecture filter per extension, it's easier to add +repos and modules per extension. + +Note that the repos and modules are still *global* state, so +we're not supporting actively conflicting extensions right now +still. + +Closes:
https://github.com/coreos/rpm-ostree/issues/3150
+--- + docs/extensions.md | 12 +++++++++++ + rust/src/extensions.rs | 46 ++++++++++++++++++++++++++++++++++++++++++ + rust/src/treefile.rs | 2 +- + 3 files changed, 59 insertions(+), 1 deletion(-) + +diff --git a/docs/extensions.md b/docs/extensions.md +index 9dbc6230..bc3d0d7b 100644 +--- a/docs/extensions.md ++++ b/docs/extensions.md +@@ -55,6 +55,18 @@ extensions: + packages: + - strace + - ltrace ++ # Optional additional repos (still added globally). ++ # The reason use per-extension `repos` and `modules` ++ # is that it more closely groups them (where relevant) ++ # and further these are only added after architecture conditionals ++ # apply, so one can use repositories that only exist ++ # on a particular architecture. ++ repos: ++ - sooper-repo ++ # Optional additional modules (this also affects global state) ++ modules: ++ enable: ++ - sooper:latest + # Optional list of architectures on which this extension + # is valid. These are RPM basearches. If omitted, + # defaults to all architectures. +diff --git a/rust/src/extensions.rs b/rust/src/extensions.rs +index e667f886..df37b792 100644 +--- a/rust/src/extensions.rs ++++ b/rust/src/extensions.rs +@@ -34,6 +34,10 @@ pub struct Extensions { + pub struct Extension { + packages: Vec<String>, + #[serde(skip_serializing_if = "Option::is_none")] ++ repos: Option<Vec<String>>, ++ #[serde(skip_serializing_if = "Option::is_none")] ++ modules: Option<crate::treefile::ModulesConfig>, ++ #[serde(skip_serializing_if = "Option::is_none")] + architectures: Option<Vec<String>>, + #[serde(skip_serializing_if = "Option::is_none")] + match_base_evr: Option<String>, +@@ -74,6 +78,14 @@ fn extensions_load_stream( + .collect(); + + for (_, ext) in parsed.extensions.iter_mut() { ++ // Extend the global extension state with the per-extension repos and modules, ++ // after we've done architecture filtering. ++ if let Some(repos) = parsed.repos.as_mut() { ++ repos.extend(ext.repos.take().unwrap_or_default()); ++ } else { ++ parsed.repos = ext.repos.take(); ++ } ++ crate::treefile::merge_modules(&mut parsed.modules, &mut ext.modules); + if ext.kind == ExtensionKind::OsExtension { + for pkg in &ext.packages { + if base_pkgs.contains_key(pkg.as_str()) { +@@ -264,10 +276,17 @@ extensions: + #[test] + fn basearch_filter() { + let buf = r###" ++repos: ++ - baserepo ++modules: ++ enable: ++ - virt:av + extensions: + bazboo: + packages: + - bazboo ++ repos: ++ - bazboo-repo + architectures: + - x86_64 + dodo: +@@ -276,13 +295,40 @@ extensions: + - dada + architectures: + - s390x ++ foo: ++ modules: ++ enable: ++ - foo:stable ++ packages: ++ - foo ++ repos: ++ - foo-repo ++ architectures: ++ - ppc64le + "###; + let mut input = std::io::BufReader::new(buf.as_bytes()); + let extensions = extensions_load_stream(&mut input, "x86_64", &base_rpmdb()).unwrap(); + assert!(extensions.get_os_extension_packages() == vec!["bazboo"]); ++ assert_eq!(extensions.get_repos().len(), 2); ++ assert_eq!(extensions.get_repos()[1], "bazboo-repo"); ++ let modules = extensions.modules.unwrap(); ++ assert_eq!(modules.enable.unwrap(), vec!["virt:av"]); ++ assert!(modules.install.is_none()); ++ + let mut input = std::io::BufReader::new(buf.as_bytes()); + let extensions = extensions_load_stream(&mut input, "s390x", &base_rpmdb()).unwrap(); + assert!(extensions.get_os_extension_packages() == vec!["dodo", "dada"]); ++ assert_eq!(extensions.get_repos().len(), 1); ++ assert_eq!(extensions.get_repos()[0], "baserepo"); ++ ++ let mut input = std::io::BufReader::new(buf.as_bytes()); ++ let extensions = extensions_load_stream(&mut input, "ppc64le", &base_rpmdb()).unwrap(); ++ assert_eq!(extensions.get_os_extension_packages(), vec!["foo"]); ++ assert_eq!(extensions.get_repos().len(), 2); ++ assert_eq!(extensions.get_repos()[1], "foo-repo"); ++ let modules = extensions.modules.unwrap(); ++ assert_eq!(modules.enable.unwrap(), vec!["foo:stable", "virt:av"]); ++ assert!(modules.install.is_none()); + } + + #[test] +diff --git a/rust/src/treefile.rs b/rust/src/treefile.rs +index 2c9af278..9f6c6581 100644 +--- a/rust/src/treefile.rs ++++ b/rust/src/treefile.rs +@@ -324,7 +324,7 @@ fn merge_hashset_field<T: Eq + std::hash::Hash>( + } + + /// Merge modules fields. +-fn merge_modules(dest: &mut Option<ModulesConfig>, src: &mut Option<ModulesConfig>) { ++pub(crate) fn merge_modules(dest: &mut Option<ModulesConfig>, src: &mut Option<ModulesConfig>) { + if let Some(mut srcv) = src.take() { + if let Some(mut destv) = dest.take() { + merge_vec_field(&mut destv.enable, &mut srcv.enable); +-- +2.31.1 + diff --git a/0001-extensions-support-enabling-installing-modules.patch b/0001-extensions-support-enabling-installing-modules.patch deleted file mode 100644 index e97bc5a..0000000 --- a/0001-extensions-support-enabling-installing-modules.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 25fcebfeb0e63ce395bdbbf710d4c79888e57130 Mon Sep 17 00:00:00 2001 -From: Jonathan Lebon <jonathan(a)jlebon.com> -Date: Thu, 26 Aug 2021 21:42:21 -0400 -Subject: [PATCH] extensions: support enabling/installing modules - -Fix that gap now since RHCOS does use modular packages in its -extensions. This ended up being easier than I thought because we're just -converting to a treefile underneath. ---- - docs/extensions.md | 11 +++++++++++ - rust/src/extensions.rs | 3 +++ - rust/src/treefile.rs | 2 +- - 3 files changed, 15 insertions(+), 1 deletion(-) - -diff --git a/docs/extensions.md b/docs/extensions.md -index a754b185..9dbc6230 100644 ---- a/docs/extensions.md -+++ b/docs/extensions.md -@@ -30,6 +30,17 @@ extension packages and places them in an output directory. - The format of the `extensions.yaml` file is as follow: - - ```yaml -+# Any additional repos to enable on top of treefile repos -+repos: -+ - myrepo -+ -+# Any modules to enable/install -+modules: -+ enable: -+ - foo:bar -+ install: -+ - baz:boo/default -+ - # The top-level object is a dict. The only supported key - # right now is `extensions`, which is a dict of extension - # names to extension objects. -diff --git a/rust/src/extensions.rs b/rust/src/extensions.rs -index ad2fe19b..6cb1a3a6 100644 ---- a/rust/src/extensions.rs -+++ b/rust/src/extensions.rs -@@ -25,6 +25,8 @@ pub struct Extensions { - extensions: HashMap<String, Extension>, - #[serde(skip_serializing_if = "Option::is_none")] - repos: Option<Vec<String>>, -+ #[serde(skip_serializing_if = "Option::is_none")] -+ modules: Option<crate::treefile::ModulesConfig>, - } - - #[derive(Serialize, Deserialize, Debug)] -@@ -162,6 +164,7 @@ impl Extensions { - repos: Some(repos), - packages: Some(self.get_os_extension_packages()), - releasever: src.parsed.releasever.clone(), -+ modules: self.modules.clone(), - ..Default::default() - }; - Ok(Box::new(Treefile::new_from_config(ret, None)?)) -diff --git a/rust/src/treefile.rs b/rust/src/treefile.rs -index 421f2b6c..eeb21a50 100644 ---- a/rust/src/treefile.rs -+++ b/rust/src/treefile.rs -@@ -1290,7 +1290,7 @@ pub(crate) struct RepoPackage { - pub(crate) packages: Vec<String>, - } - --#[derive(Serialize, Deserialize, Debug, Default, PartialEq, Eq)] -+#[derive(Serialize, Deserialize, Debug, Default, PartialEq, Eq, Clone)] - pub(crate) struct ModulesConfig { - #[serde(skip_serializing_if = "Option::is_none")] - pub(crate) enable: Option<Vec<String>>, --- -2.31.1 - diff --git a/rpm-ostree.spec b/rpm-ostree.spec index ea8f7cd..54aa85c 100644 --- a/rpm-ostree.spec +++ b/rpm-ostree.spec @@ -4,13 +4,16 @@ Summary: Hybrid image/package system Name: rpm-ostree Version: 2021.11 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL:
https://github.com/coreos/rpm-ostree
# This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot" # in the upstream git. It also contains vendored Rust sources. Source0:
https://github.com/coreos/rpm-ostree/releases/download/v%{version}/rpm-ostr…
+# For multiarch openshift/os extensions +Patch0: 0001-extensions-Add-support-for-per-extension-repos-and-m.patch + ExclusiveArch: %{rust_arches} BuildRequires: make @@ -221,6 +224,9 @@ $PYTHON autofiles.py > files.devel \ %files devel -f files.devel %changelog +* Thu Sep 30 2021 Colin Walters <walters(a)verbum.org> - 2021.11-3 +- Backport patch for openshift/os extensions + multiarch + * Fri Sep 24 2021 Colin Walters <walters(a)verbum.org> - 2021.11-2 -
https://github.com/coreos/rpm-ostree/releases/tag/v2021.11
https://src.fedoraproject.org/rpms/rpm-ostree/c/7b8652205a06cc8391ba71519ff…
1
0
0
0
walters pushed to rpm-ostree (f35). "Backport patch for openshift/os extensions + multiarch"
by notificationsï¼ fedoraproject.org
30 Sep '21
30 Sep '21
Notification time stamped 2021-09-30 20:59:12 UTC From 896f07c9c8068905f285235bcc2c575e882d7e07 Mon Sep 17 00:00:00 2001 From: Colin Walters <walters(a)verbum.org> Date: Sep 30 2021 20:52:33 +0000 Subject: Backport patch for openshift/os extensions + multiarch --- diff --git a/0001-extensions-Add-support-for-per-extension-repos-and-m.patch b/0001-extensions-Add-support-for-per-extension-repos-and-m.patch new file mode 100644 index 0000000..0f3dafe --- /dev/null +++ b/0001-extensions-Add-support-for-per-extension-repos-and-m.patch @@ -0,0 +1,155 @@ +From 9b4b19cda21c84fa68496e1874a31044e099d742 Mon Sep 17 00:00:00 2001 +From: Colin Walters <walters(a)verbum.org> +Date: Wed, 29 Sep 2021 14:33:04 -0400 +Subject: [PATCH] extensions: Add support for per-extension repos and modules + +While we support arch-specific extensions today, the state of +repos and modules are global. Which means if a module-using +extension is only available on one architecture (as is the +case in RHEL8/OCP with the `av` module) then it's not +possible to build on other architectures. + +The most powerful mechanism here is the `arch-include` design +that we have in the treefile, but...since we already have +an architecture filter per extension, it's easier to add +repos and modules per extension. + +Note that the repos and modules are still *global* state, so +we're not supporting actively conflicting extensions right now +still. + +Closes:
https://github.com/coreos/rpm-ostree/issues/3150
+--- + docs/extensions.md | 12 +++++++++++ + rust/src/extensions.rs | 46 ++++++++++++++++++++++++++++++++++++++++++ + rust/src/treefile.rs | 2 +- + 3 files changed, 59 insertions(+), 1 deletion(-) + +diff --git a/docs/extensions.md b/docs/extensions.md +index 9dbc6230..bc3d0d7b 100644 +--- a/docs/extensions.md ++++ b/docs/extensions.md +@@ -55,6 +55,18 @@ extensions: + packages: + - strace + - ltrace ++ # Optional additional repos (still added globally). ++ # The reason use per-extension `repos` and `modules` ++ # is that it more closely groups them (where relevant) ++ # and further these are only added after architecture conditionals ++ # apply, so one can use repositories that only exist ++ # on a particular architecture. ++ repos: ++ - sooper-repo ++ # Optional additional modules (this also affects global state) ++ modules: ++ enable: ++ - sooper:latest + # Optional list of architectures on which this extension + # is valid. These are RPM basearches. If omitted, + # defaults to all architectures. +diff --git a/rust/src/extensions.rs b/rust/src/extensions.rs +index e667f886..df37b792 100644 +--- a/rust/src/extensions.rs ++++ b/rust/src/extensions.rs +@@ -34,6 +34,10 @@ pub struct Extensions { + pub struct Extension { + packages: Vec<String>, + #[serde(skip_serializing_if = "Option::is_none")] ++ repos: Option<Vec<String>>, ++ #[serde(skip_serializing_if = "Option::is_none")] ++ modules: Option<crate::treefile::ModulesConfig>, ++ #[serde(skip_serializing_if = "Option::is_none")] + architectures: Option<Vec<String>>, + #[serde(skip_serializing_if = "Option::is_none")] + match_base_evr: Option<String>, +@@ -74,6 +78,14 @@ fn extensions_load_stream( + .collect(); + + for (_, ext) in parsed.extensions.iter_mut() { ++ // Extend the global extension state with the per-extension repos and modules, ++ // after we've done architecture filtering. ++ if let Some(repos) = parsed.repos.as_mut() { ++ repos.extend(ext.repos.take().unwrap_or_default()); ++ } else { ++ parsed.repos = ext.repos.take(); ++ } ++ crate::treefile::merge_modules(&mut parsed.modules, &mut ext.modules); + if ext.kind == ExtensionKind::OsExtension { + for pkg in &ext.packages { + if base_pkgs.contains_key(pkg.as_str()) { +@@ -264,10 +276,17 @@ extensions: + #[test] + fn basearch_filter() { + let buf = r###" ++repos: ++ - baserepo ++modules: ++ enable: ++ - virt:av + extensions: + bazboo: + packages: + - bazboo ++ repos: ++ - bazboo-repo + architectures: + - x86_64 + dodo: +@@ -276,13 +295,40 @@ extensions: + - dada + architectures: + - s390x ++ foo: ++ modules: ++ enable: ++ - foo:stable ++ packages: ++ - foo ++ repos: ++ - foo-repo ++ architectures: ++ - ppc64le + "###; + let mut input = std::io::BufReader::new(buf.as_bytes()); + let extensions = extensions_load_stream(&mut input, "x86_64", &base_rpmdb()).unwrap(); + assert!(extensions.get_os_extension_packages() == vec!["bazboo"]); ++ assert_eq!(extensions.get_repos().len(), 2); ++ assert_eq!(extensions.get_repos()[1], "bazboo-repo"); ++ let modules = extensions.modules.unwrap(); ++ assert_eq!(modules.enable.unwrap(), vec!["virt:av"]); ++ assert!(modules.install.is_none()); ++ + let mut input = std::io::BufReader::new(buf.as_bytes()); + let extensions = extensions_load_stream(&mut input, "s390x", &base_rpmdb()).unwrap(); + assert!(extensions.get_os_extension_packages() == vec!["dodo", "dada"]); ++ assert_eq!(extensions.get_repos().len(), 1); ++ assert_eq!(extensions.get_repos()[0], "baserepo"); ++ ++ let mut input = std::io::BufReader::new(buf.as_bytes()); ++ let extensions = extensions_load_stream(&mut input, "ppc64le", &base_rpmdb()).unwrap(); ++ assert_eq!(extensions.get_os_extension_packages(), vec!["foo"]); ++ assert_eq!(extensions.get_repos().len(), 2); ++ assert_eq!(extensions.get_repos()[1], "foo-repo"); ++ let modules = extensions.modules.unwrap(); ++ assert_eq!(modules.enable.unwrap(), vec!["foo:stable", "virt:av"]); ++ assert!(modules.install.is_none()); + } + + #[test] +diff --git a/rust/src/treefile.rs b/rust/src/treefile.rs +index 2c9af278..9f6c6581 100644 +--- a/rust/src/treefile.rs ++++ b/rust/src/treefile.rs +@@ -324,7 +324,7 @@ fn merge_hashset_field<T: Eq + std::hash::Hash>( + } + + /// Merge modules fields. +-fn merge_modules(dest: &mut Option<ModulesConfig>, src: &mut Option<ModulesConfig>) { ++pub(crate) fn merge_modules(dest: &mut Option<ModulesConfig>, src: &mut Option<ModulesConfig>) { + if let Some(mut srcv) = src.take() { + if let Some(mut destv) = dest.take() { + merge_vec_field(&mut destv.enable, &mut srcv.enable); +-- +2.31.1 + diff --git a/0001-extensions-support-enabling-installing-modules.patch b/0001-extensions-support-enabling-installing-modules.patch deleted file mode 100644 index e97bc5a..0000000 --- a/0001-extensions-support-enabling-installing-modules.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 25fcebfeb0e63ce395bdbbf710d4c79888e57130 Mon Sep 17 00:00:00 2001 -From: Jonathan Lebon <jonathan(a)jlebon.com> -Date: Thu, 26 Aug 2021 21:42:21 -0400 -Subject: [PATCH] extensions: support enabling/installing modules - -Fix that gap now since RHCOS does use modular packages in its -extensions. This ended up being easier than I thought because we're just -converting to a treefile underneath. ---- - docs/extensions.md | 11 +++++++++++ - rust/src/extensions.rs | 3 +++ - rust/src/treefile.rs | 2 +- - 3 files changed, 15 insertions(+), 1 deletion(-) - -diff --git a/docs/extensions.md b/docs/extensions.md -index a754b185..9dbc6230 100644 ---- a/docs/extensions.md -+++ b/docs/extensions.md -@@ -30,6 +30,17 @@ extension packages and places them in an output directory. - The format of the `extensions.yaml` file is as follow: - - ```yaml -+# Any additional repos to enable on top of treefile repos -+repos: -+ - myrepo -+ -+# Any modules to enable/install -+modules: -+ enable: -+ - foo:bar -+ install: -+ - baz:boo/default -+ - # The top-level object is a dict. The only supported key - # right now is `extensions`, which is a dict of extension - # names to extension objects. -diff --git a/rust/src/extensions.rs b/rust/src/extensions.rs -index ad2fe19b..6cb1a3a6 100644 ---- a/rust/src/extensions.rs -+++ b/rust/src/extensions.rs -@@ -25,6 +25,8 @@ pub struct Extensions { - extensions: HashMap<String, Extension>, - #[serde(skip_serializing_if = "Option::is_none")] - repos: Option<Vec<String>>, -+ #[serde(skip_serializing_if = "Option::is_none")] -+ modules: Option<crate::treefile::ModulesConfig>, - } - - #[derive(Serialize, Deserialize, Debug)] -@@ -162,6 +164,7 @@ impl Extensions { - repos: Some(repos), - packages: Some(self.get_os_extension_packages()), - releasever: src.parsed.releasever.clone(), -+ modules: self.modules.clone(), - ..Default::default() - }; - Ok(Box::new(Treefile::new_from_config(ret, None)?)) -diff --git a/rust/src/treefile.rs b/rust/src/treefile.rs -index 421f2b6c..eeb21a50 100644 ---- a/rust/src/treefile.rs -+++ b/rust/src/treefile.rs -@@ -1290,7 +1290,7 @@ pub(crate) struct RepoPackage { - pub(crate) packages: Vec<String>, - } - --#[derive(Serialize, Deserialize, Debug, Default, PartialEq, Eq)] -+#[derive(Serialize, Deserialize, Debug, Default, PartialEq, Eq, Clone)] - pub(crate) struct ModulesConfig { - #[serde(skip_serializing_if = "Option::is_none")] - pub(crate) enable: Option<Vec<String>>, --- -2.31.1 - diff --git a/rpm-ostree.spec b/rpm-ostree.spec index ea8f7cd..54aa85c 100644 --- a/rpm-ostree.spec +++ b/rpm-ostree.spec @@ -4,13 +4,16 @@ Summary: Hybrid image/package system Name: rpm-ostree Version: 2021.11 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL:
https://github.com/coreos/rpm-ostree
# This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot" # in the upstream git. It also contains vendored Rust sources. Source0:
https://github.com/coreos/rpm-ostree/releases/download/v%{version}/rpm-ostr…
+# For multiarch openshift/os extensions +Patch0: 0001-extensions-Add-support-for-per-extension-repos-and-m.patch + ExclusiveArch: %{rust_arches} BuildRequires: make @@ -221,6 +224,9 @@ $PYTHON autofiles.py > files.devel \ %files devel -f files.devel %changelog +* Thu Sep 30 2021 Colin Walters <walters(a)verbum.org> - 2021.11-3 +- Backport patch for openshift/os extensions + multiarch + * Fri Sep 24 2021 Colin Walters <walters(a)verbum.org> - 2021.11-2 -
https://github.com/coreos/rpm-ostree/releases/tag/v2021.11
https://src.fedoraproject.org/rpms/rpm-ostree/c/896f07c9c8068905f285235bcc2…
1
0
0
0
decathorpe pushed to rust-zvariant (f34). "Update to version 2.9.0; Fixes RHBZ#2009002"
by notificationsï¼ fedoraproject.org
30 Sep '21
30 Sep '21
Notification time stamped 2021-09-30 20:55:01 UTC From c6852b9de7c4c80fd2272903ae4807a0dd86150f Mon Sep 17 00:00:00 2001 From: Fabio Valentini <decathorpe(a)gmail.com> Date: Sep 30 2021 20:12:33 +0000 Subject: Update to version 2.9.0; Fixes RHBZ#2009002 --- diff --git a/.gitignore b/.gitignore index 6486e72..18b2392 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /zvariant-2.6.0.crate /zvariant-2.7.0.crate /zvariant-2.8.0.crate +/zvariant-2.9.0.crate diff --git a/rust-zvariant.spec b/rust-zvariant.spec index 665c4a0..c4b34ce 100644 --- a/rust-zvariant.spec +++ b/rust-zvariant.spec @@ -6,7 +6,7 @@ %global crate zvariant Name: rust-%{crate} -Version: 2.8.0 +Version: 2.9.0 Release: %autorelease Summary: D-Bus & GVariant encoding & decoding diff --git a/sources b/sources index 2c4db57..15ffbda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zvariant-2.8.0.crate) = 9d2afc7abb76141aaa746a7ca7dce1e70593b503d4b4c62dd020949a0f54f79d56aba92b6d70838128e261a2eba64b67fe55e083583f9432fed907d5e4fb5b0a +SHA512 (zvariant-2.9.0.crate) = 57a557ccbf48de00a2221d7944a1084a460c416017405063ed0eea7121ce0c146dabdc641cb98865a35bf31ee13fa2cd3691db3791cf7ade748281a86b68d90c
https://src.fedoraproject.org/rpms/rust-zvariant/c/c6852b9de7c4c80fd2272903…
1
0
0
0
walters pushed to rpm-ostree (main). "Backport patch for openshift/os extensions + multiarch"
by notificationsï¼ fedoraproject.org
30 Sep '21
30 Sep '21
Notification time stamped 2021-09-30 20:52:45 UTC From 896f07c9c8068905f285235bcc2c575e882d7e07 Mon Sep 17 00:00:00 2001 From: Colin Walters <walters(a)verbum.org> Date: Sep 30 2021 20:52:33 +0000 Subject: Backport patch for openshift/os extensions + multiarch --- diff --git a/0001-extensions-Add-support-for-per-extension-repos-and-m.patch b/0001-extensions-Add-support-for-per-extension-repos-and-m.patch new file mode 100644 index 0000000..0f3dafe --- /dev/null +++ b/0001-extensions-Add-support-for-per-extension-repos-and-m.patch @@ -0,0 +1,155 @@ +From 9b4b19cda21c84fa68496e1874a31044e099d742 Mon Sep 17 00:00:00 2001 +From: Colin Walters <walters(a)verbum.org> +Date: Wed, 29 Sep 2021 14:33:04 -0400 +Subject: [PATCH] extensions: Add support for per-extension repos and modules + +While we support arch-specific extensions today, the state of +repos and modules are global. Which means if a module-using +extension is only available on one architecture (as is the +case in RHEL8/OCP with the `av` module) then it's not +possible to build on other architectures. + +The most powerful mechanism here is the `arch-include` design +that we have in the treefile, but...since we already have +an architecture filter per extension, it's easier to add +repos and modules per extension. + +Note that the repos and modules are still *global* state, so +we're not supporting actively conflicting extensions right now +still. + +Closes:
https://github.com/coreos/rpm-ostree/issues/3150
+--- + docs/extensions.md | 12 +++++++++++ + rust/src/extensions.rs | 46 ++++++++++++++++++++++++++++++++++++++++++ + rust/src/treefile.rs | 2 +- + 3 files changed, 59 insertions(+), 1 deletion(-) + +diff --git a/docs/extensions.md b/docs/extensions.md +index 9dbc6230..bc3d0d7b 100644 +--- a/docs/extensions.md ++++ b/docs/extensions.md +@@ -55,6 +55,18 @@ extensions: + packages: + - strace + - ltrace ++ # Optional additional repos (still added globally). ++ # The reason use per-extension `repos` and `modules` ++ # is that it more closely groups them (where relevant) ++ # and further these are only added after architecture conditionals ++ # apply, so one can use repositories that only exist ++ # on a particular architecture. ++ repos: ++ - sooper-repo ++ # Optional additional modules (this also affects global state) ++ modules: ++ enable: ++ - sooper:latest + # Optional list of architectures on which this extension + # is valid. These are RPM basearches. If omitted, + # defaults to all architectures. +diff --git a/rust/src/extensions.rs b/rust/src/extensions.rs +index e667f886..df37b792 100644 +--- a/rust/src/extensions.rs ++++ b/rust/src/extensions.rs +@@ -34,6 +34,10 @@ pub struct Extensions { + pub struct Extension { + packages: Vec<String>, + #[serde(skip_serializing_if = "Option::is_none")] ++ repos: Option<Vec<String>>, ++ #[serde(skip_serializing_if = "Option::is_none")] ++ modules: Option<crate::treefile::ModulesConfig>, ++ #[serde(skip_serializing_if = "Option::is_none")] + architectures: Option<Vec<String>>, + #[serde(skip_serializing_if = "Option::is_none")] + match_base_evr: Option<String>, +@@ -74,6 +78,14 @@ fn extensions_load_stream( + .collect(); + + for (_, ext) in parsed.extensions.iter_mut() { ++ // Extend the global extension state with the per-extension repos and modules, ++ // after we've done architecture filtering. ++ if let Some(repos) = parsed.repos.as_mut() { ++ repos.extend(ext.repos.take().unwrap_or_default()); ++ } else { ++ parsed.repos = ext.repos.take(); ++ } ++ crate::treefile::merge_modules(&mut parsed.modules, &mut ext.modules); + if ext.kind == ExtensionKind::OsExtension { + for pkg in &ext.packages { + if base_pkgs.contains_key(pkg.as_str()) { +@@ -264,10 +276,17 @@ extensions: + #[test] + fn basearch_filter() { + let buf = r###" ++repos: ++ - baserepo ++modules: ++ enable: ++ - virt:av + extensions: + bazboo: + packages: + - bazboo ++ repos: ++ - bazboo-repo + architectures: + - x86_64 + dodo: +@@ -276,13 +295,40 @@ extensions: + - dada + architectures: + - s390x ++ foo: ++ modules: ++ enable: ++ - foo:stable ++ packages: ++ - foo ++ repos: ++ - foo-repo ++ architectures: ++ - ppc64le + "###; + let mut input = std::io::BufReader::new(buf.as_bytes()); + let extensions = extensions_load_stream(&mut input, "x86_64", &base_rpmdb()).unwrap(); + assert!(extensions.get_os_extension_packages() == vec!["bazboo"]); ++ assert_eq!(extensions.get_repos().len(), 2); ++ assert_eq!(extensions.get_repos()[1], "bazboo-repo"); ++ let modules = extensions.modules.unwrap(); ++ assert_eq!(modules.enable.unwrap(), vec!["virt:av"]); ++ assert!(modules.install.is_none()); ++ + let mut input = std::io::BufReader::new(buf.as_bytes()); + let extensions = extensions_load_stream(&mut input, "s390x", &base_rpmdb()).unwrap(); + assert!(extensions.get_os_extension_packages() == vec!["dodo", "dada"]); ++ assert_eq!(extensions.get_repos().len(), 1); ++ assert_eq!(extensions.get_repos()[0], "baserepo"); ++ ++ let mut input = std::io::BufReader::new(buf.as_bytes()); ++ let extensions = extensions_load_stream(&mut input, "ppc64le", &base_rpmdb()).unwrap(); ++ assert_eq!(extensions.get_os_extension_packages(), vec!["foo"]); ++ assert_eq!(extensions.get_repos().len(), 2); ++ assert_eq!(extensions.get_repos()[1], "foo-repo"); ++ let modules = extensions.modules.unwrap(); ++ assert_eq!(modules.enable.unwrap(), vec!["foo:stable", "virt:av"]); ++ assert!(modules.install.is_none()); + } + + #[test] +diff --git a/rust/src/treefile.rs b/rust/src/treefile.rs +index 2c9af278..9f6c6581 100644 +--- a/rust/src/treefile.rs ++++ b/rust/src/treefile.rs +@@ -324,7 +324,7 @@ fn merge_hashset_field<T: Eq + std::hash::Hash>( + } + + /// Merge modules fields. +-fn merge_modules(dest: &mut Option<ModulesConfig>, src: &mut Option<ModulesConfig>) { ++pub(crate) fn merge_modules(dest: &mut Option<ModulesConfig>, src: &mut Option<ModulesConfig>) { + if let Some(mut srcv) = src.take() { + if let Some(mut destv) = dest.take() { + merge_vec_field(&mut destv.enable, &mut srcv.enable); +-- +2.31.1 + diff --git a/0001-extensions-support-enabling-installing-modules.patch b/0001-extensions-support-enabling-installing-modules.patch deleted file mode 100644 index e97bc5a..0000000 --- a/0001-extensions-support-enabling-installing-modules.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 25fcebfeb0e63ce395bdbbf710d4c79888e57130 Mon Sep 17 00:00:00 2001 -From: Jonathan Lebon <jonathan(a)jlebon.com> -Date: Thu, 26 Aug 2021 21:42:21 -0400 -Subject: [PATCH] extensions: support enabling/installing modules - -Fix that gap now since RHCOS does use modular packages in its -extensions. This ended up being easier than I thought because we're just -converting to a treefile underneath. ---- - docs/extensions.md | 11 +++++++++++ - rust/src/extensions.rs | 3 +++ - rust/src/treefile.rs | 2 +- - 3 files changed, 15 insertions(+), 1 deletion(-) - -diff --git a/docs/extensions.md b/docs/extensions.md -index a754b185..9dbc6230 100644 ---- a/docs/extensions.md -+++ b/docs/extensions.md -@@ -30,6 +30,17 @@ extension packages and places them in an output directory. - The format of the `extensions.yaml` file is as follow: - - ```yaml -+# Any additional repos to enable on top of treefile repos -+repos: -+ - myrepo -+ -+# Any modules to enable/install -+modules: -+ enable: -+ - foo:bar -+ install: -+ - baz:boo/default -+ - # The top-level object is a dict. The only supported key - # right now is `extensions`, which is a dict of extension - # names to extension objects. -diff --git a/rust/src/extensions.rs b/rust/src/extensions.rs -index ad2fe19b..6cb1a3a6 100644 ---- a/rust/src/extensions.rs -+++ b/rust/src/extensions.rs -@@ -25,6 +25,8 @@ pub struct Extensions { - extensions: HashMap<String, Extension>, - #[serde(skip_serializing_if = "Option::is_none")] - repos: Option<Vec<String>>, -+ #[serde(skip_serializing_if = "Option::is_none")] -+ modules: Option<crate::treefile::ModulesConfig>, - } - - #[derive(Serialize, Deserialize, Debug)] -@@ -162,6 +164,7 @@ impl Extensions { - repos: Some(repos), - packages: Some(self.get_os_extension_packages()), - releasever: src.parsed.releasever.clone(), -+ modules: self.modules.clone(), - ..Default::default() - }; - Ok(Box::new(Treefile::new_from_config(ret, None)?)) -diff --git a/rust/src/treefile.rs b/rust/src/treefile.rs -index 421f2b6c..eeb21a50 100644 ---- a/rust/src/treefile.rs -+++ b/rust/src/treefile.rs -@@ -1290,7 +1290,7 @@ pub(crate) struct RepoPackage { - pub(crate) packages: Vec<String>, - } - --#[derive(Serialize, Deserialize, Debug, Default, PartialEq, Eq)] -+#[derive(Serialize, Deserialize, Debug, Default, PartialEq, Eq, Clone)] - pub(crate) struct ModulesConfig { - #[serde(skip_serializing_if = "Option::is_none")] - pub(crate) enable: Option<Vec<String>>, --- -2.31.1 - diff --git a/rpm-ostree.spec b/rpm-ostree.spec index ea8f7cd..54aa85c 100644 --- a/rpm-ostree.spec +++ b/rpm-ostree.spec @@ -4,13 +4,16 @@ Summary: Hybrid image/package system Name: rpm-ostree Version: 2021.11 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL:
https://github.com/coreos/rpm-ostree
# This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot" # in the upstream git. It also contains vendored Rust sources. Source0:
https://github.com/coreos/rpm-ostree/releases/download/v%{version}/rpm-ostr…
+# For multiarch openshift/os extensions +Patch0: 0001-extensions-Add-support-for-per-extension-repos-and-m.patch + ExclusiveArch: %{rust_arches} BuildRequires: make @@ -221,6 +224,9 @@ $PYTHON autofiles.py > files.devel \ %files devel -f files.devel %changelog +* Thu Sep 30 2021 Colin Walters <walters(a)verbum.org> - 2021.11-3 +- Backport patch for openshift/os extensions + multiarch + * Fri Sep 24 2021 Colin Walters <walters(a)verbum.org> - 2021.11-2 -
https://github.com/coreos/rpm-ostree/releases/tag/v2021.11
https://src.fedoraproject.org/rpms/rpm-ostree/c/896f07c9c8068905f285235bcc2…
1
0
0
0
catanzaro pushed to libwpe (rawhide). "Forgot to add the autochangelog"
by notificationsï¼ fedoraproject.org
30 Sep '21
30 Sep '21
Notification time stamped 2021-09-30 20:51:45 UTC From 2d363ddff6cdeff15dfaf3404ce07d5924b01227 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro <mcatanzaro(a)redhat.com> Date: Sep 30 2021 20:51:11 +0000 Subject: Forgot to add the autochangelog --- diff --git a/libwpe.spec b/libwpe.spec index 927e8e3..1e0c830 100644 --- a/libwpe.spec +++ b/libwpe.spec @@ -51,4 +51,4 @@ files for developing applications that use %{name}. %{_libdir}/pkgconfig/wpe-1.0.pc %changelog - +%autochangelog
https://src.fedoraproject.org/rpms/libwpe/c/2d363ddff6cdeff15dfaf3404ce07d5…
1
0
0
0
← Newer
1
...
4
5
6
7
8
9
10
...
1918
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
Results per page:
10
25
50
100
200