Skip to content
This repository has been archived by the owner on Nov 20, 2023. It is now read-only.

Commit

Permalink
fix: remove unecessary scripts and perms from files
Browse files Browse the repository at this point in the history
  • Loading branch information
tulilirockz committed Aug 14, 2023
1 parent a9acfa9 commit 84adf7f
Show file tree
Hide file tree
Showing 10 changed files with 6 additions and 56 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish-iso.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
workflow_dispatch:

name: release-iso
name: publish-iso
jobs:
release-iso:
name: Generate and Release ISOs
Expand Down
4 changes: 3 additions & 1 deletion boot_menu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,6 @@ ublue_variants:
- label: malachite
info: Malachite
- label: malachine-nvidia
info: Malachive Nvidia builds
info: Malachive Nvidia builds
- label: malachine-dx
info: Malachive Development Builds
19 changes: 0 additions & 19 deletions recipe-nvidia.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ rpm:
repos:
# Example (which also demonstrates version number expansion):
# - https://copr.fedorainfracloud.org/coprs/atim/starship/repo/fedora-%FEDORA_VERSION%/atim-starship-fedora-%FEDORA_VERSION%.repo
- https://terra.fyralabs.com/terra.repo

# These RPMs will be installed from your enabled repositories (Fedora's own
# repos, extra "repos" you've added, etc). The installation is automatically
Expand All @@ -75,10 +74,6 @@ rpm:
- cockpit-navigator
- cockpit-file-sharing
- tailscale
- fish
- ubuntumono-nerd-fonts
- ubuntu-nerd-fonts

# These RPMs will be removed from the system image. This step happens during
# image build, BEFORE installing custom RPMs (from the "rpm.install" category).
remove:
Expand All @@ -91,18 +86,4 @@ rpm:

# Configuration for the "first boot" experience, which is available after login.
firstboot:
# Whether to embed "yafti" into the OS image and configure it to autostart,
# which is the preferred uBlue "first boot" GUI. Set this to "false" if you've
# decided to use a different solution instead.
yafti: true

# These Flatpaks will be suggested for install after user login, via the yafti
# "first boot" GUI. Everything below will be merged into the "yafti.yml" config
# on build, in a category named "Custom". If you prefer, you can instead remove
# everything below and directly edit "yafti.yml" to have more control.
# Alternatively, if you've disabled "yafti", you can still install these via
# the "just setup-flatpaks" command from our "custom.just" template file.
# This is just an example selection:
flatpaks:
- io.github.celluloid_player.Celluloid
- org.kde.krita
20 changes: 2 additions & 18 deletions recipe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ rpm:
# which greatly simplifies future maintenance of your custom recipe.
repos:
# Example (which also demonstrates version number expansion):
- https://terra.fyralabs.com/terra.repo

- https://copr.fedorainfracloud.org/coprs/atim/nushell/repo/fedora-%FEDORA_VERSION%/atim-nushell-fedora-%FEDORA_VERSION%.repo
# These RPMs will be installed from your enabled repositories (Fedora's own
# repos, extra "repos" you've added, etc). The installation is automatically
# performed via rpm-ostree during the image build, and will be pre-installed
Expand All @@ -74,7 +73,7 @@ rpm:
- fish
- waydroid
- gnome-shell-extension-gsconnect

- nushell
# These RPMs will be removed from the system image. This step happens during
# image build, BEFORE installing custom RPMs (from the "rpm.install" category).
remove:
Expand All @@ -88,20 +87,5 @@ rpm:
- nvtop
- gnome-tour

# Configuration for the "first boot" experience, which is available after login.
firstboot:
# Whether to embed "yafti" into the OS image and configure it to autostart,
# which is the preferred uBlue "first boot" GUI. Set this to "false" if you've
# decided to use a different solution instead.
yafti: true

# These Flatpaks will be suggested for install after user login, via the yafti
# "first boot" GUI. Everything below will be merged into the "yafti.yml" config
# on build, in a category named "Custom". If you prefer, you can instead remove
# everything below and directly edit "yafti.yml" to have more control.
# Alternatively, if you've disabled "yafti", you can still install these via
# the "just setup-flatpaks" command from our "custom.just" template file.
# This is just an example selection:
flatpaks:
- io.github.celluloid_player.Celluloid
- org.kde.krita
Empty file modified scripts/autorun.sh
100644 → 100755
Empty file.
17 changes: 0 additions & 17 deletions scripts/build.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -88,23 +88,6 @@ else
rm -rf "${FIRSTBOOT_DATA}"
fi

# Add a new yafti "package group" called Custom, for the packages defined in recipe.yml.
# Only adds the package group if yafti is enabled and Flatpaks are defined in the recipe.
if [[ "${YAFTI_ENABLED}" == "true" ]]; then
YAFTI_FILE="${FIRSTBOOT_DATA}/yafti.yml"
get_yaml_array flatpaks '.firstboot.flatpaks[]'
if [[ ${#flatpaks[@]} -gt 0 ]]; then
echo "-- yafti: Adding Flatpaks defined in recipe.yml --"
yq -i '.screens.applications.values.groups.Custom.description = "Flatpaks suggested by the image maintainer."' "${YAFTI_FILE}"
yq -i '.screens.applications.values.groups.Custom.default = true' "${YAFTI_FILE}"
for pkg in "${flatpaks[@]}"; do
echo "Adding to yafti: ${pkg}"
yq -i ".screens.applications.values.groups.Custom.packages += [{\"${pkg}\": \"${pkg}\"}]" "${YAFTI_FILE}"
done
echo "---"
fi
fi

# Setup container signing
echo "Setup container signing in policy.json and cosign.yaml"
echo "Registry to write: $IMAGE_REGISTRY"
Expand Down
Empty file modified scripts/post/99-bash_umask.sh
100644 → 100755
Empty file.
Empty file modified scripts/post/hardening.sh
100644 → 100755
Empty file.
Empty file modified usr/etc/update.d/99-boxes.sh
100644 → 100755
Empty file.
Empty file modified usr/share/ublue-os/firstboot/launcher/login-profile.sh
100644 → 100755
Empty file.

0 comments on commit 84adf7f

Please sign in to comment.