From 0c99ab70905fa4eaf8bc7b0ca846e12d7bbc6e39 Mon Sep 17 00:00:00 2001 From: Adin Scannell Date: Fri, 8 Jan 2021 18:01:05 -0800 Subject: Support releasing aarch64 builds. This change works around an issue in rules_pkg, described here: https://github.com/bazelbuild/rules_pkg/pull/263 PiperOrigin-RevId: 350869030 --- debian/BUILD | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) (limited to 'debian/BUILD') diff --git a/debian/BUILD b/debian/BUILD index 331f44a5c..1c379b08f 100644 --- a/debian/BUILD +++ b/debian/BUILD @@ -1,4 +1,4 @@ -load("//tools:defs.bzl", "pkg_deb", "pkg_tar") +load("//tools:defs.bzl", "pkg_deb", "pkg_tar", "select_arch", "version") package(licenses = ["notice"]) @@ -22,27 +22,16 @@ pkg_tar( ], ) -genrule( - name = "debian-version", - # Note that runsc must appear in the srcs parameter and not the tools - # parameter, otherwise it will not be stamped. This is reasonable, as tools - # may be encoded differently in the build graph (cached more aggressively - # because they are assumes to be hermetic). - srcs = ["//runsc"], - outs = ["version.txt"], - # Note that the little dance here is necessary because files in the $(SRCS) - # attribute are not executable by default, and we can't touch in place. - cmd = "cp $(location //runsc:runsc) $(@D)/runsc && \ - chmod a+x $(@D)/runsc && \ - $(@D)/runsc -version | grep version | sed 's/^[^0-9]*//' > $@ && \ - rm -f $(@D)/runsc", - stamp = 1, -) - pkg_deb( name = "debian", - architecture = "amd64", + out = "runsc-latest.deb", + architecture = select_arch( + amd64 = "amd64", + arm64 = "arm64", + ), + changes = "runsc.changes", data = ":debian-data", + deb = "runsc.deb", # Note that the description_file will be flatten (all newlines removed), # and therefore it is kept to a simple one-line description. The expected # format for debian packages is "short summary\nLonger explanation of @@ -52,7 +41,7 @@ pkg_deb( maintainer = "The gVisor Authors ", package = "runsc", postinst = "postinst.sh", - version_file = ":version.txt", + version_file = version, visibility = [ "//visibility:public", ], -- cgit v1.2.3