Граф коммитов

1327 Коммитов

Автор SHA1 Сообщение Дата
CBL-Mariner-Bot b8d0cb188c
Upgrade curl to 8.3.0 CVE-2023-38039 (#6261) 2023-09-25 11:19:41 -07:00
Andrew Phelps cb5b8d9250
util-linux: add su-l file for PAM (#6254)
* add su-l file to util-linux

* update manifests

* bump to release 8 after merging with main

* linting
2023-09-25 11:14:41 -07:00
jslobodzian eb08b37916
Bump package version to recompile binaries with fixed gcc stack prote… (#6253)
* Bump package version to recompile binaries with fixed gcc stack protection (CVE-2023-4039)

* Bump debuginfo versions in toolchain manifests

* Bump kernel headers to match kernel

* Update SPECS/gettext/gettext.spec

Taking suggestion

Co-authored-by: Muhammad Falak R Wani <falakreyaz@gmail.com>

* Update for code review comments

* Fix for code review comment in qt5-qtdeclarative changelog

* Fix dash version for signed spec files

---------

Co-authored-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
2023-09-21 17:10:15 -04:00
reuben olinsky b63f439ed8
Get go tools unit tests to pass in VSCode (#6243)
* Fix the network config unit test so that it arranges to write to a test dir, not to real /etc.
* Identify unit tests that require running in a chroot and arrange for them to be skipped when the effective UID isn't 0 (i.e., when we're running as non-root, and not under sudo).
2023-09-21 13:53:33 -07:00
reuben olinsky 5f00c91956
Add `help` target to toolkit Makefile (#6200)
* Introduces a basic pattern for ##help comments that allow expressing the help content for well-known variables and targets at their respective definition sites.
* Adds help Makefile target that extracts the ##help comments via sed/grep/awk and does a simple rendering of it to stdout.
* Adds help.mk, which documents the format of these comments and also includes the toplevel help preamble.
* Populates a set of initial ##help comments for commonly used targets and variables. The intention is for this to be easy to iterate on in-tree over time.
2023-09-21 11:44:39 -07:00
Chris Gunn 1a1eaec589
Disable unreliable test (#6260) 2023-09-21 11:06:02 -07:00
Daniel McIlvaney 1f2e2c2ffa
Make CONFIG_FILE default assignment consistent (#6259) 2023-09-21 10:21:43 -07:00
Olivia Crain ee9c59106b
Add SPDX license guidance to spec guidelines error message (#6242) 2023-09-21 06:25:30 -07:00
Chris Gunn c1dc869a11
Mariner Image Customizer boilerplate (#5982) 2023-09-20 15:19:33 -07:00
Olivia Crain 56cc033fdf
Re-enable tests for gnutls, jna, libsoup, strongswan (#6244) 2023-09-20 15:19:10 -07:00
Neha Agarwal 12a3deea7d
containerized-rpmbuild: set starting directory based on mode (#6124) 2023-09-20 13:03:44 -07:00
Muhammad Falak R Wani acac4baecf
Revert "Added a toolkit check for required tooling. (#6199)" (#6237)
This reverts commit d3fd41653a.
Fix error: "Tool 'awk' missing! Please install it before using the toolkit.".  Stop.

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
2023-09-20 08:56:11 +05:30
AZaugg b958e9287d
Use the PIC'ed version of libiberty.a static object (#6100)
* Use the PIC'ed version of libiberty.a static object

* Bumping binutils version in tool chain resource files
2023-09-19 20:07:44 -07:00
Daniel McIlvaney 3deebc19d0
Remove default CONFIG_FILE= (#6050)
Set `CONFIG_FILE=""` as the new default instead of `CONFIG_FILE="./imageconfigs/core-efi.json"`.

For teams that use the Mariner toolkit to build custom packages or images using the Mariner toolkit:
- Previously the toolkit would default to the core-efi.json image definition for all invocations.
  - This would result it building all packages required for that image definition when calling `make build-packages` in the core repo
  - This would mean that `make image` would succeed without explicitly setting a desired image config
- In future versions of the toolkit, CONFIG_FILE will default to “”
  - Package builds will no longer include extraneous packages that may be unneeded
  - Image builds will return an error if a config is not explicitly selected

 

Considerations:
- Packages like the kernel will no longer build during normal package builds unless requested. Set desired packages via PACKAGE_BUILD_LIST=”pkg1 pkg2 …”
- `make image` will no longer succeed without CONFIG_FILE=”/path/to/config.json” being set explicitly
2023-09-19 13:45:37 -07:00
Pawel Winogrodzki d3fd41653a
Added a toolkit check for required tooling. (#6199) 2023-09-19 12:55:29 -07:00
Neha Agarwal a22e0eb737
containerized-rpmbuild: use folder definitions from Makefile (#6229) 2023-09-19 09:48:29 -07:00
Neha Agarwal 78de33b845
containerized-rpmbuild: createrepo in all repos defined in local.repo (#6172) 2023-09-19 09:47:28 -07:00
Daniel McIlvaney 0f7148d5ff
Add SliceToSet() to sliceutils (#6054) 2023-09-18 12:03:27 -07:00
Neha Agarwal e370dd5350
Add arch to welcome (#6227) 2023-09-18 12:02:05 -07:00
suresh-thelkar 9177f76ef4
Patch libssh2 to address CVE-2020-22218 (#6214)
* Patch libssh2 to address CVE-2020-22218
* libssh2: Updating toolchain manifests
2023-09-18 14:11:43 +05:30
Andrew Phelps 1f2b396d39
gcc: add patch for CVE-2023-4039 (#6213)
* patch gcc for CVE-2023-4039

* Add CVE-2023-4039.patch

* fix callee_offset issue in patch

* fix callee_offset issue in aarch64_expand_epilogue()
2023-09-16 17:37:14 -07:00
Neha Agarwal bbef3566a5
containerized-rpmbuild: Use space as delimiter for multiple extra mounts (#6138) 2023-09-15 13:30:18 -07:00
Neha Agarwal db22c534e0
containerized-rpmbuild: Add user provided build_mount (#6137) 2023-09-15 13:11:48 -07:00
Pawel Winogrodzki 47c831d5b1
Cleaned-up invalid edges from duplicate nodes. (#6143) 2023-09-14 14:42:06 -07:00
Neha Agarwal 7ea2362cdf
containerized-rpmbuild: build intermediate_srpms in build mode (#6140) 2023-09-13 10:07:08 -07:00
Neha Agarwal 49dd4fa911
containerized-rpmbuild: fix make target for worker chroot #6125 2023-09-12 21:15:29 -07:00
Neha Agarwal 753028a601
containerized-rpmbuild: make tools in parallel (#6136) 2023-09-12 21:13:38 -07:00
Neha Agarwal 32f26e7b56
containerized-rpmbuild: create sources_dir if doesn't exist in container (#6173) 2023-09-12 21:09:39 -07:00
CBL-Mariner-Bot e94787c454
[AUTOPATCHER-kernel] Kernel upgrade to version 5.15.131.1 - branch main (#6196)
* Kernel upgrade to 5.15.131.1 version

* Update configs

* Update mariner-required-configs

---------

Co-authored-by: Rachel Menge <rachelmenge@microsoft.com>
2023-09-11 10:47:11 -07:00
bfjelds 502a10d2f7
cmake patch for CVE-2023-35495 (#6182)
* add cmake patch for CVE-2023-35495

* add new cmake version
2023-09-07 20:48:10 -07:00
Neha Agarwal 138190c5e3
containerized-rpmbuild: fix docker command (#6192) 2023-09-07 20:46:18 -07:00
Neha Agarwal bee34a3a09
Update welcome text (#6188) 2023-09-07 20:43:14 -07:00
Pawel Winogrodzki ab6d3ffb00
Added ptest results parsing to the `PackageBuild` template (#6113) 2023-09-05 15:19:54 -07:00
Pawel Winogrodzki 3d8a0f72dd
Limited running `setfacl` to package builds (#6133) 2023-09-01 16:47:16 -07:00
Bala 43ce7586b0
Don't pass toolchainManifest to grapher and clean-workplan depend on clean-grapher-cache-worker (#6132) 2023-09-01 18:35:36 +05:30
Muhammad Falak R Wani 4316572daa
Bump gopkg.in/yaml.v3 to 3.0.0 to address CVE-2022-28948 (#6118)
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
2023-09-01 17:00:47 +05:30
sindhu-karri c97ac8a4d9
Grapher resolves cyclic dependencies from remote repos (#5572)
* add flag for grapher to resolve cycles by downloading RPM from repos in repolist
add flag to clear version. replace run node with remote node in lookupTable for graphpkgfetcher
send cloner object instead of multiple parameters

* add info to show cycle resolution and use pre-allocated array instead of counted size

* preallocate nodes instead of getting actual count and add info stmt

* Avoid clearing version in original node

* use a different directory for saving chroot

* revert new NodeTypes

* Revert "Avoid clearing version in original node"

This reverts commit e1f17452dbd0df2c5e17109fb3c5b8085cee57d3.

* graphpkgfetcher satisfy with fetched packages

* clear version only if package cannot be found with version

* add Info stmt to show how cycle is fixed

* use rpmsprovidedbySRPM

* Revert "use rpmsprovidedbySRPM"

This reverts commit 571e5be0d7ddb6819ecf998f5397dc46eabf805c.

* Revert "graphpkgfetcher satisfy with fetched packages"

This reverts commit 162882f0d41691011ac9bec4c82fc30aac37097f.

* Revert "Revert "Avoid clearing version in original node""

This reverts commit e36664cf5214aa7b180a369f42a0a9e05e41c13d.

* introduce clonerErr to avoid it tamper the return error

* sort is not deferred when adding remote node to lookup table

Co-authored-by: Daniel McIlvaney <damcilva@microsoft.com>

* do not defer sort when adding remote node to lookup table

Co-authored-by: Daniel McIlvaney <damcilva@microsoft.com>

* remove packageURLlist from grapher

* add disableDefaultrepos flag to grapher

* split MakeDAG

* continue on clonerErr

Co-authored-by: Pawel Winogrodzki <pawelwi@microsoft.com>

* continue early if not buildToRunEdge

* function and arg name changes in replaceCurrentRunNodeWithNewNode

* return error from addRemoteToLookup if tried to add a nonRemote Node

* use proper tmp dir for grapher worker_chroot

Co-authored-by: Pawel Winogrodzki <pawelwi@microsoft.com>

* drop extra debug print

* Try to break cycle with prebuilt RPMs before ignoring version

* Panic if AddRemoteToLookup is called with a non-remote node

* Remove debug function - printLookupTable

* Break inconsistancy in scheduler

Call AddRunToLookup in scheduler.go to avoid inconsistency of the
LookupTable

* Update toolkit/tools/internal/pkggraph/pkggraph.go

Co-authored-by: Pawel Winogrodzki <pawelwi@microsoft.com>

* Update toolkit/tools/grapher/grapher.go

Co-authored-by: Pawel Winogrodzki <pawelwi@microsoft.com>

* Address review comments to

 * Functionalize the breaking cycle using upstream at a particular node
 * Update function namereplaceCurrentRunNodeWithNewNode to meaningful
   replaceSRPMBuildDependency

* Update proper name in function call

* Update toolkit/tools/internal/pkggraph/pkggraph.go

Co-authored-by: Pawel Winogrodzki <pawelwi@microsoft.com>

* Return proper error message from fixCyclesWithExistingRPMS

* Remove Add*ToLookup APIs

* Replace AllRunNodes with AllPreferredRunNodes and make AllRunNodes
travers the entire graph

* Elaborate comments for AllPreferredRunNodes

* Adding suggestions.

* Remove unnecessary assignment in pkggraph.go

---------

Co-authored-by: Sindhu Karri <lakarri@microsoft.com>
Co-authored-by: Daniel McIlvaney <damcilva@microsoft.com>
Co-authored-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Co-authored-by: Bala <balakumaran.kannan@microsoft.com>
Co-authored-by: Bala <kumaran.4353@gmail.com>
2023-09-01 11:34:24 +05:30
Pawel Winogrodzki 5a25d347f7
Fixed tarball generations for incremental toolchain builds. (#6126) 2023-08-31 22:41:28 -07:00
Christopher Co 89a738123c
feat: add Azure Marketplace Gen2 FIPS definition (#6102)
This commit adds a new Azure VM Gen2 image with FIPS enabled by default.
This image definition is identical to the current marketplace gen2 image
definition, except for the following specific changes:

1. Include the fips-packages.json package list before the initramfs
package in the overall package list

2. Set KernelCommandLine.EnableFIPS to true, to inform image generation
tools to enable FIPS during image creation

3. Set basename for image as "cblmariner-gen2-fips"

Signed-off-by: Chris Co <chrco@microsoft.com>
2023-08-31 21:29:26 -07:00
Christopher Co ddfed35052
feat: add Azure Marketplace Gen1 FIPS definition (#6120)
This commit adds a new Azure VM Gen1 image with FIPS enabled by default.
This image definition is identical to the current marketplace gen1 image
definition, except for the following specific changes:

1. Include the fips-packages.json package list before the initramfs
package in the overall package list

2. Set KernelCommandLine.EnableFIPS to true, to inform image generation
tools to enable FIPS during image creation

3. Set basename for image as "cblmariner-gen1-fips"

Signed-off-by: Chris Co <chrco@microsoft.com>
2023-08-31 20:57:51 -07:00
Daniel McIlvaney 7d7fe51664
Fix parsing of releases containing '_' (#6127)
* Fix parsing of releases containing '_'
2023-08-31 18:27:47 -07:00
Trung 72f75c44f0
Add workflow to automatically cherry-pick commits to development branches (#6082)
Co-authored-by: Pawel Winogrodzki <pawelwi@microsoft.com>
2023-08-31 11:23:42 -07:00
Muhammad Falak R Wani 7a62eec9eb
toolkit: containerized-build: honor $SPECS_DIR instead of hard-coding (#6043)
This PR introduces the capability to override the source of the `specs`. 
Appending the option `SPECS_DIR=/path/to/specs` enables building
packages that reside at locations other than the default `SPECS`

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
2023-08-31 10:18:53 +05:30
Pawel Winogrodzki 4d812d01a9
Disabled CCache for quick rebuilds. (#6112) 2023-08-30 17:12:16 -07:00
Daniel McIlvaney 2f80bc3f05
Make precache also use new backoff (#6042)
* Make precache also use new backoff
2023-08-29 13:30:01 -07:00
Daniel McIlvaney 9029178826
Remove dst file on failed network download (#6080)
* Remove dst file on failed network download

* Add file.RemoveFileIfExists()
2023-08-29 13:28:23 -07:00
rlmenge b06683f273
Nopatch CVE-2023-3439 as mctp is not enabled in CBL-Mariner (#6072) 2023-08-29 11:02:42 -07:00
Christopher Co 0f63c57325
Add new EnableFIPS image configuration option (#6075)
* feat: add new EnableFIPS image configuration option

This commit introduces a new EnableFIPS configuration option to the
KernelCommandline image schema. EnableFIPS is a boolean option that
controls whether the image tools should configure the system with FIPS
enabled or not.

To enable FIPS on a system, 3 parts must be present:
1. The argument fips=1 must be passed to the kernel via the kernel
commandline during boot. To do this, updates are needed to the grub.cfg
to make sure the command line parameter is passed when the kernel is
loaded into memory.

2. The dracut-fips package must be installed on the system. The
dracut-fips package contains FIPS self-tests which will halt the system
if any FIPS-approved kernel crypto algorithm is not functioning as
expected.

3. A boot= argument must be passed to the kernel via the kernel command
line during boot ONLY if the partition where /boot is mounted is
separate from the rootfs. This argument is needed for dracut-fips to
locate the kernel's .hmac file, which our kernel package places this in
/boot next to the kernel binary.

* docs: Add EnableFIPS documentation

* docs: add comments for bootPrefix and readOnlyRoot

Signed-off-by: Chris Co <chrco@microsoft.com>
2023-08-29 01:21:22 -07:00
Andrew Phelps 7fc5ec8dbc
toolkit: generate image_pkg_manifest.json with image builds (#6044)
* generate image_pkg_manifest.json with image builds

* updates per feedback

* rename variables

* move variables to tdnf.go

* fix comment

* move regexp code in rpmrepocloner to tdnf.go
2023-08-28 12:16:01 -07:00
sindhu-karri 8d2115f204
Fixed image build issues with packages lacking tests. (#6074)
Co-authored-by: Sindhu Karri <lakarri@microsoft.com>
Co-authored-by: Pawel Winogrodzki <pawelwi@microsoft.com>
2023-08-28 11:43:49 -07:00