Remove spurious '@//' root workspace references
Test Plan: covered by tests
X-Origin-Diff: phab/D364
GitOrigin-RevId: 4425fa5756468685dfafaf87186bf12f7da455e8
diff --git a/WORKSPACE b/WORKSPACE
index ad829af..13807dd 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -99,11 +99,11 @@
http_archive(
name = "linux_kernel",
- build_file = "@//core/build/linux_kernel_repo:BUILD.repo",
+ build_file = "//core/build/linux_kernel_repo:BUILD.repo",
patch_args = ["-p1"],
patches = [
# Enable built-in cmdline for efistub
- "@//core/build/linux_kernel_repo:0001-x86-Allow-built-in-command-line-to-work-in-early-ker.patch",
+ "//core/build/linux_kernel_repo:0001-x86-Allow-built-in-command-line-to-work-in-early-ker.patch",
],
sha256 = "abc9b21d9146d95853dac35f4c4489a0199aff53ee6eee4b0563d1b37079fcc9",
strip_prefix = "linux-" + linux_kernel_version,
@@ -115,7 +115,7 @@
# edk2-stable201908
new_git_repository(
name = "edk2",
- build_file = "@//core/build/edk2:BUILD.repo",
+ build_file = "//core/build/edk2:BUILD.repo",
commit = "37eef91017ad042035090cae46557f9d6e2d5917",
init_submodules = True,
remote = "https://github.com/tianocore/edk2",
@@ -155,7 +155,7 @@
build_file_content = all_content,
patch_args = ["-p1"],
patches = [
- "@//core/build/utils/xfsprogs_dev:0001-Fixes-for-static-compilation.patch",
+ "//core/build/utils/xfsprogs_dev:0001-Fixes-for-static-compilation.patch",
],
sha256 = "6187f25f1744d1ecbb028b0ea210ad586d0f2dae24e258e4688c67740cc861ef",
strip_prefix = "xfsprogs-dev-" + xfsprogs_dev_version,
@@ -169,7 +169,7 @@
name = "kubernetes",
patch_args = ["-p1"],
patches = [
- "@//core/build/kubernetes:0001-avoid-unexpected-keyword-error-by-using-positional-p.patch",
+ "//core/build/kubernetes:0001-avoid-unexpected-keyword-error-by-using-positional-p.patch",
],
sha256 = "3a49373ba56c73c282deb0cfa2ec7bfcc6bf46acb6992f01319eb703cbf68996",
urls = ["https://dl.k8s.io/v%s/kubernetes-src.tar.gz" % k8s_version],
diff --git a/build/sqlboiler/sqlboiler.bzl b/build/sqlboiler/sqlboiler.bzl
index 602c73c..3fb4f27 100644
--- a/build/sqlboiler/sqlboiler.bzl
+++ b/build/sqlboiler/sqlboiler.bzl
@@ -107,8 +107,8 @@
attrs = {
"srcs": attr.label_list(mandatory = True, allow_files = [".sql"]),
"tables": attr.string_list(default = []),
- "migrate_config": attr.label(allow_single_file = True, default = Label("@//build/sqlboiler:dbconfig.yml")),
- "boiler_config": attr.label(allow_single_file = True, default = Label("@//build/sqlboiler:sqlboiler.toml")),
+ "migrate_config": attr.label(allow_single_file = True, default = Label("//build/sqlboiler:dbconfig.yml")),
+ "boiler_config": attr.label(allow_single_file = True, default = Label("//build/sqlboiler:sqlboiler.toml")),
"boiler": attr.label(allow_single_file = True, default = Label("@com_github_volatiletech_sqlboiler//:sqlboiler")),
"adapter": attr.label(allow_single_file = True, default = Label("@com_github_glerchundi_sqlboiler_crdb//:sqlboiler-crdb")),
"migrate": attr.label(allow_single_file = True, default = Label("@com_github_rubenv_sql_migrate//sql-migrate:sql-migrate")),
diff --git a/core/BUILD b/core/BUILD
index 38160dc..d2d6e33 100644
--- a/core/BUILD
+++ b/core/BUILD
@@ -1,20 +1,20 @@
genrule(
name = "image",
srcs = [
- "@//core/build/linux_kernel:bzImage",
- "@//core/build/linux_kernel:initramfs",
+ "//core/build/linux_kernel:bzImage",
+ "//core/build/linux_kernel:initramfs",
],
outs = [
"smalltown.img",
],
cmd = """
- $(location @//core/cmd/mkimage) \
- -efi $(location @//core/build/linux_kernel:bzImage) \
- -initramfs $(location @//core/build/linux_kernel:initramfs) \
+ $(location //core/cmd/mkimage) \
+ -efi $(location //core/build/linux_kernel:bzImage) \
+ -initramfs $(location //core/build/linux_kernel:initramfs) \
-out $@
""",
tools = [
- "@//core/cmd/mkimage",
+ "//core/cmd/mkimage",
],
visibility = ["//visibility:public"],
)
diff --git a/core/build/linux_kernel/BUILD b/core/build/linux_kernel/BUILD
index 8827285..625dd5c 100644
--- a/core/build/linux_kernel/BUILD
+++ b/core/build/linux_kernel/BUILD
@@ -24,9 +24,9 @@
genrule(
name = "initramfs",
srcs = [
- "@//core/cmd/init",
- "@//core/build/utils:mkfs.xfs",
- "@//core/cmd/kube-controlplane",
+ "//core/cmd/init",
+ "//core/build/utils:mkfs.xfs",
+ "//core/cmd/kube-controlplane",
],
outs = [
"initramfs.cpio.lz4",
@@ -36,10 +36,10 @@
dir /dev 0755 0 0
nod /dev/console 0600 0 0 c 5 1
nod /dev/null 0644 0 0 c 1 3
-file /init $(location @//core/cmd/init) 0755 0 0
+file /init $(location //core/cmd/init) 0755 0 0
dir /bin 0755 0 0
-file /bin/mkfs.xfs $(location @//core/build/utils:mkfs.xfs) 0755 0 0
-file /bin/kube-controlplane $(location @//core/cmd/kube-controlplane) 0755 0 0
+file /bin/mkfs.xfs $(location //core/build/utils:mkfs.xfs) 0755 0 0
+file /bin/kube-controlplane $(location //core/cmd/kube-controlplane) 0755 0 0
EOF
""",
tools = [
diff --git a/core/scripts/BUILD b/core/scripts/BUILD
index 2440119..8e8f18a 100644
--- a/core/scripts/BUILD
+++ b/core/scripts/BUILD
@@ -1,8 +1,8 @@
sh_library(
name = "vm_deps",
data = [
- "@//core:image",
- "@//core:swtpm_data",
+ "//core:image",
+ "//core:swtpm_data",
"@edk2//:firmware",
],
)