diff options
| author |  Michal Rydlo <michal.rydlo@gmail.com> | 2016-08-26 12:30:30 +0000 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2016-08-26 18:42:11 +0000 |
| commit | 3330528d760db4eb45b91f0777536414904be97f (patch) | |
| tree | bb0654470c86686c3db3e8c0b0ab6a157bb00f6b /tools/build_defs/pkg/BUILD | |
| parent | 629af535457c77ce984c90c98b49c5835ac0c75c (diff) | |
Add conffiles support to pkg_deb
pkg_deb can have either conffiles or conffiles_file parameter that propagates
the list of conffiles into the deb archive.
Also the tests in //tools/build_defs/pkg were fixed to run against the rules
from the source tree and not from the bazel distribtution.
--
Change-Id: I61c447feef16511acbb0078d91954dcd7d3375f4
Reviewed-on: https://bazel-review.googlesource.com/#/c/5610
MOS_MIGRATED_REVID=131391925
Diffstat (limited to 'tools/build_defs/pkg/BUILD')
| -rw-r--r-- | tools/build_defs/pkg/BUILD | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/tools/build_defs/pkg/BUILD b/tools/build_defs/pkg/BUILD index 65429abceb..6144bc1641 100644 --- a/tools/build_defs/pkg/BUILD +++ b/tools/build_defs/pkg/BUILD @@ -46,8 +46,8 @@ py_binary( srcs = ["build_tar.py"], visibility = ["//visibility:public"], deps = [ - "@bazel_tools//third_party/py/gflags", ":archive", + "@bazel_tools//third_party/py/gflags", ], ) @@ -56,8 +56,8 @@ py_binary( srcs = ["make_deb.py"], visibility = ["//visibility:public"], deps = [ - "@bazel_tools//third_party/py/gflags", ":archive", + "@bazel_tools//third_party/py/gflags", ], ) @@ -75,6 +75,7 @@ genrule( [pkg_tar( name = "test-tar-%s" % ext[1:], + build_tar = ":build_tar", extension = "tar%s" % ext, files = [ ":etc/nsswitch.conf", @@ -94,6 +95,7 @@ genrule( [pkg_tar( name = "test-tar-inclusion-%s" % ext, + build_tar = ":build_tar", deps = [":test-tar-%s" % ext], ) for ext in [ "", @@ -104,6 +106,7 @@ genrule( pkg_tar( name = "test-tar-strip_prefix-empty", + build_tar = ":build_tar", files = [ ":etc/nsswitch.conf", ], @@ -112,6 +115,7 @@ pkg_tar( pkg_tar( name = "test-tar-strip_prefix-none", + build_tar = ":build_tar", files = [ ":etc/nsswitch.conf", ], @@ -119,6 +123,7 @@ pkg_tar( pkg_tar( name = "test-tar-strip_prefix-etc", + build_tar = ":build_tar", files = [ ":etc/nsswitch.conf", ], @@ -127,6 +132,7 @@ pkg_tar( pkg_tar( name = "test-tar-strip_prefix-dot", + build_tar = ":build_tar", files = [ ":etc/nsswitch.conf", ], @@ -135,6 +141,10 @@ pkg_tar( pkg_deb( name = "test-deb", + conffiles = [ + "/etc/nsswitch.conf", + "/etc/other", + ], data = ":test-tar-gz.tar.gz", depends = [ "dep1", @@ -142,6 +152,7 @@ pkg_deb( ], description = "toto", maintainer = "someone@somewhere.com", + make_deb = ":make_deb", package = "titi", version = "test", ) |