On December 31, 2022 10:00:13 AM UTC, Sebastian Andrzej Siewior
<sebast...@breakpoint.cc> wrote:
>On 2022-12-31 01:09:46 [-0500], Scott Kitterman wrote:
>> I discovered that the experimental (and upstream-experimental) branches
>> still
>> have the crates that are now excluded when the tarball is created. I made a
>> new branch called upstream-experimental-fixup and pushed it. You ought to
>> be
>> able to merge that to upstream-experimental and then merge that to
>> experimental and get an unpacked directory that dpkg-buildpackage things
>> goes
>> with the tarball. We (I volunteer) will also need to fixup the pristine-tar
>> branch, but that can be later.
>
>I recreated these things while recreating the tar file. I parse the
>remaining parts of the email while moving forward. This just a diff
>between the new upstream-exp branch and your's:
>
>| $ git diff salsa/upstream-experimental-fixup -w --stat
>| .gitattributes | 16 +++++++++
>| .github/ISSUE_TEMPLATE/bug_report.md | 41
>++++++++++++++++++++++
>| .github/ISSUE_TEMPLATE/config.yml | 5 +++
>| .github/workflows/clang-format.yml | 65
>++++++++++++++++++++++++++++++++++
>| .github/workflows/cmake.yml | 185
>+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>| .github/workflows/codeql.yml | 86
>+++++++++++++++++++++++++++++++++++++++++++++
>| .github/workflows/docker-db-update.yml | 17 +++++++++
>| .gitignore | 236
>++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>| libclamav_rust/.cargo/vendor/libloading/tests/nagisa32.dll | Bin 3072 -> 0
>bytes
>| libclamav_rust/.cargo/vendor/libloading/tests/nagisa64.dll | Bin 2560 -> 0
>bytes
>| 10 files changed, 651 insertions(+)
>
>The additional .git* files should be okay and the copyright file dropped
>two dlls. Good. I don't know *why* but the cargo files have a larger
>CR/LF vs LF so that is why the `-w' option is there.
>
>Other than that, I need to teach mk-origtargz to compress xz with -T
>(multiple blocks) now that xz-utils supports threaded decompression.
>dpkg-deb (during installation) can handle it already and the dpkg-source
>bits are on its way ;)
>
>Sebastian
Great. I'm looking at this on my phone, so the diff is hard to parse. I may
have made a mistake somewhere.
libclamav_rust/.cargo/vendor/libloading/tests/nagisa* have prebuilt Windows
artifacts in them and need to not be in the tarball.
Scott K
