March 2022 - openSUSE Commits - openSUSE Mailing Lists

commit parsec-tool for openSUSE:Factory
by Source-Sync 31 Mar '22

31 Mar '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package parsec-tool for openSUSE:Factory checked in at 2022-03-31 17:18:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/parsec-tool (Old) and /work/SRC/openSUSE:Factory/.parsec-tool.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "parsec-tool" Thu Mar 31 17:18:38 2022 rev:8 rq:966124 version:0.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/parsec-tool/parsec-tool.changes 2022-03-21 20:13:15.740514256 +0100 +++ /work/SRC/openSUSE:Factory/.parsec-tool.new.1900/parsec-tool.changes 2022-03-31 17:19:12.184923949 +0200 @@ -1,0 +2,5 @@ +Thu Mar 31 06:27:30 UTC 2022 - Guillaume GARDET <guillaume.gardet(a)opensuse.org> + +- Disable build on x86 to follow parsec package + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ parsec-tool.spec ++++++ --- /var/tmp/diff_new_pack.y7EEfF/_old 2022-03-31 17:19:12.904915828 +0200 +++ /var/tmp/diff_new_pack.y7EEfF/_new 2022-03-31 17:19:12.908915783 +0200 @@ -31,7 +31,7 @@ BuildRequires: protobuf-devel BuildRequires: rust-packaging Requires: parsec -ExcludeArch: armv6l armv6hl +ExcludeArch: %{ix86} armv6l armv6hl %description A tool to communicate with the Parsec service on the command-line.

1 0

commit parsec for openSUSE:Factory
by Source-Sync 31 Mar '22

31 Mar '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package parsec for openSUSE:Factory checked in at 2022-03-31 17:18:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/parsec (Old) and /work/SRC/openSUSE:Factory/.parsec.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "parsec" Thu Mar 31 17:18:37 2022 rev:14 rq:966123 version:1.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/parsec/parsec.changes 2022-03-21 20:13:17.540515993 +0100 +++ /work/SRC/openSUSE:Factory/.parsec.new.1900/parsec.changes 2022-03-31 17:19:10.340944749 +0200 @@ -1,0 +2,7 @@ +Thu Mar 31 06:17:05 UTC 2022 - Guillaume GARDET <guillaume.gardet(a)opensuse.org> + +- Update to 1.0.0: + * Update changelog file only +- Disable build on x86 since the build fails + +------------------------------------------------------------------- Old: ---- parsec-1.0.0-rc3.tar.gz New: ---- parsec-1.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ parsec.spec ++++++ --- /var/tmp/diff_new_pack.t16Anv/_old 2022-03-31 17:19:11.836927875 +0200 +++ /var/tmp/diff_new_pack.t16Anv/_new 2022-03-31 17:19:11.840927830 +0200 @@ -17,11 +17,11 @@ %global rustflags '-Clink-arg=-Wl,-z,relro,-z,now' -%define archive_version 1.0.0-rc3 +%define archive_version 1.0.0 %{?systemd_ordering} Name: parsec -Version: 1.0.0~rc3 +Version: 1.0.0 Release: 0 Summary: Platform AbstRaction for SECurity License: Apache-2.0 @@ -55,7 +55,7 @@ Requires: tpm2-0-tss # Without libtss2-tcti-device0 parsec fails to start TPM properly Requires: libtss2-tcti-device0 -ExcludeArch: armv6l armv6hl +ExcludeArch: %{ix86} armv6l armv6hl %description PARSEC is the Platform AbstRaction for SECurity, an open-source initiative to provide ++++++ _service ++++++ --- /var/tmp/diff_new_pack.t16Anv/_old 2022-03-31 17:19:11.880927379 +0200 +++ /var/tmp/diff_new_pack.t16Anv/_new 2022-03-31 17:19:11.884927333 +0200 @@ -1,7 +1,7 @@ <services> <service name="cargo_vendor" mode="disabled"> <param name="compression">xz</param> - <param name="srcdir">parsec-1.0.0-rc3</param> + <param name="srcdir">parsec-1.0.0</param> </service> </services> ++++++ parsec-1.0.0-rc3.tar.gz -> parsec-1.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parsec-1.0.0-rc3/CHANGELOG.md new/parsec-1.0.0/CHANGELOG.md --- old/parsec-1.0.0-rc3/CHANGELOG.md 2022-03-21 12:21:38.000000000 +0100 +++ new/parsec-1.0.0/CHANGELOG.md 2022-03-30 16:16:03.000000000 +0200 @@ -1,6 +1,32 @@ # Changelog -## [1.0.0-rc1](https://github.com/parallaxsecond/parsec/tree/1.0.0-rc1) (2022-02-16) +## [1.0.0](https://github.com/parallaxsecond/parsec/tree/1.0.0) (2022-03-21) + +### [1.0.0-rc3](https://github.com/parallaxsecond/parsec/tree/1.0.0-rc3) (2022-03-21) + +[Full Changelog](https://github.com/parallaxsecond/parsec/compare/1.0.0...1.0.0-r… + +**Fixed bugs:** + +- Cargo audit failing [\#544](https://github.com/parallaxsecond/parsec/issues/544) + +**Merged pull requests:** + +- Prepare for Release Candidate 3 [\#592](https://github.com/parallaxsecond/parsec/pull/592) ([ionut-arm](https://github.com/ionut-arm)) + +### [1.0.0-rc2](https://github.com/parallaxsecond/parsec/tree/1.0.0-rc2) (2022-03-02) + +[Full Changelog](https://github.com/parallaxsecond/parsec/compare/1.0.0-rc1...1.0… + +**Implemented enhancements:** + +- Updates for Release Candidate 2 [\#584](https://github.com/parallaxsecond/parsec/pull/584) ([ionut-arm](https://github.com/ionut-arm)) + +**Closed issues:** + +- Update the Parsec Book to include SQLiteKeyInfoManager [\#532](https://github.com/parallaxsecond/parsec/issues/532) + +### [1.0.0-rc1](https://github.com/parallaxsecond/parsec/tree/1.0.0-rc1) (2022-02-16) [Full Changelog](https://github.com/parallaxsecond/parsec/compare/0.8.1...1.0.0-r… @@ -41,6 +67,7 @@ **Closed issues:** +- Align with stable TSS crate [\#567](https://github.com/parallaxsecond/parsec/issues/567) - Stable 0.8.1 release depends on tss-esapi alpha [\#527](https://github.com/parallaxsecond/parsec/issues/527) - Create E2E tests for SQLite KIM [\#516](https://github.com/parallaxsecond/parsec/issues/516) - Switch to dynamic key names in tests [\#453](https://github.com/parallaxsecond/parsec/issues/453) @@ -48,6 +75,7 @@ **Merged pull requests:** +- Update Changelog and service version no. [\#583](https://github.com/parallaxsecond/parsec/pull/583) ([ionut-arm](https://github.com/ionut-arm)) - Bump bindgen dependency version [\#582](https://github.com/parallaxsecond/parsec/pull/582) ([ionut-arm](https://github.com/ionut-arm)) - Bump SQLite dependency [\#581](https://github.com/parallaxsecond/parsec/pull/581) ([ionut-arm](https://github.com/ionut-arm)) - \[CryptoAuthLib provider\] PsaRawKeyAgreement operation implementation [\#578](https://github.com/parallaxsecond/parsec/pull/578) ([akazimierskigl](https://github.com/akazimierskigl)) @@ -266,7 +294,7 @@ **Fixed bugs:** - Move the spiffe related features in its own branch [\#327](https://github.com/parallaxsecond/parsec/issues/327) -- Resolve default implementation issue for `list\_keys` in `Provide` [\#312](https://github.com/parallaxsecond/parsec/issues/312) +- Resolve default implementation issue for `list_keys` in `Provide` [\#312](https://github.com/parallaxsecond/parsec/issues/312) - ListKeys should only be callable on the Core provider [\#310](https://github.com/parallaxsecond/parsec/issues/310) - Service should not start if some components weren't built successfully [\#297](https://github.com/parallaxsecond/parsec/issues/297) - No changelog for the releases [\#278](https://github.com/parallaxsecond/parsec/issues/278) @@ -369,7 +397,7 @@ - Import private key support for TPM provider [\#243](https://github.com/parallaxsecond/parsec/pull/243) ([joechrisellis](https://github.com/joechrisellis)) - Allow software operations in PKCS11 provider [\#241](https://github.com/parallaxsecond/parsec/pull/241) ([ionut-arm](https://github.com/ionut-arm)) - Improve key metadata handling [\#240](https://github.com/parallaxsecond/parsec/pull/240) ([ionut-arm](https://github.com/ionut-arm)) -- Add support for `psa\_generate\_random` operation for MbedCrypto provider [\#208](https://github.com/parallaxsecond/parsec/pull/208) ([joechrisellis](https://github.com/joechrisellis)) +- Add support for `psa_generate_random` operation for MbedCrypto provider [\#208](https://github.com/parallaxsecond/parsec/pull/208) ([joechrisellis](https://github.com/joechrisellis)) **Fixed bugs:** @@ -377,7 +405,7 @@ - Fix attribute conversion in PKCS11 provider [\#254](https://github.com/parallaxsecond/parsec/pull/254) ([ionut-arm](https://github.com/ionut-arm)) - Fix sign attribute in PKCS11 [\#252](https://github.com/parallaxsecond/parsec/pull/252) ([ionut-arm](https://github.com/ionut-arm)) - Add Uuid from the interface directly [\#242](https://github.com/parallaxsecond/parsec/pull/242) ([hug-dev](https://github.com/hug-dev)) -- Add `buffer\_size\_limit` config option for providers [\#233](https://github.com/parallaxsecond/parsec/pull/233) ([joechrisellis](https://github.com/joechrisellis)) +- Add `buffer_size_limit` config option for providers [\#233](https://github.com/parallaxsecond/parsec/pull/233) ([joechrisellis](https://github.com/joechrisellis)) **Security fixes:** ++++++ vendor.tar.xz ++++++ /work/SRC/openSUSE:Factory/parsec/vendor.tar.xz /work/SRC/openSUSE:Factory/.parsec.new.1900/vendor.tar.xz differ: char 26, line 1

1 0

commit openSUSE-release-tools for openSUSE:Factory
by Source-Sync 31 Mar '22

31 Mar '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openSUSE-release-tools for openSUSE:Factory checked in at 2022-03-31 17:18:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old) and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openSUSE-release-tools" Thu Mar 31 17:18:36 2022 rev:415 rq:966127 version:20220330.1114fbdd Changes: -------- --- /work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes 2022-03-30 20:36:04.949323780 +0200 +++ /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1900/openSUSE-release-tools.changes 2022-03-31 17:19:08.060970467 +0200 @@ -1,0 +2,26 @@ +Wed Mar 30 14:22:36 UTC 2022 - opensuse-releaseteam(a)opensuse.org + +- Update to version 20220330.1114fbdd: + * Add new aggregation periods to Grafana dashboard + +------------------------------------------------------------------- +Wed Mar 30 09:29:04 UTC 2022 - opensuse-releaseteam(a)opensuse.org + +- Update to version 20220330.68fa08aa: + * Remove obsolete Leap 15.2 announcer config + * Remove obsolete Leap 15.2 scheduling + +------------------------------------------------------------------- +Wed Mar 30 09:16:56 UTC 2022 - opensuse-releaseteam(a)opensuse.org + +- Update to version 20220330.a2fa6583: + * dist: no longer package check_source_in_factory + * Fix adi projects having no archs + +------------------------------------------------------------------- +Wed Mar 30 07:57:37 UTC 2022 - opensuse-releaseteam(a)opensuse.org + +- Update to version 20220330.adef152c: + * Merge check_source_in_factory into check_tags_in_requests.py + +------------------------------------------------------------------- Old: ---- openSUSE-release-tools-20220330.39d635d6.obscpio New: ---- openSUSE-release-tools-20220330.1114fbdd.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-release-tools.spec ++++++ --- /var/tmp/diff_new_pack.ZVbvKR/_old 2022-03-31 17:19:09.524953953 +0200 +++ /var/tmp/diff_new_pack.ZVbvKR/_new 2022-03-31 17:19:09.532953863 +0200 @@ -20,7 +20,7 @@ %define source_dir openSUSE-release-tools %define announcer_filename factory-package-news Name: openSUSE-release-tools -Version: 20220330.39d635d6 +Version: 20220330.1114fbdd Release: 0 Summary: Tools to aid in staging and release work for openSUSE/SUSE License: GPL-2.0-or-later AND MIT @@ -356,7 +356,6 @@ %{_bindir}/osrt-build-fail-reminder %{_bindir}/osrt-checknewer %{_bindir}/osrt-check_bugowner -%{_bindir}/osrt-check_source_in_factory %{_bindir}/osrt-check_tags_in_requests %{_bindir}/osrt-compare_pkglist %{_bindir}/osrt-container_cleaner ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.ZVbvKR/_old 2022-03-31 17:19:09.572953412 +0200 +++ /var/tmp/diff_new_pack.ZVbvKR/_new 2022-03-31 17:19:09.576953367 +0200 @@ -1,7 +1,7 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param> - <param name="changesrevision">c4af75db585d384f660153b1c1f3867bc92fcda1</param> + <param name="changesrevision">1114fbdd30d0d4506ca3767d2e5d563bf076304f</param> </service> </servicedata> ++++++ openSUSE-release-tools-20220330.39d635d6.obscpio -> openSUSE-release-tools-20220330.1114fbdd.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20220330.39d635d6/CONTENTS.md new/openSUSE-release-tools-20220330.1114fbdd/CONTENTS.md --- old/openSUSE-release-tools-20220330.39d635d6/CONTENTS.md 2022-03-30 09:07:58.000000000 +0200 +++ new/openSUSE-release-tools-20220330.1114fbdd/CONTENTS.md 2022-03-30 16:20:50.000000000 +0200 @@ -224,17 +224,6 @@ * Package: openSUSE-release-tools-abichecker * Usage: gocd? -#### check_source_in_factory - -Checks if the sources of a submission are either in Factory or a request for Factory with the same -sources exist. Not used as a standalone bot anymore, but called internally from -check_tags_in_requests. - -* Sources: [check_source_in_factory.py](check_source_in_factory.py) -* Documentation: [docs/factory-source.asciidoc](docs/factory-source.asciidoc) -* Package: openSUSE-release-tools -* Usage: used from other bots (check_tags_in_requests) - #### openqa-maintenance OpenQA stuff, not sure about the details. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20220330.39d635d6/check_maintenance_incidents.py new/openSUSE-release-tools-20220330.1114fbdd/check_maintenance_incidents.py --- old/openSUSE-release-tools-20220330.39d635d6/check_maintenance_incidents.py 2022-03-30 09:07:58.000000000 +0200 +++ new/openSUSE-release-tools-20220330.1114fbdd/check_maintenance_incidents.py 2022-03-30 16:20:50.000000000 +0200 @@ -113,11 +113,6 @@ self._check_maintainer_review_needed(req, a) - if a.tgt_releaseproject.startswith("openSUSE:Backports:") \ - and not a.tgt_releaseproject.startswith("openSUSE:Backports:SLE-15-SP3") \ - and not a.tgt_releaseproject.startswith("openSUSE:Backports:SLE-15-SP4"): - self.add_factory_source = True - return True def check_action_submit(self, req, a): @@ -132,23 +127,10 @@ return True def check_one_request(self, req): - self.add_factory_source = False self.needs_maintainer_review = set() ret = ReviewBot.ReviewBot.check_one_request(self, req) - # check if factory-source is already a reviewer - if self.add_factory_source: - for r in req.reviews: - if r.by_user == 'factory-source': - self.add_factory_source = False - self.logger.debug("factory-source already is a reviewer") - break - - if self.add_factory_source: - self.logger.debug("%s needs review by factory-source" % req.reqid) - self.add_review(req, by_user='factory-source') - if self.needs_maintainer_review: for p in self.needs_maintainer_review: self.add_devel_project_review(req, p) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20220330.39d635d6/check_source_in_factory.py new/openSUSE-release-tools-20220330.1114fbdd/check_source_in_factory.py --- old/openSUSE-release-tools-20220330.39d635d6/check_source_in_factory.py 2022-03-30 09:07:58.000000000 +0200 +++ new/openSUSE-release-tools-20220330.1114fbdd/check_source_in_factory.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,170 +0,0 @@ -#!/usr/bin/python3 - -import sys -import osc.conf -import osc.core -from urllib.error import HTTPError, URLError -import ReviewBot - - -class FactorySourceChecker(ReviewBot.ReviewBot): - """ This review bot is obsolete since the introduction of better - alternatives like origin-manager. But it's kept because other bots like - TagChecker (check_tags_in_request) still call this bot as part of their - implementation. - - This review bot was used in the past to check if the sources of a submission - are either in Factory or a request for Factory with the same sources exist. - If the latter a request is only accepted if the Factory request is reviewed - positive.""" - - def __init__(self, *args, **kwargs): - ReviewBot.ReviewBot.__init__(self, *args, **kwargs) - self.factory = ["openSUSE:Factory"] - self.review_messages = {'accepted': 'ok', 'declined': 'the package needs to be accepted in Factory first'} - self.history_limit = 5 - - def check_source_submission(self, src_project, src_package, src_rev, target_project, target_package): - super(FactorySourceChecker, self).check_source_submission( - src_project, src_package, src_rev, target_project, target_package) - src_srcinfo = self.get_sourceinfo(src_project, src_package, src_rev) - if src_srcinfo is None: - # source package does not exist? - # handle here to avoid crashing on the next line - self.logger.info("Could not get source info for %s/%s@%s" % (src_project, src_package, src_rev)) - return False - projects = self._package_get_upstream_projects(target_package) - if projects is None: - self.logger.error("no upstream project found for {}, can't check".format(target_package)) - return False - - self.review_messages['declined'] = 'the package needs to be accepted in {} first'.format(' or '.join(projects)) - for project in projects: - self.logger.info("Checking in project %s" % project) - good = self._check_matching_srcmd5(project, target_package, src_srcinfo.verifymd5, self.history_limit) - if good: - self.logger.info("{} is in {}".format(target_package, project)) - return good - - good = self._check_requests(project, target_package, src_srcinfo.verifymd5) - if good: - self.logger.info("{} already reviewed for {}".format(target_package, project)) - - if not good: - self.logger.info('{} failed source submission check'.format(target_package)) - - return good - - def _package_get_upstream_projects(self, package): - """ return list of projects where the specified package is supposed to come - from. Either by lookup table or self.factory """ - projects = [] - for prj in self.factory: - r = self.lookup.get(prj, package) - if r: - projects.append(r) - - if not projects: - projects = self.factory - - return projects - - def _check_requests(self, project, package, rev): - self.logger.debug("checking requests") - prjprefix = '' - apiurl = self.apiurl - sr = 'sr' - try: - if self.config.project_namespace_api_map: - for prefix, url, srprefix in self.config.project_namespace_api_map: - if project.startswith(prefix): - apiurl = url - prjprefix = prefix - project = project[len(prefix):] - sr = srprefix - break - requests = osc.core.get_request_list(apiurl, project, package, None, ['new', 'review'], 'submit') - except (HTTPError, URLError): - self.logger.error("caught exception while checking %s/%s", project, package) - return None - - def srref(reqid): - return '#'.join((sr, reqid)) - - for req in requests: - for a in req.actions: - si = self.get_sourceinfo(prjprefix + a.src_project, a.src_package, a.src_rev) - self.logger.debug("rq %s: %s/%s@%s" % (req.reqid, prjprefix + - a.src_project, a.src_package, si.verifymd5)) - if si.verifymd5 == rev: - if req.state.name == 'new': - self.logger.info("%s ok", srref(req.reqid)) - return True - elif req.state.name == 'review': - self.logger.debug("%s still in review", srref(req.reqid)) - if not req.reviews: - self.logger.error("%s in state review but no reviews?", srref(req.reqid)) - return False - for r in req.reviews: - if r.state == 'new': - if r.by_project and r.by_project.startswith('openSUSE:Factory:Staging:'): - self.logger.info("%s review by %s ok", srref(req.reqid), r.by_project) - continue - - if r.by_user == 'repo-checker': - self.logger.info('%s review by %s ok', srref(req.reqid), r.by_user) - continue - - if r.state != 'accepted': - if r.by_user: - self.logger.info("%s waiting for review by %s", srref(req.reqid), r.by_user) - elif r.by_group: - self.logger.info("%s waiting for review by %s", srref(req.reqid), r.by_group) - elif r.by_project: - if r.by_package: - self.logger.info("%s waiting for review by %s/%s", - srref(req.reqid), r.by_project, r.by_package) - else: - self.logger.info("%s waiting for review by %s", srref(req.reqid), r.by_project) - return None - return True - else: - self.logger.error("%s in state %s not expected", srref(req.reqid), req.state.name) - return None - else: - self.logger.info("%s to %s has different sources", srref(req.reqid), project) - return False - - -class CommandLineInterface(ReviewBot.CommandLineInterface): - - def __init__(self, *args, **kwargs): - ReviewBot.CommandLineInterface.__init__(self, args, kwargs) - self.clazz = FactorySourceChecker - - def get_optparser(self): - parser = ReviewBot.CommandLineInterface.get_optparser(self) - parser.add_option("--factory", metavar="project", action="append", - help=("Project to check source against. Use multiple times to check more than one project. " - "[default: openSUSE:Factory]")) - parser.add_option("--lookup", metavar="project", help="use lookup file") - parser.add_option("--limit", metavar="limit", help="how many revisions back to check. [default: 5]") - - return parser - - def setup_checker(self): - bot = ReviewBot.CommandLineInterface.setup_checker(self) - - if self.options.factory: - bot.factory = self.options.factory - if self.options.lookup: - bot.parse_lookup(self.options.lookup) - if self.options.limit: - bot.history_limit = self.options.limit - - return bot - - -if __name__ == "__main__": - app = CommandLineInterface() - sys.exit(app.main()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20220330.39d635d6/check_tags_in_requests.py new/openSUSE-release-tools-20220330.1114fbdd/check_tags_in_requests.py --- old/openSUSE-release-tools-20220330.39d635d6/check_tags_in_requests.py 2022-03-30 09:07:58.000000000 +0200 +++ new/openSUSE-release-tools-20220330.1114fbdd/check_tags_in_requests.py 2022-03-30 16:20:50.000000000 +0200 @@ -9,7 +9,137 @@ import ReviewBot -import check_source_in_factory + +class FactorySourceChecker(ReviewBot.ReviewBot): + """ This review bot is obsolete since the introduction of better + alternatives like origin-manager. But it's kept because other bots like + TagChecker (check_tags_in_request) still call this bot as part of their + implementation. + + This review bot was used in the past to check if the sources of a submission + are either in Factory or a request for Factory with the same sources exist. + If the latter a request is only accepted if the Factory request is reviewed + positive.""" + + def __init__(self, *args, **kwargs): + ReviewBot.ReviewBot.__init__(self, *args, **kwargs) + self.factory = ["openSUSE:Factory"] + self.review_messages = {'accepted': 'ok', 'declined': 'the package needs to be accepted in Factory first'} + self.history_limit = 5 + + def check_source_submission(self, src_project, src_package, src_rev, target_project, target_package): + super(FactorySourceChecker, self).check_source_submission( + src_project, src_package, src_rev, target_project, target_package) + src_srcinfo = self.get_sourceinfo(src_project, src_package, src_rev) + if src_srcinfo is None: + # source package does not exist? + # handle here to avoid crashing on the next line + self.logger.info("Could not get source info for %s/%s@%s" % (src_project, src_package, src_rev)) + return False + projects = self._package_get_upstream_projects(target_package) + if projects is None: + self.logger.error("no upstream project found for {}, can't check".format(target_package)) + return False + + self.review_messages['declined'] = 'the package needs to be accepted in {} first'.format(' or '.join(projects)) + for project in projects: + self.logger.info("Checking in project %s" % project) + good = self._check_matching_srcmd5(project, target_package, src_srcinfo.verifymd5, self.history_limit) + if good: + self.logger.info("{} is in {}".format(target_package, project)) + return good + + good = self._check_requests(project, target_package, src_srcinfo.verifymd5) + if good: + self.logger.info("{} already reviewed for {}".format(target_package, project)) + + if not good: + self.logger.info('{} failed source submission check'.format(target_package)) + + return good + + def _check_requests(self, project, package, rev): + self.logger.debug("checking requests") + prjprefix = '' + apiurl = self.apiurl + sr = 'sr' + try: + if self.config.project_namespace_api_map: + for prefix, url, srprefix in self.config.project_namespace_api_map: + if project.startswith(prefix): + apiurl = url + prjprefix = prefix + project = project[len(prefix):] + sr = srprefix + break + requests = osc.core.get_request_list(apiurl, project, package, None, ['new', 'review'], 'submit') + except (HTTPError, URLError): + self.logger.error("caught exception while checking %s/%s", project, package) + return None + + def srref(reqid): + return '#'.join((sr, reqid)) + + for req in requests: + for a in req.actions: + si = self.get_sourceinfo(prjprefix + a.src_project, a.src_package, a.src_rev) + self.logger.debug("rq %s: %s/%s@%s" % (req.reqid, prjprefix + + a.src_project, a.src_package, si.verifymd5)) + if si.verifymd5 != rev: + self.logger.info("%s to %s has different sources", srref(req.reqid), project) + continue + + if req.state.name == 'new': + self.logger.info("%s ok", srref(req.reqid)) + return True + if req.state.name != 'review': + self.logger.error("%s in state %s not expected", srref(req.reqid), req.state.name) + return None + + self.logger.debug("%s still in review", srref(req.reqid)) + if not req.reviews: + self.logger.error("%s in state review but no reviews?", srref(req.reqid)) + return False + for r in req.reviews: + if r.state == 'new': + if r.by_project and r.by_project.startswith('openSUSE:Factory:Staging:'): + self.logger.info("%s review by %s ok", srref(req.reqid), r.by_project) + continue + + if r.by_user == 'repo-checker': + self.logger.info('%s review by %s ok', srref(req.reqid), r.by_user) + continue + + if r.state == 'accepted': + continue + if r.by_user: + self.logger.info("%s waiting for review by %s", srref(req.reqid), r.by_user) + elif r.by_group: + self.logger.info("%s waiting for review by %s", srref(req.reqid), r.by_group) + elif r.by_project: + if r.by_package: + self.logger.info("%s waiting for review by %s/%s", + srref(req.reqid), r.by_project, r.by_package) + else: + self.logger.info("%s waiting for review by %s", srref(req.reqid), r.by_project) + return None + return True + + return False + + def _package_get_upstream_projects(self, package): + """ return list of projects where the specified package is supposed to come + from. Either by lookup table or self.factory """ + projects = [] + for prj in self.factory: + r = self.lookup.get(prj, package) + if r: + projects.append(r) + + if not projects: + projects = self.factory + + return projects class TagChecker(ReviewBot.ReviewBot): @@ -82,11 +212,11 @@ # already in Factory with the same revision, # and the package is being introduced, not updated # 2) A new package must have an issue tag - factory_checker = check_source_in_factory.FactorySourceChecker(apiurl=self.apiurl, - dryrun=self.dryrun, - logger=self.logger, - user=self.review_user, - group=self.review_group) + factory_checker = FactorySourceChecker(apiurl=self.apiurl, + dryrun=self.dryrun, + logger=self.logger, + user=self.review_user, + group=self.review_group) factory_checker.factory = self.factory factory_ok = factory_checker.check_source_submission(a.src_project, a.src_package, a.src_rev, a.tgt_project, a.tgt_package) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20220330.39d635d6/config/announcer/openSUSE:Leap:15.2.yml new/openSUSE-release-tools-20220330.1114fbdd/config/announcer/openSUSE:Leap:15.2.yml --- old/openSUSE-release-tools-20220330.39d635d6/config/announcer/openSUSE:Leap:15.2.yml 2022-03-30 09:07:58.000000000 +0200 +++ new/openSUSE-release-tools-20220330.1114fbdd/config/announcer/openSUSE:Leap:15.2.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -bodytemplate: ' - - Please note that this mail was generated by a script. - - The described changes are computed based on the x86_64 DVD. - - The full online repo contains too many changes to be listed here. - - - Please check the known defects of this snapshot before upgrading: - - https://openqa.opensuse.org/tests/overview?distri=opensuse&version=15.2&bui… - - https://bugzilla.opensuse.org/buglist.cgi?product=openSUSE%20Distribution&q… - - - When you reply to discuss some issues, make sure to change the subject. - - Please use the test plan at - - https://docs.google.com/spreadsheets/d/1AGKijKpKiJCB616-bHVoNQuhWHpQLHPWCb3… - - to record your testing efforts and use bugzilla to report bugs. - - - {text} - - ' -iso: openSUSE-Leap-15.2-DVD-x86_64-Current.iso -name: openSUSE:Leap:15.2 -subject: Leap 15.2 Build {version} released! -url: http://download.opensuse.org/distribution/leap/15.2/iso/ -sender: openSUSE release team <opensuse-releaseteam(a)opensuse.org> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20220330.39d635d6/data/apimap.json new/openSUSE-release-tools-20220330.1114fbdd/data/apimap.json --- old/openSUSE-release-tools-20220330.39d635d6/data/apimap.json 2022-03-30 09:07:58.000000000 +0200 +++ new/openSUSE-release-tools-20220330.1114fbdd/data/apimap.json 2022-03-30 16:20:50.000000000 +0200 @@ -1,9 +1,4 @@ { - "openSUSE:Leap:15.2:Update" : { - "version": "15.2", - "flavor": "DVD-Incidents", - "distri": "opensuse" - }, "openSUSE:Leap:15.3:Update" : { "version": "15.3", "flavor": "DVD-Incidents", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20220330.39d635d6/data/incidents.json new/openSUSE-release-tools-20220330.1114fbdd/data/incidents.json --- old/openSUSE-release-tools-20220330.39d635d6/data/incidents.json 2022-03-30 09:07:58.000000000 +0200 +++ new/openSUSE-release-tools-20220330.1114fbdd/data/incidents.json 2022-03-30 16:20:50.000000000 +0200 @@ -1,10 +1,4 @@ { - "openSUSE:Leap:15.2:Update": { - "DISTRI": "opensuse", - "FLAVOR": "DVD-Incidents", - "VERSION": "15.2", - "ARCH": "x86_64" - }, "openSUSE:Leap:15.3:Update": { "DISTRI": "opensuse", "FLAVOR": "DVD-Incidents", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20220330.39d635d6/data/repos.json new/openSUSE-release-tools-20220330.1114fbdd/data/repos.json --- old/openSUSE-release-tools-20220330.39d635d6/data/repos.json 2022-03-30 09:07:58.000000000 +0200 +++ new/openSUSE-release-tools-20220330.1114fbdd/data/repos.json 2022-03-30 16:20:50.000000000 +0200 @@ -1,19 +1,5 @@ { "https://openqa.opensuse.org" : { - "openSUSE:Leap:15.2:Update" : { - "settings" : { - "OS_TEST_ISSUES" : "", - "FLAVOR" : "DVD-Updates", - "DISTRI" : "opensuse", - "VERSION" : "15.2", - "ARCH" : "x86_64" - }, - "test" : "kde", - "repos" : [ - "http://download.opensuse.org/update/leap/15.2/oss/", - "http://download.opensuse.org/update/leap/15.2/non-oss/" - ] - }, "openSUSE:Leap:15.3:Update" : { "settings" : { "OS_TEST_ISSUES" : "", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20220330.39d635d6/dist/package/openSUSE-release-tools.spec new/openSUSE-release-tools-20220330.1114fbdd/dist/package/openSUSE-release-tools.spec --- old/openSUSE-release-tools-20220330.39d635d6/dist/package/openSUSE-release-tools.spec 2022-03-30 09:07:58.000000000 +0200 +++ new/openSUSE-release-tools-20220330.1114fbdd/dist/package/openSUSE-release-tools.spec 2022-03-30 16:20:50.000000000 +0200 @@ -356,7 +356,6 @@ %{_bindir}/osrt-build-fail-reminder %{_bindir}/osrt-checknewer %{_bindir}/osrt-check_bugowner -%{_bindir}/osrt-check_source_in_factory %{_bindir}/osrt-check_tags_in_requests %{_bindir}/osrt-compare_pkglist %{_bindir}/osrt-container_cleaner diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20220330.39d635d6/docs/factory-source.asciidoc new/openSUSE-release-tools-20220330.1114fbdd/docs/factory-source.asciidoc --- old/openSUSE-release-tools-20220330.39d635d6/docs/factory-source.asciidoc 2022-03-30 09:07:58.000000000 +0200 +++ new/openSUSE-release-tools-20220330.1114fbdd/docs/factory-source.asciidoc 1970-01-01 01:00:00.000000000 +0100 @@ -1,42 +0,0 @@ -Factory Source Check -==================== -:author: Ludwig Nussel <ludwig.nussel(a)suse.de> -:toc: - - -Introduction ------------- -[id="intro"] - -A review bot that checks if the sources of a submission are either in Factory -or a request for Factory with the same sources exist. If the latter a request -is only accepted if the Factory request is reviewed positive. - -It's based on the generic ReviewBot.py - -Installation ------------- -[id="install"] - -No installation. The bot can run directly from git. - -Command line ------------- -[id="cli"] - -Check all requests that have "factory-source" as reviewer: - -------------------------------------------------------------------------------- -./check_source_in_factory.py review -------------------------------------------------------------------------------- - -Checks done ------------ -[id="checks"] - - -This bot accepts review requests if sources for a request are accepted in -factory. Either at top, in the history or due to a submit request with the same -sources in state new. If not the request is rejected unless a submission with -the same sources in state review exists. In that case the bot doesn't touch the -request. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20220330.39d635d6/docs/maintbot.asciidoc new/openSUSE-release-tools-20220330.1114fbdd/docs/maintbot.asciidoc --- old/openSUSE-release-tools-20220330.39d635d6/docs/maintbot.asciidoc 2022-03-30 09:07:58.000000000 +0200 +++ new/openSUSE-release-tools-20220330.1114fbdd/docs/maintbot.asciidoc 2022-03-30 16:20:50.000000000 +0200 @@ -36,5 +36,3 @@ This bot accepts review requests if the author of the request is a known maintainer of the package in Factory. If not the devel project/package is set as reviewer. -Furthermore the bot checks if the submission is for the Backports project. In that -case it adds factory-source as reviewer. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20220330.39d635d6/metrics/grafana/access.json new/openSUSE-release-tools-20220330.1114fbdd/metrics/grafana/access.json --- old/openSUSE-release-tools-20220330.39d635d6/metrics/grafana/access.json 2022-03-30 09:07:58.000000000 +0200 +++ new/openSUSE-release-tools-20220330.1114fbdd/metrics/grafana/access.json 2022-03-30 16:20:50.000000000 +0200 @@ -2415,9 +2415,19 @@ "selected": true, "text": "month", "value": "month" + }, + { + "selected": false, + "text": "FQ", + "value": "FQ" + }, + { + "selected": false, + "text": "FY", + "value": "FY" } ], - "query": "day, week, month", + "query": "day, week, month, FQ, FY", "type": "custom" }, { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20220330.39d635d6/osclib/stagingapi.py new/openSUSE-release-tools-20220330.1114fbdd/osclib/stagingapi.py --- old/openSUSE-release-tools-20220330.39d635d6/osclib/stagingapi.py 2022-03-30 09:07:58.000000000 +0200 +++ new/openSUSE-release-tools-20220330.1114fbdd/osclib/stagingapi.py 2022-03-30 16:20:50.000000000 +0200 @@ -1441,6 +1441,7 @@ for arch in self.cstaging_archs: a = ET.SubElement(repository, 'arch') a.text = arch + meta = ET.tostring(root) url = make_meta_url('prj', name, self.apiurl) http_PUT(url, data=meta) # put twice because on first put, the API adds useless maintainer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20220330.39d635d6/tests/factory_source_tests.py new/openSUSE-release-tools-20220330.1114fbdd/tests/factory_source_tests.py --- old/openSUSE-release-tools-20220330.39d635d6/tests/factory_source_tests.py 2022-03-30 09:07:58.000000000 +0200 +++ new/openSUSE-release-tools-20220330.1114fbdd/tests/factory_source_tests.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,300 +0,0 @@ -import os -import unittest -import logging -import httpretty -from osclib.cache import Cache -from . import OBSLocal - -from urllib.parse import urlparse, parse_qs -from check_source_in_factory import FactorySourceChecker - -APIURL = 'http://testhost.example.com' -FIXTURES = os.path.join(os.getcwd(), 'tests/fixtures') - - -class TestFactorySourceAccept(OBSLocal.TestCase): - - def tearDown(self): - httpretty.disable() - httpretty.reset() - - def setUp(self): - """ - Initialize the configuration - """ - super().setUp() - - Cache.last_updated[APIURL] = {'__oldest': '2016-12-18T11:49:37Z'} - httpretty.reset() - httpretty.enable(allow_net_connect=False) - - logging.basicConfig() - self.logger = logging.getLogger(__file__) - self.logger.setLevel(logging.DEBUG) - - self.checker = FactorySourceChecker(apiurl=APIURL, - user='factory-source', - logger=self.logger) - self.checker.override_allow = False # Test setup cannot handle. - - def test_accept_request(self): - - httpretty.register_uri(httpretty.GET, - APIURL + '/source/openSUSE:Factory/00Meta/lookup.yml', - status=404) - - httpretty.register_uri(httpretty.GET, - APIURL + "/request/770001", - body=""" - <request id="770001" creator="chameleon"> - <action type="submit"> - <source project="Base:System" package="timezone" rev="481ecbe0dfc63ece3a1f1b5598f7d96c"/> - <target project="openSUSE:13.2" package="timezone"/> - </action> - <state name="new" who="factory-source" when="2014-10-08T12:06:07"> - <comment>...</comment> - </state> - <review state="new" by_user="factory-source"/> - <description>...</description> - </request> - """) - - httpretty.register_uri(httpretty.GET, - APIURL + "/source/Base:System/timezone?view=info&rev=481ecbe0dfc63ece3a1f1b5598f7d96c", - match_querystring=True, - body=""" - <sourceinfo package="timezone" - rev="481ecbe0dfc63ece3a1f1b5598f7d96c" - srcmd5="481ecbe0dfc63ece3a1f1b5598f7d96c" - verifymd5="67bac34d29d70553239d33aaf92d2fdd"> - <filename>timezone.spec</filename> - </sourceinfo> - """) - - httpretty.register_uri(httpretty.GET, - APIURL + "/source/openSUSE:Factory/timezone/_meta", - body=""" - <package name="timezone" project="openSUSE:Factory"> - <title>timezone</title> - <description></description> - </package> - """) - - httpretty.register_uri(httpretty.GET, - APIURL + "/source/Base:System/timezone/_meta", - body=""" - <package name="timezone" project="Base:System"> - <title>timezone</title> - <description></description> - </package> - """) - - httpretty.register_uri(httpretty.GET, - APIURL + "/source/openSUSE:Factory/timezone?view=info", - match_querystring=True, - body=""" - <sourceinfo package="timezone" - rev="89" - vrev="1" - srcmd5="a36605617cbeefa8168bf0ccf3058074" - verifymd5="a36605617cbeefa8168bf0ccf3058074"> - <filename>timezone.spec</filename> - </sourceinfo> - """) - - httpretty.register_uri(httpretty.GET, - APIURL + "/source/openSUSE:Factory/timezone/_history?limit=5", - match_querystring=True, - body=""" - <sourceinfo package="timezone" - rev="89" - vrev="1" - srcmd5="a36605617cbeefa8168bf0ccf3058074" - verifymd5="a36605617cbeefa8168bf0ccf3058074"> - <filename>timezone.spec</filename> - </sourceinfo> - """) - - httpretty.register_uri(httpretty.GET, - APIURL + '/search/request', - responses=[ - httpretty.Response(body=""" - <collection matches="1"> - <request id="254684" creator="chameleon"> - <action type="submit"> - <source project="Base:System" package="timezone" rev="481ecbe0dfc63ece3a1f1b5598f7d96c"/> - <target project="openSUSE:Factory" package="timezone"/> - </action> - <state name="review" who="factory-auto" when="2014-10-08T11:55:56"> - <comment>...</comment> - </state> - <review state="new" by_group="opensuse-review-team"> - <comment/> - </review> - <description> ... </description> - </request> - </collection> - """), - httpretty.Response(body=""" - <collection matches="1"> - <request id="254684" creator="chameleon"> - <action type="submit"> - <source project="Base:System" package="timezone" rev="481ecbe0dfc63ece3a1f1b5598f7d96c"/> - <target project="openSUSE:Factory" package="timezone"/> - </action> - <state name="new" who="factory-auto" when="2014-10-08T11:55:56"> - <comment>...</comment> - </state> - <description> ... </description> - </request> - </collection> - """) - ]) - - result = {'status': None} - - def change_request(result, method, uri, headers): - query = parse_qs(urlparse(uri).query) - if query == {'by_user': ['factory-source'], 'cmd': ['changereviewstate'], 'newstate': ['accepted']}: - result['status'] = True - else: - result['status'] = 'ERROR' - return (200, headers, '<status code="blah"/>') - - httpretty.register_uri(httpretty.POST, - APIURL + "/request/770001", - body=lambda method, uri, headers: change_request(result, method, uri, headers)) - - # first time request is in in review - self.checker.set_request_ids(['770001']) - self.checker.check_requests() - - self.assertEqual(result['status'], None) - - # second time request is in state new so we can accept - self.checker.set_request_ids(['770001']) - self.checker.check_requests() - - self.assertTrue(result['status']) - - def test_source_not_in_factory(self): - url = '/search/request?match=state%2F%40name%3D%27review%27+and+review%5B%40by_user%3D' - url += '%27factory-source%27+and+%40state%3D%27new%27%5D&withfullhistory=1' - httpretty.register_uri(httpretty.GET, - APIURL + url, - match_querystring=True, - body=""" - <collection matches="1"> - <request id="261411" creator="lnussel"> - <action type="maintenance_incident"> - <source project="home:lnussel:branches:openSUSE:Backports:SLE-12" package="plan" - rev="71e76daf2c2e9ddb0b9208f54a14f608"/> - <target project="openSUSE:Maintenance" releaseproject="openSUSE:Backports:SLE-12"/> - </action> - <state name="review" who="maintbot" when="2014-11-13T13:22:02"> - <comment></comment> - </state> - <review state="accepted" when="2014-11-13T13:22:02" who="maintbot" by_user="maintbot"> - <comment>accepted</comment> - <history who="maintbot" when="2014-11-13T16:43:09"> - <description>Review got accepted</description> - <comment>accepted</comment> - </history> - </review> - <review state="new" by_user="factory-source"/> - <history who="lnussel" when="2014-11-13T13:22:02"> - <description>Request created</description> - <comment>test update</comment> - </history> - <history who="maintbot" when="2014-11-13T16:43:08"> - <description>Request got a new review request</description> - </history> - <description>test update</description> - </request> - </collection> - """) - - httpretty.register_uri(httpretty.GET, - APIURL + "/request/261411", - body=""" - <request id="261411" creator="lnussel"> - <action type="maintenance_incident"> - <source project="home:lnussel:branches:openSUSE:Backports:SLE-12" package="plan" - rev="71e76daf2c2e9ddb0b9208f54a14f608"/> - <target project="openSUSE:Maintenance" releaseproject="openSUSE:Backports:SLE-12"/> - </action> - <state name="review" who="maintbot" when="2014-11-13T13:22:02"> - <comment></comment> - </state> - <review state="accepted" when="2014-11-13T13:22:02" who="maintbot" by_user="maintbot"> - <comment>accepted</comment> - <history who="maintbot" when="2014-11-13T16:43:09"> - <description>Review got accepted</description> - <comment>accepted</comment> - </history> - </review> - <review state="new" by_user="factory-source"/> - <history who="lnussel" when="2014-11-13T13:22:02"> - <description>Request created</description> - <comment>test update</comment> - </history> - <history who="maintbot" when="2014-11-13T16:43:08"> - <description>Request got a new review request</description> - </history> - <description>test update</description> - </request> - """) - - httpretty.register_uri(httpretty.GET, - APIURL + "/source/home:lnussel:branches:openSUSE:Backports:SLE-12/plan", - body=""" - <directory name="plan" rev="1" vrev="1" srcmd5="b4ed19dc30c1b328168bc62a81ec6998"> - <linkinfo project="home:lnussel:plan" package="plan" srcmd5="7a2353f73b29dba970702053229542a0" - baserev="7a2353f73b29dba970702053229542a0" xsrcmd5="71e76daf2c2e9ddb0b9208f54a14f608" - lsrcmd5="b4ed19dc30c1b328168bc62a81ec6998" /> - <entry name="_link" md5="91f81d88456818a18a7332999fb2da18" size="125" mtime="1415807350" /> - <entry name="plan.spec" md5="b6814215f6d2e8559b43de9a214b2cbd" size="8103" mtime="1413627959" /> - </directory> - """) - - httpretty.register_uri(httpretty.GET, - APIURL + "/source/openSUSE:Factory/plan/_meta", - status=404, - body=""" - <status code="unknown_package"> - <summary>openSUSE:Factory/plan</summary> - </status> - """) - - httpretty.register_uri(httpretty.GET, - APIURL + '/source/openSUSE:Factory/00Meta/lookup.yml', - status=404) - - httpretty.register_uri(httpretty.GET, - APIURL + '/search/request', - body=""" - <collection matches="0"> - </collection> - """) - - result = {'factory_source_declined': None} - - def change_request(result, method, uri, headers): - query = parse_qs(urlparse(uri).query) - if query == {'by_user': ['factory-source'], 'cmd': ['changereviewstate'], 'newstate': ['declined']}: - result['factory_source_declined'] = True - return (200, headers, '<status code="ok"/>') - - httpretty.register_uri(httpretty.POST, - APIURL + "/request/261411", - body=lambda method, uri, headers: change_request(result, method, uri, headers)) - - self.checker.requests = [] - self.checker.set_request_ids_search_review() - self.checker.check_requests() - - self.assertTrue(result['factory_source_declined']) - - -if __name__ == '__main__': - unittest.main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20220330.39d635d6/tests/maintenance_tests.py new/openSUSE-release-tools-20220330.1114fbdd/tests/maintenance_tests.py --- old/openSUSE-release-tools-20220330.39d635d6/tests/maintenance_tests.py 2022-03-30 09:07:58.000000000 +0200 +++ new/openSUSE-release-tools-20220330.1114fbdd/tests/maintenance_tests.py 2022-03-30 16:20:50.000000000 +0200 @@ -281,89 +281,6 @@ self.assertFalse(result['devel_review_added']) - def test_backports_submit(self): - - httpretty.register_uri(httpretty.GET, - APIURL + '/search/request', - body=""" - <collection matches="1"> - <request id="261411" creator="lnussel"> - <action type="maintenance_incident"> - <source project="home:lnussel:branches:openSUSE:Backports:SLE-12" - package="plan" rev="71e76daf2c2e9ddb0b9208f54a14f608"/> - <target project="openSUSE:Maintenance" releaseproject="openSUSE:Backports:SLE-12"/> - </action> - <state name="review" who="lnussel" when="2014-11-13T13:22:02"> - <comment></comment> - </state> - <review state="new" by_user="maintbot"/> - <history who="lnussel" when="2014-11-13T13:22:02"> - <description>Request created</description> - <comment>test update</comment> - </history> - <description>test update</description> - </request> - </collection> - """) - - httpretty.register_uri(httpretty.GET, - APIURL + "/request/261411", - body=""" - <request id="261411" creator="lnussel"> - <action type="maintenance_incident"> - <source project="home:lnussel:branches:openSUSE:Backports:SLE-12" - package="plan" rev="71e76daf2c2e9ddb0b9208f54a14f608"/> - <target project="openSUSE:Maintenance" releaseproject="openSUSE:Backports:SLE-12"/> - </action> - <state name="review" who="lnussel" when="2014-11-13T13:22:02"> - <comment></comment> - </state> - <review state="new" by_user="maintbot"/> - <history who="lnussel" when="2014-11-13T13:22:02"> - <description>Request created</description> - <comment>test update</comment> - </history> - <description>test update</description> - </request> - """) - - httpretty.register_uri(httpretty.GET, - APIURL + "/source/home:lnussel:branches:openSUSE:Backports:SLE-12/plan", - body=""" - <directory name="plan" rev="1" vrev="1" srcmd5="b4ed19dc30c1b328168bc62a81ec6998"> - <linkinfo project="home:lnussel:plan" package="plan" srcmd5="7a2353f73b29dba970702053229542a0" - baserev="7a2353f73b29dba970702053229542a0" xsrcmd5="71e76daf2c2e9ddb0b9208f54a14f608" - lsrcmd5="b4ed19dc30c1b328168bc62a81ec6998" /> - <entry name="_link" md5="91f81d88456818a18a7332999fb2da18" size="125" mtime="1415807350" /> - <entry name="plan.spec" md5="b6814215f6d2e8559b43de9a214b2cbd" size="8103" mtime="1413627959" /> - </directory> - - """) - - httpretty.register_uri(httpretty.GET, - APIURL + '/search/owner', - body=""" - <collection/> - """) - - result = {'factory_review_added': None} - - def change_request(result, method, uri, headers): - query = parse_qs(urlparse(uri).query) - if query == {'cmd': ['addreview'], 'by_user': ['factory-source']}: - result['factory_review_added'] = True - return (200, headers, '<status code="ok"/>') - - httpretty.register_uri(httpretty.POST, - APIURL + "/request/261411", - body=lambda method, uri, headers: change_request(result, method, uri, headers)) - - self.checker.requests = [] - self.checker.set_request_ids_search_review() - self.checker.check_requests() - - self.assertTrue(result['factory_review_added']) - if __name__ == '__main__': unittest.main() ++++++ openSUSE-release-tools.obsinfo ++++++ --- /var/tmp/diff_new_pack.ZVbvKR/_old 2022-03-31 17:19:10.152946870 +0200 +++ /var/tmp/diff_new_pack.ZVbvKR/_new 2022-03-31 17:19:10.156946825 +0200 @@ -1,5 +1,5 @@ name: openSUSE-release-tools -version: 20220330.39d635d6 -mtime: 1648624078 -commit: 39d635d6de83bbdba1a319b7b73d0de6cfac5aa3 +version: 20220330.1114fbdd +mtime: 1648650050 +commit: 1114fbdd30d0d4506ca3767d2e5d563bf076304f

1 0

commit python-swifter for openSUSE:Factory
by Source-Sync 31 Mar '22

31 Mar '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-swifter for openSUSE:Factory checked in at 2022-03-31 17:18:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-swifter (Old) and /work/SRC/openSUSE:Factory/.python-swifter.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-swifter" Thu Mar 31 17:18:35 2022 rev:8 rq:965629 version:1.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-swifter/python-swifter.changes 2022-02-09 20:39:54.918478623 +0100 +++ /work/SRC/openSUSE:Factory/.python-swifter.new.1900/python-swifter.changes 2022-03-31 17:19:06.116992395 +0200 @@ -1,0 +2,7 @@ +Sun Mar 27 19:09:15 UTC 2022 - Ben Greiner <code(a)bnavigator.de> + +- Update to 1.1.2 + * Resolve installation issue by removing import from setup.py +- Reenable python310 build, now that dask is available + +------------------------------------------------------------------- Old: ---- swifter-1.1.1.tar.gz New: ---- swifter-1.1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-swifter.spec ++++++ --- /var/tmp/diff_new_pack.yPejzx/_old 2022-03-31 17:19:06.620986709 +0200 +++ /var/tmp/diff_new_pack.yPejzx/_new 2022-03-31 17:19:06.624986664 +0200 @@ -16,12 +16,10 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%{?!python_module:%define python_module() python3-%{**}} %define skip_python2 1 -# no dask for python310 yet -%define skip_python310 1 Name: python-swifter -Version: 1.1.1 +Version: 1.1.2 Release: 0 Summary: Tool to speed up pandas calculations License: MIT @@ -59,6 +57,8 @@ %prep %setup -q -n swifter-%{version} +# https://github.com/jmcarpenter2/swifter/commit/bc754088feb97f883794585a7eeb… +sed -i 's/{VERSION}/%{version}/' setup.py %build %python_build ++++++ swifter-1.1.1.tar.gz -> swifter-1.1.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swifter-1.1.1/Makefile new/swifter-1.1.2/Makefile --- old/swifter-1.1.1/Makefile 2022-02-05 05:14:50.000000000 +0100 +++ new/swifter-1.1.2/Makefile 2022-02-07 18:27:56.000000000 +0100 @@ -1,9 +1,9 @@ .PHONY: help, build, ci-black, ci-flake8, ci-unittest, ci, black, sphinx, git-tag, release-tag, release-production, dev-start, dev-stop -IMAGE=swifter -VERSION_FILE:=swifter/__init__.py +PROJECT=swifter +IMAGE=${PROJECT} +VERSION_FILE:=${PROJECT}/__init__.py VERSION_TAG:=$(shell cat ${VERSION_FILE} | grep -oEi [0-9]+.[0-9]+.[0-9]+) -TAG?=test help: ## Display help @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' @@ -11,36 +11,38 @@ build: ## Build docker image with tag "latest" for unit testing cd docker && DOCKER_BUILDKIT=1 docker build --build-arg GRANT_SUDO="yes" -t $(IMAGE) . -f Dockerfile-dev && cd .. -release-tag: ## TOODO - echo ${TAG} - -release-production: #TODO - echo ${VERSION_TAG} - git-tag: ## Tag in git from VERSION file then push tag up to origin git tag $(VERSION_TAG) - git push origin $(VERSION_TAG) + git push --tag + +release-production-pypi: ## Builds and publishes the version to PyPi + rm -r dist && rm -r build + python3 setup.py build sdist + twine upload dist/swifter-${VERSION_TAG}.tar.gz + rm -r dist && rm -r build + +release-production: git-tag release-production-pypi ci-black: build ## Test for black requirements - docker run --rm -t -v ${PWD}:/mnt $(IMAGE) black --diff --color --check swifter + docker run --rm -t -v ${PWD}:/mnt $(IMAGE) black --diff --color --check ${PROJECT} ci-flake8: build ## Test for flake8 requirements - docker run --rm -v ${PWD}:/mnt -t $(IMAGE) flake8 swifter + docker run --rm -v ${PWD}:/mnt -t $(IMAGE) flake8 ${PROJECT} ci-unittest: build ## Test pytest unittests - docker run --rm -v ${PWD}:/mnt -t $(IMAGE) python -m unittest swifter/swifter_tests.py + docker run --rm -v ${PWD}:/mnt -t $(IMAGE) python -m unittest ${PROJECT}/swifter_tests.py ci: ci-black ci-flake8 ci-unittest ## Check black, flake8, and unittests @echo "CI successful" black: build ## Run black, which formats code - docker run --rm -v ${PWD}:/mnt -t $(IMAGE) black swifter + docker run --rm -v ${PWD}:/mnt -t $(IMAGE) black ${PROJECT} dev-start: ## Primary make command for dev, spins up containers - docker-compose -f docker/docker-compose.yml --project-name swifter up -d --build + docker-compose -f docker/docker-compose.yml --project-name ${PROJECT} up -d --build dev-stop: dev-start ## Spins down active containers - docker-compose -f docker/docker-compose.yml --project-name swifter down + docker-compose -f docker/docker-compose.yml --project-name ${PROJECT} down sphinx: ## Creates docs using sphinx echo "Not implemented" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swifter-1.1.1/docs/changelog.md new/swifter-1.1.2/docs/changelog.md --- old/swifter-1.1.1/docs/changelog.md 2022-02-05 05:14:50.000000000 +0100 +++ new/swifter-1.1.2/docs/changelog.md 2022-02-07 18:27:56.000000000 +0100 @@ -1,5 +1,8 @@ # Changelog +## Version 1.1.2 -- 2022-02-07 +* Resolve installation issue by removing import from setup.py + ## Version 1.1.1 -- 2022-02-04 * Resolve installation issues by removing modin dependency, and modin apply route for axis=1 string applies * apply_dask_on_strings returns to original functionality, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swifter-1.1.1/setup.py new/swifter-1.1.2/setup.py --- old/swifter-1.1.1/setup.py 2022-02-05 05:14:50.000000000 +0100 +++ new/swifter-1.1.2/setup.py 2022-02-07 18:27:56.000000000 +0100 @@ -1,10 +1,9 @@ from setuptools import setup -from swifter import __version__ as VERSION setup( name="swifter", packages=["swifter"], # this must be the same as the name above - version=VERSION, + version="1.1.2", description="A package which efficiently applies any function to a pandas dataframe or series in the fastest available manner", author="Jason Carpenter", author_email="jcarpenter(a)manifold.ai", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swifter-1.1.1/swifter/__init__.py new/swifter-1.1.2/swifter/__init__.py --- old/swifter-1.1.1/swifter/__init__.py 2022-02-05 05:14:50.000000000 +0100 +++ new/swifter-1.1.2/swifter/__init__.py 2022-02-07 18:27:56.000000000 +0100 @@ -21,4 +21,4 @@ "register_parallel_series_accessor", "register_modin", ] -__version__ = "1.1.1" +__version__ = "1.1.2"

1 0

commit python-streamz for openSUSE:Factory
by Source-Sync 31 Mar '22

31 Mar '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-streamz for openSUSE:Factory checked in at 2022-03-31 17:18:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-streamz (Old) and /work/SRC/openSUSE:Factory/.python-streamz.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-streamz" Thu Mar 31 17:18:34 2022 rev:8 rq:965301 version:0.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-streamz/python-streamz.changes 2022-02-09 20:39:55.638480346 +0100 +++ /work/SRC/openSUSE:Factory/.python-streamz.new.1900/python-streamz.changes 2022-03-31 17:19:05.476999613 +0200 @@ -1,0 +2,5 @@ +Sun Mar 27 19:30:39 UTC 2022 - Benjamin Greiner <code(a)bnavigator.de> + +- Reenable tests with dask on python310 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-streamz.spec ++++++ --- /var/tmp/diff_new_pack.E7dktu/_old 2022-03-31 17:19:05.996993748 +0200 +++ /var/tmp/diff_new_pack.E7dktu/_new 2022-03-31 17:19:06.000993703 +0200 @@ -49,10 +49,10 @@ # SECTION test requirements BuildRequires: %{python_module certifi} BuildRequires: %{python_module confluent-kafka} -BuildRequires: %{python_module dask if %python-base < 3.10} -BuildRequires: %{python_module dask-dataframe if %python-base < 3.10} -BuildRequires: %{python_module dask-distributed if %python-base < 3.10} -BuildRequires: %{python_module distributed if %python-base < 3.10} +BuildRequires: %{python_module dask >= 2.5} +BuildRequires: %{python_module dask-dataframe} +BuildRequires: %{python_module dask-distributed} +BuildRequires: %{python_module distributed} BuildRequires: %{python_module flaky} BuildRequires: %{python_module graphviz} BuildRequires: %{python_module ipywidgets} @@ -86,15 +86,12 @@ %check # infinite loop because the automatic skip does not work here; the kafka tests need a docker container with STREAMZ_LAUNCH_KAFKA=true donttest="test_from_kafka or test_to_kafka" -# no dask on python310 yet: this disables a majority of the test suite, but dask and kafka are nominally optional -python310_flags="--ignore streamz/dataframe/tests/test_dataframes.py" -python310_flags+=" --ignore streamz/tests/test_core.py" -python310_flags+=" --ignore streamz/tests/test_kafka.py" if [ $(getconf LONG_BIT) -eq 32 ]; then # don't test on 32-bit: 64-bit datatypes expected donttest+=" or test_dataframes" fi # flaky: some tests are very fragile when run server-side +donttest+=" or test_tcp" %pytest -m "not network" --asyncio-mode=auto --force-flaky --max-runs=10 --no-success-flaky-report -rsfE ${$python_flags} -k "not ($donttest)" %files %{python_files}

1 0

commit python-dask for openSUSE:Factory
by Source-Sync 31 Mar '22

31 Mar '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-dask for openSUSE:Factory checked in at 2022-03-31 17:18:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-dask (Old) and /work/SRC/openSUSE:Factory/.python-dask.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-dask" Thu Mar 31 17:18:33 2022 rev:51 rq:965275 version:2022.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-dask/python-dask.changes 2022-02-02 22:45:01.142065626 +0100 +++ /work/SRC/openSUSE:Factory/.python-dask.new.1900/python-dask.changes 2022-03-31 17:19:04.509010532 +0200 @@ -1,0 +2,58 @@ +Sun Mar 27 19:18:19 UTC 2022 - Ben Greiner <code(a)bnavigator.de> + +- dask.dataframe requires dask.bag (revealed by swifter test suite) + +------------------------------------------------------------------- +Fri Mar 25 19:02:53 UTC 2022 - Ben Greiner <code(a)bnavigator.de> + +- Update to 2022.3.0 + * Bag: add implementation for reservoir sampling + * Add ma.count to Dask array + * Change to_parquet default to compression="snappy" + * Add weights parameter to dask.array.reduction + * Add ddf.compute_current_divisions to get divisions on a sorted + index or column + * Pass __name__ and __doc__ through on DelayedLeaf + * Raise exception for not implemented merge how option + * Move Bag.map_partitions to Blockwise + * Improve error messages for malformed config files + * Revise column-projection optimization to capture common + dask-sql patterns + * Useful error for empty divisions + * Scipy 1.8.0 compat: copy private classes into + dask/array/stats.py +- Release 2022.2.1 + * Add aggregate functions first and last to + dask.dataframe.pivot_table + * Add std() support for datetime64 dtype for pandas-like objects + * Add materialized task counts to HighLevelGraph and Layer html + reprs + * Do not allow iterating a DataFrameGroupBy + * Fix missing newline after info() call on empty DataFrame + * Add groupby.compute as a not implemented method + * Improve multi dataframe join performance + * Include bool type for Index + * Allow ArrowDatasetEngine subclass to override pandas->arrow + conversion also for partitioned write + * Increase performance of k-diagonal extraction in da.diag() and + da.diagonal() + * Change linspace creation to match numpy when num equal to 0 + * Tokenize dataclasses + * Update tokenize to treat dict and kwargs differently +- Release 2022.2.0 + * Add region to to_zarr when using existing array + * Add engine_kwargs support to dask.dataframe.to_sql + * Add include_path_column arg to read_json + * Add expand_dims to Dask array + * Add scheduler option to assert_eq utilities + * Fix eye inconsistency with NumPy for dtype=None + * Fix concatenate inconsistency with NumPy for axis=None + * Type annotations, part 1 + * Really allow any iterable to be passed as a meta + * Use map_partitions (Blockwise) in to_parquet +- Update dask-fix8169-pandas13.patch +- Add dask-py310-test.patch -- gh#dask/dask#8566 +- Make the distributed/dask update sync requirement even more + obvious. + +------------------------------------------------------------------- Old: ---- dask-2022.1.1.tar.gz New: ---- dask-2022.3.0.tar.gz dask-py310-test.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-dask.spec ++++++ --- /var/tmp/diff_new_pack.lheM9s/_old 2022-03-31 17:19:05.293001689 +0200 +++ /var/tmp/diff_new_pack.lheM9s/_new 2022-03-31 17:19:05.297001644 +0200 @@ -31,32 +31,33 @@ %bcond_without test %endif %if "%{flavor}" == "test-py310" -%define psuffix -test-py310" +%define psuffix -test-py310 %define skip_python38 1 %define skip_python39 1 %bcond_without test %endif %if "%{flavor}" == "" -# https://github.com/dask/distributed/issues/5350, https://github.com/dask/distributed/issues/5460 -%define skip_python310 1 %bcond_with test %endif %{?!python_module:%define python_module() python3-%{**}} %define skip_python2 1 -%define ghversiontag 2022.01.1 +# ===> Note: python-dask MUST be updated in sync with python-distributed! <=== +%define ghversiontag 2022.03.0 Name: python-dask%{psuffix} -# Note: please always update together with python-distributed! -Version: 2022.1.1 +# ===> Note: python-dask MUST be updated in sync with python-distributed! <=== +Version: 2022.3.0 Release: 0 Summary: Minimal task scheduling abstraction License: BSD-3-Clause URL: https://dask.org Source0: https://files.pythonhosted.org/packages/source/d/dask/dask-%{version}.tar.gz Source1: https://github.com/dask/dask/raw/%{ghversiontag}/conftest.py -# PATCH-FIX-UPSTREAM dask-fix8169-pandas13.patch -- gh#dask/dask#8169 +# PATCH-FIX-UPSTREAM dask-fix8169-pandas13.patch -- gh#dask/dask#8169, gh#dask/dask#8851 Patch0: dask-fix8169-pandas13.patch -BuildRequires: %{python_module base >= 3.7} +# PATCH-FIX-UPSTREAM dask-py310-test.patch -- gh#dask/dask#8566 +Patch1: https://github.com/dask/dask/pull/8566/commits/c329509fc9e78925682c9a0d5c57… +BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module packaging >= 20.0} BuildRequires: %{python_module setuptools} BuildRequires: fdupes @@ -210,6 +211,7 @@ Summary: Pandas-like DataFrame data structure for dask Requires: %{name} = %{version} Requires: %{name}-array = %{version} +Requires: %{name}-bag = %{version} Requires: python-numpy >= 1.18 # Patch0 requires pandas 1.3+ -- https://github.com/dask/dask/issues/8169 Requires: python-pandas >= 1.3 @@ -257,7 +259,7 @@ Summary: Diagnostics for dask Requires: %{name} = %{version} Requires: python-Jinja2 -Requires: python-bokeh >= 2.1.1 +Requires: python-bokeh >= 2.4.2 %description diagnostics A flexible library for parallel computing in Python. @@ -316,7 +318,7 @@ %prep %autosetup -p1 -n dask-%{version} cp %{SOURCE1} ./ -sed -i '/addopts/ {s/--durations=10//; s/--color=yes//}' setup.cfg +sed -i '/addopts/d' setup.cfg chmod a-x dask/dataframe/io/orc/utils.py %build @@ -354,15 +356,17 @@ # requires otherwise optional pyarrow (not available on TW) donttest+=" or (test_parquet and (test_chunksize or test_extra_file))" if [[ $(getconf LONG_BIT) -eq 32 ]]; then - # https://github.com/dask/dask/issues/8169 - donttest+=" or test_categorize_info" + # https://github.com/dask/dask/issues/8620 donttest+=" or test_query_with_meta" fi -# https://github.com/dask/dask/issues/8639 -donttest+=" or test__get_paths" # (rarely) flaky on obs donttest+=" or test_local_scheduler" -%pytest --pyargs dask -rfEs -m "not network" -k "not ($donttest)" -n auto +donttest+=" or (test_threaded and test_interrupt)" +# perhaps? rh#1968947#c4 +donttest+=" or test_select_from_select" +# tries to get an IP address +donttest+=" or test_map_partitions_df_input" +%pytest --pyargs dask -n auto -r fE -m "not network" -k "not ($donttest)" --reruns 3 --reruns-delay 3 %endif %if !%{with test} ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.lheM9s/_old 2022-03-31 17:19:05.325001328 +0200 +++ /var/tmp/diff_new_pack.lheM9s/_new 2022-03-31 17:19:05.329001283 +0200 @@ -1,6 +1,6 @@ <multibuild> <package>test-py38</package> <package>test-py39</package> -  + <package>test-py310</package> </multibuild> ++++++ dask-2022.1.1.tar.gz -> dask-2022.3.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/python-dask/dask-2022.1.1.tar.gz /work/SRC/openSUSE:Factory/.python-dask.new.1900/dask-2022.3.0.tar.gz differ: char 5, line 1 ++++++ dask-fix8169-pandas13.patch ++++++ --- /var/tmp/diff_new_pack.lheM9s/_old 2022-03-31 17:19:05.369000832 +0200 +++ /var/tmp/diff_new_pack.lheM9s/_new 2022-03-31 17:19:05.373000786 +0200 @@ -1,8 +1,10 @@ -Index: dask-2021.9.1/dask/dataframe/backends.py -=================================================================== ---- dask-2021.9.1.orig/dask/dataframe/backends.py -+++ dask-2021.9.1/dask/dataframe/backends.py -@@ -356,7 +356,7 @@ class ShuffleGroupResult(SimpleSizeof, d +--- + dask/dataframe/backends.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/dask/dataframe/backends.py ++++ b/dask/dataframe/backends.py +@@ -352,7 +352,7 @@ class ShuffleGroupResult(SimpleSizeof, d @group_split_dispatch.register((pd.DataFrame, pd.Series, pd.Index)) def group_split_pandas(df, c, k, ignore_index=False): indexer, locations = pd._libs.algos.groupsort_indexer( @@ -11,4 +13,37 @@ ) df2 = df.take(indexer) locations = locations.cumsum() +--- a/dask/dataframe/tests/test_dataframe.py ++++ b/dask/dataframe/tests/test_dataframe.py +@@ -3,6 +3,7 @@ + import xml.etree.ElementTree + from itertools import product + from operator import add ++import platform + + import numpy as np + import pandas as pd +@@ -3597,6 +3598,12 @@ + # Verbose=False + buf = StringIO() + ddf.info(buf=buf, verbose=True) ++ ++ if platform.architecture()[0] == "32bit": ++ memory_usage = "312.0" ++ else: ++ memory_usage = "496.0" ++ + expected = ( + "<class 'dask.dataframe.core.DataFrame'>\n" + "Int64Index: 4 entries, 0 to 3\n" +@@ -3607,7 +3614,7 @@ + " 1 y 4 non-null category\n" + " 2 z 4 non-null object\n" + "dtypes: category(1), object(1), int64(1)\n" +- "memory usage: 496.0 bytes\n" ++ "memory usage: {} bytes\n".format(memory_usage) + ) + assert buf.getvalue() == expected + +(No newline at EOF) ++++++ dask-py310-test.patch ++++++ From c329509fc9e78925682c9a0d5c579101da740d43 Mon Sep 17 00:00:00 2001 From: Jim Crist-Harif <jcristharif(a)gmail.com> Date: Thu, 24 Mar 2022 16:00:42 -0500 Subject: [PATCH] Fixup distributed test --- dask/tests/test_distributed.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dask/tests/test_distributed.py b/dask/tests/test_distributed.py index 55804293748..fcd5fc5419a 100644 --- a/dask/tests/test_distributed.py +++ b/dask/tests/test_distributed.py @@ -259,7 +259,7 @@ async def f(): z = await y.persist() assert len(z.dask) == 1 - asyncio.get_event_loop().run_until_complete(f()) + asyncio.run(f()) @gen_cluster(client=True)

1 0

commit python-distributed for openSUSE:Factory
by Source-Sync 31 Mar '22

31 Mar '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-distributed for openSUSE:Factory checked in at 2022-03-31 17:18:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-distributed (Old) and /work/SRC/openSUSE:Factory/.python-distributed.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-distributed" Thu Mar 31 17:18:33 2022 rev:55 rq:965227 version:2022.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-distributed/python-distributed.changes 2022-02-21 20:51:33.286296309 +0100 +++ /work/SRC/openSUSE:Factory/.python-distributed.new.1900/python-distributed.changes 2022-03-31 17:19:03.381023255 +0200 @@ -1,0 +2,102 @@ +Fri Mar 25 19:18:11 UTC 2022 - Ben Greiner <code(a)bnavigator.de> + +- Update to 2022.03.0 + * Support dumping cluster state to URL (GH#5863) Gabe Joseph + * Prevent data duplication on unspill (GH#5936) crusaderky + * Encapsulate spill buffer and memory_monitor (GH#5904) + crusaderky + * Drop pkg_resources in favour of importlib.metadata (GH#5923) + Thomas Grainger + * Worker State Machine refactor: redesign TaskState and scheduler + messages (GH#5922) crusaderky + * Tidying of OpenSSL 1.0.2/Python 3.9 (and earlier) handling + (GH#5854) jakirkham + * zict type annotations (GH#5905) crusaderky + * Add key to compute failed message (GH#5928) Florian Jetter + * Change default log format to include timestamp (GH#5897) + Florian Jetter + * Improve type annotations in worker.py (GH#5814) crusaderky +- Add distributed-pr5952-py310.patch -- gh#dask/distributed#5952 +- Add distributed-ignore-thread-leaks.patch +- Make the distributed/dask update sync requirement even more + obvious. + +------------------------------------------------------------------- +Tue Mar 8 07:46:52 UTC 2022 - Matej Cepl <mcepl(a)suse.com> + +- Update to 2022.02.1: + Add the ability for Client to run preload code + Optionally use NumPy to allocate buffers + Add git hash to distributed-impl version + Immediately raise exception when trying to connect to a closed cluster + Lazily get dask version information + Remove the requirements to add comm to every handler + Raise on unclosed comms in check_instances + Constrained spill + Remove redundant str() conversions + Cluster dump now excludes run_spec by default + Dump more objects with dump_cluster_state + Do not connect to any sockets on import + Avoid deadlock when two tasks are concurrently waiting for an unresolved ActorFuture + Drop Python 3.7 + Remove support for UCX < 1.11.1 + Document and test spill->target hysteresis cycle + Fix flaky test_remove_replicas_while_computing + Fix time based test_assert_worker_story_malformed_story parameterize + Remove xfail from test_no_unnecessary_imports_on_worker + Start building pre-releases with cythonized scheduler + Do not mark tests xfail if they don't come up in time + Use gen_cluster where possible in test_dask_worker.py + Generate junit report when pytest-timeout kills pytest + Decrease timeout-minutes for GHA jobs + Bump pre-release version to be greater than stable releases + Do not run schedule jobs on forks + Remove pillow<9 pin in CI + Show scheduled test runs in report + Add obvious exclusions with pragma statement + Add coverage exclusions for cli files + Add pragma statements + Remove pragma: no cover from distributed.cli.dask_ssh + Add pragma - worker.py, client.py, stealing.py + Relax distributed / dask-core dependencies for pre-releases + Remove test_ucx_config_w_env_var flaky condition +- Update to 2022.02.0: + Update client.scheduler_info in wait_for_workers + Increase robustness to TimeoutError during connect + Respect KeyboardInterrupt in sync + Add workflow / recipe to generate Dask/distributed pre-releases + Review Scheduler / Worker display repr + AMM: Graceful Worker Retirement + AMM: tentatively stabilize flaky tests around worker pause + AMM: speed up and stabilize test_memory + Defer pandas import on worker in P2P shuffle + Fix for distributed.worker.memory.target=False and spill=0.7 + Transition flight to missing if no who_has + Remove deprecated ncores + Deprecate registering plugins by class + Deprecate --nprocs option for dask-worker CLI + Fix imbalanced backticks + xfail test_worker_reconnects_mid_compute + Fix linting CI build + Update pre-commit versions + Reactivate pytest_resourceleaks + Set test assumption for test_client_timeout + Remove client timeout from test_ucx_config_w_env_var + Remove test_failed_worker_without_warning + Fix longitudinal report + Fix flaky test_robust_to_bad_sizeof_estimates + Revert "Pin coverage to 6.2 + Trigger test runs periodically to increases failure statistics + More fault tolerant test report + Pin pillow<9 to work around torch incompatability + Overhaul check_process_leak + Fix flaky test_exit_callback test + Generate tests summary + Upload different architectured pre-releases separately + Ignore non-test directories + Bump gpuCI PYTHON_VER to 3.9 + Regression: threads noted down before they start +- Remove upstreamed patches: + - 5709-avoid-deadlock-ActorFuture.patch + +------------------------------------------------------------------- @@ -8 +109,0 @@ - Old: ---- 5709-avoid-deadlock-ActorFuture.patch distributed-2022.01.1-gh.tar.gz New: ---- distributed-2022.03.0-gh.tar.gz distributed-ignore-thread-leaks.patch distributed-pr5952-py310.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-distributed.spec ++++++ --- /var/tmp/diff_new_pack.60vSAZ/_old 2022-03-31 17:19:03.989016398 +0200 +++ /var/tmp/diff_new_pack.60vSAZ/_new 2022-03-31 17:19:03.997016307 +0200 @@ -31,15 +31,12 @@ %bcond_without test %endif %if "%{flavor}" == "test-py310" -# add to _multibuild when enabling python310 (see below) -%define psuffix -test-py310" +%define psuffix -test-py310 %define skip_python38 1 %define skip_python39 1 %bcond_without test %endif %if "%{flavor}" == "" -# https://github.com/dask/distributed/issues/5350 -- NOT fixed by https://github.com/dask/distributed/pull/5353 -%define skip_python310 1 %bcond_with test %endif @@ -53,22 +50,27 @@ %define cythonize --with-cython %endif +# use this to run tests with xdist in parallel, unfortunately fails server side +%bcond_with paralleltests + %{?!python_module:%define python_module() python3-%{**}} %define skip_python2 1 -%define ghversiontag 2022.01.1 +# ===> Note: python-dask MUST be updated in sync with python-distributed! <=== +%define ghversiontag 2022.03.0 Name: python-distributed%{psuffix} -# Note: please always update together with python-dask -Version: 2022.1.1 +# ===> Note: python-dask MUST be updated in sync with python-distributed! <=== +Version: 2022.3.0 Release: 0 Summary: Library for distributed computing with Python License: BSD-3-Clause -URL: https://distributed.readthedocs.io/en/latest/ -Source: https://github.com/dask/distributed/archive/refs/tags//%{ghversiontag}.tar.… +URL: https://distributed.dask.org +Source: https://github.com/dask/distributed/archive/refs/tags/%{ghversiontag}.tar.g… Source99: python-distributed-rpmlintrc -# PATCH-FIX-UPSTREAM 5709-avoid-deadlock-ActorFuture.patch gh#dask/distributed#5709 mcepl(a)suse.com -# avoid deadlock in ActorFuture -Patch0: 5709-avoid-deadlock-ActorFuture.patch -BuildRequires: %{python_module base >= 3.7} +# PATCH-FIX-UPSTREAM distributed-pr5952-py310.patch -- gh#dask/distributed#5952 +Patch1: distributed-pr5952-py310.patch +# PATCH-FIX-OPENSUSE distributed-ignore-thread-leaks.patch -- ignore leaking threads on obs, code(a)bnavigator.de +Patch2: distributed-ignore-thread-leaks.patch +BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -116,6 +118,9 @@ BuildRequires: %{python_module toolz >= 0.8.2} BuildRequires: %{python_module tornado >= 6.0.3} BuildRequires: %{python_module zict >= 0.1.3} +%if %{with paralleltests} +BuildRequires: %{python_module pytest-xdist} +%endif %endif %python_subpackages @@ -127,7 +132,8 @@ %prep %autosetup -p1 -n distributed-%{ghversiontag} -sed -i '/addopts/ {s/--durations=20//; s/--color=yes//}' setup.cfg +sed -i -e '/addopts/ {s/--durations=20//; s/--color=yes//}' \ + -e 's/timeout_method = thread/timeout_method = signal/' setup.cfg %build %if ! %{with test} @@ -145,21 +151,44 @@ %if %{with test} %check -# randomly fail server-side -- too slow for obs (?) +# we obviously don't test a git repo +donttest="test_git_revision" +# logger error +donttest+=" or test_version_warning_in_cluster" + +# Some tests randomly fail server-side -- too slow for obs (?) +# see also https://github.com/dask/distributed/issues/5818 donttest+=" or (test_asyncprocess and test_exit_callback)" -donttest+=" or (test_nanny and test_throttle_outgoing_connections)" -donttest+=" or (test_scheduler and test_rebalance)" -donttest+=" or (test_tls_functional and test_rebalance)" -donttest+=" or (test_worker and test_fail_write_to_disk)" -donttest+=" or (test_worker and test_multiple_transfers)" -donttest+=" or (test_worker and test_remove_replicas_while_computing)" +donttest+=" or (test_client and test_repr)" +donttest+=" or (test_priorities and test_compute)" +donttest+=" or (test_resources and test_prefer_constrained)" +donttest+=" or (test_steal and test_steal_twice)" +donttest+=" or (test_worker and test_gather_dep_one_worker_always_busy)" donttest+=" or (test_worker and test_worker_reconnects_mid_compute)" + +# Exception messages not caught -- https://github.com/dask/distributed/issues/5460#issuecomment-1079432890 +python310_donttest+=" or test_exception_text" +python310_donttest+=" or test_worker_bad_args" + if [[ $(getconf LONG_BIT) -eq 32 ]]; then - # OverflowError - donttest+=" or (test_ensure_spilled_immediately)" - donttest+=" or (test_value_raises_during_spilling)" + # OverflowError -- https://github.com/dask/distributed/issues/5252 + donttest+=" or test_ensure_spilled_immediately" + donttest+=" or test_value_raises_during_spilling" + donttest+=" or test_fail_to_pickle_target_1" fi -%pytest_arch distributed/tests -r sfER -m "not avoid_ci" -k "not (${donttest:4})" --reruns 3 --reruns-delay 3 + +%if %{with paralleltests} +# not fully supported parallel test suite: https://github.com/dask/distributed/issues/5186 +# works locally, but fails with too many tests server-side +notparallel="rebalance or memory or upload" +notparallel+=" or test_open_close_many_workers" +notparallel+=" or test_recreate_error_array" +notparallel+=" or (test_preload and test_web_preload_worker)" +%pytest_arch distributed/tests -m "not avoid_ci" -n auto -k "not ($notparallel or $donttest ${$python_donttest})" +%pytest_arch distributed/tests -m "not avoid_ci" -k "($notparallel) and (not ($donttest ${$python_donttest}))" +%else +%pytest_arch distributed/tests -m "not avoid_ci" -k "not ($donttest ${$python_donttest})" --reruns 3 --reruns-delay 3 +%endif %endif %if ! %{with test} @@ -177,6 +206,7 @@ %python_alternative %{_bindir}/dask-worker %{python_sitearch}/distributed %{python_sitearch}/distributed-%{version}*-info + %endif %changelog ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.60vSAZ/_old 2022-03-31 17:19:04.029015946 +0200 +++ /var/tmp/diff_new_pack.60vSAZ/_new 2022-03-31 17:19:04.029015946 +0200 @@ -1,6 +1,6 @@ <multibuild> <package>test-py38</package> <package>test-py39</package> -  + <package>test-py310</package> </multibuild> ++++++ distributed-2022.01.1-gh.tar.gz -> distributed-2022.03.0-gh.tar.gz ++++++ ++++ 21332 lines of diff (skipped) ++++++ distributed-ignore-thread-leaks.patch ++++++ Index: distributed-2022.03.0/distributed/utils_test.py =================================================================== --- distributed-2022.03.0.orig/distributed/utils_test.py +++ distributed-2022.03.0/distributed/utils_test.py @@ -1612,7 +1612,7 @@ def check_thread_leak(): yield start = time() - while True: + while False: bad_threads = [ thread for thread in threading.enumerate() ++++++ distributed-pr5952-py310.patch ++++++ From 9c6a4c905c75c5e64ca460ea17bb2bdf0f2782fa Mon Sep 17 00:00:00 2001 From: James Bourbeau <jrbourbeau(a)gmail.com> Date: Thu, 3 Feb 2022 12:58:32 -0600 Subject: [PATCH 01/12] Add Python 3.10 build to CI --- .github/workflows/tests.yaml | 2 +- continuous_integration/environment-3.10.yaml | 56 ++++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 continuous_integration/environment-3.10.yaml Index: distributed-2022.03.0/.github/workflows/tests.yaml =================================================================== --- distributed-2022.03.0.orig/.github/workflows/tests.yaml +++ distributed-2022.03.0/.github/workflows/tests.yaml @@ -23,7 +23,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ["3.8", "3.9"] + python-version: ["3.8", "3.9", "3.10"] # Cherry-pick test modules to split the overall runtime roughly in half partition: [ci1, not ci1] include: @@ -65,12 +65,6 @@ jobs: shell: bash -l {0} run: conda config --show - - name: Install stacktrace - shell: bash -l {0} - # stacktrace for Python 3.8 has not been released at the moment of writing - if: ${{ matrix.os == 'ubuntu-latest' && matrix.python-version < '3.8' }} - run: mamba install -c conda-forge -c defaults -c numba libunwind stacktrace - - name: Hack around https://github.com/ipython/ipython/issues/12197 # This upstream issue causes an interpreter crash when running # distributed/protocol/tests/test_serialize.py::test_profile_nested_sizeof Index: distributed-2022.03.0/continuous_integration/environment-3.10.yaml =================================================================== --- /dev/null +++ distributed-2022.03.0/continuous_integration/environment-3.10.yaml @@ -0,0 +1,56 @@ +name: dask-distributed +channels: + - conda-forge + - defaults +dependencies: + - python=3.10 + - packaging + - pip + - asyncssh + - bokeh + - click + - cloudpickle + - coverage<6.3 # https://github.com/nedbat/coveragepy/issues/1310 + - dask # overridden by git tip below + - filesystem-spec # overridden by git tip below + - h5py + - ipykernel + - ipywidgets + - jinja2 + - joblib # overridden by git tip below + - jupyter_client + - lz4 # Only tested here + - msgpack-python + - netcdf4 + - paramiko + - pre-commit + - prometheus_client + - psutil + - pynvml # Only tested here + - pytest + - pytest-cov + - pytest-faulthandler + - pytest-repeat + - pytest-rerunfailures + - pytest-timeout + - python-blosc # Only tested here + - python-snappy # Only tested here + - requests + - s3fs # overridden by git tip below + - scikit-learn + - scipy + - sortedcollections + - tblib + - toolz + - tornado=6 + - zict # overridden by git tip below + - zstandard + - pip: + - git+https://github.com/dask/dask + - git+https://github.com/dask/s3fs + - git+https://github.com/dask/zict + # FIXME https://github.com/dask/distributed/issues/5345 + # - git+https://github.com/intake/filesystem_spec + - git+https://github.com/joblib/joblib + - keras + - pytest-asyncio<0.14.0 # `pytest-asyncio<0.14.0` isn't available on conda-forge for Python 3.10 Index: distributed-2022.03.0/distributed/tests/test_client.py =================================================================== --- distributed-2022.03.0.orig/distributed/tests/test_client.py +++ distributed-2022.03.0/distributed/tests/test_client.py @@ -6461,6 +6461,10 @@ async def test_performance_report(c, s, assert "cdn.bokeh.org" in data +(a)pytest.mark.skipif( + sys.version_info >= (3, 10), + reason="On Py3.10+ semaphore._loop is not bound until .acquire() blocks", +) @gen_cluster(nthreads=[]) async def test_client_gather_semaphore_loop(s): async with Client(s.address, asynchronous=True) as c: @@ -6471,9 +6475,16 @@ async def test_client_gather_semaphore_l async def test_as_completed_condition_loop(c, s, a, b): seq = c.map(inc, range(5)) ac = as_completed(seq) + # consume the ac so that the ac.condition is bound to the loop on py3.10+ + async for _ in ac: + pass assert ac.condition._loop == c.loop.asyncio_loop +(a)pytest.mark.skipif( + sys.version_info >= (3, 10), + reason="On Py3.10+ semaphore._loop is not bound until .acquire() blocks", +) def test_client_connectionpool_semaphore_loop(s, a, b): with Client(s["address"]) as c: assert c.rpc.semaphore._loop is c.loop.asyncio_loop Index: distributed-2022.03.0/distributed/node.py =================================================================== --- distributed-2022.03.0.orig/distributed/node.py +++ distributed-2022.03.0/distributed/node.py @@ -131,12 +131,9 @@ class ServerNode(Server): import ssl ssl_options = ssl.create_default_context( - cafile=tls_ca_file, purpose=ssl.Purpose.SERVER_AUTH + cafile=tls_ca_file, purpose=ssl.Purpose.CLIENT_AUTH ) ssl_options.load_cert_chain(tls_cert, keyfile=tls_key) - # We don't care about auth here, just encryption - ssl_options.check_hostname = False - ssl_options.verify_mode = ssl.CERT_NONE self.http_server = HTTPServer(self.http_application, ssl_options=ssl_options) Index: distributed-2022.03.0/distributed/profile.py =================================================================== --- distributed-2022.03.0.orig/distributed/profile.py +++ distributed-2022.03.0/distributed/profile.py @@ -27,6 +27,7 @@ We represent this tree as a nested dicti from __future__ import annotations import bisect +import dis import linecache import sys import threading @@ -59,21 +60,41 @@ def identifier(frame): ) +# work around some frames lacking an f_lineo eg: https://bugs.python.org/issue47085 +def _f_lineno(frame): + f_lineno = frame.f_lineno + if f_lineno is not None: + return f_lineno + + f_lasti = frame.f_lasti + code = frame.f_code + prev_line = code.co_firstlineno + + for start, next_line in dis.findlinestarts(code): + if f_lasti < start: + return prev_line + prev_line = next_line + + return prev_line + + def repr_frame(frame): """Render a frame as a line for inclusion into a text traceback""" co = frame.f_code - text = f' File "{co.co_filename}", line {frame.f_lineno}, in {co.co_name}' - line = linecache.getline(co.co_filename, frame.f_lineno, frame.f_globals).lstrip() + f_lineno = _f_lineno(frame) + text = f' File "{co.co_filename}", line {f_lineno}, in {co.co_name}' + line = linecache.getline(co.co_filename, f_lineno, frame.f_globals).lstrip() return text + "\n\t" + line def info_frame(frame): co = frame.f_code - line = linecache.getline(co.co_filename, frame.f_lineno, frame.f_globals).lstrip() + f_lineno = _f_lineno(frame) + line = linecache.getline(co.co_filename, f_lineno, frame.f_globals).lstrip() return { "filename": co.co_filename, "name": co.co_name, - "line_number": frame.f_lineno, + "line_number": f_lineno, "line": line, } Index: distributed-2022.03.0/distributed/tests/test_profile.py =================================================================== --- distributed-2022.03.0.orig/distributed/tests/test_profile.py +++ distributed-2022.03.0/distributed/tests/test_profile.py @@ -1,5 +1,9 @@ +from __future__ import annotations + +import dataclasses import sys import threading +from collections.abc import Iterator, Sequence from time import sleep import pytest @@ -11,6 +15,7 @@ from distributed.profile import ( call_stack, create, identifier, + info_frame, ll_get_stack, llprocess, merge, @@ -200,3 +205,102 @@ def test_watch(): while threading.active_count() > start_threads: assert time() < start + 2 sleep(0.01) + + +(a)dataclasses.dataclass(frozen=True) +class FakeCode: + co_filename: str + co_name: str + co_firstlineno: int + co_lnotab: bytes + co_lines_seq: Sequence[tuple[int, int, int | None]] + co_code: bytes + + def co_lines(self) -> Iterator[tuple[int, int, int | None]]: + yield from self.co_lines_seq + + +FAKE_CODE = FakeCode( + co_filename="<stdin>", + co_name="example", + co_firstlineno=1, + # https://github.com/python/cpython/blob/b68431fadb3150134ac6ccbf501cdfeaf4c7… + # generated from: + # def example(): + # for i in range(1): + # if i >= 0: + # pass + # example.__code__.co_lnotab + co_lnotab=b"\x00\x01\x0c\x01\x08\x01\x04\xfe", + # generated with list(example.__code__.co_lines()) + co_lines_seq=[ + (0, 12, 2), + (12, 20, 3), + (20, 22, 4), + (22, 24, None), + (24, 28, 2), + ], + # used in dis.findlinestarts as bytecode_len = len(code.co_code) + # https://github.com/python/cpython/blob/6f345d363308e3e6ecf0ad518ea0fcc30afd… + co_code=bytes(28), +) + + +(a)dataclasses.dataclass(frozen=True) +class FakeFrame: + f_lasti: int + f_code: FakeCode + f_lineno: int | None = None + f_back: FakeFrame | None = None + f_globals: dict[str, object] = dataclasses.field(default_factory=dict) + + +(a)pytest.mark.parametrize( + "f_lasti,f_lineno", + [ + (-1, 1), + (0, 2), + (1, 2), + (11, 2), + (12, 3), + (21, 4), + (22, 4), + (23, 4), + (24, 2), + (25, 2), + (26, 2), + (27, 2), + (100, 2), + ], +) +def test_info_frame_f_lineno(f_lasti: int, f_lineno: int) -> None: + assert info_frame(FakeFrame(f_lasti=f_lasti, f_code=FAKE_CODE)) == { + "filename": "<stdin>", + "name": "example", + "line_number": f_lineno, + "line": "", + } + + +(a)pytest.mark.parametrize( + "f_lasti,f_lineno", + [ + (-1, 1), + (0, 2), + (1, 2), + (11, 2), + (12, 3), + (21, 4), + (22, 4), + (23, 4), + (24, 2), + (25, 2), + (26, 2), + (27, 2), + (100, 2), + ], +) +def test_call_stack_f_lineno(f_lasti: int, f_lineno: int) -> None: + assert call_stack(FakeFrame(f_lasti=f_lasti, f_code=FAKE_CODE)) == [ + f' File "<stdin>", line {f_lineno}, in example\n\t' + ] Index: distributed-2022.03.0/distributed/utils_test.py =================================================================== --- distributed-2022.03.0.orig/distributed/utils_test.py +++ distributed-2022.03.0/distributed/utils_test.py @@ -706,13 +706,16 @@ def cluster( except KeyError: rpc_kwargs = {} - with rpc(saddr, **rpc_kwargs) as s: - while True: - nthreads = loop.run_sync(s.ncores) - if len(nthreads) == nworkers: - break - if time() - start > 5: - raise Exception("Timeout on cluster creation") + async def wait_for_workers(): + async with rpc(saddr, **rpc_kwargs) as s: + while True: + nthreads = await s.ncores() + if len(nthreads) == nworkers: + break + if time() - start > 5: + raise Exception("Timeout on cluster creation") + + loop.run_sync(wait_for_workers) # avoid sending processes down to function yield {"address": saddr}, [ Index: distributed-2022.03.0/setup.py =================================================================== --- distributed-2022.03.0.orig/setup.py +++ distributed-2022.03.0/setup.py @@ -98,8 +98,11 @@ setup( "License :: OSI Approved :: BSD License", "Operating System :: OS Independent", "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "Topic :: Scientific/Engineering", "Topic :: System :: Distributed Computing", ],

1 0

commit kernel-source for openSUSE:Factory
by Source-Sync 31 Mar '22

31 Mar '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2022-03-31 17:18:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-source" Thu Mar 31 17:18:32 2022 rev:636 rq:966099 version:5.17.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes 2022-03-19 22:22:16.596902818 +0100 +++ /work/SRC/openSUSE:Factory/.kernel-source.new.1900/dtb-aarch64.changes 2022-03-31 17:18:53.397135868 +0200 @@ -1,0 +2,248 @@ +Thu Mar 31 07:28:17 CEST 2022 - jslaby(a)suse.cz + +- Revert "config: Enable BPF LSM" (bsc#1197746) + This reverts commit c2c25b18721866d6211054f542987036ed6e0a50. +- commit 58205bc + +------------------------------------------------------------------- +Mon Mar 28 11:35:43 CEST 2022 - tiwai(a)suse.de + +- Revert "swiotlb: rework "fix info leak with DMA_FROM_DEVICE"" + (bsc#1197460). +- commit ffd9dce + +------------------------------------------------------------------- +Mon Mar 28 11:00:29 CEST 2022 - jslaby(a)suse.cz + +- block: restore the old set_task_ioprio() behaviour wrt + PF_EXITING (bsc#1197582). +- commit c349fed + +------------------------------------------------------------------- +Mon Mar 28 10:22:52 CEST 2022 - jslaby(a)suse.cz + +- Linux 5.17.1 (bsc#1012628). +- llc: only change llc->dev when bind() succeeds (bsc#1012628). +- drm/msm/gpu: Fix crash on devices without devfreq support (v2) + (bsc#1012628). +- nds32: fix access_ok() checks in get/put_user (bsc#1012628). +- m68k: fix access_ok for coldfire (bsc#1012628). +- wcn36xx: Differentiate wcn3660 from wcn3620 (bsc#1012628). +- tpm: use try_get_ops() in tpm-space.c (bsc#1012628). +- tpm: fix reference counting for struct tpm_chip (bsc#1012628). +- mac80211: fix potential double free on mesh join (bsc#1012628). +- uaccess: fix integer overflow on access_ok() (bsc#1012628). +- rcu: Don't deboost before reporting expedited quiescent state + (bsc#1012628). +- jbd2: fix use-after-free of transaction_t race (bsc#1012628). +- drm/virtio: Ensure that objs is not NULL in + virtio_gpu_array_put_free() (bsc#1012628). +- Revert "ath: add support for special 0x0 regulatory domain" + (bsc#1012628). +- Bluetooth: btusb: Use quirk to skip HCI_FLT_CLEAR_ALL on fake + CSR controllers (bsc#1012628). +- Bluetooth: hci_sync: Add a new quirk to skip HCI_FLT_CLEAR_ALL + (bsc#1012628). +- Bluetooth: btusb: Add one more Bluetooth part for the Realtek + RTL8852AE (bsc#1012628). +- crypto: qat - disable registration of algorithms (bsc#1012628). +- ACPI: video: Force backlight native for Clevo NL5xRU and NL5xNU + (bsc#1012628). +- ACPI: battery: Add device HID and quirk for Microsoft Surface + Go 3 (bsc#1012628). +- ACPI / x86: Work around broken XSDT on Advantech DAC-BJ01 board + (bsc#1012628). +- netfilter: nf_tables: validate registers coming from userspace + (bsc#1012628). +- netfilter: nf_tables: initialize registers in nft_do_chain() + (bsc#1012628). +- drivers: net: xgene: Fix regression in CRC stripping + (bsc#1012628). +- ALSA: pci: fix reading of swapped values from pcmreg in AC97 + codec (bsc#1012628). +- ALSA: cmipci: Restore aux vol on suspend/resume (bsc#1012628). +- ALSA: usb-audio: Add mute TLV for playback volumes on RODE + NT-USB (bsc#1012628). +- ALSA: pcm: Add stream lock during PCM reset ioctl operations + (bsc#1012628). +- ALSA: pcm: Fix races among concurrent prealloc proc writes + (bsc#1012628). +- ALSA: pcm: Fix races among concurrent prepare and + hw_params/hw_free calls (bsc#1012628). +- ALSA: pcm: Fix races among concurrent read/write and buffer + changes (bsc#1012628). +- ALSA: pcm: Fix races among concurrent hw_params and hw_free + calls (bsc#1012628). +- ALSA: hda/realtek: Add quirk for ASUS GA402 (bsc#1012628). +- ALSA: hda/realtek - Fix headset mic problem for a HP machine + with alc671 (bsc#1012628). +- ALSA: hda/realtek: Add quirk for Clevo NP50PNJ (bsc#1012628). +- ALSA: hda/realtek: Add quirk for Clevo NP70PNJ (bsc#1012628). +- ALSA: usb-audio: add mapping for new Corsair Virtuoso SE + (bsc#1012628). +- ALSA: oss: Fix PCM OSS buffer allocation overflow (bsc#1012628). +- ASoC: sti: Fix deadlock via snd_pcm_stop_xrun() call + (bsc#1012628). +- llc: fix netdevice reference leaks in llc_ui_bind() + (bsc#1012628). +- Bluetooth: btusb: Add another Realtek 8761BU (bsc#1012628). +- tpm: Fix error handling in async work (bsc#1012628). +- commit e830013 + +------------------------------------------------------------------- +Fri Mar 25 10:23:19 CET 2022 - mkubecek(a)suse.cz + +- series.conf: cleanup +- update mainline references and move into sorted section: + - patches.suse/Bluetooth-btusb-Add-missing-Chicony-device-for-Realt.patch + - patches.suse/bpf-add-config-to-allow-loading-modules-with-BTF-mis.patch +- commit 62d2682 + +------------------------------------------------------------------- +Fri Mar 25 10:14:04 CET 2022 - tiwai(a)suse.de + +- Revert "Input: clear BTN_RIGHT/MIDDLE on buttonpads" + (bsc#1197243). +- commit 7257225 + +------------------------------------------------------------------- +Fri Mar 25 10:11:56 CET 2022 - tiwai(a)suse.de + +- Drop HID multitouch fix patch (bsc#1197243) + Delete patches.suse/HID-multitouch-fix-Dell-Precision-7550-and-7750-butt.patch. + Replaced with another revert patch. +- commit 01821ca + +------------------------------------------------------------------- +Mon Mar 21 17:53:26 CET 2022 - dmueller(a)suse.com + +- rpm/constraints.in: skip SLOW_DISK workers for kernel-source +- commit e84694f + +------------------------------------------------------------------- +Mon Mar 21 15:04:49 CET 2022 - msuchanek(a)suse.de + +- Revert "rpm/macros.kernel-source: avoid %if's and %define's" + This reverts commit d0cec50d019c853336e26f5ff5df5a4c9c3ea120. +- commit b20736a + +------------------------------------------------------------------- +Mon Mar 21 13:19:17 CET 2022 - msuchanek(a)suse.de + +- macros.kernel-source: Fix conditional expansion. + Fixes: bb95fef3cf19 ("rpm: Use bash for %() expansion (jsc#SLE-18234).") +- commit 7e857f7 + +------------------------------------------------------------------- +Mon Mar 21 12:26:30 CET 2022 - jslaby(a)suse.cz + +- rpm/macros.kernel-source: avoid %if's and %define's + It's not supported in rpm macros scripts. So for now, resolve + %kernel_build_shell_package to bash-sh in stable branch unconditionally. + When this is fixed in the packaging branch, revert this. +- commit d0cec50 + +------------------------------------------------------------------- +Mon Mar 21 08:47:36 CET 2022 - jslaby(a)suse.cz + +- Refresh + patches.suse/Bluetooth-btusb-Add-missing-Chicony-device-for-Realt.patch. + Update upstream status. +- commit 36a1351 + +------------------------------------------------------------------- +Sun Mar 20 22:25:20 CET 2022 - mkubecek(a)suse.cz + +- Update to 5.17 final +- refresh configs (headers only) +- commit be2cbd1 + +------------------------------------------------------------------- +Sat Mar 19 18:07:17 CET 2022 - msuchanek(a)suse.de + +- rpm: Use bash for %() expansion (jsc#SLE-18234). + Since 15.4 alternatives for /bin/sh are provided by packages + <something>-sh. While the interpreter for the build script can be + selected the interpreter for %() cannot. + The kernel spec files use bashisms in %(). + While this could technically be fixed there is more serious underlying + problem: neither bash nor any of the alternatives are 100% POSIX + compliant nor bug-free. + It is not my intent to maintain bug compatibility with any number of + shells for shell scripts embedded in the kernel spec file. The spec file + syntax is not documented so embedding the shell script in it causes some + unspecified transformation to be applied to it. That means that + ultimately any changes must be tested by building the kernel, n times if + n shells are supported. + To reduce maintenance effort require that bash is used for kernel build + always. +- commit bb95fef + +------------------------------------------------------------------- +Sat Mar 19 15:19:05 CET 2022 - jslaby(a)suse.cz + +- Linux 5.16.16 (bsc#1012628). +- ice: Fix race condition during interface enslave (bsc#1012628). +- kselftest/vm: fix tests build with old libc (bsc#1012628). +- bnx2: Fix an error message (bsc#1012628). +- sfc: extend the locking on mcdi->seqno (bsc#1012628). +- tcp: make tcp_read_sock() more robust (bsc#1012628). +- nl80211: Update bss channel on channel switch for P2P_CLIENT + (bsc#1012628). +- drm/vrr: Set VRR capable prop only if it is attached to + connector (bsc#1012628). +- iwlwifi: don't advertise TWT support (bsc#1012628). +- Input: goodix - workaround Cherry Trail devices with a bogus + ACPI Interrupt() resource (bsc#1012628). +- Input: goodix - use the new soc_intel_is_byt() helper ++++ 409 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new.1900/dtb-aarch64.changes dtb-armv6l.changes: same change dtb-armv7l.changes: same change dtb-riscv64.changes: same change kernel-64kb.changes: same change kernel-debug.changes: same change kernel-default.changes: same change kernel-docs.changes: same change kernel-kvmsmall.changes: same change kernel-lpae.changes: same change kernel-obs-build.changes: same change kernel-obs-qa.changes: same change kernel-pae.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-vanilla.changes: same change kernel-zfcpdump.changes: same change Old: ---- fdupes_relink linux-5.16.tar.xz New: ---- _buildconfig-standard-x86_64 _buildinfo-standard-x86_64.xml linux-5.17.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dtb-aarch64.spec ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:00.697053527 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:00.701053483 +0200 @@ -16,8 +16,8 @@ # -%define srcversion 5.16 -%define patchversion 5.16.15 +%define srcversion 5.17 +%define patchversion 5.17.1 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -26,12 +26,12 @@ %define dtc_symbols 1 %endif -%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build,fdupes_relink}) +%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build}) Name: dtb-aarch64 -Version: 5.16.15 +Version: 5.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.gd8f0e40 +Release: <RELEASE>.g58205bc %else Release: 0 %endif @@ -100,7 +100,6 @@ Source83: kernel-subpackage-build Source84: kernel-subpackage-spec Source85: kernel-default-base.spec.txt -Source86: fdupes_relink Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -344,9 +343,9 @@ %build source=linux-%srcversion cp $source/COPYING . -SRCDIR=`pwd`/$source +SRCDIR=$PWD/$source mkdir pp -PPDIR=`pwd`/pp +PPDIR=$PWD/pp export DTC_FLAGS="-R 4 -p 0x1000" %if 0%{?dtc_symbols} DTC_FLAGS="$DTC_FLAGS -@" dtb-armv6l.spec: same change dtb-armv7l.spec: same change dtb-riscv64.spec: same change ++++++ kernel-64kb.spec ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:00.801052356 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:00.805052311 +0200 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 5.16 -%define patchversion 5.16.15 +%define srcversion 5.17 +%define patchversion 5.17.1 %define variant %{nil} %define vanilla_only 0 %define compress_modules zstd @@ -44,7 +44,7 @@ %define klp_symbols 1 %endif -%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build,fdupes_relink}) +%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -107,13 +107,16 @@ Summary: Kernel with 64kb PAGE_SIZE License: GPL-2.0-only Group: System/Kernel -Version: 5.16.15 +Version: 5.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.gd8f0e40 +Release: <RELEASE>.g58205bc %else Release: 0 %endif URL: https://www.kernel.org/ +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 +BuildRequires: bash-sh +%endif BuildRequires: bc BuildRequires: bison BuildRequires: coreutils @@ -231,10 +234,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 -Provides: kernel-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: kernel-%build_flavor-base-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb +Provides: kernel-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb # END COMMON DEPS -Provides: %name-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: %name-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -288,7 +291,6 @@ Source83: kernel-subpackage-build Source84: kernel-subpackage-spec Source85: kernel-default-base.spec.txt -Source86: fdupes_relink Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -370,7 +372,6 @@ NoSource: 83 NoSource: 84 NoSource: 85 -NoSource: 86 NoSource: 100 NoSource: 101 NoSource: 102 @@ -919,7 +920,7 @@ # pointless to rely on its contents. Replacing by zeros to make the # checksums always the same for several builds of the same package. test -s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep && \ - dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=`stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep` count=1 + dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep) count=1 res=0 if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then @@ -1193,14 +1194,14 @@ %endif %preun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %endif %postun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1259,13 +1260,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1325,13 +1326,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1492,13 +1493,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n cluster-md-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "cluster-md-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "cluster-md-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n cluster-md-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "cluster-md-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "cluster-md-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1539,13 +1540,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n dlm-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "dlm-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "dlm-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n dlm-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "dlm-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "dlm-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1586,13 +1587,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n gfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "gfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "gfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n gfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "gfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "gfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1648,13 +1649,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n kselftests-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "kselftests-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "kselftests-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n kselftests-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "kselftests-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "kselftests-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1696,13 +1697,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n ocfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "ocfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "ocfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n ocfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "ocfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "ocfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1743,13 +1744,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n reiserfs-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n reiserfs-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:00.829052041 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:00.837051950 +0200 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 5.16 -%define patchversion 5.16.15 +%define srcversion 5.17 +%define patchversion 5.17.1 %define variant %{nil} %define vanilla_only 0 %define compress_modules zstd @@ -44,7 +44,7 @@ %define klp_symbols 1 %endif -%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build,fdupes_relink}) +%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -107,13 +107,16 @@ Summary: A Debug Version of the Kernel License: GPL-2.0-only Group: System/Kernel -Version: 5.16.15 +Version: 5.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.gd8f0e40 +Release: <RELEASE>.g58205bc %else Release: 0 %endif URL: https://www.kernel.org/ +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 +BuildRequires: bash-sh +%endif BuildRequires: bc BuildRequires: bison BuildRequires: coreutils @@ -231,10 +234,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 -Provides: kernel-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: kernel-%build_flavor-base-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb +Provides: kernel-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb # END COMMON DEPS -Provides: %name-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: %name-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb %ifarch ppc64 Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 @@ -296,7 +299,6 @@ Source83: kernel-subpackage-build Source84: kernel-subpackage-spec Source85: kernel-default-base.spec.txt -Source86: fdupes_relink Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -378,7 +380,6 @@ NoSource: 83 NoSource: 84 NoSource: 85 -NoSource: 86 NoSource: 100 NoSource: 101 NoSource: 102 @@ -925,7 +926,7 @@ # pointless to rely on its contents. Replacing by zeros to make the # checksums always the same for several builds of the same package. test -s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep && \ - dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=`stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep` count=1 + dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep) count=1 res=0 if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then @@ -1199,14 +1200,14 @@ %endif %preun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %endif %postun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1267,13 +1268,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1335,13 +1336,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1506,13 +1507,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n cluster-md-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "cluster-md-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "cluster-md-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n cluster-md-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "cluster-md-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "cluster-md-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1553,13 +1554,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n dlm-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "dlm-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "dlm-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n dlm-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "dlm-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "dlm-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1600,13 +1601,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n gfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "gfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "gfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n gfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "gfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "gfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1662,13 +1663,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n kselftests-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "kselftests-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "kselftests-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n kselftests-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "kselftests-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "kselftests-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1710,13 +1711,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n ocfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "ocfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "ocfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n ocfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "ocfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "ocfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1757,13 +1758,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n reiserfs-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n reiserfs-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:00.861051680 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:00.865051634 +0200 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 5.16 -%define patchversion 5.16.15 +%define srcversion 5.17 +%define patchversion 5.17.1 %define variant %{nil} %define vanilla_only 0 %define compress_modules zstd @@ -44,7 +44,7 @@ %define klp_symbols 1 %endif -%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build,fdupes_relink}) +%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -107,13 +107,16 @@ Summary: The Standard Kernel License: GPL-2.0-only Group: System/Kernel -Version: 5.16.15 +Version: 5.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.gd8f0e40 +Release: <RELEASE>.g58205bc %else Release: 0 %endif URL: https://www.kernel.org/ +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 +BuildRequires: bash-sh +%endif BuildRequires: bc BuildRequires: bison BuildRequires: coreutils @@ -231,10 +234,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 -Provides: kernel-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: kernel-%build_flavor-base-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb +Provides: kernel-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb # END COMMON DEPS -Provides: %name-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: %name-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb %ifarch %ix86 Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 @@ -340,7 +343,6 @@ Source83: kernel-subpackage-build Source84: kernel-subpackage-spec Source85: kernel-default-base.spec.txt -Source86: fdupes_relink Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -422,7 +424,6 @@ NoSource: 83 NoSource: 84 NoSource: 85 -NoSource: 86 NoSource: 100 NoSource: 101 NoSource: 102 @@ -968,7 +969,7 @@ # pointless to rely on its contents. Replacing by zeros to make the # checksums always the same for several builds of the same package. test -s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep && \ - dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=`stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep` count=1 + dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep) count=1 res=0 if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then @@ -1242,14 +1243,14 @@ %endif %preun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %endif %postun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1329,13 +1330,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1416,13 +1417,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1607,13 +1608,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n cluster-md-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "cluster-md-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "cluster-md-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n cluster-md-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "cluster-md-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "cluster-md-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1654,13 +1655,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n dlm-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "dlm-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "dlm-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n dlm-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "dlm-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "dlm-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1701,13 +1702,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n gfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "gfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "gfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n gfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "gfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "gfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1763,13 +1764,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n kselftests-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "kselftests-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "kselftests-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n kselftests-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "kselftests-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "kselftests-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1811,13 +1812,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n ocfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "ocfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "ocfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n ocfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "ocfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "ocfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1858,13 +1859,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n reiserfs-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n reiserfs-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:00.889051364 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:00.893051318 +0200 @@ -16,8 +16,8 @@ # -%define srcversion 5.16 -%define patchversion 5.16.15 +%define srcversion 5.17 +%define patchversion 5.17.1 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -25,18 +25,21 @@ %define build_html 1 %define build_pdf 0 -%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build,fdupes_relink}) +%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build}) Name: kernel-docs Summary: Kernel Documentation License: GPL-2.0-only Group: Documentation/Man -Version: 5.16.15 +Version: 5.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.gd8f0e40 +Release: <RELEASE>.g58205bc %else Release: 0 %endif +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 +BuildRequires: bash-sh +%endif # TW (4.13 or later) no longer needs xmlto %if 0%{?sle_version} BuildRequires: xmlto @@ -64,7 +67,7 @@ %endif URL: https://www.kernel.org/ Provides: %name = %version-%source_rel -Provides: %name-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: %name-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz @@ -119,7 +122,6 @@ Source83: kernel-subpackage-build Source84: kernel-subpackage-spec Source85: kernel-default-base.spec.txt -Source86: fdupes_relink Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -187,7 +189,6 @@ NoSource: 83 NoSource: 84 NoSource: 85 -NoSource: 86 NoSource: 100 NoSource: 101 NoSource: 102 ++++++ kernel-kvmsmall.spec ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:00.917051047 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:00.925050957 +0200 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 5.16 -%define patchversion 5.16.15 +%define srcversion 5.17 +%define patchversion 5.17.1 %define variant %{nil} %define vanilla_only 0 %define compress_modules zstd @@ -44,7 +44,7 @@ %define klp_symbols 1 %endif -%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build,fdupes_relink}) +%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -107,13 +107,16 @@ Summary: The Small Developer Kernel for KVM License: GPL-2.0-only Group: System/Kernel -Version: 5.16.15 +Version: 5.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.gd8f0e40 +Release: <RELEASE>.g58205bc %else Release: 0 %endif URL: https://www.kernel.org/ +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 +BuildRequires: bash-sh +%endif BuildRequires: bc BuildRequires: bison BuildRequires: coreutils @@ -231,10 +234,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 -Provides: kernel-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: kernel-%build_flavor-base-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb +Provides: kernel-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb # END COMMON DEPS -Provides: %name-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: %name-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -288,7 +291,6 @@ Source83: kernel-subpackage-build Source84: kernel-subpackage-spec Source85: kernel-default-base.spec.txt -Source86: fdupes_relink Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -370,7 +372,6 @@ NoSource: 83 NoSource: 84 NoSource: 85 -NoSource: 86 NoSource: 100 NoSource: 101 NoSource: 102 @@ -923,7 +924,7 @@ # pointless to rely on its contents. Replacing by zeros to make the # checksums always the same for several builds of the same package. test -s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep && \ - dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=`stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep` count=1 + dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep) count=1 res=0 if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then @@ -1197,14 +1198,14 @@ %endif %preun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %endif %postun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1267,13 +1268,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1337,13 +1338,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1504,13 +1505,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n cluster-md-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "cluster-md-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "cluster-md-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n cluster-md-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "cluster-md-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "cluster-md-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1551,13 +1552,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n dlm-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "dlm-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "dlm-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n dlm-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "dlm-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "dlm-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1598,13 +1599,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n gfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "gfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "gfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n gfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "gfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "gfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1660,13 +1661,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n kselftests-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "kselftests-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "kselftests-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n kselftests-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "kselftests-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "kselftests-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1708,13 +1709,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n ocfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "ocfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "ocfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n ocfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "ocfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "ocfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1755,13 +1756,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n reiserfs-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n reiserfs-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" kernel-lpae.spec: same change ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:00.981050326 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:00.981050326 +0200 @@ -19,7 +19,7 @@ #!BuildIgnore: post-build-checks -%define patchversion 5.16.15 +%define patchversion 5.17.1 %define variant %{nil} %define vanilla_only 0 @@ -45,7 +45,7 @@ %endif %endif %endif -BuildRequires: kernel%kernel_flavor-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +BuildRequires: kernel%kernel_flavor-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb %if 0%{?rhel_version} BuildRequires: kernel @@ -64,9 +64,9 @@ Summary: package kernel and initrd for OBS VM builds License: GPL-2.0-only Group: SLES -Version: 5.16.15 +Version: 5.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.gd8f0e40 +Release: <RELEASE>.g58205bc %else Release: 0 %endif @@ -157,7 +157,7 @@ %if 0%{?suse_version} > 1550 || 0%{?sle_version} > 150200 --compress "zstd -19 -T0" \ %endif - `echo /boot/%{kernel_name}-*%{kernel_flavor} | sed -n -e 's,[^-]*-$.*'%{kernel_flavor}'$,\1,p'` + $(echo /boot/%{kernel_name}-*%{kernel_flavor} | sed -n -e 's,[^-]*-$.*'%{kernel_flavor}'$,\1,p') %endif #cleanup ++++++ kernel-obs-qa.spec ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.005050055 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.013049965 +0200 @@ -17,7 +17,7 @@ # needsrootforbuild -%define patchversion 5.16.15 +%define patchversion 5.17.1 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -36,9 +36,9 @@ Summary: Basic QA tests for the kernel License: GPL-2.0-only Group: SLES -Version: 5.16.15 +Version: 5.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.gd8f0e40 +Release: <RELEASE>.g58205bc %else Release: 0 %endif ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.041049649 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.045049604 +0200 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 5.16 -%define patchversion 5.16.15 +%define srcversion 5.17 +%define patchversion 5.17.1 %define variant %{nil} %define vanilla_only 0 %define compress_modules zstd @@ -44,7 +44,7 @@ %define klp_symbols 1 %endif -%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build,fdupes_relink}) +%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -107,13 +107,16 @@ Summary: Kernel with PAE Support License: GPL-2.0-only Group: System/Kernel -Version: 5.16.15 +Version: 5.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.gd8f0e40 +Release: <RELEASE>.g58205bc %else Release: 0 %endif URL: https://www.kernel.org/ +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 +BuildRequires: bash-sh +%endif BuildRequires: bc BuildRequires: bison BuildRequires: coreutils @@ -231,10 +234,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 -Provides: kernel-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: kernel-%build_flavor-base-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb +Provides: kernel-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb # END COMMON DEPS -Provides: %name-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: %name-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb %ifarch %ix86 Provides: kernel-bigsmp = 2.6.17 Obsoletes: kernel-bigsmp <= 2.6.17 @@ -310,7 +313,6 @@ Source83: kernel-subpackage-build Source84: kernel-subpackage-spec Source85: kernel-default-base.spec.txt -Source86: fdupes_relink Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -392,7 +394,6 @@ NoSource: 83 NoSource: 84 NoSource: 85 -NoSource: 86 NoSource: 100 NoSource: 101 NoSource: 102 @@ -945,7 +946,7 @@ # pointless to rely on its contents. Replacing by zeros to make the # checksums always the same for several builds of the same package. test -s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep && \ - dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=`stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep` count=1 + dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep) count=1 res=0 if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then @@ -1219,14 +1220,14 @@ %endif %preun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %endif %postun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1299,13 +1300,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1379,13 +1380,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1556,13 +1557,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n cluster-md-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "cluster-md-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "cluster-md-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n cluster-md-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "cluster-md-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "cluster-md-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1603,13 +1604,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n dlm-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "dlm-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "dlm-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n dlm-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "dlm-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "dlm-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1650,13 +1651,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n gfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "gfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "gfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n gfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "gfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "gfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1712,13 +1713,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n kselftests-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "kselftests-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "kselftests-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n kselftests-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "kselftests-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "kselftests-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1760,13 +1761,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n ocfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "ocfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "ocfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n ocfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "ocfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "ocfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1807,13 +1808,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n reiserfs-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n reiserfs-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.061049424 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.065049379 +0200 @@ -16,8 +16,8 @@ # -%define srcversion 5.16 -%define patchversion 5.16.15 +%define srcversion 5.17 +%define patchversion 5.17.1 %define variant %{nil} %define vanilla_only 0 @@ -31,9 +31,9 @@ %endif Name: kernel-source -Version: 5.16.15 +Version: 5.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.gd8f0e40 +Release: <RELEASE>.g58205bc %else Release: 0 %endif @@ -42,12 +42,15 @@ Group: Development/Sources URL: https://www.kernel.org/ AutoReqProv: off +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 +BuildRequires: bash-sh +%endif BuildRequires: coreutils BuildRequires: fdupes BuildRequires: sed Requires(post): coreutils sed Provides: %name = %version-%source_rel -Provides: %name-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: %name-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb Provides: linux Provides: multiversion(kernel) Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz @@ -102,7 +105,6 @@ Source83: kernel-subpackage-build Source84: kernel-subpackage-spec Source85: kernel-default-base.spec.txt -Source86: fdupes_relink Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -133,7 +135,7 @@ %endif %obsolete_rebuilds %name -%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build,fdupes_relink}) +%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build}) # Force bzip2 instead of lzma compression to # 1) allow install on older dist versions, and @@ -226,6 +228,8 @@ cd linux-%kernelrelease-vanilla %_sourcedir/apply-patches --vanilla %_sourcedir/series.conf %my_builddir %symbols rm -f $(find . -name ".gitignore") +# Hardlink duplicate files automatically (from package fdupes). +%fdupes $PWD cd .. %endif @@ -237,11 +241,10 @@ if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi +# Hardlink duplicate files automatically (from package fdupes). +%fdupes $PWD cd .. %endif - -# Hardlink duplicate files. -fdupes -q -p -n -H -o name -r %{buildroot} | %_sourcedir/fdupes_relink popd %if ! %vanilla_only ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.093049063 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.097049018 +0200 @@ -24,10 +24,10 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0-only Group: Development/Sources -Version: 5.16.15 +Version: 5.17.1 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.gd8f0e40 +Release: <RELEASE>.g58205bc %else Release: 0 %endif @@ -52,7 +52,7 @@ %endif Requires: pesign-obs-integration Provides: %name = %version-%source_rel -Provides: %name-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: %name-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.117048792 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.125048702 +0200 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 5.16 -%define patchversion 5.16.15 +%define srcversion 5.17 +%define patchversion 5.17.1 %define variant %{nil} %define vanilla_only 0 %define compress_modules zstd @@ -44,7 +44,7 @@ %define klp_symbols 1 %endif -%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build,fdupes_relink}) +%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -107,13 +107,16 @@ Summary: The Standard Kernel - without any SUSE patches License: GPL-2.0-only Group: System/Kernel -Version: 5.16.15 +Version: 5.17.1 %if 0%{?is_kotd} -Release: <RELEASE>.gd8f0e40 +Release: <RELEASE>.g58205bc %else Release: 0 %endif URL: https://www.kernel.org/ +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 +BuildRequires: bash-sh +%endif BuildRequires: bc BuildRequires: bison BuildRequires: coreutils @@ -231,10 +234,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 -Provides: kernel-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: kernel-%build_flavor-base-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb +Provides: kernel-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb # END COMMON DEPS -Provides: %name-srchash-d8f0e4059e0e053d843c5cb54700bdc033e4c284 +Provides: %name-srchash-58205bc0990184a0cddf884ee828b9f8bc9290bb %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -288,7 +291,6 @@ Source83: kernel-subpackage-build Source84: kernel-subpackage-spec Source85: kernel-default-base.spec.txt -Source86: fdupes_relink Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -370,7 +372,6 @@ NoSource: 83 NoSource: 84 NoSource: 85 -NoSource: 86 NoSource: 100 NoSource: 101 NoSource: 102 @@ -916,7 +917,7 @@ # pointless to rely on its contents. Replacing by zeros to make the # checksums always the same for several builds of the same package. test -s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep && \ - dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=`stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep` count=1 + dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep) count=1 res=0 if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then @@ -1190,14 +1191,14 @@ %endif %preun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %endif %postun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1253,13 +1254,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1316,13 +1317,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1483,13 +1484,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n cluster-md-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "cluster-md-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "cluster-md-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n cluster-md-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "cluster-md-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "cluster-md-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1530,13 +1531,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n dlm-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "dlm-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "dlm-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n dlm-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "dlm-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "dlm-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1577,13 +1578,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n gfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "gfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "gfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n gfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "gfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "gfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1639,13 +1640,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n kselftests-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "kselftests-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "kselftests-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n kselftests-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "kselftests-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "kselftests-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1687,13 +1688,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n ocfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "ocfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "ocfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n ocfs2-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "ocfs2-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "ocfs2-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1734,13 +1735,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n reiserfs-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n reiserfs-kmp-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" kernel-zfcpdump.spec: same change ++++++ _buildconfig-standard-x86_64 ++++++ ++++ 1570 lines (skipped) ++++++ _buildinfo-standard-x86_64.xml ++++++ <buildinfo project="Kernel:stable" repository="standard" downloadurl="https://download.opensuse.org/repositories"> <arch>x86_64</arch> <debuginfo>1</debuginfo> <subpack>kernel-default</subpack> <subpack>kernel-default-devel</subpack> <subpack>kernel-default-extra</subpack> <bdep name="liblua5_4-5" preinstall="1" notmeta="1" version="5.4.4" release="2.1" arch="x86_64" hdrmd5="3a1c089298ab20a27f03fd03fdbef4a8" project="openSUSE:Factory" repository="standard"/> <bdep name="aaa_base" preinstall="1" notmeta="1" version="84.87+git20220324.fca4619" release="1.1" arch="x86_64" hdrmd5="a1a26d2ce941c9b346bb870e8a1abdf2" project="openSUSE:Factory" repository="standard"/> <bdep name="filesystem" preinstall="1" notmeta="1" version="84.87" release="4.1" arch="x86_64" hdrmd5="e0cff458d94f929919e2bef68d765be7" project="openSUSE:Factory" repository="standard"/> <bdep name="attr" preinstall="1" notmeta="1" version="2.5.1" release="1.17" arch="x86_64" hdrmd5="a21ec4cc7751b1c27308527c8eda0198" project="openSUSE:Factory" repository="standard"/> <bdep name="bash" preinstall="1" notmeta="1" version="5.1.16" release="7.1" arch="x86_64" hdrmd5="be1ef0cca67466073fc97580514f4614" project="openSUSE:Factory" repository="standard"/> <bdep name="bash-sh" preinstall="1" version="5.1.16" release="7.1" arch="x86_64" hdrmd5="d159482f52254316f56314b0aa59fb2c" project="openSUSE:Factory" repository="standard"/> <bdep name="coreutils" preinstall="1" version="9.0" release="2.3" arch="x86_64" hdrmd5="97409685379a990f353a518b076a3a45" project="openSUSE:Factory" repository="standard"/> <bdep name="diffutils" preinstall="1" notmeta="1" version="3.8" release="2.5" arch="x86_64" hdrmd5="0a4ba6a3617f073df9a4e2e92c350dab" project="openSUSE:Factory" repository="standard"/> <bdep name="fillup" preinstall="1" notmeta="1" version="1.42" release="276.9" arch="x86_64" hdrmd5="72fd693f39133a6ef24ffee2c3e71025" project="openSUSE:Factory" repository="standard"/> <bdep name="glibc" preinstall="1" notmeta="1" version="2.35" release="2.1" arch="x86_64" hdrmd5="38cbec74ef87c3efb99f67ed57e624e9" project="openSUSE:Factory" repository="standard"/> <bdep name="grep" preinstall="1" notmeta="1" version="3.7" release="3.1" arch="x86_64" hdrmd5="c003454bdc71eb26844a03379c34ff58" project="openSUSE:Factory" repository="standard"/> <bdep name="pam" preinstall="1" notmeta="1" version="1.5.2" release="6.1" arch="x86_64" hdrmd5="c4f94b370afbf38f3c33e7960f730a76" project="openSUSE:Factory" repository="standard"/> <bdep name="permissions" preinstall="1" notmeta="1" version="20220309.1599" release="30.1" arch="x86_64" hdrmd5="95c3933c1f477df7c8cf9f910e81d832" project="openSUSE:Factory" repository="standard"/> <bdep name="rpm" preinstall="1" notmeta="1" version="4.17.0" release="5.1" arch="x86_64" hdrmd5="48f7aad98ecc028da6a683ef1460b603" project="openSUSE:Factory" repository="standard"/> <bdep name="rpm-config-SUSE" preinstall="1" notmeta="1" version="20220317" release="1.1" arch="noarch" hdrmd5="58250c69b58d5c85f1606c97aaeb1691" project="openSUSE:Factory" repository="standard"/> <bdep name="sed" preinstall="1" notmeta="1" version="4.8" release="3.10" arch="x86_64" hdrmd5="35b4c9fb9d5f544f42e79643bc336a12" project="openSUSE:Factory" repository="standard"/> <bdep name="tar" preinstall="1" notmeta="1" version="1.34" release="5.3" arch="x86_64" hdrmd5="bab5906c8e71347d41a0129f9be7ab29" project="openSUSE:Factory" repository="standard"/> <bdep name="libbz2-1" preinstall="1" notmeta="1" version="1.0.8" release="3.6" arch="x86_64" hdrmd5="3ac4b485f80ea21872f9a83401e856b9" project="openSUSE:Factory" repository="standard"/> <bdep name="libgcc_s1" preinstall="1" notmeta="1" version="11.2.1+git1406" release="1.1" arch="x86_64" hdrmd5="ded7b0ef62d9d0ac28d1c667d9595b7b" project="openSUSE:Factory" repository="standard"/> <bdep name="libncurses6" preinstall="1" notmeta="1" version="6.3.20220312" release="13.1" arch="x86_64" hdrmd5="56b24fef8ed3bc6d6f42e7c8592a2f27" project="openSUSE:Factory" repository="standard"/> <bdep name="libreadline8" preinstall="1" notmeta="1" version="8.1" release="3.3" arch="x86_64" hdrmd5="947e3d71f05758a9040072e699ab6a3d" project="openSUSE:Factory" repository="standard"/> <bdep name="libz1" preinstall="1" notmeta="1" version="1.2.11" release="18.21" arch="x86_64" hdrmd5="fccdccb205ba6b37509bf75b17c4bffc" project="openSUSE:Factory" repository="standard"/> <bdep name="libselinux1" preinstall="1" notmeta="1" version="3.3" release="2.1" arch="x86_64" hdrmd5="be4590fce7260b32685995a230091eaa" project="openSUSE:Factory" repository="standard"/> <bdep name="libgcrypt20" preinstall="1" notmeta="1" version="1.9.4" release="3.3" arch="x86_64" hdrmd5="211449e11b42a7be7f7cb4ff30ed2e19" project="openSUSE:Factory" repository="standard"/> <bdep name="libgpg-error0" preinstall="1" notmeta="1" version="1.44" release="1.3" arch="x86_64" hdrmd5="a6dfab364dc8de2dde686b566b738e2b" project="openSUSE:Factory" repository="standard"/> <bdep name="liblzma5" preinstall="1" notmeta="1" version="5.2.5" release="2.6" arch="x86_64" hdrmd5="b5d1e637b0588eafd9e74efb09a6ade2" project="openSUSE:Factory" repository="standard"/> <bdep name="libcap2" preinstall="1" notmeta="1" version="2.63" release="2.1" arch="x86_64" hdrmd5="b1c836a39fc87db295e73106d6960e19" project="openSUSE:Factory" repository="standard"/> <bdep name="libacl1" preinstall="1" notmeta="1" version="2.3.1" release="1.18" arch="x86_64" hdrmd5="a2b9475bd633b77f61aee618e6c602e0" project="openSUSE:Factory" repository="standard"/> <bdep name="libattr1" preinstall="1" notmeta="1" version="2.5.1" release="1.17" arch="x86_64" hdrmd5="eb06b784d8619db67067a0d629528a29" project="openSUSE:Factory" repository="standard"/> <bdep name="libpopt0" preinstall="1" notmeta="1" version="1.18" release="2.21" arch="x86_64" hdrmd5="c9e4a784005aef62973fb0107cd03d6e" project="openSUSE:Factory" repository="standard"/> <bdep name="libelf1" preinstall="1" notmeta="1" version="0.186" release="2.1" arch="x86_64" hdrmd5="72aeaedf132df0a110b3af845257cd34" project="openSUSE:Factory" repository="standard"/> <bdep name="libpcre1" preinstall="1" notmeta="1" version="8.45" release="1.5" arch="x86_64" hdrmd5="a222acbb4b91f202cfcfbe633949009d" project="openSUSE:Factory" repository="standard"/> <bdep name="libzstd1" preinstall="1" notmeta="1" version="1.5.2" release="1.3" arch="x86_64" hdrmd5="bdc713c042bef38de159839fcace1d96" project="openSUSE:Factory" repository="standard"/> <bdep name="libpcre2-8-0" preinstall="1" notmeta="1" version="10.39" release="1.5" arch="x86_64" hdrmd5="b7bcb9cbbc538ff20d7f875ffb06c98e" project="openSUSE:Factory" repository="standard"/> <bdep name="util-linux" vminstall="1" version="2.37.4" release="1.1" arch="x86_64" hdrmd5="b7651c423640c4c9c541384255832e0b" project="openSUSE:Factory" repository="standard"/> <bdep name="libmount1" vminstall="1" version="2.37.4" release="1.1" arch="x86_64" hdrmd5="e7cb2327a65b142d70ac884678df9c77" project="openSUSE:Factory" repository="standard"/> <bdep name="perl-base" vminstall="1" version="5.34.0" release="2.1" arch="x86_64" hdrmd5="a96cfb03c5f876d854d1018c9e741515" project="openSUSE:Factory" repository="standard"/> <bdep name="libdb-4_8" vminstall="1" notmeta="1" version="4.8.30" release="38.42" arch="x86_64" hdrmd5="8cdee2f54a428320391d933513f371d2" project="openSUSE:Factory" repository="standard"/> <bdep name="libblkid1" vminstall="1" version="2.37.4" release="1.1" arch="x86_64" hdrmd5="07578a9b95fb18d3025304bcb3624f87" project="openSUSE:Factory" repository="standard"/> <bdep name="libuuid1" vminstall="1" version="2.37.4" release="1.1" arch="x86_64" hdrmd5="37577cb286c0b50c0f3053acd42a41c1" project="openSUSE:Factory" repository="standard"/> <bdep name="libsmartcols1" vminstall="1" version="2.37.4" release="1.1" arch="x86_64" hdrmd5="5e51c42dc936a55b92a3d19b47d5a370" project="openSUSE:Factory" repository="standard"/> <bdep name="libcrypt1" vminstall="1" version="4.4.27" release="1.4" arch="x86_64" hdrmd5="d488933ee6caf372b1be966f97f664fd" project="openSUSE:Factory" repository="standard"/> <bdep name="kernel-obs-build" vminstall="1" notmeta="1" version="5.16.15" release="1.1" arch="x86_64" hdrmd5="7fc326781602569d554222caed047fd3" project="openSUSE:Factory" repository="standard"/> <bdep name="bc" version="1.07.1" release="4.20" arch="x86_64" hdrmd5="13c2e9d6129a53aa8676db6ba594f1b8" project="openSUSE:Factory" repository="standard"/> <bdep name="bison" version="3.8.2" release="2.5" arch="x86_64" hdrmd5="7ccda2608ec82552686aab642fe32f05" project="openSUSE:Factory" repository="standard"/> <bdep name="fdupes" version="2.1.2" release="2.1" arch="x86_64" hdrmd5="527373f696e47c0b5a76c3375bed726e" project="openSUSE:Factory" repository="standard"/> <bdep name="flex" version="2.6.4" release="6.16" arch="x86_64" hdrmd5="20386bc3f6a4cbd40e3f5598a4eb6cb4" project="openSUSE:Factory" repository="standard"/> <bdep name="hmaccalc" version="0.9.14" release="2.13" arch="x86_64" hdrmd5="8a665d84f1c51f8e8e462e0c5929fc26" project="openSUSE:Factory" repository="standard"/> <bdep name="libopenssl-devel" version="1.1.1n" release="1.1" arch="noarch" hdrmd5="21f478b5f77058c03ca4c91902ead1d8" project="openSUSE:Factory" repository="standard"/> <bdep name="openssl" version="1.1.1n" release="1.1" arch="noarch" hdrmd5="5b016c7fbc3b05db55659ea43da392fd" project="openSUSE:Factory" repository="standard"/> <bdep name="pesign-obs-integration" version="10.2+git20210804.ff18da1" release="2.1" arch="x86_64" hdrmd5="52a6ffbfb874f12e4fe7e1e90924c521" project="openSUSE:Factory" repository="standard"/> <bdep name="dwarves" version="1.22" release="2.3" arch="x86_64" hdrmd5="b2ff285738854934896cea7e972c65fd" project="openSUSE:Factory" repository="standard"/> <bdep name="libelf-devel" version="0.186" release="2.1" arch="x86_64" hdrmd5="60821fe7c5df30050c00ce5b20f4cf03" project="openSUSE:Factory" repository="standard"/> <bdep name="elfutils" version="0.186" release="2.1" arch="x86_64" hdrmd5="4608fa7ec694a15780c242cc58ca61b2" project="openSUSE:Factory" repository="standard"/> <bdep name="zstd" version="1.5.2" release="1.3" arch="x86_64" hdrmd5="5d3444ba387d8909faa1b6ed4eda0542" project="openSUSE:Factory" repository="standard"/> <bdep name="rpm-build" version="4.17.0" release="5.1" arch="x86_64" hdrmd5="990f0251576f523828bea931d8f498fa" project="openSUSE:Factory" repository="standard"/> <bdep name="gcc-PIE" version="11" release="5.3" arch="x86_64" hdrmd5="9a3e4b66c17715e3347a9b406c65306e" project="openSUSE:Factory" repository="standard"/> <bdep name="kmod" version="29" release="8.4" arch="x86_64" hdrmd5="29de7185630c011cdc89f923e1ff98e4" project="openSUSE:Factory" repository="standard"/> <bdep name="m4" version="1.4.18" release="6.6" arch="x86_64" hdrmd5="117d121ed02492bedad89ff3eadb307a" project="openSUSE:Factory" repository="standard"/> <bdep name="libgmp10" version="6.2.1" release="4.5" arch="x86_64" hdrmd5="c58a46f3234e3a1b4f21e3c96127abf0" project="openSUSE:Factory" repository="standard"/> <bdep name="libstdc++6" version="11.2.1+git1406" release="1.1" arch="x86_64" hdrmd5="45bce3aec82cfb83ecc8b43819a9df7d" project="openSUSE:Factory" repository="standard"/> <bdep name="libfl-devel" version="2.6.4" release="6.16" arch="x86_64" hdrmd5="c3c1851a5f612f5f2ac8db720980938a" project="openSUSE:Factory" repository="standard"/> <bdep name="mozilla-nss" version="3.75" release="2.1" arch="x86_64" hdrmd5="f45282dc4b10a97b9f02d210ce0fac2e" project="openSUSE:Factory" repository="standard"/> <bdep name="mozilla-nspr" version="4.33" release="1.3" arch="x86_64" hdrmd5="d699571224677ab40394444bce4adb82" project="openSUSE:Factory" repository="standard"/> <bdep name="pkgconf-pkg-config" version="1.8.0" release="1.6" arch="x86_64" hdrmd5="32db575c9995ac0b207b298ae525ca6b" project="openSUSE:Factory" repository="standard"/> <bdep name="libopenssl-1_1-devel" version="1.1.1n" release="1.1" arch="x86_64" hdrmd5="d7851e267014ca4b0cc5acc85cce7cd9" project="openSUSE:Factory" repository="standard"/> <bdep name="libopenssl1_1" version="1.1.1n" release="1.1" arch="x86_64" hdrmd5="bb00bd1e09700a8ef1133f06b8af8cf1" project="openSUSE:Factory" repository="standard"/> <bdep name="openssl-1_1" version="1.1.1n" release="1.1" arch="x86_64" hdrmd5="30efea33cc325253d0f74e2b1a6e0a60" project="openSUSE:Factory" repository="standard"/> <bdep name="fipscheck" version="1.5.0" release="4.22" arch="x86_64" hdrmd5="06ce1158c4f2c822edaa2d4cc55e7b57" project="openSUSE:Factory" repository="standard"/> <bdep name="mozilla-nss-tools" version="3.75" release="2.1" arch="x86_64" hdrmd5="63d61c38ebb2f100c5a1512d46e4143c" project="openSUSE:Factory" repository="standard"/> <bdep name="pesign" version="113" release="10.3" arch="x86_64" hdrmd5="8b1a30f37cf40a6a04a815f91ac668c2" project="openSUSE:Factory" repository="standard"/> <bdep name="suse-module-tools" version="16.0.19" release="1.3" arch="x86_64" hdrmd5="c81261025db21283bee73fc359239760" project="openSUSE:Factory" repository="standard"/> <bdep name="python38-base" version="3.8.12" release="4.1" arch="x86_64" hdrmd5="eb064eb1a8baa6f2177cbf33a2c63032" project="openSUSE:Factory" repository="standard"/> <bdep name="libbpf0" version="0.7.0" release="2.1" arch="x86_64" hdrmd5="7f89d77e7c3523cd1fd226332f459231" project="openSUSE:Factory" repository="standard"/> <bdep name="libdwarves1" version="1.22" release="2.3" arch="x86_64" hdrmd5="559675064145d35c09cf21ff50e52c87" project="openSUSE:Factory" repository="standard"/> <bdep name="glibc-devel" version="2.35" release="2.1" arch="x86_64" hdrmd5="bb609b208cf3044f4e4371b1579417e9" project="openSUSE:Factory" repository="standard"/> <bdep name="libdw1" version="0.186" release="2.1" arch="x86_64" hdrmd5="d55b3f0dfd9f2f4242754e09169469c5" project="openSUSE:Factory" repository="standard"/> <bdep name="libasm1" version="0.186" release="2.1" arch="x86_64" hdrmd5="ebee80aad3e5d54a72baa12425e53bc7" project="openSUSE:Factory" repository="standard"/> <bdep name="findutils" version="4.9.0" release="1.3" arch="x86_64" hdrmd5="8353611211ca8f951a85b4bf90261f36" project="openSUSE:Factory" repository="standard"/> <bdep name="xz" version="5.2.5" release="2.6" arch="x86_64" hdrmd5="b7d1132cf7b61a66997694e7630823c1" project="openSUSE:Factory" repository="standard"/> <bdep name="gcc" version="11" release="5.3" arch="x86_64" hdrmd5="4cf81e8a70d95977e3d48a49956b73fe" project="openSUSE:Factory" repository="standard"/> <bdep name="make" version="4.3" release="2.39" arch="x86_64" hdrmd5="9cb51272c6b2df2a4a04bc1c6148d0c8" project="openSUSE:Factory" repository="standard"/> <bdep name="cpio" version="2.13" release="4.5" arch="x86_64" hdrmd5="9eb5897d0acc364836fbc6edc24ee702" project="openSUSE:Factory" repository="standard"/> <bdep name="file" version="5.41" release="3.1" arch="x86_64" hdrmd5="b0fbde895791f46c93158585218d386f" project="openSUSE:Factory" repository="standard"/> <bdep name="bzip2" version="1.0.8" release="3.6" arch="x86_64" hdrmd5="88c3eb363589dd8e94dcd49a23dd85cc" project="openSUSE:Factory" repository="standard"/> <bdep name="gawk" version="5.1.1" release="3.5" arch="x86_64" hdrmd5="9982c5f0c9ec98031270def2540e9c96" project="openSUSE:Factory" repository="standard"/> <bdep name="binutils" version="2.38" release="3.1" arch="x86_64" hdrmd5="831315fcdd253fb60f556024ad939699" project="openSUSE:Factory" repository="standard"/> <bdep name="patch" version="2.7.6" release="4.5" arch="x86_64" hdrmd5="8bc7bc2d1780533053b5ea1a4881e0f8" project="openSUSE:Factory" repository="standard"/> <bdep name="which" version="2.21" release="4.49" arch="x86_64" hdrmd5="a16c29eaae5703d8630f542601ee1fa6" project="openSUSE:Factory" repository="standard"/> <bdep name="glibc-locale-base" version="2.35" release="2.1" arch="x86_64" hdrmd5="90fd7dca456f8e684a9b7a239a081431" project="openSUSE:Factory" repository="standard"/> <bdep name="systemd-rpm-macros" version="16" release="1.1" arch="noarch" hdrmd5="29bd5eee7846286ddf031711eca73891" project="openSUSE:Factory" repository="standard"/> <bdep name="dwz" version="0.14" release="3.3" arch="x86_64" hdrmd5="0a441759744f0bde41808410dd46920c" project="openSUSE:Factory" repository="standard"/> <bdep name="librpmbuild9" version="4.17.0" release="5.1" arch="x86_64" hdrmd5="d1be1d090b007e5dd0e37765cdb064ec" project="openSUSE:Factory" repository="standard"/> <bdep name="gcc11-PIE" version="11.2.1+git1406" release="1.1" arch="x86_64" hdrmd5="0addc9c900c5b6abc63e815aef6998b3" project="openSUSE:Factory" repository="standard"/> <bdep name="rpm-build-perl" version="4.17.0" release="5.1" arch="x86_64" hdrmd5="ad6657c4a2a8f5b2603b9e8f25028831" project="openSUSE:Factory" repository="standard"/> <bdep name="rpm-build-python" version="4.17.0" release="5.1" arch="x86_64" hdrmd5="fcc2c1c97c0f920089f8f394e505bf5f" project="openSUSE:Factory" repository="standard"/> <bdep name="libfl2" version="2.6.4" release="6.16" arch="x86_64" hdrmd5="2d7d7b1d6db4f0c0ce6e881a1ac46486" project="openSUSE:Factory" repository="standard"/> <bdep name="libfreebl3" version="3.75" release="2.1" arch="x86_64" hdrmd5="532415587bce659288700f6e4dd01f43" project="openSUSE:Factory" repository="standard"/> <bdep name="libsoftokn3" version="3.75" release="2.1" arch="x86_64" hdrmd5="aa3111969ced25cfeefdb58c6ea8b300" project="openSUSE:Factory" repository="standard"/> <bdep name="pkgconf" version="1.8.0" release="1.6" arch="x86_64" hdrmd5="38064342c0ee786f5dbaab2d77011acc" project="openSUSE:Factory" repository="standard"/> <bdep name="pkgconf-m4" version="1.8.0" release="1.6" arch="noarch" hdrmd5="13bfbada4004821cb3b497344f48550a" project="openSUSE:Factory" repository="standard"/> <bdep name="crypto-policies" version="20210917.c9d86d1" release="1.5" arch="noarch" hdrmd5="f135319d71167da5d3b210232deb5d2e" project="openSUSE:Factory" repository="standard"/> <bdep name="libfipscheck1" version="1.5.0" release="4.22" arch="x86_64" hdrmd5="ba09db07e2b5aa6ba96a309f73eeed8a" project="openSUSE:Factory" repository="standard"/> <bdep name="libefivar1" version="37" release="5.4" arch="x86_64" hdrmd5="a88aa2d06acfa15b4e6664e884677365" project="openSUSE:Factory" repository="standard"/> <bdep name="sysuser-shadow" version="3.1" release="4.3" arch="noarch" hdrmd5="c0b115e7ef6e1ca77c224c130b5b77f1" project="openSUSE:Factory" repository="standard"/> <bdep name="libpython3_8-1_0" version="3.8.12" release="4.1" arch="x86_64" hdrmd5="0ae63ea8e7f0cab5fb305ad44791f4d0" project="openSUSE:Factory" repository="standard"/> <bdep name="libexpat1" version="2.4.7" release="1.1" arch="x86_64" hdrmd5="305a75aa74fd02426b1d7d9c084441cb" project="openSUSE:Factory" repository="standard"/> <bdep name="libffi8" version="3.4.2" release="1.5" arch="x86_64" hdrmd5="5bf59ee9f65238685bc17558c1716b1a" project="openSUSE:Factory" repository="standard"/> <bdep name="libmpdec3" version="2.5.1" release="2.6" arch="x86_64" hdrmd5="92ca35da51d690a7f6a2aa5cf342ce5a" project="openSUSE:Factory" repository="standard"/> <bdep name="linux-glibc-devel" version="5.16" release="1.3" arch="x86_64" hdrmd5="be48d2b421b64b89d7ca06810dc116e1" project="openSUSE:Factory" repository="standard"/> <bdep name="libxcrypt-devel" version="4.4.27" release="1.4" arch="x86_64" hdrmd5="aeb0e4eb6904be0a8c2a1c3a6e9539ff" project="openSUSE:Factory" repository="standard"/> <bdep name="libaudit1" version="3.0.6" release="2.4" arch="x86_64" hdrmd5="748459ba43401447c42aebe3f4c05230" project="openSUSE:Factory" repository="standard"/> <bdep name="libcap-ng0" version="0.7.11" release="1.5" arch="x86_64" hdrmd5="5e5d7cba858d79da6906e38d7c5a6fd7" project="openSUSE:Factory" repository="standard"/> <bdep name="libeconf0" version="0.4.4+git20220104.962774f" release="1.4" arch="x86_64" hdrmd5="5a360578979b026376c47878ab199d59" project="openSUSE:Factory" repository="standard"/> <bdep name="libutempter0" version="1.2.0" release="3.19" arch="x86_64" hdrmd5="89a94da7156b5c027bd6d54adbbd58f1" project="openSUSE:Factory" repository="standard"/> <bdep name="libfdisk1" version="2.37.4" release="1.1" arch="x86_64" hdrmd5="4ee285915e2e823ebfb75a0da4781ac1" project="openSUSE:Factory" repository="standard"/> <bdep name="system-group-hardware" version="20170617" release="24.5" arch="noarch" hdrmd5="b8768a77bbc019a8eeb4b28584e5dad2" project="openSUSE:Factory" repository="standard"/> <bdep name="gcc11" version="11.2.1+git1406" release="1.1" arch="x86_64" hdrmd5="56ccecb9331e07f94eb915024fcee1a3" project="openSUSE:Factory" repository="standard"/> <bdep name="cpp" version="11" release="5.3" arch="x86_64" hdrmd5="1fe32e6c9773209f372bb98bcb7064c8" project="openSUSE:Factory" repository="standard"/> <bdep name="libseccomp2" version="2.5.3" release="4.5" arch="x86_64" hdrmd5="0b725656146b17cc948970a672a56f87" project="openSUSE:Factory" repository="standard"/> <bdep name="libmagic1" version="5.41" release="3.1" arch="x86_64" hdrmd5="2c6f8603361a1c02d52fa04f938d1e70" project="openSUSE:Factory" repository="standard"/> <bdep name="libmpfr6" version="4.1.0" release="2.18" arch="x86_64" hdrmd5="bc8666a238457a65717b6921376d17da" project="openSUSE:Factory" repository="standard"/> <bdep name="libctf-nobfd0" version="2.38" release="3.1" arch="x86_64" hdrmd5="07473f380c3de0f90471486faad487a4" project="openSUSE:Factory" repository="standard"/> <bdep name="libctf0" version="2.38" release="3.1" arch="x86_64" hdrmd5="7fb9b915f1fdf1aec42b688a39282e15" project="openSUSE:Factory" repository="standard"/> <bdep name="update-alternatives" version="1.21.1" release="1.1" arch="x86_64" hdrmd5="915e73a57ae680984da0cd123df94f0b" project="openSUSE:Factory" repository="standard"/> <bdep name="python-rpm-macros" version="20220106.80d3756" release="1.4" arch="noarch" hdrmd5="7854af9bf015a8100a73a83a899c2051" project="openSUSE:Factory" repository="standard"/> <bdep name="system-user-root" version="20190513" release="2.3" arch="noarch" hdrmd5="39a03749e48b34a202da01c77e8a5b60" project="openSUSE:Factory" repository="standard"/> <bdep name="compat-usrmerge-tools" version="84.87" release="5.6" arch="x86_64" hdrmd5="ae62447676061124e263750ff9df3d9c" project="openSUSE:Factory" repository="standard"/> <bdep name="terminfo-base" version="6.3.20220312" release="13.1" arch="x86_64" hdrmd5="a6ec9a4cd5de63fd8fe46e0d14d8e22d" project="openSUSE:Factory" repository="standard"/> <bdep name="libsqlite3-0" version="3.38.1" release="1.1" arch="x86_64" hdrmd5="7951a90b708bd24ebccc4f6229125496" project="openSUSE:Factory" repository="standard"/> <bdep name="libpkgconf3" version="1.8.0" release="1.6" arch="x86_64" hdrmd5="49d38e1fe01c13b6f9fa860e91f47629" project="openSUSE:Factory" repository="standard"/> <bdep name="pam_unix" version="1.5.2" release="6.1" arch="x86_64" hdrmd5="22ca7432f805ff864790c548f2c65b53" project="openSUSE:Factory" repository="standard"/> <bdep name="chkstat" version="1599_20220309" release="30.1" arch="x86_64" hdrmd5="39792980d7c24b2c88b59aa6cf9ede3e" project="openSUSE:Factory" repository="standard"/> <bdep name="permissions-config" version="1599_20220309" release="30.1" arch="x86_64" hdrmd5="9cbb775b83a1b3b02e1dad5bd1ed506e" project="openSUSE:Factory" repository="standard"/> <bdep name="libmpc3" version="1.2.1" release="1.19" arch="x86_64" hdrmd5="adf662a9a3b24178be77659331e658ea" project="openSUSE:Factory" repository="standard"/> <bdep name="libisl23" version="0.24" release="1.17" arch="x86_64" hdrmd5="1aa92b29dda73463d09c5e01854ca114" project="openSUSE:Factory" repository="standard"/> <bdep name="cpp11" version="11.2.1+git1406" release="1.1" arch="x86_64" hdrmd5="efe611ceac662611d923213c4f474c51" project="openSUSE:Factory" repository="standard"/> <bdep name="libasan6" version="11.2.1+git1406" release="1.1" arch="x86_64" hdrmd5="78a48a4ee5152be155f083b88b795952" project="openSUSE:Factory" repository="standard"/> <bdep name="libatomic1" version="11.2.1+git1406" release="1.1" arch="x86_64" hdrmd5="8cc4e209b82455d6b047fd0162470ed0" project="openSUSE:Factory" repository="standard"/> <bdep name="libgomp1" version="11.2.1+git1406" release="1.1" arch="x86_64" hdrmd5="f6904901f22ee0a0e81ececaabd3f036" project="openSUSE:Factory" repository="standard"/> <bdep name="libitm1" version="11.2.1+git1406" release="1.1" arch="x86_64" hdrmd5="4ef65e57d853ee7201b462286aa5ac86" project="openSUSE:Factory" repository="standard"/> <bdep name="liblsan0" version="11.2.1+git1406" release="1.1" arch="x86_64" hdrmd5="0d115caa58f42b70e961d79476ecb5df" project="openSUSE:Factory" repository="standard"/> <bdep name="libtsan0" version="11.2.1+git1406" release="1.1" arch="x86_64" hdrmd5="97f7638b08fb75cf61407bc9bcf520a7" project="openSUSE:Factory" repository="standard"/> <bdep name="libubsan1" version="11.2.1+git1406" release="1.1" arch="x86_64" hdrmd5="3c235e5c84fe1a0770830d4ba1f1d8e6" project="openSUSE:Factory" repository="standard"/> <bdep name="file-magic" version="5.41" release="3.1" arch="noarch" hdrmd5="03ab638fc37b0bc585f3f6fcd4b7d679" project="openSUSE:Factory" repository="standard"/> <bdep name="zlib-devel" version="1.2.11" release="18.21" arch="x86_64" hdrmd5="e278aca35f9ee65910c718b22f3746de" project="openSUSE:Factory" repository="standard"/> <bdep name="gzip" version="1.11" release="2.3" arch="x86_64" hdrmd5="ecf68b3859a27667118bbcb5f4f7e418" project="openSUSE:Factory" repository="standard"/> <bdep name="mozilla-nss-certs" version="3.75" release="2.1" arch="x86_64" hdrmd5="7a0e477fe9b9c107cf3fd18c740313cf" project="openSUSE:Factory" repository="standard"/> <bdep name="shadow" version="4.11.1" release="1.3" arch="x86_64" hdrmd5="a67884c66a54842072e15452399001fe" project="openSUSE:Factory" repository="standard"/> <bdep name="libsemanage2" version="3.3" release="2.3" arch="x86_64" hdrmd5="ddff7298fba8421427e61543e7e84195" project="openSUSE:Factory" repository="standard"/> <bdep name="libsubid4" version="4.11.1" release="1.3" arch="x86_64" hdrmd5="c54c503974139c6bad7e21d55fd9e21f" project="openSUSE:Factory" repository="standard"/> <bdep name="login_defs" version="4.11.1" release="1.3" arch="noarch" hdrmd5="56fd824ca7359e37a4e4a21ef6ae82a2" project="openSUSE:Factory" repository="standard"/> <bdep name="libsepol2" version="3.3" release="1.5" arch="x86_64" hdrmd5="6d1c7b36514f433a48b9a54f00d4bf3f" project="openSUSE:Factory" repository="standard"/> <bdep name="libsemanage-conf" version="3.3" release="2.3" arch="x86_64" hdrmd5="557141c464657e83e74f3ccb96f60455" project="openSUSE:Factory" repository="standard"/> <bdep name="vim-data" notmeta="1" version="8.2.4602" release="1.1" arch="noarch" hdrmd5="13487a08e8ca29df1b060056215539f5" project="openSUSE:Factory" repository="standard"/> <bdep name="perf" notmeta="1" version="5.16.15" release="74.1" arch="x86_64" hdrmd5="afa5117a5c0eaa611f3e50f143d57038" project="openSUSE:Factory" repository="standard"/> <bdep name="gdb" notmeta="1" version="11.1" release="7.1" arch="x86_64" hdrmd5="e5e27a57eab24cd88ddc846588480987" project="openSUSE:Factory" repository="standard"/> <bdep name="vim" notmeta="1" version="8.2.4602" release="1.1" arch="x86_64" hdrmd5="abd107bdb54681b1980f0902434ce744" project="openSUSE:Factory" repository="standard"/> <bdep name="strace" notmeta="1" version="5.17" release="1.1" arch="x86_64" hdrmd5="6098f1b6618718e1130bcc1dcccc9c52" project="openSUSE:Factory" repository="standard"/> <bdep name="less" notmeta="1" version="590" release="3.5" arch="x86_64" hdrmd5="bc004e9e232fc5fca0b38091d6df828b" project="openSUSE:Factory" repository="standard"/> <bdep name="rzsz" notmeta="1" version="0.12.21~rc" release="4.7" arch="x86_64" hdrmd5="f8a60049c2fed2d545d17b2172cbe8a6" project="openSUSE:Factory" repository="standard"/> <bdep name="perl" notmeta="1" version="5.34.0" release="2.1" arch="x86_64" hdrmd5="8114b8f9675e483821a81cae72e0c442" project="openSUSE:Factory" repository="standard"/> <bdep name="build-mkbaselibs" notmeta="1" version="20220315" release="1.1" arch="noarch" hdrmd5="b30104b4d72bb0a4c95cef0ab167dec6" project="openSUSE:Factory" repository="standard"/> <bdep name="compat-usrmerge-build" notmeta="1" version="84.87" release="5.6" arch="x86_64" hdrmd5="6966df2c8af0494dbc449ac039322b81" project="openSUSE:Factory" repository="standard"/> <bdep name="build-compare" notmeta="1" version="20220307T115648.b5abdde" release="1.1" arch="noarch" hdrmd5="a87b3edca5b6ca312ffccd4fcf643c3b" project="openSUSE:Factory" repository="standard"/> <bdep name="rpmlint-mini" notmeta="1" version="2.2.0+git20220325.40598ec" release="5.6" arch="x86_64" hdrmd5="4323845f6e9d7b787c9d4eeebfc1350b" project="openSUSE:Factory" repository="standard"/> <bdep name="vim-data-common" notmeta="1" version="8.2.4602" release="1.1" arch="noarch" hdrmd5="285d7f8686fd6bce19fbe7c773aa6cb5" project="openSUSE:Factory" repository="standard"/> <bdep name="libnuma1" notmeta="1" version="2.0.14.20.g4ee5e0c" release="1.4" arch="x86_64" hdrmd5="9a118ca181d2d7d05af0abb9e406b629" project="openSUSE:Factory" repository="standard"/> <bdep name="libunwind" notmeta="1" version="1.5.0" release="1.7" arch="x86_64" hdrmd5="d99a7e55aad88d7e95c3998cf60265fb" project="openSUSE:Factory" repository="standard"/> <bdep name="libslang2" notmeta="1" version="2.3.2" release="1.11" arch="x86_64" hdrmd5="ebb6c3cd46400475a162024bc88ac5dd" project="openSUSE:Factory" repository="standard"/> <bdep name="babeltrace" notmeta="1" version="1.5.8" release="3.2" arch="x86_64" hdrmd5="b8eba9a97d665e116cc4e8264d82fb3b" project="openSUSE:Factory" repository="standard"/> <bdep name="libtraceevent1" notmeta="1" version="1.5.0" release="3.1" arch="x86_64" hdrmd5="e3019009f1ecc03f7cc37617c02d51b6" project="openSUSE:Factory" repository="standard"/> <bdep name="libopencsd_c_api1" notmeta="1" version="1.2.0" release="1.3" arch="x86_64" hdrmd5="5d9aeeb60b9815070245a6fa82f86735" project="openSUSE:Factory" repository="standard"/> <bdep name="libsource-highlight4" notmeta="1" version="3.1.9" release="4.3" arch="x86_64" hdrmd5="8ee5aef24fb33430c2dfd0dcfc697030" project="openSUSE:Factory" repository="standard"/> <bdep name="alts" notmeta="1" version="1.2+3.b848aad" release="2.3" arch="x86_64" hdrmd5="f6077cb4370bd068b799ed9e51e9ca08" project="openSUSE:Factory" repository="standard"/> <bdep name="ncurses-utils" notmeta="1" version="6.3.20220312" release="13.1" arch="x86_64" hdrmd5="8d6ed6af84a0684832a2a8f2e3bf9b42" project="openSUSE:Factory" repository="standard"/> <bdep name="libgdbm6" notmeta="1" version="1.23" release="1.4" arch="x86_64" hdrmd5="063235da4b158151cfbfb2ce11bbd4e1" project="openSUSE:Factory" repository="standard"/> <bdep name="libgdbm_compat4" notmeta="1" version="1.23" release="1.4" arch="x86_64" hdrmd5="01a0e4fd430e70c578a6981c6e625fbe" project="openSUSE:Factory" repository="standard"/> <bdep name="polkit-default-privs" notmeta="1" version="1550+20220325.163dbdf" release="1.1" arch="noarch" hdrmd5="dcb31ba3772d779555f0412ef6c2bc9e" project="openSUSE:Factory" repository="standard"/> <bdep name="libglib-2_0-0" notmeta="1" version="2.72.0" release="1.1" arch="x86_64" hdrmd5="52f770c8f2e2e4ba3ac786752584a958" project="openSUSE:Factory" repository="standard"/> <bdep name="libgmodule-2_0-0" notmeta="1" version="2.72.0" release="1.1" arch="x86_64" hdrmd5="c5d6acc0964bd0f21b8aea06916dbad4" project="openSUSE:Factory" repository="standard"/> <bdep name="libopencsd1" notmeta="1" version="1.2.0" release="1.3" arch="x86_64" hdrmd5="260634084d0c9e3776690b63cd5b2a8b" project="openSUSE:Factory" repository="standard"/> <bdep name="libalternatives1" notmeta="1" version="1.2+3.b848aad" release="2.3" arch="x86_64" hdrmd5="5722007c3b3b96805950c7515ca09796" project="openSUSE:Factory" repository="standard"/> <bdep name="libdebuginfod1" notmeta="1" version="0.186" release="2.1" arch="x86_64" hdrmd5="99fddeecd4032a66c569548f57885a36" project="openSUSE:Factory" repository="standard"/> <bdep name="libcurl4" notmeta="1" version="7.82.0" release="1.1" arch="x86_64" hdrmd5="eaf7c53407f280f1a80a67ee00586e8f" project="openSUSE:Factory" repository="standard"/> <bdep name="libldap-2_4-2" notmeta="1" version="2.4.59" release="71.3" arch="x86_64" hdrmd5="af279f678b0d596402215487cafc68f9" project="openSUSE:Factory" repository="standard"/> <bdep name="libbrotlidec1" notmeta="1" version="1.0.9" release="1.7" arch="x86_64" hdrmd5="a5cc02ce509169501bb32dda4b8a1da4" project="openSUSE:Factory" repository="standard"/> <bdep name="libssh4" notmeta="1" version="0.9.6" release="3.2" arch="x86_64" hdrmd5="cde6ac920fb9cbed28f964291c9c36b4" project="openSUSE:Factory" repository="standard"/> <bdep name="libidn2-0" notmeta="1" version="2.3.2" release="1.4" arch="x86_64" hdrmd5="97e12d2aa26f24d1ba346036d495f832" project="openSUSE:Factory" repository="standard"/> <bdep name="libnghttp2-14" notmeta="1" version="1.47.0" release="1.1" arch="x86_64" hdrmd5="f8f859a77e74b378f899f5825c6b098b" project="openSUSE:Factory" repository="standard"/> <bdep name="libpsl5" notmeta="1" version="0.21.1" release="1.9" arch="x86_64" hdrmd5="8d15631c26c8c3179666eb42ccde930d" project="openSUSE:Factory" repository="standard"/> <bdep name="libsasl2-3" notmeta="1" version="2.1.28" release="1.1" arch="x86_64" hdrmd5="466872aaf42a614c2438042476fd656b" project="openSUSE:Factory" repository="standard"/> <bdep name="libbrotlicommon1" notmeta="1" version="1.0.9" release="1.7" arch="x86_64" hdrmd5="01b930d336d75ca894ce759d237314e6" project="openSUSE:Factory" repository="standard"/> <bdep name="libssh-config" notmeta="1" version="0.9.6" release="3.2" arch="x86_64" hdrmd5="c8c663d89d8a55339a303aab86c767c1" project="openSUSE:Factory" repository="standard"/> <bdep name="libunistring2" notmeta="1" version="0.9.10" release="2.13" arch="x86_64" hdrmd5="b0b60cca6566d5ee3a1f820d9110de16" project="openSUSE:Factory" repository="standard"/> <bdep name="krb5-mini" notmeta="1" version="1.19.2" release="4.3" arch="x86_64" hdrmd5="bf78426085475e1f81875ce783aae020" project="openSUSE:Factory" repository="standard"/> <bdep name="libcom_err2" notmeta="1" version="1.46.5" release="1.3" arch="x86_64" hdrmd5="6ce49fe157cbf451950ed472901feef2" project="openSUSE:Factory" repository="standard"/> <bdep name="libkeyutils1" notmeta="1" version="1.6.3" release="3.6" arch="x86_64" hdrmd5="61902d5722044471acd90e39e45a8724" project="openSUSE:Factory" repository="standard"/> <bdep name="libverto1" notmeta="1" version="0.3.1" release="1.20" arch="x86_64" hdrmd5="eea0a3adade656d295b807214a57d00d" project="openSUSE:Factory" repository="standard"/> <bdep name="lua54" notmeta="1" version="5.4.4" release="2.1" arch="x86_64" hdrmd5="0511c75d07c18184f3dac4737fed3de2" project="openSUSE:Factory" repository="standard"/> <path project="Kernel:stable" repository="standard" url="https://download.opensuse.org/repositories/Kernel:/stable/standard/"/> <path project="openSUSE:Factory" repository="standard" url="http://download.opensuse.org/tumbleweed/repo/oss/"/> </buildinfo> ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.305046672 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.309046626 +0200 @@ -45,6 +45,7 @@ <size unit="G">8</size> </disk> </hardware> + <hostlabel exclude="true">SLOW_DISK</hostlabel> </overwrite>  ++++++ arch-symbols ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.329046401 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.333046356 +0200 @@ -2,7 +2,7 @@ ############################################################################# # Copyright (c) 2003-2005,2009 Novell, Inc. -# All Rights Reserved. +# Copyright (c) 2010-2022 SUSE LLC # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public License as @@ -14,12 +14,11 @@ # 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, contact Novell, Inc. +# along with this program; if not, contact https://www.suse.com/source-code/ # -# To contact Novell about this file by physical or electronic mail, -# you may find current contact information at www.novell.com ############################################################################# + # With --list, list all known architectures, otherwise print the generic # name for this architecture (or the one specified on command line). @@ -32,7 +31,7 @@ if [ -n "$1" ]; then ARCH="$1" else - ARCH="`arch`" + ARCH="$(arch)" fi case "$ARCH" in # from rpm --eval '%ix86' ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.409045498 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.409045498 +0200 @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=5.16 +SRCVERSION=5.17 # variant of the kernel-source package, either empty or "-rt" VARIANT= # enable kernel module compression ++++++ config.tar.bz2 ++++++ ++++ 7676 lines of diff (skipped) ++++++ constraints.in ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.753041618 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.757041574 +0200 @@ -38,6 +38,7 @@ <size unit="G">8</size> </disk> </hardware> + <hostlabel exclude="true">SLOW_DISK</hostlabel> </overwrite>  ++++++ dtb.spec.in.in ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.785041257 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.789041213 +0200 @@ -65,9 +65,9 @@ %build source=linux-%srcversion cp $source/COPYING . -SRCDIR=`pwd`/$source +SRCDIR=$PWD/$source mkdir pp -PPDIR=`pwd`/pp +PPDIR=$PWD/pp export DTC_FLAGS="-R 4 -p 0x1000" %if 0%{?dtc_symbols} DTC_FLAGS="$DTC_FLAGS -@" ++++++ guards ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.809040987 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.813040942 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/perl -w -############################################################################# +############################################################################## # Copyright (c) 2003-2007,2009 Novell, Inc. -# All Rights Reserved. +# Copyright (c) 2010-2022 SUSE LLC # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public License as @@ -13,10 +13,8 @@ # 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, contact Novell, Inc. +# along with this program; if not, contact https://www.suse.com/source-code/ # -# To contact Novell about this file by physical or electronic mail, -# you may find current contact information at www.novell.com ############################################################################# # # Guards: ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.857040446 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.861040401 +0200 @@ -114,6 +114,9 @@ Release: @RELEASE@ %endif URL: https://www.kernel.org/ +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 +BuildRequires: bash-sh +%endif BuildRequires: bc BuildRequires: bison BuildRequires: coreutils @@ -786,7 +789,7 @@ # pointless to rely on its contents. Replacing by zeros to make the # checksums always the same for several builds of the same package. test -s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep && \ - dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=`stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep` count=1 + dd if=/dev/zero of=%buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep ibs=$(stat -c%s %buildroot/lib/modules/%kernelrelease-%build_flavor/modules.dep) count=1 res=0 if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then @@ -1060,14 +1063,14 @@ %endif %preun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %endif %postun %if "%build_flavor" != "zfcpdump" -/usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1124,13 +1127,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun extra -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-extra" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1188,13 +1191,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun optional -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "%name-optional" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" @@ -1355,13 +1358,13 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %preun -n @KMP_NAME@-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "@KMP_NAME@-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "@KMP_NAME@-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %postun -n @KMP_NAME@-%build_flavor -/usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "@KMP_NAME@-%build_flavor" \ +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "@KMP_NAME@-%build_flavor" \ --version "%version" --release "%release" --kernelrelease "%kernelrelease" \ --image "%image" --flavor "%build_flavor" --variant "%variant" \ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" ++++++ kernel-cert-subpackage ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.881040175 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.885040130 +0200 @@ -7,6 +7,15 @@ This package contains the UEFI Secure Boot certificate used to sign modules in the %{-n*}-kmp packages. +%define run_if_exists run_if_exists() { \ +if [ -x "$1" ] ; then \ + "$@" \ +else \ + echo Cannot execute "$1" >&2 \ +fi \ +} \ +run_if_exists + %pre -n %{-n*}-ueficert /usr/lib/module-init-tools/kernel-scriptlets/cert-pre --certs "@CERTS@" "$@" @@ -14,10 +23,10 @@ /usr/lib/module-init-tools/kernel-scriptlets/cert-post --certs "@CERTS@" "$@" %preun -n %{-n*}-ueficert -/usr/lib/module-init-tools/kernel-scriptlets/cert-preun --certs "@CERTS@" "$@" +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/cert-preun --certs "@CERTS@" "$@" %postun -n %{-n*}-ueficert -/usr/lib/module-init-tools/kernel-scriptlets/cert-postun --certs "@CERTS@" "$@" +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/cert-postun --certs "@CERTS@" "$@" %posttrans -n %{-n*}-ueficert /usr/lib/module-init-tools/kernel-scriptlets/cert-posttrans --certs "@CERTS@" "$@" ++++++ kernel-docs.spec.in ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.921039723 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.929039634 +0200 @@ -37,6 +37,9 @@ %else Release: @RELEASE@ %endif +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 +BuildRequires: bash-sh +%endif # TW (4.13 or later) no longer needs xmlto %if 0%{?sle_version} BuildRequires: xmlto ++++++ kernel-module-subpackage ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.953039363 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.957039318 +0200 @@ -48,6 +48,16 @@ Obsoletes: %{-n*}-kmp-desktop %endif AutoReqProv: on + +%define run_if_exists run_if_exists() { \ +if [ -x "$1" ] ; then \ + "$@" \ +else \ + echo Cannot execute "$1" >&2 \ +fi \ +} \ +run_if_exists + %{-p:%{expand:%(cd %_sourcedir; cat %{-p*})}} %description -n %{-n*}-kmp-%1 %( @@ -80,11 +90,11 @@ --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \ --flavor "%1" --usrmerged "0%{?usrmerged}" "$@" %preun -n %{-n*}-kmp-%1 -%{-b:KMP_NEEDS_MKINITRD=1} /usr/lib/module-init-tools/kernel-scriptlets/kmp-preun --name "%{-n*}-kmp-%1" \ +%{-b:KMP_NEEDS_MKINITRD=1} %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/kmp-preun --name "%{-n*}-kmp-%1" \ --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \ --flavor "%1" --usrmerged "0%{?usrmerged}" "$@" %postun -n %{-n*}-kmp-%1 -%{-b:KMP_NEEDS_MKINITRD=1} /usr/lib/module-init-tools/kernel-scriptlets/kmp-postun --name "%{-n*}-kmp-%1" \ +%{-b:KMP_NEEDS_MKINITRD=1} %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/kmp-postun --name "%{-n*}-kmp-%1" \ --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \ --flavor "%1" --usrmerged "0%{?usrmerged}" "$@" %posttrans -n %{-n*}-kmp-%1 ++++++ kernel-obs-build.spec.in ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:01.981039047 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:01.985039002 +0200 @@ -157,7 +157,7 @@ %if 0%{?suse_version} > 1550 || 0%{?sle_version} > 150200 --compress "zstd -19 -T0" \ %endif - `echo /boot/%{kernel_name}-*%{kernel_flavor} | sed -n -e 's,[^-]*-$.*'%{kernel_flavor}'$,\1,p'` + $(echo /boot/%{kernel_name}-*%{kernel_flavor} | sed -n -e 's,[^-]*-$.*'%{kernel_flavor}'$,\1,p') %endif #cleanup ++++++ kernel-source.spec.in ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:02.037038415 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:02.037038415 +0200 @@ -42,6 +42,9 @@ Group: Development/Sources URL: https://www.kernel.org/ AutoReqProv: off +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 +BuildRequires: bash-sh +%endif BuildRequires: coreutils BuildRequires: fdupes BuildRequires: sed @@ -102,7 +105,6 @@ Source83: kernel-subpackage-build Source84: kernel-subpackage-spec Source85: kernel-default-base.spec.txt -Source86: fdupes_relink Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -226,6 +228,8 @@ cd linux-%kernelrelease-vanilla %_sourcedir/apply-patches --vanilla %_sourcedir/series.conf %my_builddir %symbols rm -f $(find . -name ".gitignore") +# Hardlink duplicate files automatically (from package fdupes). +%fdupes $PWD cd .. %endif @@ -237,11 +241,10 @@ if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion fi +# Hardlink duplicate files automatically (from package fdupes). +%fdupes $PWD cd .. %endif - -# Hardlink duplicate files. -fdupes -q -p -n -H -o name -r %{buildroot} | %_sourcedir/fdupes_relink popd %if ! %vanilla_only ++++++ kernel-spec-macros ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:02.061038145 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:02.061038145 +0200 @@ -72,5 +72,15 @@ %define kernel_module_directory /lib/modules %endif +# Very basic macro for conditional execution. +%define run_if_exists run_if_exists() { \ +if [ -x "$1" ] ; then \ + "$@" \ +else \ + echo Cannot execute "$1" >&2 \ +fi \ +} \ +run_if_exists + # vim: ft=spec ++++++ linux-5.16.tar.xz -> linux-5.17.tar.xz ++++++ /work/SRC/openSUSE:Factory/kernel-source/linux-5.16.tar.xz /work/SRC/openSUSE:Factory/.kernel-source.new.1900/linux-5.17.tar.xz differ: char 13, line 1 ++++++ macros.kernel-source ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:02.157037062 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:02.161037016 +0200 @@ -1,6 +1,13 @@ # A few cross-distro definitions: +%kernel_build_shell_package %{lua: \ +if ((tonumber(rpm.expand("0%{?suse_version}")) > 1500) or (tonumber(rpm.expand("0%{?sle_version}")) > 150300)) then \ + print( "bash-sh" ) \ +else \ + print( "" ) \ +end \ +} %kernel_module_package_release 1 -%kernel_module_package_buildreqs modutils kernel-syms kmod-compat +%kernel_module_package_buildreqs modutils kernel-syms kmod-compat %kernel_build_shell_package %cpu_arch %(case %_target_cpu in \ # from rpm --eval '%ix86' \ ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 218239 lines of diff (skipped) ++++++ patches.rpmify.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/BTF-Don-t-break-ABI-when-debuginfo-is-disabled.patch new/patches.rpmify/BTF-Don-t-break-ABI-when-debuginfo-is-disabled.patch --- old/patches.rpmify/BTF-Don-t-break-ABI-when-debuginfo-is-disabled.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/BTF-Don-t-break-ABI-when-debuginfo-is-disabled.patch 2022-02-15 21:03:03.000000000 +0100 @@ -0,0 +1,35 @@ +From 3ade2c9958731789f7ec4ff4e71f1d058d041c5d Mon Sep 17 00:00:00 2001 +From: Michal Suchanek <msuchanek(a)suse.de> +Date: Fri, 11 Feb 2022 18:25:37 +0100 +Subject: [PATCH] BTF: Don't break ABI when debuginfo is disabled. + +Patch-mainline: Never, SUSE-specific +References: jsc#SLE-18805 + +Disabling BTF removes a member from struct modinfo breaking ABI all over +the place. We expect that disabling debuginfo builds the same kernel but +with BTF disabling debuginfo also disables BTF causing this brekage. + +Simply include the BTF member in struct modinfo always. + +Signed-off-by: Michal Suchanek <msuchanek(a)suse.de> +--- + include/linux/module.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/linux/module.h b/include/linux/module.h +index 12d310f7c0fc..8e2ed15b5d24 100644 +--- a/include/linux/module.h ++++ b/include/linux/module.h +@@ -470,7 +470,7 @@ struct module { + unsigned int num_bpf_raw_events; + struct bpf_raw_event_map *bpf_raw_events; + #endif +-#ifdef CONFIG_DEBUG_INFO_BTF_MODULES ++#if 1 + unsigned int btf_data_size; + void *btf_data; + #endif +-- +2.31.1 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/powerpc-64-BE-option-to-use-ELFv2-ABI-for-big-endian.patch new/patches.rpmify/powerpc-64-BE-option-to-use-ELFv2-ABI-for-big-endian.patch --- old/patches.rpmify/powerpc-64-BE-option-to-use-ELFv2-ABI-for-big-endian.patch 2021-09-26 23:30:32.000000000 +0200 +++ new/patches.rpmify/powerpc-64-BE-option-to-use-ELFv2-ABI-for-big-endian.patch 2022-02-15 21:03:03.000000000 +0100 @@ -24,14 +24,14 @@ --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig -@@ -163,6 +163,7 @@ config PPC +@@ -164,6 +164,7 @@ config PPC select ARCH_WEAK_RELEASE_ACQUIRE select BINFMT_ELF select BUILDTIME_TABLE_SORT + select BUILD_ELF_V2 if PPC64 && CPU_LITTLE_ENDIAN select CLONE_BACKWARDS + select CPUMASK_OFFSTACK if NR_CPUS >= 8192 select DCACHE_WORD_ACCESS if PPC64 && CPU_LITTLE_ENDIAN - select DMA_OPS_BYPASS if PPC64 @@ -561,6 +562,24 @@ config KEXEC_FILE config ARCH_HAS_KEXEC_PURGATORY def_bool KEXEC_FILE @@ -59,7 +59,7 @@ depends on PPC64 || (FLATMEM && (44x || FSL_BOOKE)) --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile -@@ -91,10 +91,14 @@ endif +@@ -89,10 +89,14 @@ endif ifdef CONFIG_PPC64 ifndef CONFIG_CC_IS_CLANG @@ -78,7 +78,7 @@ endif endif -@@ -142,7 +146,7 @@ endif +@@ -141,7 +145,7 @@ endif CFLAGS-$(CONFIG_PPC64) := $(call cc-option,-mtraceback=no) ifndef CONFIG_CC_IS_CLANG @@ -87,7 +87,7 @@ CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mabi=elfv2,$(call cc-option,-mcall-aixdesc)) AFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mabi=elfv2) else -@@ -151,6 +155,7 @@ CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mcall-aixdesc) +@@ -150,6 +154,7 @@ CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mcall-aixdesc) AFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mabi=elfv1) endif endif @@ -97,7 +97,7 @@ --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile -@@ -46,6 +46,10 @@ endif +@@ -45,6 +45,10 @@ endif BOOTCFLAGS += -isystem $(shell $(BOOTCC) -print-file-name=include) ++++++ patches.suse.tar.bz2 ++++++ ++++ 2992 lines of diff (skipped) ++++++ series.conf ++++++ ++++ 2550 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/series.conf ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new.1900/series.conf ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:03.065026820 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:03.065026820 +0200 @@ -1,4 +1,4 @@ -2022-03-16 23:33:05 +0000 -GIT Revision: d8f0e4059e0e053d843c5cb54700bdc033e4c284 +2022-03-31 05:28:33 +0000 +GIT Revision: 58205bc0990184a0cddf884ee828b9f8bc9290bb GIT Branch: stable ++++++ try-disable-staging-driver ++++++ --- /var/tmp/diff_new_pack.PHaYPW/_old 2022-03-31 17:19:03.117026233 +0200 +++ /var/tmp/diff_new_pack.PHaYPW/_new 2022-03-31 17:19:03.117026233 +0200 @@ -2,7 +2,7 @@ ############################################################################# # Copyright (c) 2011 Novell, Inc. -# All Rights Reserved. +# Copyright (c) 2012-2022 SUSE LLC # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public License as @@ -14,10 +14,8 @@ # 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, contact Novell, Inc. +# along with this program; if not, contact https://www.suse.com/source-code/ # -# To contact Novell about this file by physical or electronic mail, -# you may find current contact information at www.novell.com #############################################################################

1 0

commit iproute2 for openSUSE:Factory
by Source-Sync 31 Mar '22

31 Mar '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package iproute2 for openSUSE:Factory checked in at 2022-03-31 17:18:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iproute2 (Old) and /work/SRC/openSUSE:Factory/.iproute2.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "iproute2" Thu Mar 31 17:18:31 2022 rev:125 rq:965968 version:5.17 Changes: -------- --- /work/SRC/openSUSE:Factory/iproute2/iproute2.changes 2022-03-17 17:01:32.793687570 +0100 +++ /work/SRC/openSUSE:Factory/.iproute2.new.1900/iproute2.changes 2022-03-31 17:18:51.789154007 +0200 @@ -1,0 +2,16 @@ +Sat Mar 26 13:58:23 UTC 2022 - Callum Farmer <gmbr3(a)opensuse.org> + +- update to 5.17: + * lib/fs: fix memory leak in get_task_name() + * bridge: Remove vlan listing from `bridge link` + * bond: add arp_missed_max option + * libnetlink: fix socket leak in rtnl_open_byproto() + * dcb: Fix error reporting when accessing "dcb app" + * tc_util: Fix parsing action control with space and slash + * lib: fix ax25.h include for musl + * uapi: add missing rose and ax25 files + * rdma: Fix res_print_uint() and add res_print_u64() + * tc: Add support for ce_threshold_value/mask in fq_codel +- Add tmpfiles.d conf for /run/netns + +------------------------------------------------------------------- Old: ---- iproute2-5.16.0.tar.sign iproute2-5.16.0.tar.xz New: ---- iproute2-5.17.0.tar.sign iproute2-5.17.0.tar.xz iproute2.tmpfiles ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iproute2.spec ++++++ --- /var/tmp/diff_new_pack.pqYcFD/_old 2022-03-31 17:18:52.533145614 +0200 +++ /var/tmp/diff_new_pack.pqYcFD/_new 2022-03-31 17:18:52.541145524 +0200 @@ -18,7 +18,7 @@ %define _buildshell /bin/bash Name: iproute2 -Version: 5.16 +Version: 5.17 Release: 0 Summary: Linux network configuration utilities License: GPL-2.0-only @@ -31,6 +31,7 @@ #Git-Mirror: https://github.com/shemminger/iproute2 ## not updated Source: https://kernel.org/pub/linux/utils/net/iproute2/%name-%version.0.tar.xz Source2: https://kernel.org/pub/linux/utils/net/iproute2/%name-%version.0.tar.sign +Source3: %name.tmpfiles Source9: %name.keyring Patch1: adjust-installation-directories-for-openSUSE-SLE.patch Patch2: use-sysconf-_SC_CLK_TCK-if-HZ-undefined.patch @@ -119,6 +120,7 @@ chmod -x "$b/%_libdir/libnetlink.a" install -pm0644 "include/libnetlink.h" "$b/%_includedir/" chmod -x "$b/%_includedir/libnetlink.h" +install -Dm0644 "%SOURCE3" "$b/%_tmpfilesdir/%name.conf" %if 0%{?usrmerged} ln -sf "%_sbindir/ip" "$b/%_bindir/ip" %else @@ -133,12 +135,17 @@ cp -an README* examples/bpf "$b/%_docdir/%name/" %fdupes %buildroot/%_prefix +%post +%tmpfiles_create %_tmpfilesdir/%name.conf + %files %_bindir/lnstat %_bindir/nstat %_bindir/routel %_bindir/ss %_sbindir/* +%_tmpfilesdir/%name.conf +%ghost %dir %_rundir/netns %exclude %_sbindir/arpd %if 0%{?usrmerged} %_bindir/ip ++++++ adjust-installation-directories-for-openSUSE-SLE.patch ++++++ --- /var/tmp/diff_new_pack.pqYcFD/_old 2022-03-31 17:18:52.569145209 +0200 +++ /var/tmp/diff_new_pack.pqYcFD/_new 2022-03-31 17:18:52.573145163 +0200 @@ -61,7 +61,7 @@ - snprintf(name, sizeof(name), "%s/%s.dist", get_tc_lib(), type); + snprintf(name, sizeof(name), "%s/%s.dist", PKGDATADIR, type); - if ((f = fopen(name, "r")) == NULL) { + f = fopen(name, "r"); + if (f == NULL) { fprintf(stderr, "No distribution data for %s (%s: %s)\n", - type, name, strerror(errno)); ++++++ iproute2-5.16.0.tar.xz -> iproute2-5.17.0.tar.xz ++++++ ++++ 3267 lines of diff (skipped) ++++++ iproute2.tmpfiles ++++++ #Type Path Mode User Group Age Argument d /run/netns 0755 root root - -

1 0

commit audit for openSUSE:Factory
by Source-Sync 31 Mar '22

31 Mar '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package audit for openSUSE:Factory checked in at 2022-03-31 17:18:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/audit (Old) and /work/SRC/openSUSE:Factory/.audit.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "audit" Thu Mar 31 17:18:30 2022 rev:101 rq:965461 version:3.0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/audit/audit-secondary.changes 2021-12-02 02:10:11.367589486 +0100 +++ /work/SRC/openSUSE:Factory/.audit.new.1900/audit-secondary.changes 2022-03-31 17:18:50.553167949 +0200 @@ -1,0 +2,20 @@ +Sat Mar 26 11:14:19 UTC 2022 - Stephan Kulow <coolo(a)suse.com> + +- Fix buildrequire for openldap2-devel - audit doesn't require the + (outdated) C++ binding, but the C headers that happen to be pulled + in by buildrequiring the C++ devel package + +------------------------------------------------------------------- +Fri Mar 25 04:56:19 UTC 2022 - Enzo Matsumiya <ematsumiya(a)suse.com> + +- Fix unhandled ECONNREFUSED with LDAP environments (bsc#1196645) + * add libaudit-fix-unhandled-ECONNREFUSED-from-getpwnam-25.patch +- Fix hang in audisp-remote with disk_low_action=suspend (bsc#1196517) + * add audisp-remote-fix-hang-with-disk_low_action-suspend-.patch + +------------------------------------------------------------------- +Wed Mar 23 16:37:06 UTC 2022 - Dirk M��ller <dmueller(a)suse.com> + +- add audit-userspace-517-compat.patch + +------------------------------------------------------------------- New: ---- audisp-remote-fix-hang-with-disk_low_action-suspend-.patch audit-userspace-517-compat.patch libaudit-fix-unhandled-ECONNREFUSED-from-getpwnam-25.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audit-secondary.spec ++++++ --- /var/tmp/diff_new_pack.9bG2tN/_old 2022-03-31 17:18:51.401158383 +0200 +++ /var/tmp/diff_new_pack.9bG2tN/_new 2022-03-31 17:18:51.409158293 +0200 @@ -1,7 +1,7 @@ # # spec file for package audit-secondary # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -41,12 +41,15 @@ Patch9: fix-hardened-service.patch Patch10: enable-stop-rules.patch Patch11: create-augenrules-service.patch +Patch12: audit-userspace-517-compat.patch +Patch13: audisp-remote-fix-hang-with-disk_low_action-suspend-.patch +Patch14: libaudit-fix-unhandled-ECONNREFUSED-from-getpwnam-25.patch BuildRequires: audit-devel = %{version} BuildRequires: autoconf >= 2.12 BuildRequires: gcc-c++ BuildRequires: kernel-headers >= 2.6.30 -BuildRequires: libldapcpp-devel BuildRequires: libtool +BuildRequires: openldap2-devel BuildRequires: pkgconfig %if %{with python2} BuildRequires: python2-devel ++++++ audit.spec ++++++ --- /var/tmp/diff_new_pack.9bG2tN/_old 2022-03-31 17:18:51.433158022 +0200 +++ /var/tmp/diff_new_pack.9bG2tN/_new 2022-03-31 17:18:51.437157977 +0200 @@ -1,7 +1,7 @@ # # spec file for package audit # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ audisp-remote-fix-hang-with-disk_low_action-suspend-.patch ++++++ From b6c474b22f6e76969221138d0d9ec8d97cb217ee Mon Sep 17 00:00:00 2001 From: Enzo Matsumiya <ematsumiya(a)suse.com> Date: Thu, 24 Mar 2022 23:38:24 -0300 Subject: [PATCH] audisp-remote: fix hang with disk_low_action=suspend (#254) If auditd.conf has disk_low_action=suspend and the partition where the log is triggers the disk_low_action, audisp-remote will hang in infinite loop. Fixes: 10dde069d1ac ("Dont look for stop on exit while draining the queue") Signed-off-by: Enzo Matsumiya <ematsumiya(a)suse.de> --- audisp/plugins/remote/audisp-remote.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audisp/plugins/remote/audisp-remote.c b/audisp/plugins/remote/audisp-remote.c index b7e610e8ca32..3be91b3d5190 100644 --- a/audisp/plugins/remote/audisp-remote.c +++ b/audisp/plugins/remote/audisp-remote.c @@ -619,7 +619,7 @@ int main(int argc, char *argv[]) // If stdin is a pipe, then flush the queue if (is_pipe(0)) { - while (q_queue_length(queue) && transport_ok) + while (q_queue_length(queue) && !suspend && transport_ok) send_one(queue); } -- 2.35.1 ++++++ audit-userspace-517-compat.patch ++++++ From: Sergei Trofimovich <slyich(a)gmail.com> Date: Wed, 23 Mar 2022 07:27:05 +0000 Subject: [PATCH] auditswig.i: avoid setter generation for audit_rule_data::buf References: https://github.com/linux-audit/audit-userspace/issues/252 Git-commit: https://github.com/linux-audit/audit-userspace/pull/253/commits/beed1382224… Git-repo: [if different from https://github.com/linux-audit/audit-userspace.git] Patch-mainline: submitted for review upstream As it's a flexible array generated code was never safe to use. With kernel's https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… change it's a build failure now: audit> audit_wrap.c:5010:15: error: invalid use of flexible array member audit> 5010 | arg1->buf = (char [])(char *)memcpy(malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size)); audit> | ^ Let's avoid setter generation entirely. Closes: https://github.com/linux-audit/audit-userspace/issues/252 --- bindings/swig/src/auditswig.i | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bindings/swig/src/auditswig.i b/bindings/swig/src/auditswig.i index 21aafca31..9a2c5661d 100644 --- a/bindings/swig/src/auditswig.i +++ b/bindings/swig/src/auditswig.i @@ -39,6 +39,10 @@ signed #define __attribute(X) /*nothing*/ typedef unsigned __u32; typedef unsigned uid_t; +/* Sidestep SWIG's limitation of handling c99 Flexible arrays by not: + * generating setters against them: https://github.com/swig/swig/issues/1699 + */ +%ignore audit_rule_data::buf; %include "/usr/include/linux/audit.h" #define __extension__ /*nothing*/ %include <stdint.i> ++++++ libaudit-fix-unhandled-ECONNREFUSED-from-getpwnam-25.patch ++++++ From 614edbe52180698c5b447ff4c3e7031ff0721683 Mon Sep 17 00:00:00 2001 From: Enzo Matsumiya <ematsumiya(a)suse.com> Date: Thu, 24 Mar 2022 23:36:53 -0300 Subject: [PATCH] libaudit: fix unhandled ECONNREFUSED from getpwnam() (#255) From: Luis Galdos <luis.galdos(a)suse.com> In some very specific scenarios with LDAP + network issues, getpwnam() and getgrnam() might return ECONNREFUSED. Up in the call chain to audit_name_to_uid()/audit_name_to_gid(), ECONNREFUSED will be handled as kernel auditd is not running, showing "The audit system is disabled" and stopping parsing rules. This patch manually sets errno to ENOENT after those affected calls, in case they fail, so rule parsing can continue cleanly. Signed-off-by: Enzo Matsumiya <ematsumiya(a)suse.de> --- lib/libaudit.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/libaudit.c b/lib/libaudit.c index 54e276156ef0..41303c244aee 100644 --- a/lib/libaudit.c +++ b/lib/libaudit.c @@ -1830,9 +1830,17 @@ static int audit_name_to_uid(const char *name, uid_t *uid) { struct passwd *pw; + errno = 0; pw = getpwnam(name); - if (pw == NULL) + if (pw == NULL) { + /* getpwnam() might return ECONNREFUSED in some very + * specific cases when using LDAP. + * Manually set it to ENOENT so callers don't get confused + * with netlink's ECONNREFUSED */ + if (errno == ECONNREFUSED) + errno = ENOENT; return 1; + } memset(pw->pw_passwd, ' ', strlen(pw->pw_passwd)); *uid = pw->pw_uid; @@ -1843,9 +1851,14 @@ static int audit_name_to_gid(const char *name, gid_t *gid) { struct group *gr; + errno = 0; gr = getgrnam(name); - if (gr == NULL) + if (gr == NULL) { + /* See above for explanation. */ + if (errno == ECONNREFUSED) + errno = ENOENT; return 1; + } *gid = gr->gr_gid; return 0; -- 2.35.1

1 0