Browse Source

sys/src/9/amd64: add move directive

make sure factotum goes to bin/auth/factotum.

Signed-off-by: Sevki <s@sevki.org>
Sevki 3 years ago
parent
commit
9580cbb7f9
2 changed files with 16 additions and 3 deletions
  1. 6 2
      BUILD
  2. 10 1
      sys/src/9/amd64/BUILD

+ 6 - 2
BUILD

@@ -7,7 +7,7 @@ objcopy(
 	outfile="elf32-i386",
 )
 
-kernel(
+move(
 	name="kernel",
 	deps=[
 		":harvey",
@@ -94,7 +94,7 @@ kernel(
 		"amd64/bin/date": "bin/date",
 		"amd64/bin/ipconfig": "bin/ipconfig",
 		"amd64/bin/acme": "bin/acme",
-		"amd64/bin/factotum": "bin/factotum",
+		"amd64/bin/auth/factotum": "bin/factotum",
 		"amd64/bin/mount": "bin/mount",
 		"amd64/bin/srv": "bin/srv",
 		"amd64/bin/ed": "bin/ed",
@@ -102,3 +102,7 @@ kernel(
 		"amd64/bin/ps": "bin/ps",
 	},
 )
+old_build(
+	name="all",
+	package="all",
+)

+ 10 - 1
sys/src/9/amd64/BUILD

@@ -266,6 +266,15 @@ cc_binary(
 		"-T",
 	]
 )
+move(
+	name="factotum",
+	deps=[
+		"//sys/src/cmd/auth/factotum:factotum",
+	],
+	installs={
+		"bin/auth/factotum": "bin/factotum",
+	},
+)
 
 KERNEL_DEPS = [
 	"//sys/src/cmd:bind",
@@ -273,7 +282,7 @@ KERNEL_DEPS = [
 	"//sys/src/cmd:cat",
 	"//sys/src/cmd:date",
 	"//sys/src/cmd:echo",
-	"//sys/src/cmd/auth/factotum:factotum",
+	":factotum",
 	"//sys/src/cmd/disk/prep:fdisk",
 	"//sys/src/cmd/fossil:fossil",
 	"//sys/src/cmd/ip/ipconfig:ipconfig",