🐧 Add Ubuntu flavors for RPi #1170

mauromorales · 2023-03-20T12:40:12Z

QA:

rolling release
22 lts
20 lts

What this PR does / why we need it:
Ubuntu flavors which support raspberrypi

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #645
supersedes #816

netlify · 2023-03-20T12:40:18Z

✅ Deploy Preview for kairos-io canceled.

Name	Link
🔨 Latest commit	`846232e`
🔍 Latest deploy log	https://app.netlify.com/sites/kairos-io/deploys/643edfb3fbf01100073ed0d5

mauromorales · 2023-03-22T15:30:36Z

Sizes needed to be expanded in order to build the images, but now I can finally do. Pending QA

codecov-commenter · 2023-03-22T16:06:25Z

Codecov Report

Merging #1170 (c623991) into master (7bb9af9) will decrease coverage by 1.78%.
The diff coverage is 45.20%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@            Coverage Diff             @@
##           master    #1170      +/-   ##
==========================================
- Coverage   22.79%   21.01%   -1.78%     
==========================================
  Files          22       16       -6     
  Lines        1610     1275     -335     
==========================================
- Hits          367      268      -99     
+ Misses       1179      958     -221     
+ Partials       64       49      -15

Impacted Files	Coverage Δ
internal/agent/config.go	`0.00% <ø> (ø)`
internal/agent/interactive_install.go	`0.00% <ø> (ø)`
internal/agent/notify.go	`0.00% <0.00%> (ø)`
internal/agent/recovery.go	`0.00% <ø> (ø)`
internal/agent/reset.go	`0.00% <0.00%> (ø)`
internal/agent/upgrade.go	`0.00% <0.00%> (ø)`
pkg/config/config.go	`0.00% <0.00%> (-51.36%)`	⬇️
internal/agent/install.go	`5.10% <21.21%> (+5.10%)`	⬆️
pkg/config/collector/options.go	`64.51% <37.50%> (ø)`
pkg/config/collector/collector.go	`61.76% <61.76%> (ø)`
... and 2 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

mauromorales · 2023-03-28T09:36:03Z

Getting the following errors:

IMG_2460.MOV

sdwilsh · 2023-04-11T20:29:01Z

@mauromorales, I take it you can't actually get into the system to see any logs to help there, based on the video, yeah?

mauromorales · 2023-04-11T21:01:20Z

@sdwilsh yeah indeed, I'll try to have a better setup for it next week and give it another shot

sdwilsh · 2023-04-11T21:31:18Z

Sounds good; I should have bandwidth soon and some incentive to help get this working :D

images/.hadolint.yaml

overlay/files-opensuse-arm-rpi/etc/cos/bootargs.cfg

images/Dockerfile.ubuntu-20-lts-arm-rpi

mauromorales · 2023-05-02T14:16:12Z

For faster iteration I wanted to try using the generic arm image. It builds successfully, starts up and shows the grub menu, but then it gets stuck here quite quickly

images/Dockerfile.ubuntu-20-lts-arm-rpi

overlay/files-ubuntu-arm-rpi/system/oem/03-setupcon.yaml

overlay/files-ubuntu-arm-rpi/system/oem/11_persistency.yaml

Earthfile

images/.hadolint.yaml

mauromorales · 2023-05-08T10:11:33Z

I'm currently experiencing an issue where the RPi starts booting, I can see systemd logs, but then at some point I loose video, so I cannot debug any further. Will get a cable to try to view via serial console and report back. Or if you have any ideas pls let me know

trim.D6FA5EAC-524B-473A-A804-E8C0E9B0C898.MOV

mauromorales · 2023-05-08T10:20:34Z

Generic image booting properly you can try this out by building it locally from the branch via: earthly -P +all-arm-generic --FLAVOR=ubuntu-arm-rpi

The main difference between the two images are the kernel and the extra firmware packages for the RPi:

FROM base AS generic
RUN apt-get update && apt-get install -y linux-base \
    linux-image-generic-hwe-22.04 \
    && apt-get clean && rm -rf /var/lib/apt/lists/*

FROM base AS rpi64
RUN apt-get update && apt-get install -y linux-firmware-raspi \
    linux-modules-extra-raspi \
    linux-raspi \
    && apt-get clean && rm -rf /var/lib/apt/lists/*

Signed-off-by: Mauro Morales <[email protected]>

jimmykarily · 2023-05-12T05:31:23Z

Earthfile

@@ -293,7 +299,7 @@ base-image:
    END
    # END

-    # TEST KCRYPT FROM BRANCH
+# TEST KCRYPT FROM BRANCH


accidental?

jimmykarily · 2023-05-12T05:32:36Z

Earthfile

@@ -366,6 +373,7 @@ image:
        ARG OS_VERSION=${KAIROS_VERSION}
    END
    ARG OS_ID
+    # should we add the model to the resulting iso?


you mean in /etc/os-release? Consider moving it here: #1365

I guess to the name. That its a good point. we probably need to rethink the iso naming somehow as it should probably also include the ARCH+MODEL if they are special so we can provide arm64-generic, and arm64-rpi and in the future arm64-nvidia or whatever?

yup indeed to the name of the resulting file whether iso or img

Earthfile

Itxaka · 2023-05-12T07:21:46Z

Earthfile

  ENV SIZE="15200"
-  ENV DEFAULT_ACTIVE_SIZE="2000"
+  IF [[ "$FLAVOR" =~ ^ubuntu* ]]


I hate this. This should probably come from some env files where its clear what goes with what flavor and such. Not for this PR

Good point, can it be done in the /etc/elemental/config.yaml that we include?

ah probably not cuz this here has precedence when creating the image ... ok will open an issue

Itxaka · 2023-05-12T07:23:20Z

framework-profile.yaml

@@ -15,6 +15,15 @@ flavors:
  ubuntu:
    - systemd-base
    - dracut-network-legacy
+  ubuntu-arm-rpi:
+    - systemd-base


we should probably need to start grouping this below and just have a single "metapackage" here to not repeat ourselves this much.

do you mean using anchors? or what is a meta package?

no, see how you mark here systemd-base and then below you can see that it contains 2 packages: init-svc/systemd and systemd-default/network ? So Im thinking that we may need to just merge more of the stuff seeing that there is a clear repetition here with systemd-base and dracut-network-legacy*

so something similar to those, like ubuntu-base that includes all those packages, or something shared that includes all of that so its a one line for all. Dont know how, just thinking out loud seeing that this keeps frowing and lines repeating :D

Ok, I get your point now. Yeah I agree, I had the same feeling that this was lots of duplication but didn't know how this part integrates to be able to suggest a recommendation. I'll create an issue out of your comment.

Itxaka · 2023-05-12T07:26:26Z

images/Dockerfile.ubuntu-20-lts-arm-rpi

+    linux-raspi \
+    && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+FROM ${MODEL} AS all


I...dont get this.

So if we call this with the generic model it will run:

FROM $BASE_IMAGE as base

FROM base AS generic

FROM ${MODEL} AS all

but all its still installing the linux-raspi kernel no? dont we want the rpi to install those packages only? Wont we end up with a generic image that has both kernels inside and the possibility of linking to it?

Yeah I didn't find it very intuitive at first, but I'm finding it quite helpful now, feels a bit like Earthly ... anyways, my understanding is that all is the requested target (because it's the last one?) and depending on it's base it will only build generic or rpi64. And it properly ignores all the targets it doesn't need to build

see: https://docs.docker.com/build/building/multi-stage/#differences-between-legacy-builder-and-buildkit

Itxaka · 2023-05-12T07:31:23Z

overlay/files-ubuntu-arm-rpi/etc/default/console-setup

@@ -0,0 +1,7 @@
+ACTIVE_CONSOLES="/dev/tty[1-6]"


same file as the ubuntu files, wont copying the ubuntu files if it matches ^ubuntu* would be enough so we dont duplicate?

we just have the one difference with the /etc/elemental/config.yaml for ubuntu arm rpi. Here's where I started thinking about also refactoring this but then I thought, I better start the discussion before changing everything LOL

Itxaka

Looking good, a cleanup can come after about the overlay stuff

Itxaka · 2023-05-12T07:34:44Z

Just thinking out loud, but maybe we should drop to bootargs for rpi and during building add the vc4.conf to /etc/modprobe.d with a blacklist vc4 line to not even have to worry about the vc4 module and stop adding it to the cmdline?

Signed-off-by: Mauro Morales <[email protected]>

mauromorales · 2023-05-12T09:51:02Z

Just thinking out loud, but maybe we should drop to bootargs for rpi and during building add the vc4.conf to /etc/modprobe.d with a blacklist vc4 line to not even have to worry about the vc4 module and stop adding it to the cmdline?

good point, added a new issue #1407

very cool that you can create issues from comments, wasn't aware of this

mauromorales mentioned this pull request Mar 20, 2023

🐧 Add ubuntu arm rpi flavor #816

Closed

mauromorales added the qa label Mar 22, 2023

mauromorales changed the title ~~[WIP] Ubuntu rpi~~ 🐧 [WIP] Add Ubuntu flavors for RPi Mar 22, 2023

mauromorales changed the title ~~🐧 [WIP] Add Ubuntu flavors for RPi~~ [WIP] 🐧 Add Ubuntu flavors for RPi Mar 22, 2023

mauromorales self-assigned this Mar 23, 2023

sdwilsh reviewed Apr 12, 2023

View reviewed changes

images/.hadolint.yaml Outdated Show resolved Hide resolved

overlay/files-opensuse-arm-rpi/etc/cos/bootargs.cfg Outdated Show resolved Hide resolved

mauromorales force-pushed the ubuntu-rpi branch from 99049f8 to c623991 Compare April 13, 2023 07:46

mauromorales commented Apr 13, 2023

View reviewed changes

images/Dockerfile.ubuntu-20-lts-arm-rpi Show resolved Hide resolved

mauromorales force-pushed the ubuntu-rpi branch from c623991 to 82475a5 Compare April 18, 2023 12:20

mauromorales force-pushed the ubuntu-rpi branch 2 times, most recently from f8cdc16 to d6cdf1c Compare May 2, 2023 12:39

Itxaka reviewed May 3, 2023

View reviewed changes

images/Dockerfile.ubuntu-20-lts-arm-rpi Show resolved Hide resolved

Itxaka reviewed May 3, 2023

View reviewed changes

images/Dockerfile.ubuntu-20-lts-arm-rpi Show resolved Hide resolved

Itxaka reviewed May 3, 2023

View reviewed changes

overlay/files-ubuntu-arm-rpi/system/oem/03-setupcon.yaml Show resolved Hide resolved

Itxaka reviewed May 3, 2023

View reviewed changes

overlay/files-ubuntu-arm-rpi/system/oem/11_persistency.yaml Outdated Show resolved Hide resolved

mauromorales force-pushed the ubuntu-rpi branch 2 times, most recently from b6f1817 to 9553bb6 Compare May 4, 2023 08:36

sdwilsh reviewed May 6, 2023

View reviewed changes

Earthfile Show resolved Hide resolved

images/.hadolint.yaml Outdated Show resolved Hide resolved

mauromorales added help wanted Extra attention is needed and removed help wanted Extra attention is needed labels May 8, 2023

mauromorales added 8 commits May 11, 2023 15:25

Update packages for 20.04

80f2523

Signed-off-by: Mauro Morales <[email protected]>

Remove dl3015

7891ec9

Signed-off-by: Mauro Morales <[email protected]>

Fix issue with ubuntu arm rpi overlay files

483c444

Signed-off-by: Mauro Morales <[email protected]>

Refactor overlay files for rpi

3b0136d

Signed-off-by: Mauro Morales <[email protected]>

Part of last commit

0d01f87

Signed-off-by: Mauro Morales <[email protected]>

Pass model to framework

6dbb827

Signed-off-by: Mauro Morales <[email protected]>

No need to have a different persistency config for the rpi

360eb52

Signed-off-by: Mauro Morales <[email protected]>

Disable rpi-eeprom-update

17abf4f

Signed-off-by: Mauro Morales <[email protected]>

mauromorales force-pushed the ubuntu-rpi branch from ee6b319 to 17abf4f Compare May 11, 2023 13:25

mauromorales requested a review from a team May 11, 2023 13:26

jimmykarily reviewed May 12, 2023

View reviewed changes

jimmykarily previously approved these changes May 12, 2023

View reviewed changes

Itxaka reviewed May 12, 2023

View reviewed changes

Earthfile Show resolved Hide resolved

Itxaka reviewed May 12, 2023

View reviewed changes

Itxaka previously approved these changes May 12, 2023

View reviewed changes

review feedback

5d6e6fb

Signed-off-by: Mauro Morales <[email protected]>

mauromorales dismissed stale reviews from Itxaka and jimmykarily via 5d6e6fb May 12, 2023 07:57

mauromorales mentioned this pull request May 12, 2023

✨ Blacklist vc4 module for rpi #1407

Closed

Itxaka approved these changes May 12, 2023

View reviewed changes

mauromorales merged commit 3b1fc19 into master May 12, 2023

mauromorales deleted the ubuntu-rpi branch May 12, 2023 12:39

mauromorales mentioned this pull request May 12, 2023

✨ Introduce "metapackage" that different releases can reference to in framework profile #1408

Closed

zewelor mentioned this pull request May 22, 2023

Ubuntu standard images for RPi are missing #1439

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

🐧 Add Ubuntu flavors for RPi #1170

🐧 Add Ubuntu flavors for RPi #1170

mauromorales commented Mar 20, 2023 •

edited

Loading

netlify bot commented Mar 20, 2023 •

edited

Loading

mauromorales commented Mar 22, 2023

codecov-commenter commented Mar 22, 2023 •

edited

Loading

mauromorales commented Mar 28, 2023

sdwilsh commented Apr 11, 2023

mauromorales commented Apr 11, 2023

sdwilsh commented Apr 11, 2023

mauromorales commented May 2, 2023 •

edited

Loading

mauromorales commented May 8, 2023 •

edited

Loading

mauromorales commented May 8, 2023 •

edited

Loading

jimmykarily May 12, 2023

mauromorales May 12, 2023

jimmykarily May 12, 2023

Itxaka May 12, 2023

mauromorales May 12, 2023

Itxaka May 12, 2023

mauromorales May 12, 2023

mauromorales May 12, 2023

Itxaka May 12, 2023

mauromorales May 12, 2023

Itxaka May 12, 2023

mauromorales May 12, 2023

Itxaka May 12, 2023

mauromorales May 12, 2023 •

edited

Loading

Itxaka May 12, 2023

mauromorales May 12, 2023

Itxaka left a comment

Itxaka commented May 12, 2023

mauromorales commented May 12, 2023

🐧 Add Ubuntu flavors for RPi #1170

🐧 Add Ubuntu flavors for RPi #1170

Conversation

mauromorales commented Mar 20, 2023 • edited Loading

netlify bot commented Mar 20, 2023 • edited Loading

✅ Deploy Preview for kairos-io canceled.

mauromorales commented Mar 22, 2023

codecov-commenter commented Mar 22, 2023 • edited Loading

Codecov Report

mauromorales commented Mar 28, 2023

sdwilsh commented Apr 11, 2023

mauromorales commented Apr 11, 2023

sdwilsh commented Apr 11, 2023

mauromorales commented May 2, 2023 • edited Loading

mauromorales commented May 8, 2023 • edited Loading

mauromorales commented May 8, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mauromorales May 12, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Itxaka left a comment

Choose a reason for hiding this comment

Itxaka commented May 12, 2023

mauromorales commented May 12, 2023

mauromorales commented Mar 20, 2023 •

edited

Loading

netlify bot commented Mar 20, 2023 •

edited

Loading

codecov-commenter commented Mar 22, 2023 •

edited

Loading

mauromorales commented May 2, 2023 •

edited

Loading

mauromorales commented May 8, 2023 •

edited

Loading

mauromorales commented May 8, 2023 •

edited

Loading

mauromorales May 12, 2023 •

edited

Loading