Skip to content

Commit 76c4667

Browse files
authored
[ABLD-8] Split the pkgconfig files from "all_files" but leave in pkg_install. (#46044)
Split the pkgconfig files out from "all_files" and leave only in the pkg_install rule, through the deps tree. In #46025, we will start to include "all_files" directly. - That is more managable than having to know all the component parts of each dependency. - This limits installing .pc files to the omnibus scripts. - Since they do not go into the package image, we don't have to delete them later. - Eventually we'll just delete the pc targets since they won't be needed any more. This probably has missed some packages. That is fine. We can discover and fix them later, after #46025 is landed and they merge into that scheme. ## Testing Compared the .deb files for a recent PR #45988 to this. They are identical except for the expected diff of the link opt/datadog-packages/datadog-agent/stable Co-authored-by: tony.aiuto <tony.aiuto@datadoghq.com>
1 parent 86fb1cc commit 76c4667

19 files changed

Lines changed: 225 additions & 59 deletions

deps/acl/overlay/overlay.BUILD.bazel

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,13 +217,14 @@ pkg_filegroup(
217217
srcs = [
218218
":hdr_files",
219219
":lib_files",
220-
":pc_file",
221220
],
221+
visibility = ["@@//deps/openscap:__pkg__", "@@//packages:__subpackages__"],
222222
)
223223

224224
pkg_install(
225225
name = "install",
226226
srcs = [
227227
":all_files",
228+
":pc_file",
228229
],
229230
)

deps/attr/attr.BUILD.bazel

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ load("@package_metadata//rules:package_metadata.bzl", "package_metadata")
77
load("@rules_cc//cc:defs.bzl", "cc_library", "cc_shared_library")
88
load("@rules_license//rules:license.bzl", "license")
99
load("@rules_pkg//pkg:install.bzl", "pkg_install")
10-
load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
10+
load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files")
1111

1212
package(default_package_metadata = [":package_metadata", ":ship_source_offer"])
1313

@@ -135,11 +135,19 @@ pkg_files(
135135
prefix = "embedded/lib/pkgconfig",
136136
)
137137

138-
pkg_install(
139-
name = "install",
138+
pkg_filegroup(
139+
name = "all_files",
140140
srcs = [
141141
":hdr_files",
142142
":lib_files",
143+
],
144+
visibility = ["@@//deps/openscap:__pkg__", "@@//packages:__subpackages__"],
145+
)
146+
147+
pkg_install(
148+
name = "install",
149+
srcs = [
150+
":all_files",
143151
":pc_file",
144152
],
145153
)

deps/bzip2/overlay.BUILD.bazel

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,14 @@ pkg_filegroup(
172172
srcs = [
173173
":hdr_files",
174174
":lib_files",
175-
":pkg_pc_file",
176175
],
176+
visibility = ["@@//deps/openscap:__pkg__", "@@//packages:__subpackages__"],
177177
)
178178

179179
pkg_install(
180180
name = "install",
181-
srcs = [":all_files"],
181+
srcs = [
182+
":all_files",
183+
":pkg_pc_file",
184+
],
182185
)

deps/dbus/dbus.BUILD.bazel

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
12
load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
23
load("@rules_cc//cc:cc_library.bzl", "cc_library")
34
load("@rules_license//rules:license.bzl", "license")
45
load("@rules_pkg//pkg:install.bzl", "pkg_install")
5-
load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
6-
load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
6+
load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files")
77

88
package(default_package_metadata = [":license"])
99

@@ -26,7 +26,7 @@ copy_file(
2626
cc_library(
2727
name = "config_h",
2828
hdrs = [
29-
":copy_config_h"
29+
":copy_config_h",
3030
],
3131
)
3232

@@ -64,7 +64,7 @@ expand_template(
6464
"@DBUS_MAJOR_VERSION@": "1",
6565
"@DBUS_MINOR_VERSION@": "16",
6666
"@DBUS_MICRO_VERSION@": "2",
67-
}
67+
},
6868
)
6969

7070
cc_library(
@@ -118,12 +118,12 @@ cc_library(
118118
"dbus/dbus-transport-unix.c",
119119
"dbus/dbus-userdb.c",
120120
":dbus_arch_deps_h",
121-
] + glob(["dbus/*.h"], exclude=PUBLIC_HEADERS),
121+
] + glob(["dbus/*.h"], exclude = PUBLIC_HEADERS),
122122
hdrs = PUBLIC_HEADERS,
123123
local_defines = [
124124
"_GNU_SOURCE",
125125
"__USE_MINGW_ANSI_STDIO=0",
126-
"dbus_1_EXPORTS"
126+
"dbus_1_EXPORTS",
127127
],
128128
copts = [
129129
"-O2",
@@ -155,7 +155,7 @@ expand_template(
155155
"@VERSION@": "1.16.2",
156156
"@LIBDBUS_LIBS@": "-pthread",
157157
"@DBUS_STATIC_BUILD_CPPFLAGS@": "",
158-
}
158+
},
159159
)
160160

161161
pkg_files(
@@ -183,12 +183,20 @@ pkg_files(
183183
prefix = "lib/dbus-1.0/include/dbus",
184184
)
185185

186+
pkg_filegroup(
187+
name = "all_files",
188+
srcs = [
189+
":headers",
190+
":lib_files",
191+
":dbus_arch_deps_install",
192+
],
193+
visibility = ["@@//deps/openscap:__pkg__", "@@//packages:__subpackages__"],
194+
)
195+
186196
pkg_install(
187197
name = "install",
188198
srcs = [
189-
":headers",
199+
":all_files",
190200
":pkgconfig",
191-
":lib_files",
192-
":dbus_arch_deps_install"
193201
],
194202
)

deps/gcrypt/gcrypt.BUILD.bazel

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
66
load("@package_metadata//rules:package_metadata.bzl", "package_metadata")
77
load("@rules_license//rules:license.bzl", "license")
88
load("@rules_pkg//pkg:install.bzl", "pkg_install")
9-
load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
9+
load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files")
1010

1111
package(
1212
default_package_metadata = [":license"],
@@ -779,11 +779,19 @@ pkg_files(
779779
prefix = "include",
780780
)
781781

782-
pkg_install(
783-
name = "install",
782+
pkg_filegroup(
783+
name = "all_files",
784784
srcs = [
785785
":hdr_files",
786786
":lib_files",
787+
],
788+
visibility = ["@@//deps/openscap:__pkg__", "@@//packages:__subpackages__"],
789+
)
790+
791+
pkg_install(
792+
name = "install",
793+
srcs = [
794+
":all_files",
787795
":pc_file",
788796
],
789797
)

deps/krb5/krb5.BUILD.bazel

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,20 @@ pkg_filegroup(
161161
prefix = "embedded/",
162162
)
163163

164-
pkg_install(
165-
name = "install",
164+
pkg_filegroup(
165+
name = "all_files",
166166
srcs = [
167167
":hdr_files",
168-
":pc_files",
169168
":bin_files",
170169
":all_libs",
171170
],
171+
visibility = ["@@//packages:__subpackages__"],
172+
)
173+
174+
pkg_install(
175+
name = "install",
176+
srcs = [
177+
":all_files",
178+
":pc_files",
179+
],
172180
)

deps/libselinux.BUILD.bazel

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ load("@package_metadata//rules:package_metadata.bzl", "package_metadata")
44
load("@rules_cc//cc:defs.bzl", "cc_library")
55
load("@rules_license//rules:license.bzl", "license")
66
load("@rules_pkg//pkg:install.bzl", "pkg_install")
7-
load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
7+
load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files")
88

99
package(
1010
default_package_metadata = [":package_metadata"],
@@ -112,11 +112,19 @@ pkg_files(
112112
prefix = "lib/pkgconfig",
113113
)
114114

115-
pkg_install(
116-
name = "install",
115+
pkg_filegroup(
116+
name = "all_files",
117117
srcs = [
118118
":hdr_files",
119119
":lib_files",
120+
],
121+
visibility = ["@@//deps/openscap:__pkg__", "@@//packages:__subpackages__"],
122+
)
123+
124+
pkg_install(
125+
name = "install",
126+
srcs = [
127+
":all_files",
120128
":pc_file",
121129
],
122130
)

deps/libsepol.BUILD.bazel

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ load("@package_metadata//rules:package_metadata.bzl", "package_metadata")
55
load("@rules_cc//cc:defs.bzl", "cc_library")
66
load("@rules_license//rules:license.bzl", "license")
77
load("@rules_pkg//pkg:install.bzl", "pkg_install")
8-
load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
8+
load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files")
99

1010
package(default_package_metadata = [":package_metadata", ":ship_source_offer"])
1111

@@ -120,12 +120,20 @@ pkg_files(
120120
prefix = "lib/pkgconfig",
121121
)
122122

123-
pkg_install(
124-
name = "install",
123+
pkg_filegroup(
124+
name = "all_files",
125125
srcs = [
126126
":hdr_files",
127127
":policy_hdr_files",
128128
":lib_files",
129+
],
130+
visibility = ["@@//deps/openscap:__pkg__", "@@//packages:__subpackages__"],
131+
)
132+
133+
pkg_install(
134+
name = "install",
135+
srcs = [
136+
":all_files",
129137
":pc_file",
130138
],
131139
)

deps/libxslt/overlay.BUILD.bazel

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
44
load("@rules_cc//cc:defs.bzl", "cc_library", "cc_shared_library")
55
load("@rules_license//rules:license.bzl", "license")
66
load("@rules_pkg//pkg:install.bzl", "pkg_install")
7-
load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
7+
load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files")
88

99
XSLT_VERSION = "1.1.43"
1010
EXSLT_VERSION = "0.8.25"
@@ -245,13 +245,21 @@ pkg_files(
245245
prefix = "lib/pkgconfig",
246246
)
247247

248-
pkg_install(
249-
name = "install",
248+
pkg_filegroup(
249+
name = "all_files",
250250
srcs = [
251251
":xslt_headers",
252252
":exslt_headers",
253-
":pkgconfig",
254253
":xslt_lib_files",
255254
":exslt_lib_files",
256255
],
256+
visibility = ["@@//deps/openscap:__pkg__", "@@//packages:__subpackages__"],
257+
)
258+
259+
pkg_install(
260+
name = "install",
261+
srcs = [
262+
":all_files",
263+
":pkgconfig",
264+
],
257265
)

deps/libyaml.BUILD.bazel

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ load("@@//bazel/rules:so_symlink.bzl", "so_symlink")
44
load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
55
load("@rules_license//rules:license.bzl", "license")
66
load("@rules_pkg//pkg:install.bzl", "pkg_install")
7-
load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
7+
load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files")
88

99
VERSION = "0.2.5"
1010

@@ -82,11 +82,19 @@ pkg_files(
8282
prefix = "lib/pkgconfig",
8383
)
8484

85+
pkg_filegroup(
86+
name = "all_files",
87+
srcs = [
88+
":headers",
89+
":lib_files",
90+
],
91+
visibility = ["@@//deps/openscap:__pkg__", "@@//packages:__subpackages__"],
92+
)
93+
8594
pkg_install(
8695
name = "install",
8796
srcs = [
88-
":lib_files",
89-
":headers",
97+
":all_files",
9098
":pkgconfig",
9199
],
92100
)

0 commit comments

Comments
 (0)