69f8cdcf4a
This introduces some packages for a trixie specific build.
Changes include:
- Add debian_trixie_pkg_dirs_std based off of debian_pkg_dirs and
comment out all packages except for:
- ostree/initramfs-ostree
- ostree/mttyexec
- ostree/ostree
- ostree/ostree-upgrade-mgr
- Move ostree/initramfs-ostree/debian to
ostree/initramfs-ostree/debian/all
- Move ostree/mttyexec/debian to ostree/mttyexec/debian/all
- Move ostree/ostree/debian to ostree/ostree/debian/all
- Move ostree/ostree-upgrade-mgr/debian to
ostree/ostree-upgrade-mgr/debian/all
Test Plan:
- PASS: bullseye: stx-init-env --rebuild, downloader, build-pkgs -a,
build-image
- PASS: trixie: stx-init-env --rebuild, downloader, build-pkgs -a,
build-image
NOTE: build-image for trixie fails, but further integration is required.
At this point it doesn't appear to be tooling related
Prototype: Concurrent Builds in master
Change-Id: I515a4eeb88f338091ca60e55a6b47f6ef4c21607
Depends-On: https://review.opendev.org/c/starlingx/root/+/946813
Story: NNNNNNN
Task: NNNNN
Signed-off-by: Robert Church <robert.church@windriver.com>
Signed-off-by: Scott Little <scott.little@windriver.com>
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From: Dan Voiculeasa <dan.voiculeasa@windriver.com>
|
|
Date: Tue, 19 Jul 2022 10:32:46 +0300
|
|
Subject: Wait for devices to be configured after boot
|
|
|
|
It was observed that dhcp requests happen too soon after boot.
|
|
It may happen that the NIC driver won't rename the interface
|
|
because it is in use.
|
|
Time is needed for drivers to rename NICs before using them.
|
|
|
|
Use 'udevadm settle' to let the devices be configured before
|
|
continuing the configuration process.
|
|
|
|
Signed-off-by: Dan Voiculeasa <dan.voiculeasa@windriver.com>
|
|
---
|
|
init-ostree-install.sh | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/init-ostree-install.sh b/init-ostree-install.sh
|
|
index 79496e0..befeac7 100644
|
|
--- a/init-ostree-install.sh
|
|
+++ b/init-ostree-install.sh
|
|
@@ -920,7 +920,9 @@ if [ "$INSTSH" = 1 -o "$INSTSH" = 3 -o "$INSTSH" = 4 ] ; then
|
|
lreboot
|
|
fi
|
|
|
|
-udevadm settle --timeout=3
|
|
+echo "Waiting up to 5 minutes for devices to be properly configured."
|
|
+udevadm settle --timeout=300 || fatal "udevadm settle timed out after 300 seconds"
|
|
+echo "Devices should be properly configured."
|
|
|
|
if [ "$INSTNAME" = "" ] ; then
|
|
fatal "Error no remote archive name, need kernel argument: instname=..."
|