1. Forum
  2. Usenet
  3. LINUX.DEBIAN.MAINT.BOOT

  • Re: Bug#1025708: bullseye-pu: package debootstrap/1.0.123+deb11u2

    From Cyril Brulebois@21:1/5 to All on Sat Oct 28 15:00:01 2023
    Hi,

    Simon McVittie <smcv@debian.org> (2023-08-31):
    [ Reason ]
    The same changes proposed for bookworm in #1050868, but for bullseye.
    Because official buildds that build trixie/sid are not yet all running bookworm, we'll need this change in bullseye too.

    I also included the changes that Luca previously proposed on this bug,
    which are backports from bookworm's debootstrap:

    - no longer including usrmerge and its dependencies in the installed
    system if usr-is-merged would be sufficient, saving ~ 50MB on a minbase
    image and effectively fixing a regression caused by making
    usrmerge|usr-is-merged transitively Essential in bookworm (#1025657)
    - enabling merged-/usr on Hurd

    These are technically a behaviour change for bullseye, but we're making
    a larger behaviour change here already, and it aligns the behaviour
    with what we have in bookworm. We could revert those if required, but
    they're really small changes and seem desirable to me: in particular,
    they make the whole merged-/usr code path into the same tested code
    that's in trixie and proposed for bookworm.

    Test results look good to me too, feel free to go ahead.

    Compared to what I get from a `dpkg-buildpackage -S` run locally (using
    the bullseye branch at tag debian/1.0.123+deb11u2), the source package available on coccia adds the debian/.gitignore file; this is merely
    intriguing and not something that should block processing this upload,
    possibly linked to dgit's having been used at some point?


    Cheers,
    --
    Cyril Brulebois (kibi@debian.org) <https://debamax.com/>
    D-I release manager -- Release team member -- Freelance Consultant

    -----BEGIN PGP SIGNATURE-----

    iQIzBAABCgAdFiEEtg6/KYRFPHDXTPR4/5FK8MKzVSAFAmU9BJIACgkQ/5FK8MKz VSDnCA/9HKNX+4FWnj/R7H3SBmDfAJHThQPBu7PB5SWmXxWMKoLe1cYu67VdywaZ QIJ4L+0dcz0nZAzjyDEzhv2Rf4BHxTkbBjGSaNKlBXY+6Z8gJX7DsZR7UMG46vy9 24SNuY0O7ZwuLzCxmWDGqGptabKgt1tDQyYCCa6+aaZ1U0e79sZgy1/4lEV5TbHx SmfNZKprqxRW8+J9TY7HeoVSEcLj2JTRRa2l9AGNeLZ57O2Qr/0Jg5rVprFUt20F GiVZYR6ejliXT1XjCx9GQIRRgBr5bzLE6tHu9YeeDHRWEqETtvML6l+dR5+OxCmD veemtiRPZm5m8FDlEbvH4PJQYm33vAR0rk/xhDkJ/q3Pm0MGhXscrr9EVj3Bwk5n d6oIJaMqwCBa28q1LFFju5vI0snEml3Q4P/Jqqc3Czj76X1Y/slPOI/h8xuadJkK l8Dd//3LUqmYergTokKLMQWFXUYn/hWnqepR1g+CDn7I8vZHWDhGR1R0v7xufAvA Kqg9FkbZ9TAjXprtQYms24Tmc2MvyCZiU7luSVOc0WGFT1XY/4sZEzuO1zqgqTNN NhHg08zO1Tq9KBRxHStkYB3vZInp9K0hIaXvhQAiftq5P0q0E3joCiLNXQpDpugq u7vc5gS0NjAMGgVwQF7w/cSD4P4wrjCorAoHRC7HDXmBSTX8vHs=
    =IstV
    -----END PGP SIGNATURE-----

    --- SoupGate-Win32 v1.05
    *
  • From Simon McVittie@21:1/5 to Cyril Brulebois on Sat Oct 28 15:30:01 2023
    On Sat, 28 Oct 2023 at 14:54:45 +0200, Cyril Brulebois wrote:
    Compared to what I get from a `dpkg-buildpackage -S` run locally (using
    the bullseye branch at tag debian/1.0.123+deb11u2), the source package available on coccia adds the debian/.gitignore file

    I believe dpkg-source defaults to the equivalent of `dpkg-source -I`
    for 3.0 (native) format packages, which ignores some files that would
    normally appear in git, notably .gitignore.

    I normally use
    DEBUILD_DPKG_BUILDPACKAGE_OPTS="-us -uc -I.*.sw? -I.sw? -I.git" which
    disables the default `-I` and instead excludes .git but not .gitignore,
    making the uploaded source package exactly equivalent to what's in git
    (and as a result, more dgit-friendly). If you would prefer any subsequent uploads of d-i-related components to always exclude the .gitignore,
    I'll try to remember that for the future.

    smcv

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From Cyril Brulebois@21:1/5 to All on Sat Oct 28 17:50:01 2023
    Simon McVittie <smcv@debian.org> (2023-10-28):
    I believe dpkg-source defaults to the equivalent of `dpkg-source -I`
    for 3.0 (native) format packages, which ignores some files that would normally appear in git, notably .gitignore.

    I normally use
    DEBUILD_DPKG_BUILDPACKAGE_OPTS="-us -uc -I.*.sw? -I.sw? -I.git" which disables the default `-I` and instead excludes .git but not .gitignore, making the uploaded source package exactly equivalent to what's in git
    (and as a result, more dgit-friendly).

    Alright, that explains it then.

    If you would prefer any subsequent uploads of d-i-related components
    to always exclude the .gitignore, I'll try to remember that for the
    future.

    Until 3.0 (git) was used everywhere, it was very customary to have some differences in successive uploads, depending on who was uploading, and
    whether -i/-I was used; it's not a huge deal, and only means a little
    noise when reviewing diffs.

    Whatever is fine with SRMs is fine with me. (It just happened to
    surprise me a little when I compared a local source build with what was uploaded and is available on coccia, since I built from my local repo
    as usual instead of thinking about downloading your source packages from
    the get-go.)


    Cheers,
    --
    Cyril Brulebois (kibi@debian.org) <https://debamax.com/>
    D-I release manager -- Release team member -- Freelance Consultant

    -----BEGIN PGP SIGNATURE-----

    iQIzBAABCgAdFiEEtg6/KYRFPHDXTPR4/5FK8MKzVSAFAmU9K48ACgkQ/5FK8MKz VSClrQ//fiyhi8HlVpqiXSuL9uXGFriGl70cIdwGyPgpZtXfxnFHzspEKZCpmQ9u p2imQNZu77p3IEj1E6qJ3seJOXBuu3Y4i0Wi4bykh0hQAVFgYv7W7jjIFfhie+ol W7Y1AMnNhcGtnfdq3/xoyBbFXDFutJjw+oag/kOccbc7h7gAld9i1Ce9pg5CLyIT W48SFHn/ezJOfNg7VQqOdi5DxAQpUrRtzS+VfdsSPf4vEXCmcpd0Ju6qRziFYQyC pYs7Pj8wd0H9LR9S5zAcBmkEHNiLTmh9SKFfGh9h9mD1Z4byNNGXXof1Es8192gL Hvgjnxhz1Fc+2OzWfZPGyAj+QaRKW2cnr9c5LQKpEl2Sr5zkm4+9Le8ebqXV7CfC Yyld9CHPTDV1ia82ogBer9widxUAU7yZhmmotq5ud2wIfey0t/61YmbSFnzO+VYA L6Lf8l7G45V3OThzWmEM+nyHS4EFcMeR33JtIBRMX90G0lmejDzXYkWiICQGRH6l RD3BPJoG50cXt/vdXGTvgtvVwYjP0kkIUYHiebbnyaBN9Bp8N+34rQ/upsTFAa1T zat1bT4P03xejPiFIzwBARKmhLkFaW0OUj1iunknFZQQfZ4klGnA6w12QWkjAdAV XMvXr30blCMQsusqaPA9VSkHMd/ZTT2j4SL2zwIFPg0NcrbufiU=
    =8XKQ
    -----END PGP SIGNATURE-----

    --- SoupGate-Win32 v1.05
    *