Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moving PHP from SPECS-EXTENDED to SPECS #3820

Merged

Conversation

osamaesmailmsft
Copy link
Contributor

@osamaesmailmsft osamaesmailmsft commented Sep 22, 2022

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/tools/cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./SPECS/LICENSES-AND-NOTICES/data/licenses.json, ./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md, ./SPECS/LICENSES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge

Summary

What does the PR accomplish, why was it needed?
This PR moves PHP's RPM file and its cascading dependencies from SPECS-EXTENDED to SPECS. The move is happening to add functionality for PHP Golden Containers.

Change Log
  • These packages were moved from SPECS-EXTENDED to SPECS:
  • aspell
  • docbook-dtds
  • docbook-style-dsssl
  • enchant2
  • freetds
  • hunspell-en
  • hunspell
  • libvoikko
  • malaga-suomi-voikko
  • malaga
  • openjade
  • opensp
  • php
  • tidy
  • tokyocabinet
Does this affect the toolchain?

NO

nicogbg and others added 30 commits December 22, 2021 15:09
…ft#1801)

* fix bond build break for ARM64 on main branch

* fix bond build break for ARM64 on main branch

* fix bond build break for ARM64 on main branch

Co-authored-by: nicolas guibourge <[email protected]>

Co-authored-by: nicolas guibourge <[email protected]>
* Remove libreport support from mdadm

* Conditionally pull in perl-Sys-Virt test deps

* Fix dependency resolution for ocaml-ctypes

* Upgrade to latest ocaml-gettext

* Fix ocaml-ounit build

* Upgrade ocaml-base to latest

* Upgrade ocaml-migrate-parsetree to latest

* Upgrade ocaml-stdio to 0.15.0

* Upgrade ocaml-parsexp to 0.15.0

* Upgrade ocaml-ppxlib to 0.24.0

* Upgrade ocaml-sexplib to 0.15.0

* Upgrade ocaml-sexplib0 to 0.15.0

* Upgrade supermin to 5.2.1

* Fixup libguestfs patches and configuration
* kernel: Update mariner cert in kernel keyring

* kernel-hyperv: Update mariner cert in kernel keyring

* kernel-headers: Bump to match kernel release number

* kernel-signed: Bump to match kernel release

Signed-off-by: Chris Co <[email protected]>
* Revert "Upgrading Parted to v3.4 (microsoft#1898)"

This reverts commit 24382cf.

* verifying license to unblock upgrade revert pr
After the upgrade to RPM 4.17, when building on ARM64 only, we are
observing an unexpected /usr/lib/debug/.build-id/xx/yyyy.debug
file being packaged into the kernel.rpm package. This errant file is causing
build errors when repackaging in the kernel-signed build phase.

This patch workarounds the build issue by specifically excluding the
/usr/lib/debug/.build-id folder when building for ARM64. More investigation
underway to identify why this unexpect /usr/lib/debug/.build-id/xx/yyyy.debug
file is being included.

Signed-off-by: Chris Co <[email protected]>
…or-real-this-time

[2.0] Replace perl(Locale::TextDomain) BR in libguestfs with actual package
[2.0] Fixing tooling issues during package candidates resolution. (CP microsoft#2091)
* Bring over libguestfs changes from 2.0

* Fix selinux-policy, file bugs in libguestfs
ARM64 kernel package builds are failing due to a config diff missing
between the expected config and the actual config file.

Add missing CONFIG_USBIP_VUDC line

Signed-off-by: Chris Co <[email protected]>
SPECS/tidy/tidy.spec Outdated Show resolved Hide resolved
Comment on lines 9 to 10
Source: https://github.com/maiha/tokyocabinet/archive/refs/heads/v48.tar.gz
#Source: http://fallabs.com/%{name}/%{name}-%{version}.tar.gz
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The GitHub repo says it's an unofficial repo, so let's use the official one instead. I think the original source URL was fine.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original link doesn't pass the tests, so not sure what other links to use.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It passed for me locally - maybe it was a one-time thing. Try again after applying the changes I've mentioned in malaga.spec.

SPECS/malaga/malaga.spec Outdated Show resolved Hide resolved
@osamaesmailmsft osamaesmailmsft changed the base branch from 2.0 to main October 12, 2022 21:07
@osamaesmailmsft osamaesmailmsft merged commit 27bd1a6 into microsoft:main Oct 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.