chore: fix build issues related to tuned-ppd (#1070)

ublue-os · Mar 29, 2024 · d2be880 · d2be880
1 parent 8e84822
commit d2be880
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 36 deletions.
diff --git a/Containerfile b/Containerfile
@@ -19,42 +19,35 @@ ARG PACKAGE_LIST="bluefin"
 
 # GNOME VRR & Ptyxis
 RUN if [ ${FEDORA_MAJOR_VERSION} -ge "39" ]; then \
-  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 && \
-  wget https://copr.fedorainfracloud.org/coprs/kylegospo/prompt/repo/fedora-$(rpm -E %fedora)/kylegospo-prompt-fedora-$(rpm -E %fedora).repo?arch=x86_64 -O /etc/yum.repos.d/_copr_kylegospo-prompt.repo && \
-  rpm-ostree override replace \
-  --experimental \
-  --from repo=copr:copr.fedorainfracloud.org:kylegospo:prompt \
-  vte291 \
-  vte-profile \
-  libadwaita && \
-  rpm-ostree install \
-  ptyxis && \
-  rm -f /etc/yum.repos.d/_copr_kylegospo-prompt.repo && \
-  rpm-ostree override remove \
-  power-profiles-daemon \
-  || true && \
-  rpm-ostree override remove \
-  tlp \
-  tlp-rdw \
-  || true \
-  ; fi
+        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 && \
+        wget https://copr.fedorainfracloud.org/coprs/kylegospo/prompt/repo/fedora-$(rpm -E %fedora)/kylegospo-prompt-fedora-$(rpm -E %fedora).repo?arch=x86_64 -O /etc/yum.repos.d/_copr_kylegospo-prompt.repo && \
+        rpm-ostree override replace \
+        --experimental \
+        --from repo=copr:copr.fedorainfracloud.org:kylegospo:prompt \
+            vte291 \
+            vte-profile \
+            libadwaita && \
+        rpm-ostree install \
+            ptyxis && \
+        rm -f /etc/yum.repos.d/_copr_kylegospo-prompt.repo \
+    ; fi
 
 # Install Explicit Sync Patches on Nvidia builds
 RUN if [[ "${IMAGE_FLAVOR}" =~ "nvidia" ]]; 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
+        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
 
 COPY usr /usr
 COPY just /tmp/just

diff --git a/build.sh b/build.sh
@@ -46,7 +46,7 @@ if [[ "${#EXCLUDED_PACKAGES[@]}" -gt 0 ]]; then
     EXCLUDED_PACKAGES=($(rpm -qa --queryformat='%{NAME} ' ${EXCLUDED_PACKAGES[@]}))
 fi
 
-# remove any exluded packages which are still present on image
+# remove any excluded packages which are still present on image
 if [[ "${#EXCLUDED_PACKAGES[@]}" -gt 0 ]]; then
     rpm-ostree override remove \
         ${EXCLUDED_PACKAGES[@]}

diff --git a/packages.json b/packages.json
@@ -65,7 +65,7 @@
 				"code",
 				"containerd.io",
 				"dbus-x11",
-                                "devpod",
+				"devpod",
 				"distrobuilder",
 				"docker-ce",
 				"docker-ce-cli",
@@ -155,7 +155,10 @@
 		"exclude": {
 			"bluefin": [
 				"podman-docker",
-				"gnome-terminal-nautilus"
+				"gnome-terminal-nautilus",
+				"power-profiles-daemon",
+				"tlp",
+				"tlp-rdw"
 			],
 			"bluefin-dx": [],
 			"bluefin-framework": []