From 32bd3cd41a1dc462596425b161710b9568e29767 Mon Sep 17 00:00:00 2001 From: Mark Mihalik Date: Tue, 7 Nov 2023 17:15:36 -0500 Subject: [PATCH] try moving google chrome to non script. Start building F39 --- .github/workflows/build.yml | 1 + .../usr/etc/yum.repos.d/google-chrome.repo | 7 ++++++ config/module_config/packages.yml | 6 +++-- config/module_config/scripts.yml | 2 +- config/recipe-nvidia-39.yml | 22 +++++++++++++++++++ config/scripts/early-script.sh | 10 ++++++--- config/scripts/google-chrome.sh | 2 +- config/scripts/post-install.sh | 6 +++++ 8 files changed, 49 insertions(+), 7 deletions(-) create mode 100644 config/files/usr/etc/yum.repos.d/google-chrome.repo create mode 100644 config/recipe-nvidia-39.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fb657a4530..f83a68e311 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,6 +42,7 @@ jobs: recipe: - recipe.yml - recipe-nvidia.yml + - recipe-nvidia-39.yml # !!! steps: diff --git a/config/files/usr/etc/yum.repos.d/google-chrome.repo b/config/files/usr/etc/yum.repos.d/google-chrome.repo new file mode 100644 index 0000000000..82db1c8591 --- /dev/null +++ b/config/files/usr/etc/yum.repos.d/google-chrome.repo @@ -0,0 +1,7 @@ +[google-chrome] +name=google-chrome +baseurl=https://dl.google.com/linux/chrome/rpm/stable/x86_64 +enabled=1 +gpgcheck=1 +repo_gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-google \ No newline at end of file diff --git a/config/module_config/packages.yml b/config/module_config/packages.yml index a4c230aad7..48078b3c24 100644 --- a/config/module_config/packages.yml +++ b/config/module_config/packages.yml @@ -69,6 +69,8 @@ install: - docker-ce - docker-ce-cli - docker-compose-plugin + # Google-Chrome + - google-chrome-stable # # Emacs - Use Script for swap to 29.1 # - emacs # - libtool @@ -82,5 +84,5 @@ remove: - gnome-software-rpm-ostree - gnome-tour -# optfix: -# - google \ No newline at end of file +optfix: + - google \ No newline at end of file diff --git a/config/module_config/scripts.yml b/config/module_config/scripts.yml index 40c1d718a0..7eb4c1d7e4 100644 --- a/config/module_config/scripts.yml +++ b/config/module_config/scripts.yml @@ -5,6 +5,6 @@ scripts: # - alternatives-workarounds.sh # - emacs.sh - devpod.sh - - google-chrome.sh + # - google-chrome.sh - pano.sh - post-install.sh \ No newline at end of file diff --git a/config/recipe-nvidia-39.yml b/config/recipe-nvidia-39.yml new file mode 100644 index 0000000000..ada583a6c3 --- /dev/null +++ b/config/recipe-nvidia-39.yml @@ -0,0 +1,22 @@ +# image will be published to ghcr.io// +name: m2-ublue-nvidia +# description will be included in the image's metadata +description: A starting point for further customization of uBlue images. Make your own! https://ublue.it/making-your-own/ + +# the base image to build on top of (FROM) and the version tag to use +base-image: ghcr.io/ublue-os/silverblue-nvidia +image-version: 39 # latest is also supported if you want new updates ASAP +flavor: nvidia + +# module configuration, executed in order +# you can include multiple instances of the same module +modules: + - from-file: module_config/files.yml + - from-file: module_config/early-script.yml + - from-file: module_config/packages.yml + - from-file: module_config/bling.yml + - from-file: module_config/fonts.yml + - from-file: module_config/systemd.yml + - from-file: module_config/flatpak.yml + - from-file: module_config/yafti.yml + - from-file: module_config/scripts.yml \ No newline at end of file diff --git a/config/scripts/early-script.sh b/config/scripts/early-script.sh index 12a838a92b..3290c3b728 100644 --- a/config/scripts/early-script.sh +++ b/config/scripts/early-script.sh @@ -2,6 +2,10 @@ set -ouex pipefail -echo "Setting up Directories for opt and alternatives" -mkdir -p /var/opt -mkdir -p /var/lib/alternatives \ No newline at end of file +echo "Setting up Directories alternatives" +mkdir -p /var/lib/alternatives +echo "Getting Google Signing Key" +curl --retry 3 --retry-delay 2 --retry-all-errors -sL \ + -o /etc/pki/rpm-gpg/RPM-GPG-KEY-google \ + https://dl.google.com/linux/linux_signing_key.pub +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-google \ No newline at end of file diff --git a/config/scripts/google-chrome.sh b/config/scripts/google-chrome.sh index 1a1db6d551..329951a2a9 100644 --- a/config/scripts/google-chrome.sh +++ b/config/scripts/google-chrome.sh @@ -34,7 +34,7 @@ mv /var/opt/google /usr/lib/opt/google # move this over here # Register path symlink # We do this via tmpfiles.d so that it is created by the live system. cat >/usr/lib/tmpfiles.d/google.conf <> /etc/bashrc + # Symlink Yafti ln -s /usr/share/ublue-os/firstboot/yafti.yml /etc/yafti.yml