Skip to content
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

Jump to bottom

simplify early-boot-config dependencies #3890

Merged
merged 2 commits into from
Apr 12, 2024
Merged

simplify early-boot-config dependencies #3890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdc63b8
early-boot-config: simplify subpackage names
bcressey Apr 11, 2024
816b779
release: add dependency on early-boot-config
bcressey Apr 11, 2024
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
34 changes: 19 additions & 15 deletions packages/early-boot-config/early-boot-config.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,39 +12,43 @@ Source100: early-boot-config.service

BuildRequires: %{_cross_os}glibc-devel

Requires: (%{name}-aws if %{_cross_os}variant-platform(aws))
Requires: (%{name}-vmware if %{_cross_os}variant-platform(vmware))
Requires: (%{name}-metal if %{_cross_os}variant-platform(metal))

%description
%{summary}.

%package -n %{_cross_os}early-boot-config-local
%package local
Summary: local-provider

%description -n %{_cross_os}early-boot-config-local
%description local
%{summary}.

%package -n %{_cross_os}early-boot-config-aws
%package aws
Summary: early-boot-config package for AWS
Requires: %{name}
Requires: %{_cross_os}early-boot-config-local
Requires: %{name}-local

%description -n %{_cross_os}early-boot-config-aws
%description aws
%{summary}.

%ifarch x86_64
%package -n %{_cross_os}early-boot-config-vmware
%package vmware
Summary: early-boot-config package for vmware
Requires: %{name}
Requires: %{_cross_os}early-boot-config-local
Requires: %{name}-local

%description -n %{_cross_os}early-boot-config-vmware
%description vmware
%{summary}.
%endif

%package -n %{_cross_os}early-boot-config-metal
%package metal
Summary: early-boot-config package for metal
Requires: %{name}
Requires: %{_cross_os}early-boot-config-local
Requires: %{name}-local

%description -n %{_cross_os}early-boot-config-metal
%description metal
%{summary}.

%prep
Expand Down Expand Up @@ -129,27 +133,27 @@ ln -rs \
%{_cross_unitdir}/early-boot-config.service
%dir %{early_boot_config_provider_dir}

%files -n %{_cross_os}early-boot-config-local
%files local
%{early_boot_config_bindir}/local-defaults-user-data-provider
%{early_boot_config_bindir}/local-file-user-data-provider
%{early_boot_config_bindir}/local-overrides-user-data-provider
%{early_boot_config_provider_dir}/10-local-defaults
%{early_boot_config_provider_dir}/20-local-user-data
%{early_boot_config_provider_dir}/99-local-overrides

%files -n %{_cross_os}early-boot-config-aws
%files aws
%{early_boot_config_bindir}/ec2-identity-doc-user-data-provider
%{early_boot_config_bindir}/ec2-imds-user-data-provider
%{early_boot_config_provider_dir}/30-ec2-identity-doc
%{early_boot_config_provider_dir}/40-ec2-imds

%ifarch x86_64
%files -n %{_cross_os}early-boot-config-vmware
%files vmware
%{early_boot_config_bindir}/vmware-cd-rom-user-data-provider
%{early_boot_config_bindir}/vmware-guestinfo-user-data-provider
%{early_boot_config_provider_dir}/30-vmware-cd-rom
%{early_boot_config_provider_dir}/40-vmware-guestinfo
%endif

# There are no metal-specific providers, just dependencies like the local file providers.
%files -n %{_cross_os}early-boot-config-metal
%files metal
1 change: 1 addition & 0 deletions packages/release/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ containerd = { path = "../containerd" }
coreutils = { path = "../coreutils" }
dbus-broker = { path = "../dbus-broker" }
e2fsprogs = { path = "../e2fsprogs" }
early-boot-config = { path = "../early-boot-config" }
ethtool = { path = "../ethtool" }
filesystem = { path = "../filesystem" }
findutils = { path = "../findutils" }
Expand Down
1 change: 1 addition & 0 deletions packages/release/release.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ Requires: %{_cross_os}containerd
Requires: %{_cross_os}coreutils
Requires: %{_cross_os}dbus-broker
Requires: %{_cross_os}e2fsprogs
Requires: %{_cross_os}early-boot-config
Requires: %{_cross_os}ethtool
Requires: %{_cross_os}libgcc
Requires: %{_cross_os}libstd-rust
Expand Down
32 changes: 1 addition & 31 deletions variants/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions variants/aws-dev/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ kernel-parameters = [
]
included-packages = [
# core
"early-boot-config-aws",
"release",
"kernel-6.1",
# docker
Expand All @@ -46,7 +45,6 @@ path = "../variants.rs"
[build-dependencies]
# core
release = { path = "../../packages/release" }
early-boot-config = { path = "../../packages/early-boot-config" }
kernel-6_1 = { path = "../../packages/kernel-6.1" }
# docker
docker-cli = { path = "../../packages/docker-cli" }
Expand Down
2 changes: 0 additions & 2 deletions variants/aws-ecs-1-nvidia/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ kernel-parameters = [
]
included-packages = [
# core
"early-boot-config-aws",
"release",
"kernel-5.10",
# docker
Expand All @@ -39,7 +38,6 @@ path = "../variants.rs"
[build-dependencies]
# core
release = { path = "../../packages/release" }
early-boot-config = { path = "../../packages/early-boot-config" }
kernel-5_10 = { path = "../../packages/kernel-5.10" }
# docker
docker-cli = { path = "../../packages/docker-cli" }
Expand Down
Loading