Merge pull request #428 from amazonlinux/nyoom

Combine first-party Rust builds
bottlerocket-os · Oct 17, 2019 · a55a680 · a55a680
2 parents acd0d38 + 2d6d2e3
commit a55a680
Show file tree

Hide file tree

Showing 38 changed files with 133 additions and 331 deletions.
diff --git 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
diff --git 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
diff --git a/packages/growpart/build.rs b/packages/growpart/build.rs
diff --git a/packages/growpart/growpart.spec b/packages/growpart/growpart.spec
diff --git a/packages/growpart/pkg.rs b/packages/growpart/pkg.rs
diff --git a/packages/preinit/Cargo.toml b/packages/preinit/Cargo.toml
diff --git a/packages/preinit/build.rs b/packages/preinit/build.rs
diff --git a/packages/preinit/pkg.rs b/packages/preinit/pkg.rs
diff --git a/packages/preinit/preinit.spec b/packages/preinit/preinit.spec
diff --git a/packages/updater/Cargo.toml b/packages/updater/Cargo.toml
diff --git a/packages/updater/build.rs b/packages/updater/build.rs
diff --git a/packages/updater/pkg.rs b/packages/updater/pkg.rs
diff --git a/packages/updater/updater.spec b/packages/updater/updater.spec
diff --git a/packages/api/Cargo.toml → packages/workspaces/Cargo.toml b/packages/api/Cargo.toml → 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 → packages/workspaces/api-sysusers.conf b/packages/api/api-sysusers.conf → packages/workspaces/api-sysusers.conf
diff --git a/packages/api/apiserver.service → packages/workspaces/apiserver.service b/packages/api/apiserver.service → packages/workspaces/apiserver.service
diff --git a/packages/api/build.rs → packages/workspaces/build.rs b/packages/api/build.rs → packages/workspaces/build.rs
diff --git a/packages/api/data-store-version → packages/workspaces/data-store-version b/packages/api/data-store-version → packages/workspaces/data-store-version
diff --git a/packages/api/eni-max-pods → packages/workspaces/eni-max-pods b/packages/api/eni-max-pods → packages/workspaces/eni-max-pods
diff --git a/packages/api/host-containers-tmpfiles.conf → .../workspaces/host-containers-tmpfiles.conf b/packages/api/host-containers-tmpfiles.conf → .../workspaces/host-containers-tmpfiles.conf
diff --git a/packages/api/[email protected] → packages/workspaces/[email protected] b/packages/api/[email protected] → packages/workspaces/[email protected]
diff --git a/packages/api/migration-tmpfiles.conf → packages/workspaces/migration-tmpfiles.conf b/packages/api/migration-tmpfiles.conf → packages/workspaces/migration-tmpfiles.conf
diff --git a/packages/api/migrator.service → packages/workspaces/migrator.service b/packages/api/migrator.service → packages/workspaces/migrator.service
diff --git a/packages/api/moondog.service → packages/workspaces/moondog.service b/packages/api/moondog.service → packages/workspaces/moondog.service
diff --git a/packages/api/pkg.rs → packages/workspaces/pkg.rs b/packages/api/pkg.rs → packages/workspaces/pkg.rs
diff --git a/packages/updater/root.json → packages/workspaces/root.json b/packages/updater/root.json → packages/workspaces/root.json
diff --git a/packages/api/settings-applier.service → packages/workspaces/settings-applier.service b/packages/api/settings-applier.service → packages/workspaces/settings-applier.service
diff --git a/packages/api/settings-committer.service → ...ges/workspaces/settings-committer.service b/packages/api/settings-committer.service → ...ges/workspaces/settings-committer.service
diff --git a/packages/api/storewolf.service → packages/workspaces/storewolf.service b/packages/api/storewolf.service → packages/workspaces/storewolf.service
diff --git a/packages/api/sundog.service → packages/workspaces/sundog.service b/packages/api/sundog.service → packages/workspaces/sundog.service
diff --git a/packages/updater/updog-toml → packages/workspaces/updog-toml b/packages/updater/updog-toml → packages/workspaces/updog-toml
diff --git a/packages/updater/updog.service → packages/workspaces/updog.service b/packages/updater/updog.service → packages/workspaces/updog.service
diff --git a/packages/updater/updog.timer → packages/workspaces/updog.timer b/packages/updater/updog.timer → packages/workspaces/updog.timer