From f9848030beba9eed55ea40f50cbdb0e878c1ed2f Mon Sep 17 00:00:00 2001 From: iliana destroyer of worlds Date: Tue, 15 Oct 2019 21:59:43 +0000 Subject: [PATCH 1/2] Combine first-party Rust builds Signed-off-by: iliana destroyer of worlds --- macros/cargo | 5 +- packages/Cargo.lock | 47 ++--- packages/Cargo.toml | 5 +- packages/growpart/Cargo.toml | 26 --- packages/growpart/build.rs | 6 - packages/growpart/growpart.spec | 32 ---- packages/growpart/pkg.rs | 1 - packages/preinit/Cargo.toml | 23 --- packages/preinit/build.rs | 6 - packages/preinit/pkg.rs | 1 - packages/preinit/preinit.spec | 32 ---- packages/updater/Cargo.toml | 23 --- packages/updater/build.rs | 6 - packages/updater/pkg.rs | 1 - packages/updater/updater.spec | 67 ------- packages/{api => workspaces}/Cargo.toml | 9 +- .../{api => workspaces}/api-sysusers.conf | 0 .../{api => workspaces}/apiserver.service | 0 packages/{api => workspaces}/build.rs | 0 .../{api => workspaces}/data-store-version | 0 packages/{api => workspaces}/eni-max-pods | 0 .../host-containers-tmpfiles.conf | 0 .../host-containers@.service | 0 .../migration-tmpfiles.conf | 0 packages/{api => workspaces}/migrator.service | 0 packages/{api => workspaces}/moondog.service | 0 packages/{api => workspaces}/pkg.rs | 0 packages/{updater => workspaces}/root.json | 0 .../settings-applier.service | 0 .../settings-committer.service | 0 .../{api => workspaces}/storewolf.service | 0 packages/{api => workspaces}/sundog.service | 0 packages/{updater => workspaces}/updog-toml | 0 .../{updater => workspaces}/updog.service | 0 packages/{updater => workspaces}/updog.timer | 0 .../api.spec => workspaces/workspaces.spec} | 169 +++++++++++------- workspaces/api/apiserver/Cargo.toml | 2 +- workspaces/tuftool/Cargo.toml | 2 +- 38 files changed, 132 insertions(+), 331 deletions(-) delete mode 100644 packages/growpart/Cargo.toml delete mode 100644 packages/growpart/build.rs delete mode 100644 packages/growpart/growpart.spec delete mode 100644 packages/growpart/pkg.rs delete mode 100644 packages/preinit/Cargo.toml delete mode 100644 packages/preinit/build.rs delete mode 100644 packages/preinit/pkg.rs delete mode 100644 packages/preinit/preinit.spec delete mode 100644 packages/updater/Cargo.toml delete mode 100644 packages/updater/build.rs delete mode 100644 packages/updater/pkg.rs delete mode 100644 packages/updater/updater.spec rename packages/{api => workspaces}/Cargo.toml (79%) rename packages/{api => workspaces}/api-sysusers.conf (100%) rename packages/{api => workspaces}/apiserver.service (100%) rename packages/{api => workspaces}/build.rs (100%) rename packages/{api => workspaces}/data-store-version (100%) rename packages/{api => workspaces}/eni-max-pods (100%) rename packages/{api => workspaces}/host-containers-tmpfiles.conf (100%) rename packages/{api => workspaces}/host-containers@.service (100%) rename packages/{api => workspaces}/migration-tmpfiles.conf (100%) rename packages/{api => workspaces}/migrator.service (100%) rename packages/{api => workspaces}/moondog.service (100%) rename packages/{api => workspaces}/pkg.rs (100%) rename packages/{updater => workspaces}/root.json (100%) rename packages/{api => workspaces}/settings-applier.service (100%) rename packages/{api => workspaces}/settings-committer.service (100%) rename packages/{api => workspaces}/storewolf.service (100%) rename packages/{api => workspaces}/sundog.service (100%) rename packages/{updater => workspaces}/updog-toml (100%) rename packages/{updater => workspaces}/updog.service (100%) rename packages/{updater => workspaces}/updog.timer (100%) rename packages/{api/api.spec => workspaces/workspaces.spec} (61%) diff --git a/macros/cargo b/macros/cargo index 225844179e5..a1a109b25ec 100644 --- a/macros/cargo +++ b/macros/cargo @@ -7,7 +7,8 @@ %__cargo %{_bindir}/cargo %__cargo_common_opts --offline --locked --verbose -%__cargo_cross_opts %{__cargo_common_opts} --target %{_cross_arch}-unknown-linux-%{_cross_libc} +%__cargo_target %{_cross_arch}-unknown-linux-%{_cross_libc} +%__cargo_cross_opts %{__cargo_common_opts} --target %{__cargo_target} %__cargo_env CARGO_TARGET_DIR="${HOME}/.cache" SKIP_README="true" %__cargo_cross_env %{__cargo_env} TARGET_CC="%{_cross_target}-gcc" PKG_CONFIG_PATH="%{_cross_pkgconfigdir}" PKG_CONFIG_ALLOW_CROSS=1 @@ -25,4 +26,4 @@ ar = "%{_bindir}/%{_cross_target}-gcc-ar"\ EOF\ ) -%cargo_build %{__cargo_cross_env} %{__cargo} install %{__cargo_cross_opts} --root .%{?cargo_args} +%cargo_build %{__cargo_cross_env} %{__cargo} build %{__cargo_cross_opts} --release %{?cargo_args} diff --git a/packages/Cargo.lock b/packages/Cargo.lock index 6c583a10738..cdd869485e0 100644 --- a/packages/Cargo.lock +++ b/packages/Cargo.lock @@ -13,16 +13,6 @@ dependencies = [ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "api" -version = "0.1.0" -dependencies = [ - "buildsys 0.1.0", - "glibc 0.1.0", - "rust 0.1.0", - "systemd 0.1.0", -] - [[package]] name = "arrayvec" version = "0.4.12" @@ -559,15 +549,6 @@ dependencies = [ "buildsys 0.1.0", ] -[[package]] -name = "growpart" -version = "0.1.0" -dependencies = [ - "buildsys 0.1.0", - "glibc 0.1.0", - "rust 0.1.0", -] - [[package]] name = "grub" version = "0.1.0" @@ -1144,15 +1125,6 @@ name = "ppv-lite86" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "preinit" -version = "0.1.0" -dependencies = [ - "buildsys 0.1.0", - "glibc 0.1.0", - "rust 0.1.0", -] - [[package]] name = "proc-macro2" version = "0.4.30" @@ -1924,15 +1896,6 @@ name = "untrusted" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "updater" -version = "0.1.0" -dependencies = [ - "buildsys 0.1.0", - "glibc 0.1.0", - "rust 0.1.0", -] - [[package]] name = "url" version = "1.7.2" @@ -2168,6 +2131,16 @@ dependencies = [ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "workspaces" +version = "0.1.0" +dependencies = [ + "buildsys 0.1.0", + "glibc 0.1.0", + "rust 0.1.0", + "systemd 0.1.0", +] + [[package]] name = "ws2_32-sys" version = "0.2.1" diff --git a/packages/Cargo.toml b/packages/Cargo.toml index c6992d8f5c3..be43a0b41d5 100644 --- a/packages/Cargo.toml +++ b/packages/Cargo.toml @@ -1,6 +1,5 @@ [workspace] members = [ - "api", "aws-iam-authenticator", "bash", "ca-certificates", @@ -20,7 +19,6 @@ members = [ "findutils", "glibc", "golang", - "growpart", "grub", "host-ctr", "iproute", @@ -48,7 +46,6 @@ members = [ "libxcrypt", "login", "ncurses", - "preinit", "procps", "readline", "release", @@ -59,9 +56,9 @@ members = [ "strace", "systemd", "tcpdump", - "updater", "util-linux", "wicked", + "workspaces", ] [profile.dev] diff --git a/packages/growpart/Cargo.toml b/packages/growpart/Cargo.toml deleted file mode 100644 index dbc7164fc4e..00000000000 --- a/packages/growpart/Cargo.toml +++ /dev/null @@ -1,26 +0,0 @@ -[package] -name = "growpart" -version = "0.1.0" -edition = "2018" -publish = false -build = "build.rs" - -[package.metadata.build-package] -source-groups = [ - "growpart", - "updater/block-party", -] - -[lib] -path = "pkg.rs" - -[build-dependencies] -buildsys = { path = "../../tools/buildsys" } -glibc = { path = "../glibc", optional=true } -rust = { path = "../rust", optional=true } - -[features] -cascade = [ - "glibc", - "rust", -] diff --git a/packages/growpart/build.rs b/packages/growpart/build.rs deleted file mode 100644 index 39476527a2f..00000000000 --- a/packages/growpart/build.rs +++ /dev/null @@ -1,6 +0,0 @@ -fn main() { - if let Err(e) = buildsys::build_package() { - eprintln!("{}", e); - std::process::exit(1); - } -} diff --git a/packages/growpart/growpart.spec b/packages/growpart/growpart.spec deleted file mode 100644 index 9e9e35da041..00000000000 --- a/packages/growpart/growpart.spec +++ /dev/null @@ -1,32 +0,0 @@ -%global workspace_name growpart -%global workspace_dir %{_builddir}/workspaces/%{workspace_name} -%undefine _debugsource_packages - -Name: %{_cross_os}%{workspace_name} -Version: 0.0 -Release: 0%{?dist} -Summary: Tool to grow partitions -License: FIXME -BuildRequires: gcc-%{_cross_target} -BuildRequires: %{_cross_os}glibc-devel -BuildRequires: %{_cross_os}rust -Requires: %{_cross_os}glibc - -%description -%{summary}. - -%prep -%setup -T -c -%cargo_prep - -%build -%cargo_build --path %{workspace_dir} - -%install -install -d %{buildroot}%{_cross_sbindir} -install -p -m 0755 bin/growpart %{buildroot}%{_cross_sbindir} - -%files -%{_cross_sbindir}/growpart - -%changelog diff --git a/packages/growpart/pkg.rs b/packages/growpart/pkg.rs deleted file mode 100644 index d799fb2d44c..00000000000 --- a/packages/growpart/pkg.rs +++ /dev/null @@ -1 +0,0 @@ -// not used diff --git a/packages/preinit/Cargo.toml b/packages/preinit/Cargo.toml deleted file mode 100644 index f19e9759cf0..00000000000 --- a/packages/preinit/Cargo.toml +++ /dev/null @@ -1,23 +0,0 @@ -[package] -name = "preinit" -version = "0.1.0" -edition = "2018" -publish = false -build = "build.rs" - -[package.metadata.build-package] -source-groups = [ "preinit" ] - -[lib] -path = "pkg.rs" - -[build-dependencies] -buildsys = { path = "../../tools/buildsys" } -glibc = { path = "../glibc", optional=true } -rust = { path = "../rust", optional=true } - -[features] -cascade = [ - "glibc", - "rust", -] diff --git a/packages/preinit/build.rs b/packages/preinit/build.rs deleted file mode 100644 index 39476527a2f..00000000000 --- a/packages/preinit/build.rs +++ /dev/null @@ -1,6 +0,0 @@ -fn main() { - if let Err(e) = buildsys::build_package() { - eprintln!("{}", e); - std::process::exit(1); - } -} diff --git a/packages/preinit/pkg.rs b/packages/preinit/pkg.rs deleted file mode 100644 index d799fb2d44c..00000000000 --- a/packages/preinit/pkg.rs +++ /dev/null @@ -1 +0,0 @@ -// not used diff --git a/packages/preinit/preinit.spec b/packages/preinit/preinit.spec deleted file mode 100644 index 9f469c9538a..00000000000 --- a/packages/preinit/preinit.spec +++ /dev/null @@ -1,32 +0,0 @@ -%global workspace_name preinit -%global workspace_dir %{_builddir}/workspaces/%{workspace_name} -%undefine _debugsource_packages - -Name: %{_cross_os}%{workspace_name} -Version: 0.0 -Release: 0%{?dist} -Summary: Thar pre-init system setup -License: FIXME -BuildRequires: gcc-%{_cross_target} -BuildRequires: %{_cross_os}glibc-devel -BuildRequires: %{_cross_os}rust -Requires: %{_cross_os}glibc - -%description -%{summary}. - -%prep -%setup -T -c -%cargo_prep - -%build -%cargo_build --path %{workspace_dir}/laika - -%install -install -d %{buildroot}%{_cross_sbindir} -install -p -m 0755 bin/preinit %{buildroot}%{_cross_sbindir} - -%files -%{_cross_sbindir}/preinit - -%changelog diff --git a/packages/updater/Cargo.toml b/packages/updater/Cargo.toml deleted file mode 100644 index 6b7a0165065..00000000000 --- a/packages/updater/Cargo.toml +++ /dev/null @@ -1,23 +0,0 @@ -[package] -name = "updater" -version = "0.1.0" -edition = "2018" -publish = false -build = "build.rs" - -[package.metadata.build-package] -source-groups = [ "updater", "webpki-roots-shim" ] - -[lib] -path = "pkg.rs" - -[build-dependencies] -buildsys = { path = "../../tools/buildsys" } -glibc = { path = "../glibc", optional=true } -rust = { path = "../rust", optional=true } - -[features] -cascade = [ - "glibc", - "rust", -] diff --git a/packages/updater/build.rs b/packages/updater/build.rs deleted file mode 100644 index 39476527a2f..00000000000 --- a/packages/updater/build.rs +++ /dev/null @@ -1,6 +0,0 @@ -fn main() { - if let Err(e) = buildsys::build_package() { - eprintln!("{}", e); - std::process::exit(1); - } -} diff --git a/packages/updater/pkg.rs b/packages/updater/pkg.rs deleted file mode 100644 index d799fb2d44c..00000000000 --- a/packages/updater/pkg.rs +++ /dev/null @@ -1 +0,0 @@ -// not used diff --git a/packages/updater/updater.spec b/packages/updater/updater.spec deleted file mode 100644 index 940b6f7e656..00000000000 --- a/packages/updater/updater.spec +++ /dev/null @@ -1,67 +0,0 @@ -%global workspace_name updater -%global workspace_dir %{_builddir}/workspaces/%{workspace_name} -%undefine _debugsource_packages - -Name: %{_cross_os}%{workspace_name} -Version: 0.0 -Release: 0%{?dist} -Summary: Thar updater packages -License: FIXME -Source1: root.json -Source2: updog-toml -Source3: updog.timer -Source4: updog.service -BuildRequires: gcc-%{_cross_target} -BuildRequires: %{_cross_os}glibc-devel -BuildRequires: %{_cross_os}rust -Requires: %{_cross_os}glibc - -%description -%{summary}. - -%package -n %{_cross_os}signpost -Summary: Thar GPT priority querier/switcher -%description -n %{_cross_os}signpost -%{summary}. - -%package -n %{_cross_os}updog -Summary: Thar updater CLI -%description -n %{_cross_os}updog -not much what's up with you - -%prep -%setup -T -c -%cargo_prep - -%build -for p in signpost updog ; do - %cargo_build --path %{workspace_dir}/${p} -done - -%install -install -d %{buildroot}%{_cross_bindir} -install -p -m 0755 bin/signpost %{buildroot}%{_cross_bindir} -install -p -m 0755 bin/updog %{buildroot}%{_cross_bindir} - -install -d %{buildroot}/%{_cross_datadir}/updog -install -m 0644 -t %{buildroot}/%{_cross_datadir}/updog %{SOURCE1} - -install -d %{buildroot}%{_cross_templatedir} -install -p -m 0644 %{SOURCE2} %{buildroot}%{_cross_templatedir}/updog-toml - -mkdir -p %{buildroot}/%{_cross_unitdir} -install -p -m 0644 %{S:3} %{buildroot}%{_cross_unitdir}/updog.timer -install -p -m 0644 %{S:4} %{buildroot}%{_cross_unitdir}/updog.service - -%files -n %{_cross_os}signpost -%{_cross_bindir}/signpost - -%files -n %{_cross_os}updog -%{_cross_bindir}/updog -%{_cross_datadir}/updog -%dir %{_cross_templatedir} -%{_cross_templatedir}/updog-toml -%{_cross_unitdir}/updog.timer -%{_cross_unitdir}/updog.service - -%changelog diff --git a/packages/api/Cargo.toml b/packages/workspaces/Cargo.toml similarity index 79% rename from packages/api/Cargo.toml rename to packages/workspaces/Cargo.toml index 5417bce8651..312f55007ac 100644 --- a/packages/api/Cargo.toml +++ b/packages/workspaces/Cargo.toml @@ -1,12 +1,17 @@ [package] -name = "api" +name = "workspaces" version = "0.1.0" edition = "2018" publish = false build = "build.rs" [package.metadata.build-package] -source-groups = [ "api" ] +source-groups = [ + "api", + "growpart", + "updater", + "webpki-roots-shim", +] [lib] path = "pkg.rs" diff --git a/packages/api/api-sysusers.conf b/packages/workspaces/api-sysusers.conf similarity index 100% rename from packages/api/api-sysusers.conf rename to packages/workspaces/api-sysusers.conf diff --git a/packages/api/apiserver.service b/packages/workspaces/apiserver.service similarity index 100% rename from packages/api/apiserver.service rename to packages/workspaces/apiserver.service diff --git a/packages/api/build.rs b/packages/workspaces/build.rs similarity index 100% rename from packages/api/build.rs rename to packages/workspaces/build.rs diff --git a/packages/api/data-store-version b/packages/workspaces/data-store-version similarity index 100% rename from packages/api/data-store-version rename to packages/workspaces/data-store-version diff --git a/packages/api/eni-max-pods b/packages/workspaces/eni-max-pods similarity index 100% rename from packages/api/eni-max-pods rename to packages/workspaces/eni-max-pods diff --git a/packages/api/host-containers-tmpfiles.conf b/packages/workspaces/host-containers-tmpfiles.conf similarity index 100% rename from packages/api/host-containers-tmpfiles.conf rename to packages/workspaces/host-containers-tmpfiles.conf diff --git a/packages/api/host-containers@.service b/packages/workspaces/host-containers@.service similarity index 100% rename from packages/api/host-containers@.service rename to packages/workspaces/host-containers@.service diff --git a/packages/api/migration-tmpfiles.conf b/packages/workspaces/migration-tmpfiles.conf similarity index 100% rename from packages/api/migration-tmpfiles.conf rename to packages/workspaces/migration-tmpfiles.conf diff --git a/packages/api/migrator.service b/packages/workspaces/migrator.service similarity index 100% rename from packages/api/migrator.service rename to packages/workspaces/migrator.service diff --git a/packages/api/moondog.service b/packages/workspaces/moondog.service similarity index 100% rename from packages/api/moondog.service rename to packages/workspaces/moondog.service diff --git a/packages/api/pkg.rs b/packages/workspaces/pkg.rs similarity index 100% rename from packages/api/pkg.rs rename to packages/workspaces/pkg.rs diff --git a/packages/updater/root.json b/packages/workspaces/root.json similarity index 100% rename from packages/updater/root.json rename to packages/workspaces/root.json diff --git a/packages/api/settings-applier.service b/packages/workspaces/settings-applier.service similarity index 100% rename from packages/api/settings-applier.service rename to packages/workspaces/settings-applier.service diff --git a/packages/api/settings-committer.service b/packages/workspaces/settings-committer.service similarity index 100% rename from packages/api/settings-committer.service rename to packages/workspaces/settings-committer.service diff --git a/packages/api/storewolf.service b/packages/workspaces/storewolf.service similarity index 100% rename from packages/api/storewolf.service rename to packages/workspaces/storewolf.service diff --git a/packages/api/sundog.service b/packages/workspaces/sundog.service similarity index 100% rename from packages/api/sundog.service rename to packages/workspaces/sundog.service diff --git a/packages/updater/updog-toml b/packages/workspaces/updog-toml similarity index 100% rename from packages/updater/updog-toml rename to packages/workspaces/updog-toml diff --git a/packages/updater/updog.service b/packages/workspaces/updog.service similarity index 100% rename from packages/updater/updog.service rename to packages/workspaces/updog.service diff --git a/packages/updater/updog.timer b/packages/workspaces/updog.timer similarity index 100% rename from packages/updater/updog.timer rename to packages/workspaces/updog.timer diff --git a/packages/api/api.spec b/packages/workspaces/workspaces.spec similarity index 61% rename from packages/api/api.spec rename to packages/workspaces/workspaces.spec index 10bf08d8d8a..45060604687 100644 --- a/packages/api/api.spec +++ b/packages/workspaces/workspaces.spec @@ -1,31 +1,35 @@ -%global workspace_name api -%global workspace_dir %{_builddir}/workspaces/%{workspace_name} %global migration_dir %{_cross_factorydir}%{_cross_sharedstatedir}/thar/datastore/migrations %undefine _debugsource_packages -# List migrations to be installed here, eg: -#%%global migration_versions v1.0 v1.1 v1.2 -%global migration_versions %{nil} - -Name: %{_cross_os}%{workspace_name} +Name: %{_cross_os}workspaces Version: 0.0 Release: 0%{?dist} -Summary: Thar API packages -License: Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND Apache-2.0/MIT AND BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND ISC AND MIT AND (MIT OR Apache-2.0) AND MIT/Unlicense AND N/A AND (Unlicense OR MIT) AND Zlib -Source1: apiserver.service -Source2: moondog.service -Source3: sundog.service -Source4: storewolf.service -Source5: settings-committer.service -Source6: migration-tmpfiles.conf -Source7: settings-applier.service -Source8: data-store-version -Source9: migrator.service -Source10: api-sysusers.conf -Source11: host-containers@.service -Source12: host-containers-tmpfiles.conf +Summary: Thar's first-party code +License: FIXME + +# sources < 100: misc +Source1: data-store-version +Source2: api-sysusers.conf # Taken from https://github.com/awslabs/amazon-eks-ami/blob/master/files/eni-max-pods.txt -Source13: eni-max-pods +Source3: eni-max-pods +Source4: root.json +Source5: updog-toml + +# 1xx sources: systemd units +Source100: apiserver.service +Source101: moondog.service +Source102: sundog.service +Source103: storewolf.service +Source104: settings-committer.service +Source105: settings-applier.service +Source106: migrator.service +Source107: host-containers@.service +Source108: updog.timer +Source109: updog.service + +# 2xx sources: tmpfilesd configs +Source200: migration-tmpfiles.conf +Source201: host-containers-tmpfiles.conf BuildRequires: gcc-%{_cross_target} BuildRequires: %{_cross_os}glibc-devel @@ -110,30 +114,51 @@ Summary: Commits settings from user data, defaults, and generators at boot %description -n %{_cross_os}settings-committer %{summary}. +%package -n %{_cross_os}growpart +Summary: Tool to grow partitions +%description -n %{_cross_os}growpart +%{summary}. + +%package -n %{_cross_os}signpost +Summary: Thar GPT priority querier/switcher +%description -n %{_cross_os}signpost +%{summary}. + +%package -n %{_cross_os}updog +Summary: Thar updater CLI +%description -n %{_cross_os}updog +not much what's up with you + +%package -n %{_cross_os}preinit +Summary: Thar pre-init system setup +%description -n %{_cross_os}preinit +%{summary}. + %prep %setup -T -c %cargo_prep %build -%cargo_build --path %{workspace_dir}/apiserver --features sd_notify - -for p in \ - apiclient \ - moondog netdog sundog pluto bork \ - thar-be-settings servicedog host-containers \ - storewolf settings-committer \ - migration/migrator ; -do - %cargo_build --path %{workspace_dir}/${p} -done - -for v in %migration_versions ; do - for p in %{workspace_dir}/migration/migrations/${v}/* ; do - name="${p##*/}" - %cargo_build --path ${p} - mv bin/${name} bin/migrate_${v}_${name} - done -done +mkdir bin +%cargo_build --manifest-path %{_builddir}/workspaces/Cargo.toml \ + -p apiclient \ + -p apiserver \ + -p moondog \ + -p netdog \ + -p sundog \ + -p pluto \ + -p bork \ + -p thar-be-settings \ + -p servicedog \ + -p host-containers \ + -p storewolf \ + -p settings-committer \ + -p migrator \ + -p signpost \ + -p updog \ + -p growpart \ + -p laika \ + %{nil} %install install -d %{buildroot}%{_cross_bindir} @@ -142,34 +167,41 @@ for p in \ moondog netdog sundog pluto bork \ thar-be-settings servicedog host-containers \ storewolf settings-committer \ - migrator ; + migrator \ + signpost updog ; do - install -p -m 0755 bin/${p} %{buildroot}%{_cross_bindir} + install -p -m 0755 ${HOME}/.cache/%{__cargo_target}/release/${p} %{buildroot}%{_cross_bindir} +done +install -d %{buildroot}%{_cross_sbindir} +for p in growpart preinit ; do + install -p -m 0755 ${HOME}/.cache/%{__cargo_target}/release/${p} %{buildroot}%{_cross_sbindir} done - -install -d %{buildroot}%{_cross_unitdir} -install -p -m 0644 \ - %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:7} %{S:9} %{S:11} \ - %{buildroot}%{_cross_unitdir} - -install -d %{buildroot}%{_cross_datadir}/thar -install -p -m 0644 %{S:8} %{buildroot}%{_cross_datadir}/thar install -d %{buildroot}%{migration_dir} -for m in bin/migrate_* ; do - [ -f "${m}" ] || continue - install -p -m0755 ${m} %{buildroot}%{migration_dir} -done -install -d %{buildroot}%{_cross_tmpfilesdir} -install -p -m 0644 %{S:6} %{buildroot}%{_cross_tmpfilesdir}/migration.conf -install -p -m 0644 %{S:12} %{buildroot}%{_cross_tmpfilesdir}/host-containers.conf +install -d %{buildroot}%{_cross_datadir}/thar +install -p -m 0644 %{S:1} %{buildroot}%{_cross_datadir}/thar install -d %{buildroot}%{_cross_sysusersdir} -install -p -m 0644 %{S:10} %{buildroot}%{_cross_sysusersdir}/api.conf +install -p -m 0644 %{S:2} %{buildroot}%{_cross_sysusersdir}/api.conf install -d %{buildroot}%{_cross_datadir}/eks -install -p -m 0644 %{S:13} %{buildroot}%{_cross_datadir}/eks +install -p -m 0644 %{S:3} %{buildroot}%{_cross_datadir}/eks + +install -d %{buildroot}%{_cross_datadir}/updog +install -p -m 0644 %{S:4} %{buildroot}%{_cross_datadir}/updog + +install -d %{buildroot}%{_cross_templatedir} +install -p -m 0644 %{S:5} %{buildroot}%{_cross_templatedir} + +install -d %{buildroot}%{_cross_unitdir} +install -p -m 0644 \ + %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} %{S:106} %{S:107} %{S:108} %{S:109} \ + %{buildroot}%{_cross_unitdir} + +install -d %{buildroot}%{_cross_tmpfilesdir} +install -p -m 0644 %{S:200} %{buildroot}%{_cross_tmpfilesdir}/migration.conf +install -p -m 0644 %{S:201} %{buildroot}%{_cross_tmpfilesdir}/host-containers.conf %files -n %{_cross_os}apiserver %{_cross_bindir}/apiserver @@ -225,4 +257,21 @@ install -p -m 0644 %{S:13} %{buildroot}%{_cross_datadir}/eks %{_cross_bindir}/settings-committer %{_cross_unitdir}/settings-committer.service +%files -n %{_cross_os}growpart +%{_cross_sbindir}/growpart + +%files -n %{_cross_os}signpost +%{_cross_bindir}/signpost + +%files -n %{_cross_os}updog +%{_cross_bindir}/updog +%{_cross_datadir}/updog +%dir %{_cross_templatedir} +%{_cross_templatedir}/updog-toml +%{_cross_unitdir}/updog.timer +%{_cross_unitdir}/updog.service + +%files -n %{_cross_os}preinit +%{_cross_sbindir}/preinit + %changelog diff --git a/workspaces/api/apiserver/Cargo.toml b/workspaces/api/apiserver/Cargo.toml index 1c00b76e25c..b08b28cd766 100644 --- a/workspaces/api/apiserver/Cargo.toml +++ b/workspaces/api/apiserver/Cargo.toml @@ -23,7 +23,7 @@ nix = "0.15.0" libc = "0.2" [features] -default = [] +default = ["sd_notify"] sd_notify = ["systemd"] diff --git a/workspaces/tuftool/Cargo.toml b/workspaces/tuftool/Cargo.toml index 888b2b9927c..f4e3a10c143 100644 --- a/workspaces/tuftool/Cargo.toml +++ b/workspaces/tuftool/Cargo.toml @@ -19,7 +19,7 @@ maplit = "1.0.1" olpc-cjson = { path = "../updater/olpc-cjson" } pem = "0.6.0" rayon = "1.2" -reqwest = "0.9.20" +reqwest = { version = "0.9.20", features = ["rustls-tls"], default-features = false } ring = { version = "0.16.7", features = ["std"] } rusoto_core = { version = "0.41", optional = true, default-features = false } rusoto_credential = { version = "0.41", optional = true } From 2d6d2e3795651b3c686ceef56e4257e673b17321 Mon Sep 17 00:00:00 2001 From: iliana destroyer of worlds Date: Thu, 17 Oct 2019 13:16:28 -0700 Subject: [PATCH 2/2] Utilize whitespace to make a source comment clearer Co-Authored-By: Tom Kirchner --- packages/workspaces/workspaces.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/workspaces/workspaces.spec b/packages/workspaces/workspaces.spec index 45060604687..d0d9a57ab98 100644 --- a/packages/workspaces/workspaces.spec +++ b/packages/workspaces/workspaces.spec @@ -12,6 +12,7 @@ Source1: data-store-version Source2: api-sysusers.conf # Taken from https://github.com/awslabs/amazon-eks-ami/blob/master/files/eni-max-pods.txt Source3: eni-max-pods + Source4: root.json Source5: updog-toml