feat: reorganize repo for Aurora builds #1091
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| #!/usr/bin/bash | ||
|
|
||
| set -oue pipefail | ||
|
|
||
| if test "$BASE_IMAGE_NAME" = "silverblue"; then | ||
| sed -i '/^PRETTY_NAME/s/Silverblue/Bluefin/' /usr/lib/os-release | ||
| elif test "$BASE_IMAGE_NAME" = "kinoite"; then | ||
| sed -i '/^PRETTY_NAME/s/Kinoite/Aurora/' /usr/lib/os-release | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| #!/usr/bin/bash | ||
|
|
||
| set -oue pipefail | ||
|
|
||
| . /tmp/build/copr-repos.sh | ||
|
There was a problem hiding this comment. Would it be good to just run this in a If you prefer it as-is, I'm okay with that too There was a problem hiding this comment. That could also work. With this method, we can inline things like that singular rpm-ostree install. But I like the loop method to make us more purposeful with changes. I personally like this source method to not worry about the +x bit. |
||
| . /tmp/build/nvidia-explicit-sync.sh | ||
| . /tmp/build/install-akmods.sh | ||
| . /tmp/build/packages.sh | ||
| . /tmp/build/fetch-install.sh | ||
| rpm-ostree install ublue-update | ||
| . /tmp/build/image-info.sh | ||
| . /tmp/build/fetch-quadlets.sh | ||
| . /tmp/build/font-install.sh | ||
| . /tmp/build/install-tmp.sh | ||
| . /tmp/build/systemd.sh | ||
| . /tmp/build/branding.sh | ||
| . /tmp/build/cleanup.sh | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| #!/usr/bin/bash | ||
|
|
||
| set -ouex pipefail | ||
|
|
||
| rm -f /etc/yum.repos.d/tailscale.repo | ||
| rm -f /etc/yum.repos.d/charm.repo | ||
| rm -f /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo | ||
| echo "Hidden=true" >> /usr/share/applications/fish.desktop | ||
| echo "Hidden=true" >> /usr/share/applications/htop.desktop | ||
| echo "Hidden=true" >> /usr/share/applications/nvtop.desktop | ||
| if [ "$BASE_IMAGE_NAME" = "silverblue" ]; then | ||
| echo "Hidden=true" >> /usr/share/applications/gnome-system-monitor.desktop | ||
| fi | ||
| rm -f /etc/yum.repos.d/_copr_che-nerd-fonts-"${FEDORA_MAJOR_VERSION}".repo |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| #!/usr/bin/bash | ||
|
|
||
| set -oue pipefail | ||
|
|
||
| # Add Staging repo | ||
| wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo && \ | ||
| # 39 gets VRR and Ptyxis | ||
| if [ ${FEDORA_MAJOR_VERSION} -eq "39" ]; then \ | ||
m2Giles marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| wget https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-gnome-vrr-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \ | ||
| rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr mutter mutter-common gnome-control-center gnome-control-center-filesystem && \ | ||
| rm -f /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \ | ||
| rpm-ostree override replace \ | ||
| --experimental \ | ||
| --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging \ | ||
| gtk4 \ | ||
| vte291 \ | ||
| vte-profile \ | ||
| libadwaita && \ | ||
| rpm-ostree install \ | ||
| ptyxis \ | ||
| ; fi && \ | ||
| # 40 gets only Ptyxis | ||
| if [ ${FEDORA_MAJOR_VERSION} -eq "40" ]; then \ | ||
| rpm-ostree override replace \ | ||
| --experimental \ | ||
| --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging \ | ||
| vte291 \ | ||
| vte-profile && \ | ||
| rpm-ostree install \ | ||
| ptyxis \ | ||
| ; fi && \ | ||
| # Add Nerd Fonts | ||
| wget https://copr.fedorainfracloud.org/coprs/che/nerd-fonts/repo/fedora-"${FEDORA_MAJOR_VERSION}"/che-nerd-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_che-nerd-fonts-"${FEDORA_MAJOR_VERSION}".repo | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| #!/usr/bin/bash | ||
|
|
||
| set -oue pipefail | ||
|
|
||
| # Starship Shell Prompt | ||
| curl -Lo /tmp/starship.tar.gz "https://github.com/starship/starship/releases/latest/download/starship-x86_64-unknown-linux-gnu.tar.gz" && \ | ||
| tar -xzf /tmp/starship.tar.gz -C /tmp && \ | ||
| install -c -m 0755 /tmp/starship /usr/bin && \ | ||
| echo 'eval "$(starship init bash)"' >> /etc/bashrc | ||
|
|
||
| # Brew Install Script | ||
| wget https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh -O /usr/libexec/brew-install && \ | ||
| chmod +x /usr/libexec/brew-install | ||
|
|
||
| # Flatpak Remotes | ||
| mkdir -p /usr/etc/flatpak/remotes.d && \ | ||
| wget -q https://dl.flathub.org/repo/flathub.flatpakrepo -P /usr/etc/flatpak/remotes.d | ||
|
|
||
| # Topgrade Install | ||
| pip install --prefix=/usr topgrade |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| #!/usr/bin/bash | ||
|
|
||
| set -ouex pipefail | ||
| fc-cache -f /usr/share/fonts/ubuntu | ||
| fc-cache -f /usr/share/fonts/inter |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| #!/usr/bin/bash | ||
|
|
||
| set -ouex pipefail | ||
|
|
||
| find /tmp/just -iname '*.just' -exec printf "\n\n" \; -exec cat {} \; >> /usr/share/ublue-os/just/60-custom.just | ||
|
|
||
| cp /tmp/ublue-update.toml /usr/etc/ublue-update/ublue-update.toml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| #!/usr/bin/bash | ||
|
|
||
| # Install Explicit Sync Patches on Nvidia builds | ||
| if [[ "${IMAGE_FLAVOR}" =~ "nvidia" && "${IMAGE_FLAVOR}" =~ "39" ]]; then \ | ||
| wget https://copr.fedorainfracloud.org/coprs/gloriouseggroll/nvidia-explicit-sync/repo/fedora-$(rpm -E %fedora)/gloriouseggroll-nvidia-explicit-sync-fedora-$(rpm -E %fedora).repo?arch=x86_64 -O /etc/yum.repos.d/_copr_gloriouseggroll-nvidia-explicit-sync.repo && \ | ||
| rpm-ostree override replace \ | ||
| --experimental \ | ||
| --from repo=copr:copr.fedorainfracloud.org:gloriouseggroll:nvidia-explicit-sync \ | ||
| xorg-x11-server-Xwayland && \ | ||
| rpm-ostree override replace \ | ||
| --experimental \ | ||
| --from repo=copr:copr.fedorainfracloud.org:gloriouseggroll:nvidia-explicit-sync \ | ||
| egl-wayland \ | ||
| || true && \ | ||
| rm /etc/yum.repos.d/_copr_gloriouseggroll-nvidia-explicit-sync.repo \ | ||
| ; fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| #!/usr/bin/bash | ||
|
|
||
|
|
||
| if [[ "${FEDORA_MAJOR_VERSION}" -ge "39" ]]; then \ | ||
| systemctl enable tuned.service \ | ||
| ; fi | ||
| systemctl enable rpm-ostree-countme.service | ||
| systemctl enable tailscaled.service | ||
| systemctl enable dconf-update.service | ||
| systemctl --global enable ublue-flatpak-manager.service | ||
| systemctl enable ublue-update.timer | ||
| systemctl enable ublue-system-setup.service | ||
| systemctl --global enable ublue-user-setup.service |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Out of scope for this PR, but a thought - would it be good to move this to scripts too, and use skopeo or similar to extract these files?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That would be nicer. We could remove a few of these COPY layers with that.