Skip to content

Added default config files for xfsprogs #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Added default config files for xfsprogs #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions packages/kernel-5.10/kernel-5.10.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ Source100: config-bottlerocket
Source220: neuron-sysinit.target.drop-in.conf
Source221: [email protected]

# XFS configuration
Source300: mkfs.xfs.conf

# Help out-of-tree module builds run `make prepare` automatically.
Patch1001: 1001-Makefile-add-prepare-target-for-external-modules.patch
# Enable INITRAMFS_FORCE config option for our use case.
Expand Down Expand Up @@ -53,6 +56,9 @@ Requires: %{name}-devel = %{version}-%{release}
Requires: (%{name}-modules-neuron if (%{_cross_os}variant-platform(aws) without %{_cross_os}variant-flavor(nvidia)))
%endif

# Pull in XFSprogs default config files
Provides: %{_cross_os}kernel(mkfs-confs) = %{version}-%{release}

Comment on lines +59 to +61
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need this.

Suggested change
# Pull in XFSprogs default config files
Provides: %{_cross_os}kernel(mkfs-confs) = %{version}-%{release}

# The 5.10 kernel is not FIPS certified.
Conflicts: %{_cross_os}image-feature(fips)

Expand Down Expand Up @@ -291,9 +297,13 @@ mkdir -p %{buildroot}%{_cross_unitdir}/[email protected]
install -p -m 0644 %{S:221} %{buildroot}%{_cross_unitdir}/[email protected]/neuron.conf
%endif

mkdir -p %{buildroot}%{_cross_datadir}/xfs
install -p -m 0644 %{S:300} %{buildroot}%{_cross_datadir}/xfs/mkfs.xfs.conf
Comment on lines +300 to +301
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not just use the corresponding config file that's already in the xfsprogs package?

Suggested change
mkdir -p %{buildroot}%{_cross_datadir}/xfs
install -p -m 0644 %{S:300} %{buildroot}%{_cross_datadir}/xfs/mkfs.xfs.conf
mkdir -p %{buildroot}%{_cross_datadir}/xfsprogs/mkfs
ln -s lts_5.10.conf default.conf

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice call, thanks! I didn't realize we can use them in that way.


%files
%license COPYING LICENSES/preferred/GPL-2.0 LICENSES/exceptions/Linux-syscall-note
%{_cross_attribution_file}
%{_cross_datadir}/xfs/mkfs.xfs.conf
/boot/vmlinuz
/boot/config

Expand Down
5 changes: 5 additions & 0 deletions packages/kernel-5.10/mkfs.xfs.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# V5 features that were the mkfs defaults when the upstream Linux 5.10 LTS
# kernel was released at the end of 2020.

[inode]
nrext64=0
10 changes: 10 additions & 0 deletions packages/kernel-5.15/kernel-5.15.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ Source100: config-bottlerocket
Source220: neuron-sysinit.target.drop-in.conf
Source221: [email protected]

# XFS configuration
Source300: mkfs.xfs.conf

# Help out-of-tree module builds run `make prepare` automatically.
Patch1001: 1001-Makefile-add-prepare-target-for-external-modules.patch
# Expose tools/* targets for out-of-tree module builds.
Expand Down Expand Up @@ -51,6 +54,9 @@ Requires: %{name}-devel = %{version}-%{release}
Requires: (%{name}-modules-neuron if (%{_cross_os}variant-platform(aws) without %{_cross_os}variant-flavor(nvidia)))
%endif

# Pull in XFSprogs default config files
Provides: %{_cross_os}kernel(mkfs-confs) = %{version}-%{release}

# The 5.15 kernel is not FIPS certified.
Conflicts: %{_cross_os}image-feature(fips)

Expand Down Expand Up @@ -285,9 +291,13 @@ mkdir -p %{buildroot}%{_cross_unitdir}/[email protected]
install -p -m 0644 %{S:221} %{buildroot}%{_cross_unitdir}/[email protected]/neuron.conf
%endif

mkdir -p %{buildroot}%{_cross_datadir}/xfs
install -p -m 0644 %{S:300} %{buildroot}%{_cross_datadir}/xfs/mkfs.xfs.conf

%files
%license COPYING LICENSES/preferred/GPL-2.0 LICENSES/exceptions/Linux-syscall-note
%{_cross_attribution_file}
%{_cross_datadir}/xfs/mkfs.xfs.conf
/boot/vmlinuz
/boot/config

Expand Down
5 changes: 5 additions & 0 deletions packages/kernel-5.15/mkfs.xfs.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# V5 features that were the mkfs defaults when the upstream Linux 5.10 LTS
# kernel was released at the end of 2020.

[inode]
nrext64=0
10 changes: 10 additions & 0 deletions packages/kernel-6.1/kernel-6.1.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ Source300: bootconfig-aws.conf
Source301: bootconfig-vmware.conf
Source302: bootconfig-metal.conf

# XFS configuration
Source400: mkfs.xfs.conf

# Help out-of-tree module builds run `make prepare` automatically.
Patch1001: 1001-Makefile-add-prepare-target-for-external-modules.patch
# Expose tools/* targets for out-of-tree module builds.
Expand Down Expand Up @@ -75,6 +78,9 @@ Requires: (%{name}-modules-neuron if (%{_cross_os}variant-platform(aws) without
# Pull in FIPS-related files if needed.
Requires: (%{name}-fips if %{_cross_os}image-feature(fips))

# Pull in XFSprogs default config files
Provides: %{_cross_os}kernel(mkfs-confs) = %{version}-%{release}

%global _cross_ksrcdir %{_cross_usrsrc}/kernels
%global _cross_kmoddir %{_cross_libdir}/modules/%{version}

Expand Down Expand Up @@ -375,6 +381,9 @@ mkdir -p %{buildroot}%{_cross_unitdir}/[email protected]
install -p -m 0644 %{S:221} %{buildroot}%{_cross_unitdir}/[email protected]/neuron.conf
%endif

mkdir -p %{buildroot}%{_cross_datadir}/xfs
install -p -m 0644 %{S:400} %{buildroot}%{_cross_datadir}/xfs/mkfs.xfs.conf

# Install platform-specific bootconfig snippets.
install -d %{buildroot}%{_cross_bootconfigdir}
install -p -m 0644 %{S:300} %{buildroot}%{_cross_bootconfigdir}/05-aws.conf
Expand All @@ -384,6 +393,7 @@ install -p -m 0644 %{S:302} %{buildroot}%{_cross_bootconfigdir}/05-metal.conf
%files
%license COPYING LICENSES/preferred/GPL-2.0 LICENSES/exceptions/Linux-syscall-note
%{_cross_attribution_file}
%{_cross_datadir}/xfs/mkfs.xfs.conf
/boot/vmlinuz
/boot/config

Expand Down
5 changes: 5 additions & 0 deletions packages/kernel-6.1/mkfs.xfs.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# V5 features that were the mkfs defaults when the upstream Linux 5.10 LTS
# kernel was released at the end of 2020.

[inode]
nrext64=0