First Last Prev Next    This bug is not in your last search results.
Bug 55805 - debootstrap: merge patches to UCS UCS5.1 / 5.2
debootstrap: merge patches to UCS UCS5.1 / 5.2
Status: VERIFIED FIXED
Product: UCS
Classification: Unclassified
Component: General
UCS 5.1
All Linux
: P5 normal (vote)
: UCS 5.1
Assigned To: Florian Best
Philipp Hahn
:
Depends on:
Blocks: ucs520errata
  Show dependency tree / graph
 
Reported: 2023-03-06 16:42 CET by Florian Best
Modified: 2024-01-29 08:27 CET (History)
1 user (show)

See Also:
What kind of report is it?: Development Internal
What type of bug is this?: ---
Who will be affected by this bug?: ---
How will those affected feel about the bug?: ---
User Pain:
Enterprise Customer affected?:
School Customer affected?:
ISV affected?:
Waiting Support:
Flags outvoted (downgraded) after PO Review:
Ticket number:
Bug group (optional):
Max CVSS v3 score:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Florian Best univentionstaff 2023-03-06 16:42:27 CET 
The patches of debootstrap have to be cherry-picked and rebased to (UCS 5.1 and) UCS 5.2.
Comment 1 Florian Best univentionstaff 2023-03-16 13:47:39 CET 
r19907 | Bug #55805: ignore usr-is-merged also for UCS 5.1 / UCS 5.2
r19784 | Bug #55805: rebase patches
r19778 | churn(debootstrap): UCS 5.1-0

TODO: usr-is-merged is required since Debian 12 Bookworm / UCS 5.2: https://salsa.debian.org/installer-team/debootstrap/-/blob/master/scripts/debian-common#L51
Comment 4 Florian Best univentionstaff 2023-12-19 17:31:58 CET 
(In reply to Florian Best from comment #1)
> TODO: usr-is-merged is required since Debian 12 Bookworm / UCS 5.2:
> https://salsa.debian.org/installer-team/debootstrap/-/blob/master/scripts/
> debian-common#L51

bb50836b8566 | Bug #55805: remove patch 0003-disable-usr-is-merged.patch obsolete since bookworm
    UCS 5.2 is based on Debian bookworm.
    We create debootstrap packages / DVDs with this patch only for UCS 5.2
    not for UCS 5.1 / UCS 5.0 / etc. So we can safely remove the patch, as
    the added if-case will never become true.
Comment 5 Philipp Hahn univentionstaff 2023-12-19 21:09:25 CET 
(In reply to Florian Best from comment #4)
> (In reply to Florian Best from comment #1)
> > TODO: usr-is-merged is required since Debian 12 Bookworm / UCS 5.2:
> > https://salsa.debian.org/installer-team/debootstrap/-/blob/master/scripts/
> > debian-common#L51
> 
> bb50836b8566 | Bug #55805: remove patch 0003-disable-usr-is-merged.patch
> obsolete since bookworm
>     UCS 5.2 is based on Debian bookworm.
>     We create debootstrap packages / DVDs with this patch only for UCS 5.2
>     not for UCS 5.1 / UCS 5.0 / etc. So we can safely remove the patch, as
>     the added if-case will never become true.

This is wrong: You can use debootstrap from UCS 5.2 to create a chroot of << UCS 5.2 which is now broken.
Comment 6 Florian Best univentionstaff 2023-12-19 21:51:14 CET 
OK, re-added that patch:
a723bdc4b64e | Bug #55805: base patch on UCS 5.1
d3e59fe33878 | Revert "Bug #55805: remove patch 0003-disable-usr-is-merged.patch obsolete since bookworm"
Comment 7 Philipp Hahn univentionstaff 2024-01-29 08:27:02 CET 
OK: bb50836b8566 → d3e59fe33878
OK: a723bdc4b64e
First Last Prev Next    This bug is not in your last search results.