Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor pkg_deb #446

Merged
merged 18 commits into from
Nov 8, 2021
11 changes: 9 additions & 2 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
* @aiuto @nacl

/deb_packages/ @MarkusTeufelberger @adragomir
/pkg/rpm/ @nacl
/deb_packages/ @aiuto
/docs @aiuto @nacl @floriographygoth

/pkg/rpm/ @nacl
aiuto marked this conversation as resolved.
Show resolved Hide resolved
/pkg/tests/rpm/ @nacl
legacy/tests/rpm @nacl
aiuto marked this conversation as resolved.
Show resolved Hide resolved

/pkg/private/make_deb.py @aiuto @dannysullivan
/pkg/tests/deb/ @aiuto @dannysullivan
2 changes: 2 additions & 0 deletions distro/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ pkg_tar(
"//:standard_package",
"//pkg:standard_package",
"//pkg/private:standard_package",
"//pkg/private/deb:standard_package",
aiuto marked this conversation as resolved.
Show resolved Hide resolved
"//pkg/releasing:standard_package",
"//toolchains:standard_package",
"//toolchains/git:standard_package",
Expand Down Expand Up @@ -116,6 +117,7 @@ bzl_library(
"//pkg:rpm.bzl",
"//pkg/private:pkg_files.bzl",
"//pkg/private:util.bzl",
"//pkg/private/deb:deb.bzl",
"@bazel_skylib//lib:paths",
],
visibility = ["//visibility:private"],
Expand Down
2 changes: 1 addition & 1 deletion distro/testdata/BUILD.tpl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@not_named_rules_pkg//:pkg.bzl", "pkg_tar")
load("@not_named_rules_pkg//pkg:pkg.bzl", "pkg_tar")
aiuto marked this conversation as resolved.
Show resolved Hide resolved

pkg_tar(
name = "dummy_tar",
Expand Down
4 changes: 2 additions & 2 deletions pkg/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ find_system_rpmbuild(name = "rules_pkg_rpmbuild")
This example is a simplification of the debian packaging of Bazel:

```python
load("@rules_pkg//pkg:pkg.bzl", "pkg_tar", "pkg_deb")

load("@rules_pkg//pkg:pkg.bzl", "pkg_tar")
load("@rules_pkg//pkg:deb.bzl", "pkg_deb")

pkg_tar(
name = "bazel-bin",
Expand Down
16 changes: 16 additions & 0 deletions pkg/deb.bzl
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Copyright 2021 The Bazel Authors. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
load("//pkg/private/deb:deb.bzl", _pkg_deb = "pkg_deb")

pkg_deb = _pkg_deb
Loading