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

TOOLS-2557 Update eng for new Rust Makefiles. #8

Merged
merged 2 commits into from Jan 27, 2023
Merged

TOOLS-2557 Update eng for new Rust Makefiles. #8

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
9476890
TOOLS-2557 Update eng for new Rust Makefiles.
travispaul Jan 23, 2023
a6884e1
TOOLS-2557 update eng submodule
travispaul Jan 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Expand Up @@ -8,3 +8,7 @@ Cargo.lock

# These are backup files generated by rustfmt
**/*.rs.bk

# Eng rust toolchain
/rust
/cache
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
@@ -1,3 +1,3 @@
[submodule "deps/eng"]
path = deps/eng
url = https://github.com/joyent/eng.git
url = https://github.com/TritonDataCenter/eng.git
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ version = "0.2.0"
description = "Crate providing an interface to illumos's PRIVILEGES(5)"
readme = "README.md"
authors = ["Mike Zeller <mike@mikezeller.net>"]
repository = "https://github.com/joyent/rust-illumos-priv"
repository = "https://github.com/TritonDataCenter/rust-illumos-priv"
keywords = ["illumos", "solaris", "security", "privileges"]
edition = "2018"
license = "MPL-2.0"
Expand Down
10 changes: 7 additions & 3 deletions Makefile
View file
Open in desktop
@@ -1,10 +1,14 @@
RUST_CODE = 1
RUST_TOOLCHAIN = 1.49.0

ENGBLD_REQUIRE := $(shell git submodule update --init deps/eng)
include ./deps/eng/tools/mk/Makefile.defs
include ./deps/eng/tools/mk/Makefile.rust.defs

TOP ?= $(error Unable to access eng.git submodule Makefiles.)

test:
cargo test
.PHONY: test
test: | $(CARGO_EXEC)
$(CARGO) test

include ./deps/eng/tools/mk/Makefile.targ
include ./deps/eng/tools/mk/Makefile.rust.targ
2 changes: 1 addition & 1 deletion deps/eng
Open in desktop
Submodule eng updated 25 files
+3 −3 .gitmodules
+1 −1 deps/javascriptlint
+1 −1 deps/restdown
+3 −2 docs/hybridimages.md
+2 −2 package.json
+7 −6 tools/bits-upload.sh
+2 −2 tools/buildimage/README.md
+3 −1 tools/buildimage/bin/buildimage
+20 −12 tools/buildimage/lib/imgadm/README.md
+21 −3 tools/buildimage/lib/imgadm/lib/cli.js
+4 −3 tools/buildimage/lib/imgadm/lib/common.js
+8 −2 tools/buildimage/lib/imgadm/lib/errors.js
+76 −4 tools/buildimage/lib/imgadm/lib/imgadm.js
+6 −0 tools/buildimage/lib/imgadm/lib/sources/imgapi.js
+11 −3 tools/buildimage/lib/imgadm/lib/sources/source.js
+17 −41 tools/buildimage/lib/imgadm/package-lock.json
+7 −7 tools/buildimage/lib/imgadm/package.json
+1 −1 tools/buildimage/lib/imgadm/sbin/imgadm
+26 −7 tools/check-copyright
+8 −2 tools/create-hybrid-image
+3 −2 tools/mk/Makefile.defs
+186 −0 tools/mk/Makefile.rust.defs
+69 −0 tools/mk/Makefile.rust.targ
+4 −31 tools/mk/Makefile.targ
+25 −6 tools/validate-buildenv.sh