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

Tracking: skiff vs upstream-master #19

Draft
wants to merge 36 commits into
base: upstream-master
Choose a base branch
from
Draft

Tracking: skiff vs upstream-master #19

wants to merge 36 commits into from

Conversation

paralin
Copy link
Collaborator

@paralin paralin commented Jun 16, 2022

This PR tracks changes vs upstream-master.

automated build + check-package + legal-info.

Signed-off-by: Christian Stewart <[email protected]>
Signed-off-by: Christian Stewart <[email protected]>
Img is a standalone, daemon-less, unprivileged Dockerfile and OCI compatible
container image builder. It uses the moby-buildkit solver internally. The
commands/UX mirror the Docker CLI for workflow compatibility.

Using the genuinetools- prefix due to the generic nature of the "img" name.

Adds both host and target variants. fuse-overlayfs can be used as an
unprivileged and rootless overlay filesystem backend.

https://github.com/genuinetools/img

Signed-off-by: Christian Stewart <[email protected]>

---

TODO:

https://patchwork.ozlabs.org/project/buildroot/patch/[email protected]/

 - changes to patch to add libfuse3 as host package requested.
Daemonize is a command line utility to run a program as a Unix daemon.

Signed-off-by: Christian Stewart <[email protected]>

---

TODO: Changes requested for v2:

https://patchwork.ozlabs.org/project/buildroot/patch/[email protected]/
Adds both host and target packages for buildah.

Buildah is a tool that facilitates building OCI images.

https://github.com/containers/buildah

The buildah tree does not ship with a default policy.json file, and instead
relies on packagers to provide one. A patch is added to create a basic barebones
policy.json which is installed to /etc/containers/policy.json with a hook.

Signed-off-by: Christian Stewart <[email protected]>

---

v1 -> v2:

 - add package to developers
 - add host runc dependency for host package
 - add libgpgme runtime dependency

v2 -> v3:

 - add policy.json to target: required by some commands
 - example: buildah pull docker.io/library/alpine
 - pull: tested on raspberry pi 4

v3 -> v4:

 - TODO: move policy.json to package dir
 - https://lists.buildroot.org/pipermail/buildroot/2022-January/634936.html
 - bump to version v1.32.1
 - https://github.com/containers/buildah/releases/tag/v1.32.1

v4 -> v5:

- bump to version 1.35.x

Signed-off-by: Christian Stewart <[email protected]>
Add a symlink to the expected location for vpdma-1ba in the root of the firmware directory.

Signed-off-by: Christian Stewart <[email protected]>
This series is currently marked "stable" on the gentoo repo.

Signed-off-by: Christian Stewart <[email protected]>
@paralin paralin marked this pull request as draft June 16, 2022 02:36
@paralin paralin changed the base branch from upstream-master to bump-docker-proxy June 16, 2022 02:37
@paralin paralin changed the base branch from bump-docker-proxy to upstream-master June 16, 2022 02:38
@paralin paralin force-pushed the skiff branch 3 times, most recently from 0915eeb to 7af4c59 Compare June 23, 2022 03:07
@paralin paralin force-pushed the skiff branch 4 times, most recently from c5e35c6 to ba56dae Compare June 27, 2022 21:03
Android bootimg utilities: mkbootimg and unpackbootimg.

Signed-off-by: Christian Stewart <[email protected]>

---

v1: CHANGES REQUESTED (Pending)

https://patchwork.ozlabs.org/project/buildroot/patch/[email protected]/
@paralin paralin force-pushed the skiff branch 2 times, most recently from 0d083d6 to 99d3e37 Compare July 11, 2022 14:01
@paralin paralin force-pushed the skiff branch 7 times, most recently from 7c27fb0 to e7f02d7 Compare July 15, 2022 10:17
@paralin paralin force-pushed the skiff branch 3 times, most recently from 373158d to 141801a Compare June 28, 2024 16:13
@paralin paralin force-pushed the skiff branch 4 times, most recently from 00fad4b to b869d59 Compare July 3, 2024 19:35
@paralin paralin force-pushed the skiff branch 2 times, most recently from ce9b589 to d2a83b7 Compare July 19, 2024 03:17
paralin pushed a commit that referenced this pull request Jul 19, 2024
Commit 8f88a64 ("support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0") reduced the fuzz factor.

Due to this change, grpc fails to build with output:

    Applying 0003-host-grpc-only-cpp-plugin.patch using patch:
    patching file CMakeLists.txt
    Hunk #2 succeeded at 567 (offset 8 lines).
    Hunk #3 succeeded at 580 (offset 7 lines).
    Hunk #4 succeeded at 1315 (offset 79 lines).
    Hunk #5 succeeded at 1368 (offset 79 lines).
    Hunk #6 FAILED at 1462.
    Hunk #7 succeeded at 2515 (offset 131 lines).
    Hunk #8 succeeded at 2631 (offset 107 lines).
    Hunk #9 succeeded at 3117 (offset 186 lines).
    Hunk #10 succeeded at 3202 (offset 198 lines).
    Hunk #11 succeeded at 3654 (offset 172 lines).
    Hunk #12 succeeded at 3909 (offset 184 lines).
    Hunk #13 succeeded at 4203 (offset 158 lines).
    Hunk #14 succeeded at 4263 (offset 158 lines).
    Hunk #15 succeeded at 4347 (offset 158 lines).
    Hunk #16 FAILED at 4281.
    Hunk #17 succeeded at 11110 (offset -143 lines).
    Hunk #18 succeeded at 11140 (offset -143 lines).
    Hunk #19 succeeded at 23153 (offset 3325 lines).
    Hunk #20 succeeded at 23250 (offset 3325 lines).
    2 out of 20 hunks FAILED -- saving rejects to file CMakeLists.txt.rej

This commit refreshes the package patch on the current package version.

Signed-off-by: Dario Binacchi <[email protected]>
Signed-off-by: Arnout Vandecappelle <[email protected]>
@paralin paralin force-pushed the skiff branch 3 times, most recently from ce1b3f7 to 0e1ef42 Compare July 24, 2024 01:51
@paralin paralin force-pushed the skiff branch 2 times, most recently from 8500f69 to a41232e Compare August 12, 2024 20:06
@paralin paralin force-pushed the skiff branch 3 times, most recently from e8fc2ac to 4d6e562 Compare August 19, 2024 20:05
Update to the latest master branch revision.

https://github.com/raspberrypi/firmware

Signed-off-by: Christian Stewart <[email protected]>
Fixes the following CVEs:

CVE-2024-34155: go/parser: stack exhaustion in all Parse* functions
CVE-2024-34156: encoding/gob: stack exhaustion in Decoder.Decode
CVE-2024-34158: go/build/constraint: stack exhaustion in Parse

https://go.dev/doc/devel/release#go1.22.7

Signed-off-by: Christian Stewart <[email protected]>
Lack of an RNG source can block boot-up on headless systems with few hardware
entropy sources. This patch allows rngd to start earlier than the current
"basic.target" when systemd is used. Removing the dependency on "basic.target"
and by extension, "sockets.target" will allow rngd to start before, for example,
docker.sock - which can take some time to become ready without entropy.

This is a cherry-pick of a peer project patch:

https://patchwork.openembedded.org/patch/163303/

Signed-off-by: Christian Stewart <[email protected]>
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.

2 participants