From 26ef85729f1c48abbd70ff053464f8ae8e83b45a Mon Sep 17 00:00:00 2001 From: Cloud User Date: Tue, 26 Sep 2023 23:07:21 +0000 Subject: [PATCH 01/12] adding ubuntu support, fixing fedora linux config --- .gitignore | 3 +- boards/default/distros/ubuntu/Makefile | 14 ++ boards/default/distros/ubuntu/__init__.py | 1 + .../default/distros/ubuntu/overlay/.DS_Store | Bin 0 -> 6148 bytes .../default/distros/ubuntu/overlay/.gitignore | 1 + .../distros/ubuntu/overlay/etc/.DS_Store | Bin 0 -> 6148 bytes .../etc/apt/apt.conf.d/01-vendor-ubuntu | 2 + .../overlay/etc/apt/apt.conf.d/01autoremove | 41 ++++++ .../overlay/etc/apt/apt.conf.d/10periodic | 3 + .../overlay/etc/apt/apt.conf.d/15update-stamp | 1 + .../etc/apt/apt.conf.d/20apt-esm-hook.conf | 15 ++ .../overlay/etc/apt/apt.conf.d/20archive | 3 + .../etc/apt/apt.conf.d/20auto-upgrades | 2 + .../overlay/etc/apt/apt.conf.d/20packagekit | 13 ++ .../etc/apt/apt.conf.d/50command-not-found | 16 +++ .../etc/apt/apt.conf.d/50unattended-upgrades | 131 ++++++++++++++++++ .../overlay/etc/apt/apt.conf.d/70debconf | 3 + .../etc/apt/apt.conf.d/99update-notifier | 2 + .../ubuntu/overlay/etc/apt/sources.list | 61 ++++++++ .../deadsnakes-ubuntu-ppa-focal.list | 2 + .../deadsnakes-ubuntu-ppa-focal.list.save | 2 + .../graphics-drivers-ubuntu-ppa-focal.list | 2 + ...raphics-drivers-ubuntu-ppa-focal.list.save | 2 + .../ubuntu/overlay/etc/apt/sources.list.save | 61 ++++++++ .../ubuntu/overlay/etc/apt/trusted.gpg | Bin 0 -> 5671 bytes .../trusted.gpg.d/deadsnakes_ubuntu_ppa.gpg | Bin 0 -> 1129 bytes .../graphics-drivers_ubuntu_ppa.gpg | Bin 0 -> 1140 bytes .../ubuntu-keyring-2012-archive.gpg | Bin 0 -> 2796 bytes .../ubuntu-keyring-2012-cdimage.gpg | Bin 0 -> 2794 bytes .../ubuntu-keyring-2018-archive.gpg | Bin 0 -> 1733 bytes .../ubuntu/overlay/etc/firesim/.gitignore | 2 + .../default/distros/ubuntu/overlay/etc/fstab | 1 + .../overlay/etc/systemd/system/firesim.target | 4 + boards/default/distros/ubuntu/resize.sh | 15 ++ boards/default/distros/ubuntu/ubuntu.py | 110 +++++++++++++++ .../base-workloads/fedora-base/linux-config | 2 +- .../firechip/base-workloads/ubuntu-base.json | 21 +++ .../base-workloads/ubuntu-base/initRepos.sh | 3 + .../base-workloads/ubuntu-base/linux-config | 65 +++++++++ .../etc/firesim/50-cloud-init-dhcp.yaml | 13 ++ .../etc/firesim/50-cloud-init-static.yaml | 20 +++ .../ubuntu-base/overlay/etc/firesim/ip.py | 11 ++ .../etc/firesim/start-firesim-network.sh | 21 +++ .../ubuntu-base/overlay/etc/issue | 1 + .../ubuntu-base/overlay/etc/shadow | 26 ++++ .../etc/systemd/system/firesim-net.service | 14 ++ .../getty.target.wants/getty@hvc0.service | 47 +++++++ .../usr/lib/systemd/system/getty@.service | 58 ++++++++ 48 files changed, 813 insertions(+), 2 deletions(-) create mode 100644 boards/default/distros/ubuntu/Makefile create mode 100644 boards/default/distros/ubuntu/__init__.py create mode 100644 boards/default/distros/ubuntu/overlay/.DS_Store create mode 100644 boards/default/distros/ubuntu/overlay/.gitignore create mode 100644 boards/default/distros/ubuntu/overlay/etc/.DS_Store create mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/01-vendor-ubuntu create mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/01autoremove create mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/10periodic create mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/15update-stamp create mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20apt-esm-hook.conf create mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20archive create mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20auto-upgrades create mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20packagekit create mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/50command-not-found create mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/50unattended-upgrades create mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/70debconf create mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/99update-notifier create mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/sources.list create mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/deadsnakes-ubuntu-ppa-focal.list create mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/deadsnakes-ubuntu-ppa-focal.list.save create mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/graphics-drivers-ubuntu-ppa-focal.list create mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/graphics-drivers-ubuntu-ppa-focal.list.save create mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/sources.list.save create mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/trusted.gpg create mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/trusted.gpg.d/deadsnakes_ubuntu_ppa.gpg create mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/trusted.gpg.d/graphics-drivers_ubuntu_ppa.gpg create mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/trusted.gpg.d/ubuntu-keyring-2012-archive.gpg create mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/trusted.gpg.d/ubuntu-keyring-2012-cdimage.gpg create mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg create mode 100644 boards/default/distros/ubuntu/overlay/etc/firesim/.gitignore create mode 100644 boards/default/distros/ubuntu/overlay/etc/fstab create mode 100644 boards/default/distros/ubuntu/overlay/etc/systemd/system/firesim.target create mode 100755 boards/default/distros/ubuntu/resize.sh create mode 100644 boards/default/distros/ubuntu/ubuntu.py create mode 100644 boards/firechip/base-workloads/ubuntu-base.json create mode 100644 boards/firechip/base-workloads/ubuntu-base/initRepos.sh create mode 100644 boards/firechip/base-workloads/ubuntu-base/linux-config create mode 100644 boards/firechip/base-workloads/ubuntu-base/overlay/etc/firesim/50-cloud-init-dhcp.yaml create mode 100644 boards/firechip/base-workloads/ubuntu-base/overlay/etc/firesim/50-cloud-init-static.yaml create mode 100644 boards/firechip/base-workloads/ubuntu-base/overlay/etc/firesim/ip.py create mode 100755 boards/firechip/base-workloads/ubuntu-base/overlay/etc/firesim/start-firesim-network.sh create mode 100644 boards/firechip/base-workloads/ubuntu-base/overlay/etc/issue create mode 100644 boards/firechip/base-workloads/ubuntu-base/overlay/etc/shadow create mode 100644 boards/firechip/base-workloads/ubuntu-base/overlay/etc/systemd/system/firesim-net.service create mode 100644 boards/firechip/base-workloads/ubuntu-base/overlay/etc/systemd/system/getty.target.wants/getty@hvc0.service create mode 100644 boards/firechip/base-workloads/ubuntu-base/overlay/usr/lib/systemd/system/getty@.service diff --git a/.gitignore b/.gitignore index 4bc5f105..54136f89 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ wlutil/_command.sh *__pycache__ .doit.db* marshal-config.yaml +boards/default/distros/ubuntu/rootfs.img* .ropeproject *~ -*# \ No newline at end of file +*# diff --git a/boards/default/distros/ubuntu/Makefile b/boards/default/distros/ubuntu/Makefile new file mode 100644 index 00000000..ef8579f8 --- /dev/null +++ b/boards/default/distros/ubuntu/Makefile @@ -0,0 +1,14 @@ +RAWURL=https://cdimage.ubuntu.com/releases/20.04.5/release/ubuntu-20.04.5-preinstalled-server-riscv64+unmatched.img.xz +COMPIMG=rootfs.img.xz +NEWIMG=rootfs.img + +# Extract root partition without partition table +# NOTE: Offset must be adjusted for different base image +$(NEWIMG): $(COMPIMG) + xzcat -k $(COMPIMG) | dd of=$(NEWIMG) bs=512 skip=235554 + +$(COMPIMG): + curl $(RAWURL) -o $(COMPIMG) + +clean: + rm -f $(COMPIMG) $(RAWIMG) $(NEWIMG) diff --git a/boards/default/distros/ubuntu/__init__.py b/boards/default/distros/ubuntu/__init__.py new file mode 100644 index 00000000..4cd21798 --- /dev/null +++ b/boards/default/distros/ubuntu/__init__.py @@ -0,0 +1 @@ +from .ubuntu import * # NOQA diff --git a/boards/default/distros/ubuntu/overlay/.DS_Store b/boards/default/distros/ubuntu/overlay/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d43517ea2813fff79877be4999a168809d6dd1ce GIT binary patch literal 6148 zcmeHK%}T>S5Z-O8X(&Pt3VK`cTClCQ7cU{!7cim+mD-q~!I&*gY7V84yS|Vw;`2DO zy8(+ii`W_1{pNQ!`$6`HF~+?`*k{aPjJ2U5a#U&r-L;{HNk-&2Mm7r)8G!W>%uMXB z1AcpxMJ#6zLGk_jlQ_$Jy-(g~wzjq{%eFe!o&O{YKcD7{%$v?{(7Kc|2`YUWT*Xl_ zadyvSnor|2nyZ31j3DLqI!;4bcyf`3nX2`5z_#1=#5q_l2ZK>p3`WPRu2}Z_C&R87 z4Tr0h-QGJqI=z@YCoidd(|mHETgi^W3f@66%X#(ZX(H1{@Ko7V79lY}3=jjvz(zA* zj)it-qgkNE69dFR9Rs*O2xy3|!BV5zI-tYrGsatpD4^q80#O)r4VD@q0>X7Epf2U+ ziNSR__=U-H4VD^pIpb<(7{|<9Jzlt)9sEM2Gwy1no){no)){DO)4}uq9DbSFNB(*V zS;PP_@Xr|Ft+7A$U{U65{joeeYX!7>XegLhq5=Z?+9d!C+(-6RP{#%8kmnjKHR34f RSLJ|o5m1CsM-2P|17D~NNumG% literal 0 HcmV?d00001 diff --git a/boards/default/distros/ubuntu/overlay/.gitignore b/boards/default/distros/ubuntu/overlay/.gitignore new file mode 100644 index 00000000..8c93fc7a --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/.gitignore @@ -0,0 +1 @@ +etc/systemd/system/firesim.service diff --git a/boards/default/distros/ubuntu/overlay/etc/.DS_Store b/boards/default/distros/ubuntu/overlay/etc/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..0715a1f35e63c3df3287270a072f1061461791e3 GIT binary patch literal 6148 zcmeHK%}T>S5Z<-bBorYB1-&hJE!bAuibZwYmM6SljS;9tPk&nZ4 z#Xx`2glo6hJ*<1eV)kkMG6c_CI8Kv%+G@S?jaq$k%d#A+Vcq(Vvhb(Dbe8vn$u;&a zq)fv~55mhNE{5*Tsm!K9lEo91kVG+r+*~DDB#XYBWl^qjeeG}@+Znq1^LeM!Yl=?q zXwek&cKf*76uoYDv2g6&gTs^a;Zr)w;XJgRuxT1 z3=jjv05Pyu447lUZmd<+R4g$-4E%%v+#duqM9*NUQEeUY!Rs^n>xd|z<68nz81xL5 z8o>j?bt<4v<>raObvoFEiSrDW8g)A3YGxS6%v?QQxSAd8LWMK#X{0YPKnyH1P}5x( z&;K*{WmZ1&ms6-m3=jkVi~(LB_=7$aWzN=b<>6T?pxr@3!MG9?5YU${0novHWKTJ@ cU!V?gp21Qhj)HcT4oDXPMF@R}fnQ+Y1BO~m)&Kwi literal 0 HcmV?d00001 diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/01-vendor-ubuntu b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/01-vendor-ubuntu new file mode 100644 index 00000000..30d25a71 --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/01-vendor-ubuntu @@ -0,0 +1,2 @@ +Acquire::Changelogs::AlwaysOnline "true"; +Acquire::http::User-Agent-Non-Interactive "true"; diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/01autoremove b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/01autoremove new file mode 100644 index 00000000..478c571e --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/01autoremove @@ -0,0 +1,41 @@ +APT +{ + NeverAutoRemove + { + "^firmware-linux.*"; + "^linux-firmware$"; + "^linux-image-[a-z0-9]*$"; + "^linux-image-[a-z0-9]*-[a-z0-9]*$"; + }; + + VersionedKernelPackages + { + # kernels + "linux-.*"; + "kfreebsd-.*"; + "gnumach-.*"; + # (out-of-tree) modules + ".*-modules"; + ".*-kernel"; + }; + + Never-MarkAuto-Sections + { + "metapackages"; + "contrib/metapackages"; + "non-free/metapackages"; + "restricted/metapackages"; + "universe/metapackages"; + "multiverse/metapackages"; + }; + + Move-Autobit-Sections + { + "oldlibs"; + "contrib/oldlibs"; + "non-free/oldlibs"; + "restricted/oldlibs"; + "universe/oldlibs"; + "multiverse/oldlibs"; + }; +}; diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/10periodic b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/10periodic new file mode 100644 index 00000000..d1922e34 --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/10periodic @@ -0,0 +1,3 @@ +APT::Periodic::Update-Package-Lists "1"; +APT::Periodic::Download-Upgradeable-Packages "0"; +APT::Periodic::AutocleanInterval "0"; diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/15update-stamp b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/15update-stamp new file mode 100644 index 00000000..14ead837 --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/15update-stamp @@ -0,0 +1 @@ +APT::Update::Post-Invoke-Success {"touch /var/lib/apt/periodic/update-success-stamp 2>/dev/null || true";}; diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20apt-esm-hook.conf b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20apt-esm-hook.conf new file mode 100644 index 00000000..0cc68239 --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20apt-esm-hook.conf @@ -0,0 +1,15 @@ +APT::Update::Post-Invoke-Stats { + "[ ! -f /usr/lib/ubuntu-advantage/apt-esm-hook ] || /usr/lib/ubuntu-advantage/apt-esm-hook post-invoke-stats || true"; +}; + +APT::Install::Post-Invoke-Success { + "[ ! -f /usr/lib/ubuntu-advantage/apt-esm-hook ] || /usr/lib/ubuntu-advantage/apt-esm-hook post-invoke-success || true"; +}; + +APT::Install::Pre-Invoke { + "[ ! -f /usr/lib/ubuntu-advantage/apt-esm-hook ] || /usr/lib/ubuntu-advantage/apt-esm-hook pre-invoke || true"; +}; + +AptCli::Hooks::Upgrade { + "[ ! -f /usr/lib/ubuntu-advantage/apt-esm-json-hook ] || /usr/lib/ubuntu-advantage/apt-esm-json-hook || true"; +}; diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20archive b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20archive new file mode 100644 index 00000000..a2ad262f --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20archive @@ -0,0 +1,3 @@ +APT::Archives::MaxAge "30"; +APT::Archives::MinAge "2"; +APT::Archives::MaxSize "500"; diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20auto-upgrades b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20auto-upgrades new file mode 100644 index 00000000..8d6d7c82 --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20auto-upgrades @@ -0,0 +1,2 @@ +APT::Periodic::Update-Package-Lists "1"; +APT::Periodic::Unattended-Upgrade "1"; diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20packagekit b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20packagekit new file mode 100644 index 00000000..705cc2fe --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20packagekit @@ -0,0 +1,13 @@ +// THIS FILE IS USED TO INFORM PACKAGEKIT +// THAT THE UPDATE-INFO MIGHT HAVE CHANGED + +// Whenever dpkg is called we might have different updates +// i.e. if an user removes a package that had an update +DPkg::Post-Invoke { +"/usr/bin/test -e /usr/share/dbus-1/system-services/org.freedesktop.PackageKit.service && /usr/bin/test -S /var/run/dbus/system_bus_socket && /usr/bin/gdbus call --system --dest org.freedesktop.PackageKit --object-path /org/freedesktop/PackageKit --timeout 4 --method org.freedesktop.PackageKit.StateHasChanged cache-update > /dev/null; /bin/echo > /dev/null"; +}; + +// When Apt's cache is updated (i.e. apt-cache update) +APT::Update::Post-Invoke-Success { +"/usr/bin/test -e /usr/share/dbus-1/system-services/org.freedesktop.PackageKit.service && /usr/bin/test -S /var/run/dbus/system_bus_socket && /usr/bin/gdbus call --system --dest org.freedesktop.PackageKit --object-path /org/freedesktop/PackageKit --timeout 4 --method org.freedesktop.PackageKit.StateHasChanged cache-update > /dev/null; /bin/echo > /dev/null"; +}; diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/50command-not-found b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/50command-not-found new file mode 100644 index 00000000..320662bd --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/50command-not-found @@ -0,0 +1,16 @@ +## This file is provided by command-not-found(1) to download +## Commands metadata files. + +Acquire::IndexTargets { + # The deb822 metadata files + deb::CNF { + MetaKey "$(COMPONENT)/cnf/Commands-$(NATIVE_ARCHITECTURE)"; + ShortDescription "Commands-$(NATIVE_ARCHITECTURE)"; + Description "$(RELEASE)/$(COMPONENT) $(NATIVE_ARCHITECTURE) c-n-f Metadata"; + }; +}; + +# Refresh AppStream cache when APT's cache is updated (i.e. apt update) +APT::Update::Post-Invoke-Success { + "if /usr/bin/test -w /var/lib/command-not-found/ -a -e /usr/lib/cnf-update-db; then /usr/lib/cnf-update-db > /dev/null; fi"; +}; diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/50unattended-upgrades b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/50unattended-upgrades new file mode 100644 index 00000000..4e5ff8bb --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/50unattended-upgrades @@ -0,0 +1,131 @@ +// Automatically upgrade packages from these (origin:archive) pairs +// +// Note that in Ubuntu security updates may pull in new dependencies +// from non-security sources (e.g. chromium). By allowing the release +// pocket these get automatically pulled in. +Unattended-Upgrade::Allowed-Origins { + "${distro_id}:${distro_codename}"; + "${distro_id}:${distro_codename}-security"; + // Extended Security Maintenance; doesn't necessarily exist for + // every release and this system may not have it installed, but if + // available, the policy for updates is such that unattended-upgrades + // should also install from here by default. + "${distro_id}ESMApps:${distro_codename}-apps-security"; + "${distro_id}ESM:${distro_codename}-infra-security"; +// "${distro_id}:${distro_codename}-updates"; +// "${distro_id}:${distro_codename}-proposed"; +// "${distro_id}:${distro_codename}-backports"; +}; + +// Python regular expressions, matching packages to exclude from upgrading +Unattended-Upgrade::Package-Blacklist { + // The following matches all packages starting with linux- +// "linux-"; + + // Use $ to explicitely define the end of a package name. Without + // the $, "libc6" would match all of them. +// "libc6$"; +// "libc6-dev$"; +// "libc6-i686$"; + + // Special characters need escaping +// "libstdc\+\+6$"; + + // The following matches packages like xen-system-amd64, xen-utils-4.1, + // xenstore-utils and libxenstore3.0 +// "(lib)?xen(store)?"; + + // For more information about Python regular expressions, see + // https://docs.python.org/3/howto/regex.html +}; + +// This option controls whether the development release of Ubuntu will be +// upgraded automatically. Valid values are "true", "false", and "auto". +Unattended-Upgrade::DevRelease "auto"; + +// This option allows you to control if on a unclean dpkg exit +// unattended-upgrades will automatically run +// dpkg --force-confold --configure -a +// The default is true, to ensure updates keep getting installed +//Unattended-Upgrade::AutoFixInterruptedDpkg "true"; + +// Split the upgrade into the smallest possible chunks so that +// they can be interrupted with SIGTERM. This makes the upgrade +// a bit slower but it has the benefit that shutdown while a upgrade +// is running is possible (with a small delay) +//Unattended-Upgrade::MinimalSteps "true"; + +// Install all updates when the machine is shutting down +// instead of doing it in the background while the machine is running. +// This will (obviously) make shutdown slower. +// Unattended-upgrades increases logind's InhibitDelayMaxSec to 30s. +// This allows more time for unattended-upgrades to shut down gracefully +// or even install a few packages in InstallOnShutdown mode, but is still a +// big step back from the 30 minutes allowed for InstallOnShutdown previously. +// Users enabling InstallOnShutdown mode are advised to increase +// InhibitDelayMaxSec even further, possibly to 30 minutes. +//Unattended-Upgrade::InstallOnShutdown "false"; + +// Send email to this address for problems or packages upgrades +// If empty or unset then no email is sent, make sure that you +// have a working mail setup on your system. A package that provides +// 'mailx' must be installed. E.g. "user@example.com" +//Unattended-Upgrade::Mail ""; + +// Set this value to one of: +// "always", "only-on-error" or "on-change" +// If this is not set, then any legacy MailOnlyOnError (boolean) value +// is used to chose between "only-on-error" and "on-change" +//Unattended-Upgrade::MailReport "on-change"; + +// Remove unused automatically installed kernel-related packages +// (kernel images, kernel headers and kernel version locked tools). +//Unattended-Upgrade::Remove-Unused-Kernel-Packages "true"; + +// Do automatic removal of newly unused dependencies after the upgrade +//Unattended-Upgrade::Remove-New-Unused-Dependencies "true"; + +// Do automatic removal of unused packages after the upgrade +// (equivalent to apt-get autoremove) +//Unattended-Upgrade::Remove-Unused-Dependencies "false"; + +// Automatically reboot *WITHOUT CONFIRMATION* if +// the file /var/run/reboot-required is found after the upgrade +//Unattended-Upgrade::Automatic-Reboot "false"; + +// Automatically reboot even if there are users currently logged in +// when Unattended-Upgrade::Automatic-Reboot is set to true +//Unattended-Upgrade::Automatic-Reboot-WithUsers "true"; + +// If automatic reboot is enabled and needed, reboot at the specific +// time instead of immediately +// Default: "now" +//Unattended-Upgrade::Automatic-Reboot-Time "02:00"; + +// Use apt bandwidth limit feature, this example limits the download +// speed to 70kb/sec +//Acquire::http::Dl-Limit "70"; + +// Enable logging to syslog. Default is False +// Unattended-Upgrade::SyslogEnable "false"; + +// Specify syslog facility. Default is daemon +// Unattended-Upgrade::SyslogFacility "daemon"; + +// Download and install upgrades only on AC power +// (i.e. skip or gracefully stop updates on battery) +// Unattended-Upgrade::OnlyOnACPower "true"; + +// Download and install upgrades only on non-metered connection +// (i.e. skip or gracefully stop updates on a metered connection) +// Unattended-Upgrade::Skip-Updates-On-Metered-Connections "true"; + +// Verbose logging +// Unattended-Upgrade::Verbose "false"; + +// Print debugging information both in unattended-upgrades and +// in unattended-upgrade-shutdown +// Unattended-Upgrade::Debug "false"; + +// Allow package downgrade if Pin-Priority exceeds 1000 +// Unattended-Upgrade::Allow-downgrade "false"; diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/70debconf b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/70debconf new file mode 100644 index 00000000..0c8b4ca4 --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/70debconf @@ -0,0 +1,3 @@ +// Pre-configure all packages with debconf before they are installed. +// If you don't like it, comment it out. +DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt || true";}; diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/99update-notifier b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/99update-notifier new file mode 100644 index 00000000..21acb0ce --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/99update-notifier @@ -0,0 +1,2 @@ +DPkg::Post-Invoke {"if [ -d /var/lib/update-notifier ]; then touch /var/lib/update-notifier/dpkg-run-stamp; fi; /usr/lib/update-notifier/update-motd-updates-available 2>/dev/null || true";}; +APT::Update::Post-Invoke-Success {"/usr/lib/update-notifier/update-motd-updates-available 2>/dev/null || true";}; diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/sources.list b/boards/default/distros/ubuntu/overlay/etc/apt/sources.list new file mode 100644 index 00000000..bc735021 --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/etc/apt/sources.list @@ -0,0 +1,61 @@ +## Note, this file is written by cloud-init on first boot of an instance +## modifications made here will not survive a re-bundle. +## if you wish to make changes you can: +## a.) add 'apt_preserve_sources_list: true' to /etc/cloud/cloud.cfg +## or do the same in user-data +## b.) add sources in /etc/apt/sources.list.d +## c.) make changes to template file /etc/cloud/templates/sources.list.tmpl + +# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to +# newer versions of the distribution. +deb http://ports.ubuntu.com/ubuntu-ports focal main restricted +# deb-src http://ports.ubuntu.com/ubuntu-ports focal main restricted + +## Major bug fix updates produced after the final release of the +## distribution. +deb http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted +# deb-src http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted + +## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu +## team. Also, please note that software in universe WILL NOT receive any +## review or updates from the Ubuntu security team. +deb http://ports.ubuntu.com/ubuntu-ports focal universe +# deb-src http://ports.ubuntu.com/ubuntu-ports focal universe +deb http://ports.ubuntu.com/ubuntu-ports focal-updates universe +# deb-src http://ports.ubuntu.com/ubuntu-ports focal-updates universe + +## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu +## team, and may not be under a free licence. Please satisfy yourself as to +## your rights to use the software. Also, please note that software in +## multiverse WILL NOT receive any review or updates from the Ubuntu +## security team. +deb http://ports.ubuntu.com/ubuntu-ports focal multiverse +# deb-src http://ports.ubuntu.com/ubuntu-ports focal multiverse +deb http://ports.ubuntu.com/ubuntu-ports focal-updates multiverse +# deb-src http://ports.ubuntu.com/ubuntu-ports focal-updates multiverse + +## N.B. software from this repository may not have been tested as +## extensively as that contained in the main release, although it includes +## newer versions of some applications which may provide useful features. +## Also, please note that software in backports WILL NOT receive any review +## or updates from the Ubuntu security team. +deb http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse +# deb-src http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse + +## Uncomment the following two lines to add software from Canonical's +## 'partner' repository. +## This software is not part of Ubuntu, but is offered by Canonical and the +## respective vendors as a service to Ubuntu users. +# deb http://archive.canonical.com/ubuntu focal partner +# deb-src http://archive.canonical.com/ubuntu focal partner + +deb http://ports.ubuntu.com/ubuntu-ports focal-security main restricted +# deb-src http://ports.ubuntu.com/ubuntu-ports focal-security main restricted +deb http://ports.ubuntu.com/ubuntu-ports focal-security universe +# deb-src http://ports.ubuntu.com/ubuntu-ports focal-security universe +deb http://ports.ubuntu.com/ubuntu-ports focal-security multiverse +# deb-src http://ports.ubuntu.com/ubuntu-ports focal-security multiverse +deb https://apt.kitware.com/ubuntu focal main +# deb-src https://apt.kitware.com/ubuntu focal main +deb https://download.docker.com/linux/ubuntu focal stable +# deb-src https://download.docker.com/linux/ubuntu focal stable diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/deadsnakes-ubuntu-ppa-focal.list b/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/deadsnakes-ubuntu-ppa-focal.list new file mode 100644 index 00000000..1e275321 --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/deadsnakes-ubuntu-ppa-focal.list @@ -0,0 +1,2 @@ +deb http://ppa.launchpad.net/deadsnakes/ppa/ubuntu focal main +# deb-src http://ppa.launchpad.net/deadsnakes/ppa/ubuntu focal main diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/deadsnakes-ubuntu-ppa-focal.list.save b/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/deadsnakes-ubuntu-ppa-focal.list.save new file mode 100644 index 00000000..1e275321 --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/deadsnakes-ubuntu-ppa-focal.list.save @@ -0,0 +1,2 @@ +deb http://ppa.launchpad.net/deadsnakes/ppa/ubuntu focal main +# deb-src http://ppa.launchpad.net/deadsnakes/ppa/ubuntu focal main diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/graphics-drivers-ubuntu-ppa-focal.list b/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/graphics-drivers-ubuntu-ppa-focal.list new file mode 100644 index 00000000..e2d50435 --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/graphics-drivers-ubuntu-ppa-focal.list @@ -0,0 +1,2 @@ +deb http://ppa.launchpad.net/graphics-drivers/ppa/ubuntu focal main +# deb-src http://ppa.launchpad.net/graphics-drivers/ppa/ubuntu focal main diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/graphics-drivers-ubuntu-ppa-focal.list.save b/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/graphics-drivers-ubuntu-ppa-focal.list.save new file mode 100644 index 00000000..e2d50435 --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/graphics-drivers-ubuntu-ppa-focal.list.save @@ -0,0 +1,2 @@ +deb http://ppa.launchpad.net/graphics-drivers/ppa/ubuntu focal main +# deb-src http://ppa.launchpad.net/graphics-drivers/ppa/ubuntu focal main diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.save b/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.save new file mode 100644 index 00000000..bc735021 --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.save @@ -0,0 +1,61 @@ +## Note, this file is written by cloud-init on first boot of an instance +## modifications made here will not survive a re-bundle. +## if you wish to make changes you can: +## a.) add 'apt_preserve_sources_list: true' to /etc/cloud/cloud.cfg +## or do the same in user-data +## b.) add sources in /etc/apt/sources.list.d +## c.) make changes to template file /etc/cloud/templates/sources.list.tmpl + +# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to +# newer versions of the distribution. +deb http://ports.ubuntu.com/ubuntu-ports focal main restricted +# deb-src http://ports.ubuntu.com/ubuntu-ports focal main restricted + +## Major bug fix updates produced after the final release of the +## distribution. +deb http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted +# deb-src http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted + +## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu +## team. Also, please note that software in universe WILL NOT receive any +## review or updates from the Ubuntu security team. +deb http://ports.ubuntu.com/ubuntu-ports focal universe +# deb-src http://ports.ubuntu.com/ubuntu-ports focal universe +deb http://ports.ubuntu.com/ubuntu-ports focal-updates universe +# deb-src http://ports.ubuntu.com/ubuntu-ports focal-updates universe + +## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu +## team, and may not be under a free licence. Please satisfy yourself as to +## your rights to use the software. Also, please note that software in +## multiverse WILL NOT receive any review or updates from the Ubuntu +## security team. +deb http://ports.ubuntu.com/ubuntu-ports focal multiverse +# deb-src http://ports.ubuntu.com/ubuntu-ports focal multiverse +deb http://ports.ubuntu.com/ubuntu-ports focal-updates multiverse +# deb-src http://ports.ubuntu.com/ubuntu-ports focal-updates multiverse + +## N.B. software from this repository may not have been tested as +## extensively as that contained in the main release, although it includes +## newer versions of some applications which may provide useful features. +## Also, please note that software in backports WILL NOT receive any review +## or updates from the Ubuntu security team. +deb http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse +# deb-src http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse + +## Uncomment the following two lines to add software from Canonical's +## 'partner' repository. +## This software is not part of Ubuntu, but is offered by Canonical and the +## respective vendors as a service to Ubuntu users. +# deb http://archive.canonical.com/ubuntu focal partner +# deb-src http://archive.canonical.com/ubuntu focal partner + +deb http://ports.ubuntu.com/ubuntu-ports focal-security main restricted +# deb-src http://ports.ubuntu.com/ubuntu-ports focal-security main restricted +deb http://ports.ubuntu.com/ubuntu-ports focal-security universe +# deb-src http://ports.ubuntu.com/ubuntu-ports focal-security universe +deb http://ports.ubuntu.com/ubuntu-ports focal-security multiverse +# deb-src http://ports.ubuntu.com/ubuntu-ports focal-security multiverse +deb https://apt.kitware.com/ubuntu focal main +# deb-src https://apt.kitware.com/ubuntu focal main +deb https://download.docker.com/linux/ubuntu focal stable +# deb-src https://download.docker.com/linux/ubuntu focal stable diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/trusted.gpg b/boards/default/distros/ubuntu/overlay/etc/apt/trusted.gpg new file mode 100644 index 0000000000000000000000000000000000000000..80937655b9ace396dbc9a642850281a23a0afbc3 GIT binary patch literal 5671 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 literal 0 HcmV?d00001 diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/trusted.gpg.d/graphics-drivers_ubuntu_ppa.gpg b/boards/default/distros/ubuntu/overlay/etc/apt/trusted.gpg.d/graphics-drivers_ubuntu_ppa.gpg new file mode 100644 index 0000000000000000000000000000000000000000..907f705bacd8607451a8f1d2d70c49911bfa0c51 GIT binary patch literal 1140 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 /etc/sysconfig/network-scripts/ifcfg-eth0 + ;; + "52:54:00") + echo "this looks like not FireSim. exiting" + cp /etc/firesim/50-cloud-init-dhcp.yaml /etc/netplan/50-cloud-init.yaml + ;; +esac diff --git a/boards/firechip/base-workloads/ubuntu-base/overlay/etc/issue b/boards/firechip/base-workloads/ubuntu-base/overlay/etc/issue new file mode 100644 index 00000000..19cd7d8c --- /dev/null +++ b/boards/firechip/base-workloads/ubuntu-base/overlay/etc/issue @@ -0,0 +1 @@ +trying to do Ubuntu diff --git a/boards/firechip/base-workloads/ubuntu-base/overlay/etc/shadow b/boards/firechip/base-workloads/ubuntu-base/overlay/etc/shadow new file mode 100644 index 00000000..ce331c28 --- /dev/null +++ b/boards/firechip/base-workloads/ubuntu-base/overlay/etc/shadow @@ -0,0 +1,26 @@ +root:$6$soQup5SHA01WBVl8$Ky6UdkSnYBXuW7HEbz0YPWy1/TwU.5BTq.zxrwJbL/su81Q7hCDSOFvMawnYoroWxqqHglPDbm0pUT15E/jWo.:17869:0:99999:7::: +bin:*:17725:0:99999:7::: +daemon:*:17725:0:99999:7::: +adm:*:17725:0:99999:7::: +lp:*:17725:0:99999:7::: +sync:*:17725:0:99999:7::: +shutdown:*:17725:0:99999:7::: +halt:*:17725:0:99999:7::: +mail:*:17725:0:99999:7::: +operator:*:17725:0:99999:7::: +games:*:17725:0:99999:7::: +ftp:*:17725:0:99999:7::: +nobody:*:17725:0:99999:7::: +dbus:!!:17819:::::: +systemd-coredump:!!:17819:::::: +systemd-network:!!:17819:::::: +systemd-resolve:!!:17819:::::: +tss:!!:17819:::::: +polkitd:!!:17819:::::: +rpc:!!:17819:0:99999:7::: +geoclue:!!:17819:::::: +kojibuilder:!!:17819:::::: +rpcuser:!!:17819:::::: +chrony:!!:17819:::::: +sshd:!!:17819:::::: +pesign:!!:17819:::::: diff --git a/boards/firechip/base-workloads/ubuntu-base/overlay/etc/systemd/system/firesim-net.service b/boards/firechip/base-workloads/ubuntu-base/overlay/etc/systemd/system/firesim-net.service new file mode 100644 index 00000000..0d3fc1e9 --- /dev/null +++ b/boards/firechip/base-workloads/ubuntu-base/overlay/etc/systemd/system/firesim-net.service @@ -0,0 +1,14 @@ +[Unit] +Description=FireSim NIC Bringup +After=local-fs.target +Wants=local-fs.target + +Before=network-pre.target +Wants=network-pre.target + +[Service] +Type=oneshot +ExecStart=/etc/firesim/start-firesim-network.sh + +[Install] +WantedBy=network.target diff --git a/boards/firechip/base-workloads/ubuntu-base/overlay/etc/systemd/system/getty.target.wants/getty@hvc0.service b/boards/firechip/base-workloads/ubuntu-base/overlay/etc/systemd/system/getty.target.wants/getty@hvc0.service new file mode 100644 index 00000000..c01632ec --- /dev/null +++ b/boards/firechip/base-workloads/ubuntu-base/overlay/etc/systemd/system/getty.target.wants/getty@hvc0.service @@ -0,0 +1,47 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Getty on %I +Documentation=man:agetty(8) man:systemd-getty-generator(8) +Documentation=http://0pointer.de/blog/projects/serial-console.html +After=systemd-user-sessions.service plymouth-quit-wait.service getty-pre.target +After=rc-local.service + +# If additional gettys are spawned during boot then we should make +# sure that this is synchronized before getty.target, even though +# getty.target didn't actually pull it in. +Before=getty.target +IgnoreOnIsolate=yes + +# On systems without virtual consoles, don't start any getty. Note +# that serial gettys are covered by serial-getty@.service, not this +# unit. +ConditionPathExists=/dev/tty0 + +[Service] +# the VT is cleared by TTYVTDisallocate +ExecStart=-/sbin/agetty --noclear %I $TERM +Type=idle +Restart=always +RestartSec=0 +UtmpIdentifier=%I +TTYPath=/dev/%I +TTYReset=yes +TTYVHangup=yes +TTYVTDisallocate=yes +KillMode=process +IgnoreSIGPIPE=no +SendSIGHUP=yes + +# Unset locale for the console getty since the console has problems +# displaying some internationalized messages. +Environment=LANG= LANGUAGE= LC_CTYPE= LC_NUMERIC= LC_TIME= LC_COLLATE= LC_MONETARY= LC_MESSAGES= LC_PAPER= LC_NAME= LC_ADDRESS= LC_TELEPHONE= LC_MEASUREMENT= LC_IDENTIFICATION= + +[Install] +WantedBy=getty.target +DefaultInstance=tty1 diff --git a/boards/firechip/base-workloads/ubuntu-base/overlay/usr/lib/systemd/system/getty@.service b/boards/firechip/base-workloads/ubuntu-base/overlay/usr/lib/systemd/system/getty@.service new file mode 100644 index 00000000..b13acb20 --- /dev/null +++ b/boards/firechip/base-workloads/ubuntu-base/overlay/usr/lib/systemd/system/getty@.service @@ -0,0 +1,58 @@ +# SPDX-License-Identifier: LGPL-2.1+ +# +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Getty on %I +Documentation=man:agetty(8) man:systemd-getty-generator(8) +Documentation=http://0pointer.de/blog/projects/serial-console.html +After=systemd-user-sessions.service plymouth-quit-wait.service getty-pre.target +After=rc-local.service + +# If additional gettys are spawned during boot then we should make +# sure that this is synchronized before getty.target, even though +# getty.target didn't actually pull it in. +Before=getty.target +IgnoreOnIsolate=yes + +# IgnoreOnIsolate causes issues with sulogin, if someone isolates +# rescue.target or starts rescue.service from multi-user.target or +# graphical.target. +Conflicts=rescue.service +Before=rescue.service + +# On systems without virtual consoles, don't start any getty. Note +# that serial gettys are covered by serial-getty@.service, not this +# unit. +ConditionPathExists=/dev/hvc0 + +[Service] +# the VT is cleared by TTYVTDisallocate +# The '-o' option value tells agetty to replace 'login' arguments with an +# option to preserve environment (-p), followed by '--' for safety, and then +# the entered username. +ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear %I $TERM +Type=idle +Restart=always +RestartSec=0 +UtmpIdentifier=%I +TTYPath=/dev/%I +TTYReset=yes +TTYVHangup=yes +TTYVTDisallocate=yes +KillMode=process +IgnoreSIGPIPE=no +SendSIGHUP=yes + +# Unset locale for the console getty since the console has problems +# displaying some internationalized messages. +UnsetEnvironment=LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION + +[Install] +WantedBy=getty.target +DefaultInstance=hvc0 From f71b1e6b2abf2d49748b59993744bf4177917ee5 Mon Sep 17 00:00:00 2001 From: Cloud User Date: Fri, 29 Sep 2023 05:34:10 +0000 Subject: [PATCH 02/12] unset zicbom --- boards/firechip/base-workloads/ubuntu-base/linux-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/firechip/base-workloads/ubuntu-base/linux-config b/boards/firechip/base-workloads/ubuntu-base/linux-config index 7dfa4f2f..a1f2a2e9 100644 --- a/boards/firechip/base-workloads/ubuntu-base/linux-config +++ b/boards/firechip/base-workloads/ubuntu-base/linux-config @@ -56,7 +56,7 @@ CONFIG_INITRAMFS_COMPRESSION_NONE=y CONFIG_INITRAMFS_ROOT_GID=0 CONFIG_INITRAMFS_ROOT_UID=0 CONFIG_RISCV_DMA_NONCOHERENT=y -CONFIG_RISCV_ISA_ZICBOM=y +CONFIG_RISCV_ISA_ZICBOM=0 CONFIG_RISCV_ROCC=y CONFIG_STACKPROTECTOR_PER_TASK=y CONFIG_TOOLCHAIN_HAS_ZICBOM=y From 20e05496147a5bc30c87964b64c3390a3d32e341 Mon Sep 17 00:00:00 2001 From: raghav-g13 <58498249+raghav-g13@users.noreply.github.com> Date: Fri, 6 Oct 2023 00:56:06 +0000 Subject: [PATCH 03/12] rng init fix: update firesim/linux submodule + update linux-config to use Kconfig options --- boards/chipyard/base-workloads/br-base/linux-config | 2 ++ boards/default/linux | 2 +- boards/firechip/base-workloads/br-base/linux-config | 2 ++ boards/prototype/base-workloads/br-base/linux-config | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/boards/chipyard/base-workloads/br-base/linux-config b/boards/chipyard/base-workloads/br-base/linux-config index 9b71a41c..c4d673c3 100644 --- a/boards/chipyard/base-workloads/br-base/linux-config +++ b/boards/chipyard/base-workloads/br-base/linux-config @@ -63,4 +63,6 @@ CONFIG_RISCV_ROCC=y CONFIG_STACKPROTECTOR_PER_TASK=y CONFIG_TOOLCHAIN_HAS_ZICBOM=y CONFIG_TOOLCHAIN_HAS_ZIHINTPAUSE=y +CONFIG_OVERRIDE_RNG_ENTROPY=y +CONFIG_OVERRIDE_RNG_ENTROPY_VALUE=256 diff --git a/boards/default/linux b/boards/default/linux index 71bece66..e3e5d275 160000 --- a/boards/default/linux +++ b/boards/default/linux @@ -1 +1 @@ -Subproject commit 71bece669db27e8c5bf1b6e25780bab194d23103 +Subproject commit e3e5d275a34f5f5441afa727f1482b025dd3a3dd diff --git a/boards/firechip/base-workloads/br-base/linux-config b/boards/firechip/base-workloads/br-base/linux-config index 2b01766c..4c4857ff 100644 --- a/boards/firechip/base-workloads/br-base/linux-config +++ b/boards/firechip/base-workloads/br-base/linux-config @@ -62,4 +62,6 @@ CONFIG_STACKPROTECTOR_PER_TASK=y CONFIG_TOOLCHAIN_HAS_ZICBOM=y CONFIG_TOOLCHAIN_HAS_ZIHINTPAUSE=y # CONFIG_RISCV_PMU is not set +CONFIG_OVERRIDE_RNG_ENTROPY=y +CONFIG_OVERRIDE_RNG_ENTROPY_VALUE=256 diff --git a/boards/prototype/base-workloads/br-base/linux-config b/boards/prototype/base-workloads/br-base/linux-config index 1e02e3c7..23b863dc 100644 --- a/boards/prototype/base-workloads/br-base/linux-config +++ b/boards/prototype/base-workloads/br-base/linux-config @@ -55,4 +55,6 @@ CONFIG_INITRAMFS_ROOT_UID=0 # CONFIG_SPI_SN_F_OSPI is not set # CONFIG_SSIF_IPMI_BMC is not set CONFIG_RISCV_ROCC=y +CONFIG_OVERRIDE_RNG_ENTROPY=y +CONFIG_OVERRIDE_RNG_ENTROPY_VALUE=256 From fb35e2a2a1f70a3e7dab7e8f7028dbb205e2cce8 Mon Sep 17 00:00:00 2001 From: raghav-g13 <58498249+raghav-g13@users.noreply.github.com> Date: Wed, 11 Oct 2023 00:49:30 +0000 Subject: [PATCH 04/12] update fedora-base linux-config --- boards/firechip/base-workloads/fedora-base/linux-config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boards/firechip/base-workloads/fedora-base/linux-config b/boards/firechip/base-workloads/fedora-base/linux-config index 3a2c78a0..4e2add35 100644 --- a/boards/firechip/base-workloads/fedora-base/linux-config +++ b/boards/firechip/base-workloads/fedora-base/linux-config @@ -61,4 +61,6 @@ CONFIG_RISCV_ROCC=y CONFIG_STACKPROTECTOR_PER_TASK=y CONFIG_TOOLCHAIN_HAS_ZICBOM=y CONFIG_TOOLCHAIN_HAS_ZIHINTPAUSE=y +CONFIG_OVERRIDE_RNG_ENTROPY=y +CONFIG_OVERRIDE_RNG_ENTROPY_VALUE=256 From 9496932c4bc4e64e23a718ff92d84c02d924b889 Mon Sep 17 00:00:00 2001 From: Cloud User Date: Thu, 19 Oct 2023 23:06:47 +0000 Subject: [PATCH 05/12] addressed Abe's comments to symlink Fedora files, updated Fedora linux config, reduced default image size, added README for first-time Firemarshal build instructions --- boards/default/distros/ubuntu/overlay/etc/firesim | 1 + .../distros/ubuntu/overlay/etc/firesim/.gitignore | 2 -- boards/default/distros/ubuntu/overlay/etc/fstab | 2 +- boards/default/distros/ubuntu/overlay/etc/systemd | 1 + .../ubuntu/overlay/etc/systemd/system/firesim.target | 4 ---- boards/default/distros/ubuntu/ubuntu.py | 12 ++++++------ .../firechip/base-workloads/fedora-base/linux-config | 2 +- boards/firechip/base-workloads/ubuntu-base.json | 1 - boards/firechip/base-workloads/ubuntu-base/README | 5 +++++ .../base-workloads/ubuntu-base/overlay/etc/issue | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) create mode 120000 boards/default/distros/ubuntu/overlay/etc/firesim delete mode 100644 boards/default/distros/ubuntu/overlay/etc/firesim/.gitignore mode change 100644 => 120000 boards/default/distros/ubuntu/overlay/etc/fstab create mode 120000 boards/default/distros/ubuntu/overlay/etc/systemd delete mode 100644 boards/default/distros/ubuntu/overlay/etc/systemd/system/firesim.target create mode 100644 boards/firechip/base-workloads/ubuntu-base/README diff --git a/boards/default/distros/ubuntu/overlay/etc/firesim b/boards/default/distros/ubuntu/overlay/etc/firesim new file mode 120000 index 00000000..3b17a5df --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/etc/firesim @@ -0,0 +1 @@ +/home/centos/firesim/target-design/chipyard/software/firemarshal/boards/default/distros/fedora/overlay/etc/firesim/ \ No newline at end of file diff --git a/boards/default/distros/ubuntu/overlay/etc/firesim/.gitignore b/boards/default/distros/ubuntu/overlay/etc/firesim/.gitignore deleted file mode 100644 index fd1ff69a..00000000 --- a/boards/default/distros/ubuntu/overlay/etc/firesim/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# This file is auto-generated by the build system -firesim.sh diff --git a/boards/default/distros/ubuntu/overlay/etc/fstab b/boards/default/distros/ubuntu/overlay/etc/fstab deleted file mode 100644 index 4534a1b0..00000000 --- a/boards/default/distros/ubuntu/overlay/etc/fstab +++ /dev/null @@ -1 +0,0 @@ -LABEL=_/ / ext4 defaults,noatime,x-systemd.device-timeout=300s,x-systemd.mount-timeout=300s 0 0 diff --git a/boards/default/distros/ubuntu/overlay/etc/fstab b/boards/default/distros/ubuntu/overlay/etc/fstab new file mode 120000 index 00000000..cd8ba211 --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/etc/fstab @@ -0,0 +1 @@ +/home/centos/firesim/target-design/chipyard/software/firemarshal/boards/default/distros/fedora/overlay/etc/fstab \ No newline at end of file diff --git a/boards/default/distros/ubuntu/overlay/etc/systemd b/boards/default/distros/ubuntu/overlay/etc/systemd new file mode 120000 index 00000000..a797ec7f --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/etc/systemd @@ -0,0 +1 @@ +/home/centos/firesim/target-design/chipyard/software/firemarshal/boards/default/distros/fedora/overlay/etc/systemd/ \ No newline at end of file diff --git a/boards/default/distros/ubuntu/overlay/etc/systemd/system/firesim.target b/boards/default/distros/ubuntu/overlay/etc/systemd/system/firesim.target deleted file mode 100644 index 5f225f3b..00000000 --- a/boards/default/distros/ubuntu/overlay/etc/systemd/system/firesim.target +++ /dev/null @@ -1,4 +0,0 @@ -[Unit] -Requires=multi-user.target -After=multi-user.target -AllowIsolate=yes diff --git a/boards/default/distros/ubuntu/ubuntu.py b/boards/default/distros/ubuntu/ubuntu.py index 544a854c..3615eec7 100644 --- a/boards/default/distros/ubuntu/ubuntu.py +++ b/boards/default/distros/ubuntu/ubuntu.py @@ -15,10 +15,10 @@ StandardOutput=journal+console""" # Some common directories for this module (all absolute paths) -fed_dir = pathlib.Path(__file__).resolve().parent +ubuntu_dir = pathlib.Path(__file__).resolve().parent # Temporary overlay used for applying init scripts -overlay = fed_dir / 'overlay' +overlay = ubuntu_dir / 'overlay' # Fedora doesn't support any options @@ -47,13 +47,13 @@ def getWorkload(self): 'name': 'ubuntu', 'opts': {} }, - 'workdir': fed_dir, + 'workdir': ubuntu_dir, 'builder': self, - 'img': fed_dir / "rootfs.img" + 'img': ubuntu_dir / "rootfs.img" } def buildBaseImage(self, task, changed): - wlutil.run(['make', "rootfs.img"], cwd=fed_dir) + wlutil.run(['make', "rootfs.img"], cwd=ubuntu_dir) def fileDeps(self): return [] @@ -62,7 +62,7 @@ def fileDeps(self): # rebuilt. def upToDate(self): def checkMake(): - retcode = sp.call('make -q rootfs.img', shell=True, cwd=fed_dir) + retcode = sp.call('make -q rootfs.img', shell=True, cwd=ubuntu_dir) if retcode == 0: return True else: diff --git a/boards/firechip/base-workloads/fedora-base/linux-config b/boards/firechip/base-workloads/fedora-base/linux-config index 3a2c78a0..ba4f8215 100644 --- a/boards/firechip/base-workloads/fedora-base/linux-config +++ b/boards/firechip/base-workloads/fedora-base/linux-config @@ -56,7 +56,7 @@ CONFIG_INITRAMFS_COMPRESSION_NONE=y CONFIG_INITRAMFS_ROOT_GID=0 CONFIG_INITRAMFS_ROOT_UID=0 CONFIG_RISCV_DMA_NONCOHERENT=y -CONFIG_RISCV_ISA_ZICBOM=y +CONFIG_RISCV_ISA_ZICBOM=0 CONFIG_RISCV_ROCC=y CONFIG_STACKPROTECTOR_PER_TASK=y CONFIG_TOOLCHAIN_HAS_ZICBOM=y diff --git a/boards/firechip/base-workloads/ubuntu-base.json b/boards/firechip/base-workloads/ubuntu-base.json index febcb6aa..40e03efb 100644 --- a/boards/firechip/base-workloads/ubuntu-base.json +++ b/boards/firechip/base-workloads/ubuntu-base.json @@ -1,7 +1,6 @@ { "name" : "ubuntu-base", "guest-init": "initRepos.sh", - "rootfs-size": "16GB", "distro" : { "name" : "ubuntu", "opts" : {} diff --git a/boards/firechip/base-workloads/ubuntu-base/README b/boards/firechip/base-workloads/ubuntu-base/README new file mode 100644 index 00000000..40921488 --- /dev/null +++ b/boards/firechip/base-workloads/ubuntu-base/README @@ -0,0 +1,5 @@ +Ubuntu 20.04 support in Firesim + +First time setup notes: +- When running "./marshal build ubuntu-base.json" for the first time, the process will end in a login prompt for Ubuntu. Login with "root:firesim", and upon login, exit Qemu with CTRL-A+X +- Login with "root:firesim" when launching with Firemarshal/Firesim diff --git a/boards/firechip/base-workloads/ubuntu-base/overlay/etc/issue b/boards/firechip/base-workloads/ubuntu-base/overlay/etc/issue index 19cd7d8c..a1d45f22 100644 --- a/boards/firechip/base-workloads/ubuntu-base/overlay/etc/issue +++ b/boards/firechip/base-workloads/ubuntu-base/overlay/etc/issue @@ -1 +1 @@ -trying to do Ubuntu +Ubuntu on Firesim From 0f0f1b10623f9b754d32bf30dae07ebd03c985b1 Mon Sep 17 00:00:00 2001 From: Cloud User Date: Thu, 19 Oct 2023 23:57:20 +0000 Subject: [PATCH 06/12] undoing symlinks in overlay because they were breaking build --- boards/default/distros/ubuntu/overlay/etc/firesim | 1 - .../distros/ubuntu/overlay/etc/firesim/.gitignore | 2 ++ boards/default/distros/ubuntu/overlay/etc/fstab | 2 +- boards/default/distros/ubuntu/overlay/etc/systemd | 1 - .../ubuntu/overlay/etc/systemd/system/default.target | 1 + .../ubuntu/overlay/etc/systemd/system/firesim.target | 4 ++++ .../system/firesim.target.wants/firesim.service | 1 + boards/firechip/base-workloads/ubuntu-base/README | 2 +- .../ubuntu-base/overlay/etc/firesim/ip.py | 11 ----------- 9 files changed, 10 insertions(+), 15 deletions(-) delete mode 120000 boards/default/distros/ubuntu/overlay/etc/firesim create mode 100644 boards/default/distros/ubuntu/overlay/etc/firesim/.gitignore mode change 120000 => 100644 boards/default/distros/ubuntu/overlay/etc/fstab delete mode 120000 boards/default/distros/ubuntu/overlay/etc/systemd create mode 120000 boards/default/distros/ubuntu/overlay/etc/systemd/system/default.target create mode 100644 boards/default/distros/ubuntu/overlay/etc/systemd/system/firesim.target create mode 120000 boards/default/distros/ubuntu/overlay/etc/systemd/system/firesim.target.wants/firesim.service delete mode 100644 boards/firechip/base-workloads/ubuntu-base/overlay/etc/firesim/ip.py diff --git a/boards/default/distros/ubuntu/overlay/etc/firesim b/boards/default/distros/ubuntu/overlay/etc/firesim deleted file mode 120000 index 3b17a5df..00000000 --- a/boards/default/distros/ubuntu/overlay/etc/firesim +++ /dev/null @@ -1 +0,0 @@ -/home/centos/firesim/target-design/chipyard/software/firemarshal/boards/default/distros/fedora/overlay/etc/firesim/ \ No newline at end of file diff --git a/boards/default/distros/ubuntu/overlay/etc/firesim/.gitignore b/boards/default/distros/ubuntu/overlay/etc/firesim/.gitignore new file mode 100644 index 00000000..fd1ff69a --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/etc/firesim/.gitignore @@ -0,0 +1,2 @@ +# This file is auto-generated by the build system +firesim.sh diff --git a/boards/default/distros/ubuntu/overlay/etc/fstab b/boards/default/distros/ubuntu/overlay/etc/fstab deleted file mode 120000 index cd8ba211..00000000 --- a/boards/default/distros/ubuntu/overlay/etc/fstab +++ /dev/null @@ -1 +0,0 @@ -/home/centos/firesim/target-design/chipyard/software/firemarshal/boards/default/distros/fedora/overlay/etc/fstab \ No newline at end of file diff --git a/boards/default/distros/ubuntu/overlay/etc/fstab b/boards/default/distros/ubuntu/overlay/etc/fstab new file mode 100644 index 00000000..4534a1b0 --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/etc/fstab @@ -0,0 +1 @@ +LABEL=_/ / ext4 defaults,noatime,x-systemd.device-timeout=300s,x-systemd.mount-timeout=300s 0 0 diff --git a/boards/default/distros/ubuntu/overlay/etc/systemd b/boards/default/distros/ubuntu/overlay/etc/systemd deleted file mode 120000 index a797ec7f..00000000 --- a/boards/default/distros/ubuntu/overlay/etc/systemd +++ /dev/null @@ -1 +0,0 @@ -/home/centos/firesim/target-design/chipyard/software/firemarshal/boards/default/distros/fedora/overlay/etc/systemd/ \ No newline at end of file diff --git a/boards/default/distros/ubuntu/overlay/etc/systemd/system/default.target b/boards/default/distros/ubuntu/overlay/etc/systemd/system/default.target new file mode 120000 index 00000000..a853793b --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/etc/systemd/system/default.target @@ -0,0 +1 @@ +/etc/systemd/system/firesim.target \ No newline at end of file diff --git a/boards/default/distros/ubuntu/overlay/etc/systemd/system/firesim.target b/boards/default/distros/ubuntu/overlay/etc/systemd/system/firesim.target new file mode 100644 index 00000000..5f225f3b --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/etc/systemd/system/firesim.target @@ -0,0 +1,4 @@ +[Unit] +Requires=multi-user.target +After=multi-user.target +AllowIsolate=yes diff --git a/boards/default/distros/ubuntu/overlay/etc/systemd/system/firesim.target.wants/firesim.service b/boards/default/distros/ubuntu/overlay/etc/systemd/system/firesim.target.wants/firesim.service new file mode 120000 index 00000000..3e9d33d8 --- /dev/null +++ b/boards/default/distros/ubuntu/overlay/etc/systemd/system/firesim.target.wants/firesim.service @@ -0,0 +1 @@ +/etc/systemd/system/firesim.service \ No newline at end of file diff --git a/boards/firechip/base-workloads/ubuntu-base/README b/boards/firechip/base-workloads/ubuntu-base/README index 40921488..15d4c618 100644 --- a/boards/firechip/base-workloads/ubuntu-base/README +++ b/boards/firechip/base-workloads/ubuntu-base/README @@ -1,5 +1,5 @@ Ubuntu 20.04 support in Firesim First time setup notes: -- When running "./marshal build ubuntu-base.json" for the first time, the process will end in a login prompt for Ubuntu. Login with "root:firesim", and upon login, exit Qemu with CTRL-A+X +- When running "./marshal build ubuntu-base.json" for the first time, the process MAY end in a login prompt for Ubuntu. Login with "root:firesim", and upon login, exit Qemu with CTRL-A+X - Login with "root:firesim" when launching with Firemarshal/Firesim diff --git a/boards/firechip/base-workloads/ubuntu-base/overlay/etc/firesim/ip.py b/boards/firechip/base-workloads/ubuntu-base/overlay/etc/firesim/ip.py deleted file mode 100644 index afc4b54e..00000000 --- a/boards/firechip/base-workloads/ubuntu-base/overlay/etc/firesim/ip.py +++ /dev/null @@ -1,11 +0,0 @@ -import yaml -import sys - -with open(sys.argv[1], 'r') as file: - config = yaml.safe_load(file) - -config["network"]["ethernets"]["ens33"]["addresses"] = ["172.16." + sys.argv[2] + "." + sys.argv[3] + "/24"] -config["network"]["ethernets"]["ens33"]["gateway4"] = ["172.16.1.1"] - -with open(sys.argv[1], 'w') as file: - yaml.dump(config, file) From f5e94b720f2c1835ef1f87e0a1c7a95b13d49c7f Mon Sep 17 00:00:00 2001 From: Cloud User Date: Fri, 20 Oct 2023 04:22:23 +0000 Subject: [PATCH 07/12] removing apt sources from overlay --- .../etc/apt/apt.conf.d/01-vendor-ubuntu | 2 - .../overlay/etc/apt/apt.conf.d/01autoremove | 41 ------ .../overlay/etc/apt/apt.conf.d/10periodic | 3 - .../overlay/etc/apt/apt.conf.d/15update-stamp | 1 - .../etc/apt/apt.conf.d/20apt-esm-hook.conf | 15 -- .../overlay/etc/apt/apt.conf.d/20archive | 3 - .../etc/apt/apt.conf.d/20auto-upgrades | 2 - .../overlay/etc/apt/apt.conf.d/20packagekit | 13 -- .../etc/apt/apt.conf.d/50command-not-found | 16 --- .../etc/apt/apt.conf.d/50unattended-upgrades | 131 ------------------ .../overlay/etc/apt/apt.conf.d/70debconf | 3 - .../etc/apt/apt.conf.d/99update-notifier | 2 - .../ubuntu/overlay/etc/apt/sources.list | 61 -------- .../deadsnakes-ubuntu-ppa-focal.list | 2 - .../deadsnakes-ubuntu-ppa-focal.list.save | 2 - .../graphics-drivers-ubuntu-ppa-focal.list | 2 - ...raphics-drivers-ubuntu-ppa-focal.list.save | 2 - .../ubuntu/overlay/etc/apt/sources.list.save | 61 -------- .../ubuntu/overlay/etc/apt/trusted.gpg | Bin 5671 -> 0 bytes .../trusted.gpg.d/deadsnakes_ubuntu_ppa.gpg | Bin 1129 -> 0 bytes .../graphics-drivers_ubuntu_ppa.gpg | Bin 1140 -> 0 bytes .../ubuntu-keyring-2012-archive.gpg | Bin 2796 -> 0 bytes .../ubuntu-keyring-2012-cdimage.gpg | Bin 2794 -> 0 bytes .../ubuntu-keyring-2018-archive.gpg | Bin 1733 -> 0 bytes 24 files changed, 362 deletions(-) delete mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/01-vendor-ubuntu delete mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/01autoremove delete mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/10periodic delete mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/15update-stamp delete mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20apt-esm-hook.conf delete mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20archive delete mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20auto-upgrades delete mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20packagekit delete mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/50command-not-found delete mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/50unattended-upgrades delete mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/70debconf delete mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/99update-notifier delete mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/sources.list delete mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/deadsnakes-ubuntu-ppa-focal.list delete mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/deadsnakes-ubuntu-ppa-focal.list.save delete mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/graphics-drivers-ubuntu-ppa-focal.list delete mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/graphics-drivers-ubuntu-ppa-focal.list.save delete mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/sources.list.save delete mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/trusted.gpg delete mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/trusted.gpg.d/deadsnakes_ubuntu_ppa.gpg delete mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/trusted.gpg.d/graphics-drivers_ubuntu_ppa.gpg delete mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/trusted.gpg.d/ubuntu-keyring-2012-archive.gpg delete mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/trusted.gpg.d/ubuntu-keyring-2012-cdimage.gpg delete mode 100644 boards/default/distros/ubuntu/overlay/etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/01-vendor-ubuntu b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/01-vendor-ubuntu deleted file mode 100644 index 30d25a71..00000000 --- a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/01-vendor-ubuntu +++ /dev/null @@ -1,2 +0,0 @@ -Acquire::Changelogs::AlwaysOnline "true"; -Acquire::http::User-Agent-Non-Interactive "true"; diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/01autoremove b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/01autoremove deleted file mode 100644 index 478c571e..00000000 --- a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/01autoremove +++ /dev/null @@ -1,41 +0,0 @@ -APT -{ - NeverAutoRemove - { - "^firmware-linux.*"; - "^linux-firmware$"; - "^linux-image-[a-z0-9]*$"; - "^linux-image-[a-z0-9]*-[a-z0-9]*$"; - }; - - VersionedKernelPackages - { - # kernels - "linux-.*"; - "kfreebsd-.*"; - "gnumach-.*"; - # (out-of-tree) modules - ".*-modules"; - ".*-kernel"; - }; - - Never-MarkAuto-Sections - { - "metapackages"; - "contrib/metapackages"; - "non-free/metapackages"; - "restricted/metapackages"; - "universe/metapackages"; - "multiverse/metapackages"; - }; - - Move-Autobit-Sections - { - "oldlibs"; - "contrib/oldlibs"; - "non-free/oldlibs"; - "restricted/oldlibs"; - "universe/oldlibs"; - "multiverse/oldlibs"; - }; -}; diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/10periodic b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/10periodic deleted file mode 100644 index d1922e34..00000000 --- a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/10periodic +++ /dev/null @@ -1,3 +0,0 @@ -APT::Periodic::Update-Package-Lists "1"; -APT::Periodic::Download-Upgradeable-Packages "0"; -APT::Periodic::AutocleanInterval "0"; diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/15update-stamp b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/15update-stamp deleted file mode 100644 index 14ead837..00000000 --- a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/15update-stamp +++ /dev/null @@ -1 +0,0 @@ -APT::Update::Post-Invoke-Success {"touch /var/lib/apt/periodic/update-success-stamp 2>/dev/null || true";}; diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20apt-esm-hook.conf b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20apt-esm-hook.conf deleted file mode 100644 index 0cc68239..00000000 --- a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20apt-esm-hook.conf +++ /dev/null @@ -1,15 +0,0 @@ -APT::Update::Post-Invoke-Stats { - "[ ! -f /usr/lib/ubuntu-advantage/apt-esm-hook ] || /usr/lib/ubuntu-advantage/apt-esm-hook post-invoke-stats || true"; -}; - -APT::Install::Post-Invoke-Success { - "[ ! -f /usr/lib/ubuntu-advantage/apt-esm-hook ] || /usr/lib/ubuntu-advantage/apt-esm-hook post-invoke-success || true"; -}; - -APT::Install::Pre-Invoke { - "[ ! -f /usr/lib/ubuntu-advantage/apt-esm-hook ] || /usr/lib/ubuntu-advantage/apt-esm-hook pre-invoke || true"; -}; - -AptCli::Hooks::Upgrade { - "[ ! -f /usr/lib/ubuntu-advantage/apt-esm-json-hook ] || /usr/lib/ubuntu-advantage/apt-esm-json-hook || true"; -}; diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20archive b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20archive deleted file mode 100644 index a2ad262f..00000000 --- a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20archive +++ /dev/null @@ -1,3 +0,0 @@ -APT::Archives::MaxAge "30"; -APT::Archives::MinAge "2"; -APT::Archives::MaxSize "500"; diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20auto-upgrades b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20auto-upgrades deleted file mode 100644 index 8d6d7c82..00000000 --- a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20auto-upgrades +++ /dev/null @@ -1,2 +0,0 @@ -APT::Periodic::Update-Package-Lists "1"; -APT::Periodic::Unattended-Upgrade "1"; diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20packagekit b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20packagekit deleted file mode 100644 index 705cc2fe..00000000 --- a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20packagekit +++ /dev/null @@ -1,13 +0,0 @@ -// THIS FILE IS USED TO INFORM PACKAGEKIT -// THAT THE UPDATE-INFO MIGHT HAVE CHANGED - -// Whenever dpkg is called we might have different updates -// i.e. if an user removes a package that had an update -DPkg::Post-Invoke { -"/usr/bin/test -e /usr/share/dbus-1/system-services/org.freedesktop.PackageKit.service && /usr/bin/test -S /var/run/dbus/system_bus_socket && /usr/bin/gdbus call --system --dest org.freedesktop.PackageKit --object-path /org/freedesktop/PackageKit --timeout 4 --method org.freedesktop.PackageKit.StateHasChanged cache-update > /dev/null; /bin/echo > /dev/null"; -}; - -// When Apt's cache is updated (i.e. apt-cache update) -APT::Update::Post-Invoke-Success { -"/usr/bin/test -e /usr/share/dbus-1/system-services/org.freedesktop.PackageKit.service && /usr/bin/test -S /var/run/dbus/system_bus_socket && /usr/bin/gdbus call --system --dest org.freedesktop.PackageKit --object-path /org/freedesktop/PackageKit --timeout 4 --method org.freedesktop.PackageKit.StateHasChanged cache-update > /dev/null; /bin/echo > /dev/null"; -}; diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/50command-not-found b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/50command-not-found deleted file mode 100644 index 320662bd..00000000 --- a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/50command-not-found +++ /dev/null @@ -1,16 +0,0 @@ -## This file is provided by command-not-found(1) to download -## Commands metadata files. - -Acquire::IndexTargets { - # The deb822 metadata files - deb::CNF { - MetaKey "$(COMPONENT)/cnf/Commands-$(NATIVE_ARCHITECTURE)"; - ShortDescription "Commands-$(NATIVE_ARCHITECTURE)"; - Description "$(RELEASE)/$(COMPONENT) $(NATIVE_ARCHITECTURE) c-n-f Metadata"; - }; -}; - -# Refresh AppStream cache when APT's cache is updated (i.e. apt update) -APT::Update::Post-Invoke-Success { - "if /usr/bin/test -w /var/lib/command-not-found/ -a -e /usr/lib/cnf-update-db; then /usr/lib/cnf-update-db > /dev/null; fi"; -}; diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/50unattended-upgrades b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/50unattended-upgrades deleted file mode 100644 index 4e5ff8bb..00000000 --- a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/50unattended-upgrades +++ /dev/null @@ -1,131 +0,0 @@ -// Automatically upgrade packages from these (origin:archive) pairs -// -// Note that in Ubuntu security updates may pull in new dependencies -// from non-security sources (e.g. chromium). By allowing the release -// pocket these get automatically pulled in. -Unattended-Upgrade::Allowed-Origins { - "${distro_id}:${distro_codename}"; - "${distro_id}:${distro_codename}-security"; - // Extended Security Maintenance; doesn't necessarily exist for - // every release and this system may not have it installed, but if - // available, the policy for updates is such that unattended-upgrades - // should also install from here by default. - "${distro_id}ESMApps:${distro_codename}-apps-security"; - "${distro_id}ESM:${distro_codename}-infra-security"; -// "${distro_id}:${distro_codename}-updates"; -// "${distro_id}:${distro_codename}-proposed"; -// "${distro_id}:${distro_codename}-backports"; -}; - -// Python regular expressions, matching packages to exclude from upgrading -Unattended-Upgrade::Package-Blacklist { - // The following matches all packages starting with linux- -// "linux-"; - - // Use $ to explicitely define the end of a package name. Without - // the $, "libc6" would match all of them. -// "libc6$"; -// "libc6-dev$"; -// "libc6-i686$"; - - // Special characters need escaping -// "libstdc\+\+6$"; - - // The following matches packages like xen-system-amd64, xen-utils-4.1, - // xenstore-utils and libxenstore3.0 -// "(lib)?xen(store)?"; - - // For more information about Python regular expressions, see - // https://docs.python.org/3/howto/regex.html -}; - -// This option controls whether the development release of Ubuntu will be -// upgraded automatically. Valid values are "true", "false", and "auto". -Unattended-Upgrade::DevRelease "auto"; - -// This option allows you to control if on a unclean dpkg exit -// unattended-upgrades will automatically run -// dpkg --force-confold --configure -a -// The default is true, to ensure updates keep getting installed -//Unattended-Upgrade::AutoFixInterruptedDpkg "true"; - -// Split the upgrade into the smallest possible chunks so that -// they can be interrupted with SIGTERM. This makes the upgrade -// a bit slower but it has the benefit that shutdown while a upgrade -// is running is possible (with a small delay) -//Unattended-Upgrade::MinimalSteps "true"; - -// Install all updates when the machine is shutting down -// instead of doing it in the background while the machine is running. -// This will (obviously) make shutdown slower. -// Unattended-upgrades increases logind's InhibitDelayMaxSec to 30s. -// This allows more time for unattended-upgrades to shut down gracefully -// or even install a few packages in InstallOnShutdown mode, but is still a -// big step back from the 30 minutes allowed for InstallOnShutdown previously. -// Users enabling InstallOnShutdown mode are advised to increase -// InhibitDelayMaxSec even further, possibly to 30 minutes. -//Unattended-Upgrade::InstallOnShutdown "false"; - -// Send email to this address for problems or packages upgrades -// If empty or unset then no email is sent, make sure that you -// have a working mail setup on your system. A package that provides -// 'mailx' must be installed. E.g. "user@example.com" -//Unattended-Upgrade::Mail ""; - -// Set this value to one of: -// "always", "only-on-error" or "on-change" -// If this is not set, then any legacy MailOnlyOnError (boolean) value -// is used to chose between "only-on-error" and "on-change" -//Unattended-Upgrade::MailReport "on-change"; - -// Remove unused automatically installed kernel-related packages -// (kernel images, kernel headers and kernel version locked tools). -//Unattended-Upgrade::Remove-Unused-Kernel-Packages "true"; - -// Do automatic removal of newly unused dependencies after the upgrade -//Unattended-Upgrade::Remove-New-Unused-Dependencies "true"; - -// Do automatic removal of unused packages after the upgrade -// (equivalent to apt-get autoremove) -//Unattended-Upgrade::Remove-Unused-Dependencies "false"; - -// Automatically reboot *WITHOUT CONFIRMATION* if -// the file /var/run/reboot-required is found after the upgrade -//Unattended-Upgrade::Automatic-Reboot "false"; - -// Automatically reboot even if there are users currently logged in -// when Unattended-Upgrade::Automatic-Reboot is set to true -//Unattended-Upgrade::Automatic-Reboot-WithUsers "true"; - -// If automatic reboot is enabled and needed, reboot at the specific -// time instead of immediately -// Default: "now" -//Unattended-Upgrade::Automatic-Reboot-Time "02:00"; - -// Use apt bandwidth limit feature, this example limits the download -// speed to 70kb/sec -//Acquire::http::Dl-Limit "70"; - -// Enable logging to syslog. Default is False -// Unattended-Upgrade::SyslogEnable "false"; - -// Specify syslog facility. Default is daemon -// Unattended-Upgrade::SyslogFacility "daemon"; - -// Download and install upgrades only on AC power -// (i.e. skip or gracefully stop updates on battery) -// Unattended-Upgrade::OnlyOnACPower "true"; - -// Download and install upgrades only on non-metered connection -// (i.e. skip or gracefully stop updates on a metered connection) -// Unattended-Upgrade::Skip-Updates-On-Metered-Connections "true"; - -// Verbose logging -// Unattended-Upgrade::Verbose "false"; - -// Print debugging information both in unattended-upgrades and -// in unattended-upgrade-shutdown -// Unattended-Upgrade::Debug "false"; - -// Allow package downgrade if Pin-Priority exceeds 1000 -// Unattended-Upgrade::Allow-downgrade "false"; diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/70debconf b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/70debconf deleted file mode 100644 index 0c8b4ca4..00000000 --- a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/70debconf +++ /dev/null @@ -1,3 +0,0 @@ -// Pre-configure all packages with debconf before they are installed. -// If you don't like it, comment it out. -DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt || true";}; diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/99update-notifier b/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/99update-notifier deleted file mode 100644 index 21acb0ce..00000000 --- a/boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/99update-notifier +++ /dev/null @@ -1,2 +0,0 @@ -DPkg::Post-Invoke {"if [ -d /var/lib/update-notifier ]; then touch /var/lib/update-notifier/dpkg-run-stamp; fi; /usr/lib/update-notifier/update-motd-updates-available 2>/dev/null || true";}; -APT::Update::Post-Invoke-Success {"/usr/lib/update-notifier/update-motd-updates-available 2>/dev/null || true";}; diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/sources.list b/boards/default/distros/ubuntu/overlay/etc/apt/sources.list deleted file mode 100644 index bc735021..00000000 --- a/boards/default/distros/ubuntu/overlay/etc/apt/sources.list +++ /dev/null @@ -1,61 +0,0 @@ -## Note, this file is written by cloud-init on first boot of an instance -## modifications made here will not survive a re-bundle. -## if you wish to make changes you can: -## a.) add 'apt_preserve_sources_list: true' to /etc/cloud/cloud.cfg -## or do the same in user-data -## b.) add sources in /etc/apt/sources.list.d -## c.) make changes to template file /etc/cloud/templates/sources.list.tmpl - -# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to -# newer versions of the distribution. -deb http://ports.ubuntu.com/ubuntu-ports focal main restricted -# deb-src http://ports.ubuntu.com/ubuntu-ports focal main restricted - -## Major bug fix updates produced after the final release of the -## distribution. -deb http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted -# deb-src http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted - -## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu -## team. Also, please note that software in universe WILL NOT receive any -## review or updates from the Ubuntu security team. -deb http://ports.ubuntu.com/ubuntu-ports focal universe -# deb-src http://ports.ubuntu.com/ubuntu-ports focal universe -deb http://ports.ubuntu.com/ubuntu-ports focal-updates universe -# deb-src http://ports.ubuntu.com/ubuntu-ports focal-updates universe - -## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu -## team, and may not be under a free licence. Please satisfy yourself as to -## your rights to use the software. Also, please note that software in -## multiverse WILL NOT receive any review or updates from the Ubuntu -## security team. -deb http://ports.ubuntu.com/ubuntu-ports focal multiverse -# deb-src http://ports.ubuntu.com/ubuntu-ports focal multiverse -deb http://ports.ubuntu.com/ubuntu-ports focal-updates multiverse -# deb-src http://ports.ubuntu.com/ubuntu-ports focal-updates multiverse - -## N.B. software from this repository may not have been tested as -## extensively as that contained in the main release, although it includes -## newer versions of some applications which may provide useful features. -## Also, please note that software in backports WILL NOT receive any review -## or updates from the Ubuntu security team. -deb http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse -# deb-src http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse - -## Uncomment the following two lines to add software from Canonical's -## 'partner' repository. -## This software is not part of Ubuntu, but is offered by Canonical and the -## respective vendors as a service to Ubuntu users. -# deb http://archive.canonical.com/ubuntu focal partner -# deb-src http://archive.canonical.com/ubuntu focal partner - -deb http://ports.ubuntu.com/ubuntu-ports focal-security main restricted -# deb-src http://ports.ubuntu.com/ubuntu-ports focal-security main restricted -deb http://ports.ubuntu.com/ubuntu-ports focal-security universe -# deb-src http://ports.ubuntu.com/ubuntu-ports focal-security universe -deb http://ports.ubuntu.com/ubuntu-ports focal-security multiverse -# deb-src http://ports.ubuntu.com/ubuntu-ports focal-security multiverse -deb https://apt.kitware.com/ubuntu focal main -# deb-src https://apt.kitware.com/ubuntu focal main -deb https://download.docker.com/linux/ubuntu focal stable -# deb-src https://download.docker.com/linux/ubuntu focal stable diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/deadsnakes-ubuntu-ppa-focal.list b/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/deadsnakes-ubuntu-ppa-focal.list deleted file mode 100644 index 1e275321..00000000 --- a/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/deadsnakes-ubuntu-ppa-focal.list +++ /dev/null @@ -1,2 +0,0 @@ -deb http://ppa.launchpad.net/deadsnakes/ppa/ubuntu focal main -# deb-src http://ppa.launchpad.net/deadsnakes/ppa/ubuntu focal main diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/deadsnakes-ubuntu-ppa-focal.list.save b/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/deadsnakes-ubuntu-ppa-focal.list.save deleted file mode 100644 index 1e275321..00000000 --- a/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/deadsnakes-ubuntu-ppa-focal.list.save +++ /dev/null @@ -1,2 +0,0 @@ -deb http://ppa.launchpad.net/deadsnakes/ppa/ubuntu focal main -# deb-src http://ppa.launchpad.net/deadsnakes/ppa/ubuntu focal main diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/graphics-drivers-ubuntu-ppa-focal.list b/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/graphics-drivers-ubuntu-ppa-focal.list deleted file mode 100644 index e2d50435..00000000 --- a/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/graphics-drivers-ubuntu-ppa-focal.list +++ /dev/null @@ -1,2 +0,0 @@ -deb http://ppa.launchpad.net/graphics-drivers/ppa/ubuntu focal main -# deb-src http://ppa.launchpad.net/graphics-drivers/ppa/ubuntu focal main diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/graphics-drivers-ubuntu-ppa-focal.list.save b/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/graphics-drivers-ubuntu-ppa-focal.list.save deleted file mode 100644 index e2d50435..00000000 --- a/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.d/graphics-drivers-ubuntu-ppa-focal.list.save +++ /dev/null @@ -1,2 +0,0 @@ -deb http://ppa.launchpad.net/graphics-drivers/ppa/ubuntu focal main -# deb-src http://ppa.launchpad.net/graphics-drivers/ppa/ubuntu focal main diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.save b/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.save deleted file mode 100644 index bc735021..00000000 --- a/boards/default/distros/ubuntu/overlay/etc/apt/sources.list.save +++ /dev/null @@ -1,61 +0,0 @@ -## Note, this file is written by cloud-init on first boot of an instance -## modifications made here will not survive a re-bundle. -## if you wish to make changes you can: -## a.) add 'apt_preserve_sources_list: true' to /etc/cloud/cloud.cfg -## or do the same in user-data -## b.) add sources in /etc/apt/sources.list.d -## c.) make changes to template file /etc/cloud/templates/sources.list.tmpl - -# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to -# newer versions of the distribution. -deb http://ports.ubuntu.com/ubuntu-ports focal main restricted -# deb-src http://ports.ubuntu.com/ubuntu-ports focal main restricted - -## Major bug fix updates produced after the final release of the -## distribution. -deb http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted -# deb-src http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted - -## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu -## team. Also, please note that software in universe WILL NOT receive any -## review or updates from the Ubuntu security team. -deb http://ports.ubuntu.com/ubuntu-ports focal universe -# deb-src http://ports.ubuntu.com/ubuntu-ports focal universe -deb http://ports.ubuntu.com/ubuntu-ports focal-updates universe -# deb-src http://ports.ubuntu.com/ubuntu-ports focal-updates universe - -## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu -## team, and may not be under a free licence. Please satisfy yourself as to -## your rights to use the software. Also, please note that software in -## multiverse WILL NOT receive any review or updates from the Ubuntu -## security team. -deb http://ports.ubuntu.com/ubuntu-ports focal multiverse -# deb-src http://ports.ubuntu.com/ubuntu-ports focal multiverse -deb http://ports.ubuntu.com/ubuntu-ports focal-updates multiverse -# deb-src http://ports.ubuntu.com/ubuntu-ports focal-updates multiverse - -## N.B. software from this repository may not have been tested as -## extensively as that contained in the main release, although it includes -## newer versions of some applications which may provide useful features. -## Also, please note that software in backports WILL NOT receive any review -## or updates from the Ubuntu security team. -deb http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse -# deb-src http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse - -## Uncomment the following two lines to add software from Canonical's -## 'partner' repository. -## This software is not part of Ubuntu, but is offered by Canonical and the -## respective vendors as a service to Ubuntu users. -# deb http://archive.canonical.com/ubuntu focal partner -# deb-src http://archive.canonical.com/ubuntu focal partner - -deb http://ports.ubuntu.com/ubuntu-ports focal-security main restricted -# deb-src http://ports.ubuntu.com/ubuntu-ports focal-security main restricted -deb http://ports.ubuntu.com/ubuntu-ports focal-security universe -# deb-src http://ports.ubuntu.com/ubuntu-ports focal-security universe -deb http://ports.ubuntu.com/ubuntu-ports focal-security multiverse -# deb-src http://ports.ubuntu.com/ubuntu-ports focal-security multiverse -deb https://apt.kitware.com/ubuntu focal main -# deb-src https://apt.kitware.com/ubuntu focal main -deb https://download.docker.com/linux/ubuntu focal stable -# deb-src https://download.docker.com/linux/ubuntu focal stable diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/trusted.gpg b/boards/default/distros/ubuntu/overlay/etc/apt/trusted.gpg deleted file mode 100644 index 80937655b9ace396dbc9a642850281a23a0afbc3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5671 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 diff --git a/boards/default/distros/ubuntu/overlay/etc/apt/trusted.gpg.d/graphics-drivers_ubuntu_ppa.gpg b/boards/default/distros/ubuntu/overlay/etc/apt/trusted.gpg.d/graphics-drivers_ubuntu_ppa.gpg deleted file mode 100644 index 907f705bacd8607451a8f1d2d70c49911bfa0c51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1140 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 Date: Fri, 20 Oct 2023 18:35:10 +0000 Subject: [PATCH 08/12] imcreasing rootfs-size because default is too small for package upgrade --- boards/firechip/base-workloads/ubuntu-base.json | 1 + 1 file changed, 1 insertion(+) diff --git a/boards/firechip/base-workloads/ubuntu-base.json b/boards/firechip/base-workloads/ubuntu-base.json index 40e03efb..d903c5c1 100644 --- a/boards/firechip/base-workloads/ubuntu-base.json +++ b/boards/firechip/base-workloads/ubuntu-base.json @@ -1,6 +1,7 @@ { "name" : "ubuntu-base", "guest-init": "initRepos.sh", + "rootfs-size": "8GB", "distro" : { "name" : "ubuntu", "opts" : {} From ef78439cbbe7918bc74e33f8bc0edb0a0246a900 Mon Sep 17 00:00:00 2001 From: Cloud User Date: Mon, 23 Oct 2023 20:20:47 +0000 Subject: [PATCH 09/12] adding docs for Ubuntu --- docs/source/distros/Ubuntu.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 docs/source/distros/Ubuntu.rst diff --git a/docs/source/distros/Ubuntu.rst b/docs/source/distros/Ubuntu.rst new file mode 100644 index 00000000..7dc2116f --- /dev/null +++ b/docs/source/distros/Ubuntu.rst @@ -0,0 +1,12 @@ +.. _ubuntu-distro: + +The Ubuntu Distribution +============================= + +Ubuntu uses the SiFive HiFive Unmatched server image of Ubuntu 20.04 found `here +`_. + +First time setup notes: +- When running ``./marshal build ubuntu-base.json`` for the first time, the process MAY end in a login prompt for Ubuntu. Login with ``root:firesim``, and upon login, exit Qemu with CTRL-A+X +- Login with ``root:firesim`` when launching with Firemarshal/Firesim. +- Make sure to set the ``rootfs-size`` in ``ubuntu-base.json`` to be large enough to account for the space needed for ``sudo apt update && sudo apt-upgrade``. From da0154576610197f7b9f7df7e5190e070ee927fa Mon Sep 17 00:00:00 2001 From: Cloud User Date: Mon, 23 Oct 2023 20:25:31 +0000 Subject: [PATCH 10/12] docs --- docs/source/distros/Ubuntu.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/source/distros/Ubuntu.rst b/docs/source/distros/Ubuntu.rst index 7dc2116f..d103b169 100644 --- a/docs/source/distros/Ubuntu.rst +++ b/docs/source/distros/Ubuntu.rst @@ -7,6 +7,9 @@ Ubuntu uses the SiFive HiFive Unmatched server image of Ubuntu 20.04 found `here `_. First time setup notes: + - When running ``./marshal build ubuntu-base.json`` for the first time, the process MAY end in a login prompt for Ubuntu. Login with ``root:firesim``, and upon login, exit Qemu with CTRL-A+X + - Login with ``root:firesim`` when launching with Firemarshal/Firesim. + - Make sure to set the ``rootfs-size`` in ``ubuntu-base.json`` to be large enough to account for the space needed for ``sudo apt update && sudo apt-upgrade``. From 95e221e16fecffb2235f2dd3d3fe80dd9709aea5 Mon Sep 17 00:00:00 2001 From: joey0320 Date: Thu, 18 Jan 2024 21:20:46 -0800 Subject: [PATCH 11/12] remove unrelated files --- boards/default/distros/ubuntu/overlay/.DS_Store | Bin 6148 -> 0 bytes .../default/distros/ubuntu/overlay/etc/.DS_Store | Bin 6148 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 boards/default/distros/ubuntu/overlay/.DS_Store delete mode 100644 boards/default/distros/ubuntu/overlay/etc/.DS_Store diff --git a/boards/default/distros/ubuntu/overlay/.DS_Store b/boards/default/distros/ubuntu/overlay/.DS_Store deleted file mode 100644 index d43517ea2813fff79877be4999a168809d6dd1ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}T>S5Z-O8X(&Pt3VK`cTClCQ7cU{!7cim+mD-q~!I&*gY7V84yS|Vw;`2DO zy8(+ii`W_1{pNQ!`$6`HF~+?`*k{aPjJ2U5a#U&r-L;{HNk-&2Mm7r)8G!W>%uMXB z1AcpxMJ#6zLGk_jlQ_$Jy-(g~wzjq{%eFe!o&O{YKcD7{%$v?{(7Kc|2`YUWT*Xl_ zadyvSnor|2nyZ31j3DLqI!;4bcyf`3nX2`5z_#1=#5q_l2ZK>p3`WPRu2}Z_C&R87 z4Tr0h-QGJqI=z@YCoidd(|mHETgi^W3f@66%X#(ZX(H1{@Ko7V79lY}3=jjvz(zA* zj)it-qgkNE69dFR9Rs*O2xy3|!BV5zI-tYrGsatpD4^q80#O)r4VD@q0>X7Epf2U+ ziNSR__=U-H4VD^pIpb<(7{|<9Jzlt)9sEM2Gwy1no){no)){DO)4}uq9DbSFNB(*V zS;PP_@Xr|Ft+7A$U{U65{joeeYX!7>XegLhq5=Z?+9d!C+(-6RP{#%8kmnjKHR34f RSLJ|o5m1CsM-2P|17D~NNumG% diff --git a/boards/default/distros/ubuntu/overlay/etc/.DS_Store b/boards/default/distros/ubuntu/overlay/etc/.DS_Store deleted file mode 100644 index 0715a1f35e63c3df3287270a072f1061461791e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}T>S5Z<-bBorYB1-&hJE!bAuibZwYmM6SljS;9tPk&nZ4 z#Xx`2glo6hJ*<1eV)kkMG6c_CI8Kv%+G@S?jaq$k%d#A+Vcq(Vvhb(Dbe8vn$u;&a zq)fv~55mhNE{5*Tsm!K9lEo91kVG+r+*~DDB#XYBWl^qjeeG}@+Znq1^LeM!Yl=?q zXwek&cKf*76uoYDv2g6&gTs^a;Zr)w;XJgRuxT1 z3=jjv05Pyu447lUZmd<+R4g$-4E%%v+#duqM9*NUQEeUY!Rs^n>xd|z<68nz81xL5 z8o>j?bt<4v<>raObvoFEiSrDW8g)A3YGxS6%v?QQxSAd8LWMK#X{0YPKnyH1P}5x( z&;K*{WmZ1&ms6-m3=jkVi~(LB_=7$aWzN=b<>6T?pxr@3!MG9?5YU${0novHWKTJ@ cU!V?gp21Qhj)HcT4oDXPMF@R}fnQ+Y1BO~m)&Kwi From 17edff3eae778884eda269f4a31db35fe48ed544 Mon Sep 17 00:00:00 2001 From: "joonho.whangbo" Date: Thu, 18 Jan 2024 21:33:01 -0800 Subject: [PATCH 12/12] Cleanup docs, fedora->ubuntu --- boards/default/distros/ubuntu/resize.sh | 2 +- boards/default/distros/ubuntu/ubuntu.py | 6 +++--- docs/source/distros/Ubuntu.rst | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/boards/default/distros/ubuntu/resize.sh b/boards/default/distros/ubuntu/resize.sh index c52f3746..554d5328 100755 --- a/boards/default/distros/ubuntu/resize.sh +++ b/boards/default/distros/ubuntu/resize.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Usage: ./resize.sh FEDORA_IMAGE NEW_SIZE_IN_BYTES +# Usage: ./resize.sh UBUNTU_IMAGE NEW_SIZE_IN_BYTES IMG=$1 NEWSZ=$(numfmt --from=iec $2) diff --git a/boards/default/distros/ubuntu/ubuntu.py b/boards/default/distros/ubuntu/ubuntu.py index 3615eec7..9af6bd27 100644 --- a/boards/default/distros/ubuntu/ubuntu.py +++ b/boards/default/distros/ubuntu/ubuntu.py @@ -21,12 +21,12 @@ overlay = ubuntu_dir / 'overlay' -# Fedora doesn't support any options +# Ubuntu doesn't support any options def hashOpts(opts): return None -# Fedora doesn't support any options +# Ubuntu doesn't support any options def mergeOpts(base, new): return base @@ -71,7 +71,7 @@ def checkMake(): def generateBootScriptOverlay(self, script, args): # How this works: - # The fedora repo has a pre-built overlay with all the systemd paths + # The ubuntu repo has a pre-built overlay with all the systemd paths # filled in and a custom boot target (firesim.target) that loads a # custom service (firesim.service) that runs a script (/init.sh). We # can change the default boot behavior by changing this script. diff --git a/docs/source/distros/Ubuntu.rst b/docs/source/distros/Ubuntu.rst index d103b169..d0d28109 100644 --- a/docs/source/distros/Ubuntu.rst +++ b/docs/source/distros/Ubuntu.rst @@ -8,8 +8,9 @@ Ubuntu uses the SiFive HiFive Unmatched server image of Ubuntu 20.04 found `here First time setup notes: -- When running ``./marshal build ubuntu-base.json`` for the first time, the process MAY end in a login prompt for Ubuntu. Login with ``root:firesim``, and upon login, exit Qemu with CTRL-A+X +- When running ``./marshal build ubuntu-base.json`` for the first time, the process MAY end in a login prompt for Ubuntu. Login with ``root:firesim``, and upon login, exit Qemu with CTRL-A+X. - Login with ``root:firesim`` when launching with Firemarshal/Firesim. -- Make sure to set the ``rootfs-size`` in ``ubuntu-base.json`` to be large enough to account for the space needed for ``sudo apt update && sudo apt-upgrade``. +- If you need to install precompiled packages you can boot the image in QEMU and first run ``sudo apt update && sudo apt upgrade``. + Afterwards you can ``apt`` install anything you need. Make sure the rootfs size is large enough to run all the commands (default is 8GB).