Skip to content

Commit ab17efc

Browse files
committed
feat: rename build_files to build_scripts
This is more accurately describing what it actually is. Assisted-by: GNU sed 4.9
1 parent 3741333 commit ab17efc

19 files changed

Lines changed: 36 additions & 36 deletions

Containerfile.in

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ FROM ghcr.io/ublue-os/akmods-zfs:${AKMODS_FLAVOR}-${FEDORA_MAJOR_VERSION}-${KERN
2121
#endif
2222

2323
FROM scratch AS ctx
24-
COPY /build_files /build_files
24+
COPY /build_scripts /build_scripts
2525

2626
# /* https://github.com/get-aurora-dev/common */
2727
COPY --from=common /logos /system_files/shared
@@ -64,10 +64,10 @@ RUN --mount=type=tmpfs,dst=/boot \
6464
--mount=type=bind,from=akmods,src=/rpms/common,dst=/tmp/rpms/common \
6565
--mount=type=bind,from=akmods,src=/rpms/kmods,dst=/tmp/rpms/kmods \
6666
--mount=type=secret,id=GITHUB_TOKEN \
67-
/ctx/build_files/shared/build.sh && \
68-
/ctx/build_files/base/01-packages.sh && \
69-
/ctx/build_files/base/02-install-common-kernel-akmods.sh && \
70-
/ctx/build_files/base/03-fetch.sh
67+
/ctx/build_scripts/shared/build.sh && \
68+
/ctx/build_scripts/base/01-packages.sh && \
69+
/ctx/build_scripts/base/02-install-common-kernel-akmods.sh && \
70+
/ctx/build_scripts/base/03-fetch.sh
7171
#endif
7272

7373
# /* aurora:stable with zfs no nvidia */
@@ -81,11 +81,11 @@ RUN --mount=type=tmpfs,dst=/boot \
8181
--mount=type=bind,from=akmods,src=/rpms/kmods,dst=/tmp/rpms/kmods \
8282
--mount=type=bind,from=akmods-zfs,src=/rpms/kmods/zfs,dst=/tmp/rpms/kmods/zfs \
8383
--mount=type=secret,id=GITHUB_TOKEN \
84-
/ctx/build_files/shared/build.sh && \
85-
/ctx/build_files/base/01-packages.sh && \
86-
/ctx/build_files/base/02-install-common-kernel-akmods.sh && \
87-
/ctx/build_files/base/zfs.sh && \
88-
/ctx/build_files/base/03-fetch.sh
84+
/ctx/build_scripts/shared/build.sh && \
85+
/ctx/build_scripts/base/01-packages.sh && \
86+
/ctx/build_scripts/base/02-install-common-kernel-akmods.sh && \
87+
/ctx/build_scripts/base/zfs.sh && \
88+
/ctx/build_scripts/base/03-fetch.sh
8989
#endif
9090

9191
# /* aurora-nvidia-open:latest no zfs */
@@ -99,11 +99,11 @@ RUN --mount=type=tmpfs,dst=/boot \
9999
--mount=type=bind,from=akmods,src=/rpms/kmods,dst=/tmp/rpms/kmods \
100100
--mount=type=bind,from=akmods-nvidia-open,src=/rpms,dst=/tmp/rpms/nvidia \
101101
--mount=type=secret,id=GITHUB_TOKEN \
102-
/ctx/build_files/shared/build.sh && \
103-
/ctx/build_files/base/01-packages.sh && \
104-
/ctx/build_files/base/02-install-common-kernel-akmods.sh && \
105-
/ctx/build_files/base/03-fetch.sh && \
106-
/ctx/build_files/base/04-nvidia.sh
102+
/ctx/build_scripts/shared/build.sh && \
103+
/ctx/build_scripts/base/01-packages.sh && \
104+
/ctx/build_scripts/base/02-install-common-kernel-akmods.sh && \
105+
/ctx/build_scripts/base/03-fetch.sh && \
106+
/ctx/build_scripts/base/04-nvidia.sh
107107
#endif
108108

109109
# /* aurora-nvidia-open:stable with ZFS */
@@ -118,25 +118,25 @@ RUN --mount=type=tmpfs,dst=/boot \
118118
--mount=type=bind,from=akmods-nvidia-open,src=/rpms,dst=/tmp/rpms/nvidia \
119119
--mount=type=bind,from=akmods-zfs,src=/rpms/kmods/zfs,dst=/tmp/rpms/kmods/zfs \
120120
--mount=type=secret,id=GITHUB_TOKEN \
121-
/ctx/build_files/shared/build.sh && \
122-
/ctx/build_files/base/01-packages.sh && \
123-
/ctx/build_files/base/02-install-common-kernel-akmods.sh && \
124-
/ctx/build_files/base/03-fetch.sh && \
125-
/ctx/build_files/base/04-nvidia.sh && \
126-
/ctx/build_files/base/zfs.sh
121+
/ctx/build_scripts/shared/build.sh && \
122+
/ctx/build_scripts/base/01-packages.sh && \
123+
/ctx/build_scripts/base/02-install-common-kernel-akmods.sh && \
124+
/ctx/build_scripts/base/03-fetch.sh && \
125+
/ctx/build_scripts/base/04-nvidia.sh && \
126+
/ctx/build_scripts/base/zfs.sh
127127
#endif
128128

129129
# /* Everything that can be done offline after things are in place should be done here */
130130
RUN --network=none \
131131
--mount=type=tmpfs,dst=/boot \
132132
--mount=type=bind,from=ctx,source=/,target=/ctx \
133-
/ctx/build_files/base/16-override-install.sh && \
134-
/ctx/build_files/base/17-cleanup.sh && \
135-
/ctx/build_files/base/18-image-info.sh && \
136-
/ctx/build_files/base/19-initramfs.sh && \
137-
/ctx/build_files/shared/validate-repos.sh && \
138-
/ctx/build_files/shared/clean-stage.sh && \
139-
/ctx/build_files/base/20-tests.sh
133+
/ctx/build_scripts/base/16-override-install.sh && \
134+
/ctx/build_scripts/base/17-cleanup.sh && \
135+
/ctx/build_scripts/base/18-image-info.sh && \
136+
/ctx/build_scripts/base/19-initramfs.sh && \
137+
/ctx/build_scripts/shared/validate-repos.sh && \
138+
/ctx/build_scripts/shared/clean-stage.sh && \
139+
/ctx/build_scripts/base/20-tests.sh
140140

141141
CMD ["/sbin/init"]
142142

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ dnf5 distro-sync --skip-unavailable -y --repo='fedora-multimedia' "${OVERRIDES[@
3232
dnf5 versionlock add "${OVERRIDES[@]}"
3333

3434
# All DNF-related operations should be done here whenever possible
35-
#shellcheck source=build_files/shared/copr-helpers.sh
36-
source /ctx/build_files/shared/copr-helpers.sh
35+
#shellcheck source=build_scripts/shared/copr-helpers.sh
36+
source /ctx/build_scripts/shared/copr-helpers.sh
3737

3838
# NOTE:
3939
# Packages are split into FEDORA_PACKAGES and COPR_PACKAGES to prevent
@@ -215,7 +215,7 @@ dnf versionlock add plasma-setup
215215

216216
# Install DX specific packages
217217
if [[ "${IMAGE_FLAVOR}" == "dx" ]]; then
218-
/ctx/build_files/dx/00-dx.sh
218+
/ctx/build_scripts/dx/00-dx.sh
219219
fi
220220

221221
echo "::endgroup::"
File renamed without changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ for unit in "${IMPORTANT_UNITS[@]}"; do
175175
done
176176

177177
if [[ "${IMAGE_FLAVOR}" == "dx" ]]; then
178-
/ctx/build_files/dx/10-tests-dx.sh;
178+
/ctx/build_scripts/dx/10-tests-dx.sh;
179179
fi
180180

181181
echo "::endgroup::"

0 commit comments

Comments
 (0)