feat: add more convenience targets

Mirror the "inner" (per-arch) :data and :control convenience targets to
platform-aware targets at the top of the package repo so that we can use
`@<REPO>//<PACKAGE>:data` directly (see changes to
examples/debian_snapshot/BUILD).

apt/private/deb_translate_lock.bzl

@@ -23,9 +23,11 @@ _DEB_IMPORT_TMPL = '''\
     )
 '''
 
-_PACKAGE_TEMPLATE = """\
+_PACKAGE_TEMPLATE = '''\
+"""Generated by rules_distroless. DO NOT EDIT."""
+
 alias(
-    name = "{target_name}",
+    name = "data",
     actual = select({data_targets}),
     visibility = ["//visibility:public"],
 )
@@ -35,7 +37,13 @@ alias(
     actual = select({control_targets}),
     visibility = ["//visibility:public"],
 )
-"""
+
+filegroup(
+    name = "{target_name}",
+    srcs = select({deps}) + [":data"],
+    visibility = ["//visibility:public"],
+)
+'''
 
 _ROOT_BUILD_TMPL = """\
 "Generated by rules_distroless. DO NOT EDIT."
@@ -150,6 +158,8 @@ def _deb_translate_lock_impl(rctx):
             "%s/%s/BUILD.bazel" % (package["name"], package["arch"]),
             package_template.format(
                 target_name = package["arch"],
+                data_targets = '"@%s//:data"' % repo_name,
+                control_targets = '"@%s//:control"' % repo_name,
                 src = '"@%s//:data"' % repo_name,
                 deps = starlark_codegen_utils.to_list_attr([
                     "//%s/%s" % (dep["name"], package["arch"])
@@ -170,11 +180,15 @@ def _deb_translate_lock_impl(rctx):
             _PACKAGE_TEMPLATE.format(
                 target_name = package["name"],
                 data_targets = starlark_codegen_utils.to_dict_attr({
-                    "//:linux_%s" % arch: "//%s/%s" % (package["name"], arch)
+                    "//:linux_%s" % arch: "//%s/%s:data" % (package["name"], package["arch"])
                     for arch in architectures._values
                 }),
                 control_targets = starlark_codegen_utils.to_dict_attr({
-                    "//:linux_%s" % arch: "//%s/%s:control" % (package["name"], arch)
+                    "//:linux_%s" % arch: "//%s/%s:control" % (package["name"], package["arch"])
+                    for arch in architectures._values
+                }),
+                deps = starlark_codegen_utils.to_dict_list_attr({
+                    "//:linux_%s" % arch: ["//%s/%s" % (package["name"], package["arch"])]
                     for arch in architectures._values
                 }),
             ),

apt/private/package.BUILD.tmpl

@@ -1,17 +1,19 @@
+"""Generated by rules_distroless. DO NOT EDIT."""
+
 alias(
     name = "data",
-    actual = "@{repo_name}//:data",
+    actual = {data_targets},
     visibility = ["//visibility:public"],
 )
 
 alias(
     name = "control",
-    actual = "@{repo_name}//:control",
+    actual = {control_targets},
     visibility = ["//visibility:public"],
 )
 
 filegroup(
     name = "{target_name}",
+    srcs = {deps} + [":data"],
     visibility = ["//visibility:public"],
-    srcs = {deps} + [":data"]
 )

e2e/smoke/BUILD

@@ -48,10 +48,7 @@ tar(
 
 cacerts(
     name = "cacerts",
-    package = select({
-        "@platforms//cpu:arm64": "@bullseye//ca-certificates/arm64:data",
-        "@platforms//cpu:x86_64": "@bullseye//ca-certificates/amd64:data",
-    }),
+    package = "@bullseye//ca-certificates:data",
 )
 
 PACKAGES = [

examples/debian_snapshot/BUILD.bazel

@@ -48,10 +48,7 @@ tar(
 
 cacerts(
     name = "cacerts",
-    package = select({
-        "@platforms//cpu:arm64": "@bullseye//ca-certificates/arm64:data",
-        "@platforms//cpu:x86_64": "@bullseye//ca-certificates/amd64:data",
-    }),
+    package = "@bullseye//ca-certificates:data",
 )
 
 oci_image(