Bug #17612

devel branch FTBFS: patch against torbrowser.Browser.firefox is fuzzy

Added by intrigeri 2020-04-13 07:41:41 . Updated 2020-05-15 08:17:47 .

Status:
Needs Validation
Priority:
Elevated
Assignee:
anonym
Category:
Build system
Target version:
Start date:
Due date:
% Done:

50%

Feature Branch:
feature/17620-buster-10.4+force-all-tests
Type of work:
Code
Blueprint:

Starter:
Affected tool:
Deliverable for:

Description


Subtasks


Related issues

Related to Tails - Feature #17153: Make Tails work with U2F Security Keys Resolved
Related to Tails - Bug #17610: Upgrade to Linux 5.6 Needs Validation
Blocks Tails - Feature #16209: Core work: Foundations Team Confirmed
Blocks Tails - Bug #17611: devel branch FTBFS: Package 'linux-image-5.4.0-4-amd64' has no installation candidate Needs Validation
Blocked by Tails - Bug #17620: Upgrade to Buster 10.4 In Progress

History

#1 Updated by intrigeri 2020-04-13 07:42:00

#2 Updated by intrigeri 2020-04-13 07:42:15

  • related to Feature #17153: Make Tails work with U2F Security Keys added

#3 Updated by intrigeri 2020-04-15 08:29:36

  • related to Bug #17610: Upgrade to Linux 5.6 added

#4 Updated by intrigeri 2020-04-15 08:30:04

  • Assignee deleted (intrigeri)

#5 Updated by anonym 2020-04-28 12:40:41

  • Assignee set to anonym

I’ll give it a try!

#6 Updated by anonym 2020-04-28 13:41:04

  • Status changed from Confirmed to In Progress

Applied in changeset commit:tails|de8bd015b53bc132c97e10bf55fae201f118d067.

#7 Updated by anonym 2020-04-28 13:58:30

  • Status changed from In Progress to Needs Validation
  • % Done changed from 0 to 40
  • Feature Branch set to bugfix/17612-torbrowser-launcher-0.3.2-9+force-all-tests

Fixed, I think! Note that this branch has merged feature/17610-linux-5.5+force-all-tests from Bug #17610 because otherwise it won’t build. So those two branches are suitable to review at the same time. :)

Right now Debian’s infra is partially down, including Salsa, so I couldn’t follow the documented instructions. Instead I just built with the rescue option, ssh:ed into the builder and ran diff -Naur $BUILD_DIR/chroot/etc/apparmor.d/torbrowser.Browser.firefox{.orig,} and got to see that it was just one problematic hunk. So then I just imported the necessary changes to our patch and all looks good AFAICT.

As a consequence of skipping our documented procedure I haven’t done any work in our torbrowser-launcher Git repo, but my understanding is that it is not necessary (e.g. won’t make it harder to bump next time), so we can skip it this time IMHO.

Any way, just wanna see what Jenkins thinks before I ask for a review.

#8 Updated by anonym 2020-04-28 14:08:38

  • Status changed from Needs Validation to In Progress

Applied in changeset commit:tails|8596434c03e17b6e7fa0a12ceee6ce77445d1fef.

#9 Updated by CyrilBrulebois 2020-05-06 04:28:59

  • Target version changed from Tails_4.6 to Tails_4.7

#10 Updated by anonym 2020-05-06 12:02:12

  • Status changed from In Progress to Needs Validation
  • Assignee deleted (anonym)
  • Target version deleted (Tails_4.7)
  • % Done changed from 40 to 50

So this branch fixes this ticket’s problem but also Bug #17611 (bump kernel to fix FTBFS). However, we might not want to merge this straight into devel; we may want to do Bug #17610 (bump to linux 5.5) on the stable branch, and fix Bug #17611 that way, then we probably want to rewrite this ticket’s branch to only have commit:de8bd015b53bc132c97e10bf55fae201f118d067.

Or perhaps I’m caring too much about doing this properly in Git, introducing too much overhead on us work-wise. I think I’ll ask quickly about this during tonight’s FT meeting.

#11 Updated by intrigeri 2020-05-06 12:51:16

> Or perhaps I’m caring too much about doing this properly in Git, introducing too much overhead on us work-wise.

FWIW, we often cherry-pick for such things (i.e. prioritize minimizing integration friction over history cleanliness).

#12 Updated by intrigeri 2020-05-10 18:43:33

  • Status changed from Needs Validation to In Progress
  • Assignee set to anonym

@anonym, I think you forgot to push your branch to our torbrowser-launcher.git.

If, instead, you forgot about that repo, see
https://tails.boum.org/contribute/release_process/tor-browser_AppArmor_patch/ :)

#13 Updated by intrigeri 2020-05-10 18:43:52

  • blocks Bug #17611: devel branch FTBFS: Package 'linux-image-5.4.0-4-amd64' has no installation candidate added

#14 Updated by anonym 2020-05-11 09:03:33

intrigeri wrote:
> anonym, I think you forgot to push your branch to our torbrowser-launcher.git.
>
> If, instead, you forgot about that repo, see
> https://tails.boum.org/contribute/release_process/tor-browser_AppArmor_patch/ :)

See what I wrote in Bug #17612#note-7.

#15 Updated by intrigeri 2020-05-11 09:28:44

> See what I wrote in Bug #17612#note-7.

Sorry I missed that! I’ll trust your analysis and conclusion.

I’m leaving this in “In Progress” state since the branch FTBFS.

#16 Updated by anonym 2020-05-14 12:51:45

  • Status changed from In Progress to Needs Validation
  • Feature Branch changed from bugfix/17612-torbrowser-launcher-0.3.2-9+force-all-tests to feature/17620-buster-10.4+force-all-tests

See Bug #17620#note-3 for details. The feature branch should be merged into stable and then into devel (with a trivial conflict for the snapshot → pick “latest”).

#17 Updated by anonym 2020-05-14 12:53:29

  • has duplicate Bug #17620: Upgrade to Buster 10.4 added

#18 Updated by intrigeri 2020-05-15 08:17:47

  • Target version set to Tails_4.7

#19 Updated by anonym 2020-05-19 10:04:21

  • is duplicate of deleted (Bug #17620: Upgrade to Buster 10.4)

#20 Updated by anonym 2020-05-19 10:04:35

  • blocked by Bug #17620: Upgrade to Buster 10.4 added