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: my patchset vs. mainline #4

Closed
wants to merge 28 commits into from
Closed

Conversation

paralin
Copy link
Collaborator

@paralin paralin commented Dec 8, 2018

This PR is not meant to be merged, but tracks my working patchset against the upstream master branch.

@paralin paralin self-assigned this Dec 8, 2018
@paralin paralin force-pushed the master branch 3 times, most recently from d10924c to 30fbb32 Compare January 24, 2019 08:28
paralin pushed a commit that referenced this pull request Jan 24, 2019
@paralin paralin force-pushed the master branch 7 times, most recently from 9a199a1 to dc39529 Compare February 15, 2019 06:05
@paralin paralin force-pushed the master branch 2 times, most recently from 4f0c68a to f4d2777 Compare February 26, 2019 03:43
@paralin paralin force-pushed the master branch 2 times, most recently from ffec65a to 3d692c5 Compare May 1, 2019 18:58
@paralin paralin force-pushed the master branch 2 times, most recently from 3fe10ed to cb1a1e3 Compare November 11, 2019 08:14
NVIDIA Container Runtime is a fork of runc which adds support for mounting GPUs
into containers.

https://github.com/NVIDIA/nvidia-container-runtime

Signed-off-by: Christian Stewart <[email protected]>
The libnvidia-container package adds a library and CLI for GPU-backed
containers, agnostic to container runtime.

https://github.com/NVIDIA/libnvidia-container

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

v1 -> v2:

 - cjs: @asaf thanks for review
 - cjs: remove extra include dirs
 - cjs: simplify configuration opts
NVIDIA Container Toolkit is a OCI-spec hook for support for mounting GPUs into
containers.

https://github.com/NVIDIA/nvidia-container-toolkit

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

v2:

 - cjs: bump version from 1.2.0 -> 1.2.1
Adds support for the NVIDIA Jetson TX2.

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

v2:

 - cjs: thanks Asaf for the review
 - cjs: added Asaf tested-by
The Go compiler needs to know the "import path" to the root of package source
repositories. Previously, this was done by creating a fake _gopath in the build
directory and symlinking the package source into that path.

Go has deprecated the GOPATH mechanism in favor of a new approach - Modules -
which specifies the root import path (and dependencies) in a "go.mod" file.

This commit moves Buildroot to use the new go.mod approach. Both host and target
Go packages compile correctly with small tweaks adjusting the build target
specifier.

Note: the Go module system will NOT download sources from the Internet due to
GOPROXY=off and -mod=vendor. All Buildroot packages currently have "vendor"
directories included with dependencies' source code.

The environment variables passed to Go during host and target package
compilation have been fixed to correctly pass CC, CXX, CFLAGS, and so on.

Reference: https://github.com/golang/go/wiki/Modules

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

v2 -> v3:

 - cjs: cleaned up spelling and moved extract hook to configure step
 - cjs: applied fixes from vincent fazio related to host packages

v3 -> v4:

 - cjs: clean up HOST and TARGET variables passed to Go
 - cjs: fix all CXXflags, cgo env vars to be consistent/correct
 - cjs: document / explain the difference from GOPATH
Delve is a debugger for the Go programming language.

Signed-off-by: Christian Stewart <[email protected]>
Tested on Pi4 Model B (aarch64).

Note: this needs adjustment as per comments from upstream:

 - GLX is marked as provided when it's not on arm64

Signed-off-by: Christian Stewart <[email protected]>
paralin pushed a commit that referenced this pull request Aug 30, 2020
Add upstream patch (#4) fixing build with gnutls when
BR2_PACKAGE_LIBCURL_PROXY_SUPPORT is disabled.

Patch #4 depends on #3 to apply so add this one as well.

Fixes:
http://autobuild.buildroot.net/results/31d7204869ff71319ea055688c919a646bfb200b/
http://autobuild.buildroot.net/results/f8d2fb919475cdff4a36ad93071048ee09193b98/
http://autobuild.buildroot.net/results/2f07a0ac1240a6040a3509d2ebf06906a31fd172/

Signed-off-by: Baruch Siach <[email protected]>
Signed-off-by: Yann E. MORIN <[email protected]>
(cherry picked from commit 30a7389)
Signed-off-by: Peter Korsgaard <[email protected]>
@paralin paralin force-pushed the upstream-master branch 2 times, most recently from a51fcea to 7a28d29 Compare September 9, 2020 03:08
@paralin paralin closed this Dec 31, 2020
@paralin paralin deleted the master branch December 31, 2020 14:11
paralin pushed a commit that referenced this pull request Feb 8, 2023
wolfSSL has ARMv8-A assembly implementations of some functions for
both A64 and A32 ISAs.  However, some of the A32 versions use r11,
which is usually not allowed:

wolfcrypt/src/port/arm/armv8-aes.c: In function 'wc_AesCbcEncrypt':
wolfcrypt/src/port/arm/armv8-aes.c:3303:5: error: fp cannot be used in 'asm' here
 3303 |     }
      |     ^

That can be fixed by adding the compiler flag -fomit-frame-pointer,
but then there is another failure:

/tmp/ccV19DQV.s: Assembler messages:
/tmp/ccV19DQV.s:248: Error: first transfer register must be even -- `ldrd r11,r10,[r14,#4*14]'
make[3]: *** [Makefile:5858: wolfcrypt/src/port/arm/src_libwolfssl_la-armv8-chacha.lo] Error 1

This is definitely not a valid instruction in A32, which suggests that
this code isn't being tested at all upstream.  So disable it here.

Fixes:

  http://autobuild.buildroot.net/results/502/502a2b217845eb290c1961d4740b032462f8ae53/

Signed-off-by: Ben Hutchings <[email protected]>
Signed-off-by: Thomas Petazzoni <[email protected]>
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, rrdtool fails to build with output:

    patching file src/rrd_tool.c
    Hunk #2 FAILED at 42.
    Hunk #3 succeeded at 435 (offset -8 lines).
    Hunk #4 succeeded at 518 (offset -8 lines).
    Hunk #5 succeeded at 564 (offset -8 lines).
    Hunk #6 succeeded at 879 (offset -8 lines).
    1 out of 6 hunks FAILED -- saving rejects to file src/rrd_tool.c.rej

Because this was caused by an upstream patch we do not change it but add
another upstream patch to be applied before our current patch to avoid
the problem.

Fixes:
http://autobuild.buildroot.net/results/6996dbd764b0066da49dd009f1385196342c89dc/

Signed-off-by: Bernd Kuhls <[email protected]>
Reviewed-by: Yann E. MORIN <[email protected]>
Tested-by: Yann E. MORIN <[email protected]>
[[email protected]:
  - add comment as suggested by [email protected]
]
Signed-off-by: Yann E. MORIN <[email protected]>
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 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, libssh2 fails to build with output:

    Applying 0002-src-add-strict-KEX-to-fix-CVE-2023-48795-Terrapin-Attack.patch using patch:
    patching file src/kex.c
    Hunk #1 succeeded at 3037 (offset 5 lines).
    Hunk #2 succeeded at 3062 (offset 5 lines).
    Hunk #3 succeeded at 3315 (offset 5 lines).
    Hunk #4 succeeded at 3406 (offset 5 lines).
    Hunk #5 succeeded at 3440 (offset 5 lines).
    Hunk #6 succeeded at 3476 (offset 5 lines).
    Hunk #7 succeeded at 3489 (offset 5 lines).
    Hunk #8 succeeded at 3523 (offset 5 lines).
    Hunk #9 succeeded at 3569 (offset 5 lines).
    Hunk #10 succeeded at 3591 (offset 5 lines).
    Hunk #11 succeeded at 3633 (offset 5 lines).
    Hunk #12 succeeded at 3654 (offset 5 lines).
    Hunk #13 succeeded at 3687 (offset 5 lines).
    Hunk #14 succeeded at 3709 (offset 5 lines).
    Hunk #15 succeeded at 3892 (offset 5 lines).
    Hunk #16 succeeded at 3918 (offset 5 lines).
    Hunk #17 succeeded at 3967 (offset 5 lines).
    patching file src/libssh2_priv.h
    Hunk #1 succeeded at 699 (offset -37 lines).
    Hunk #2 succeeded at 873 (offset -38 lines).
    Hunk #3 succeeded at 914 (offset -38 lines).
    Hunk #4 succeeded at 1149 (offset -38 lines).
    patching file src/packet.c
    Hunk #1 succeeded at 605 (offset -19 lines).
    Hunk #2 succeeded at 656 (offset -19 lines).
    Hunk #3 succeeded at 1404 (offset -23 lines).
    Hunk #4 succeeded at 1474 (offset -23 lines).
    patching file src/packet.h
    Hunk #1 FAILED at 72.
    1 out of 1 hunk FAILED -- saving rejects to file src/packet.h.rej

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

Signed-off-by: Dario Binacchi <[email protected]>
Signed-off-by: Romain Naour <[email protected]>
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, lxc fails to build with output:

    Applying 0001-src-lxc-syscall_numbers.h-drop-define-1.patch using patch:
    patching file src/lxc/syscall_numbers.h
    Hunk #1 FAILED at 53.
    Hunk #2 FAILED at 92.
    Hunk #3 FAILED at 129.
    Hunk #4 FAILED at 166.
    Hunk #5 FAILED at 203.
    Hunk #6 FAILED at 272.
    Hunk #7 FAILED at 309.
    Hunk #8 FAILED at 346.
    Hunk #9 FAILED at 383.
    Hunk #10 FAILED at 440.
    Hunk #11 FAILED at 477.
    Hunk #12 FAILED at 518.
    Hunk #13 FAILED at 759.
    13 out of 13 hunks FAILED -- saving rejects to file src/lxc/syscall_numbers.h.rej

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

As you can see from [1], the patch was created for version v6.0.0 but
has been backported in Buildroot without being rebased on lxc v5.0.0,
where loongarch64 support was not yet merged. This is further evidence
of the importance of applying patches with fuzz 0.

[1] lxc/lxc@82fe018
Signed-off-by: Dario Binacchi <[email protected]>
Signed-off-by: Romain Naour <[email protected]>
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, vtun fails to build with output:

    Applying 0002-fix-ssl-headers-checks.patch using patch:
    patching file configure.in
    Hunk #1 succeeded at 169 (offset 3 lines).
    Hunk #2 succeeded at 179 (offset 3 lines).
    Hunk #3 FAILED at 193.
    Hunk #4 FAILED at 208.
    2 out of 4 hunks FAILED -- saving rejects to file configure.in.rej

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

Signed-off-by: Dario Binacchi <[email protected]>
Signed-off-by: Thomas Petazzoni <[email protected]>
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, pulseview fails to build with output:

    Applying 0001-Replace-obsolete-deprecated-Qt-methods.patch using patch:
    patching file pv/util.cpp
    Hunk #2 succeeded at 175 (offset 4 lines).
    Hunk #3 succeeded at 285 (offset 4 lines).
    patching file pv/util.hpp
    Hunk #2 succeeded at 139 (offset 1 line).
    patching file pv/views/trace/decodetrace.cpp
    Hunk #1 FAILED at 103.
    1 out of 1 hunk FAILED -- saving rejects to file pv/views/trace/decodetrace.cpp.rej

    Applying 0003-Support-glibmm-2.68.patch using patch:
    patching file CMakeLists.txt
    Hunk #3 FAILED at 231.
    Hunk #4 FAILED at 492.
    2 out of 4 hunks FAILED -- saving rejects to file CMakeLists.txt.rej

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

Signed-off-by: Dario Binacchi <[email protected]>
Signed-off-by: Thomas Petazzoni <[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.

1 participant