diff --git a/antlir/antlir2/bzl/dnf/defs.bzl b/antlir/antlir2/bzl/dnf/defs.bzl index 0f88293032..18645fe283 100644 --- a/antlir/antlir2/bzl/dnf/defs.bzl +++ b/antlir/antlir2/bzl/dnf/defs.bzl @@ -4,7 +4,6 @@ # LICENSE file in the root directory of this source tree. load("@bazel_skylib//lib:paths.bzl", "paths") -# @oss-disable load( "//antlir/rpm/dnf2buck:repo.bzl", "RepoInfo", # @unused Used as type @@ -37,13 +36,6 @@ def repodata_only_local_repos(ctx: AnalysisContext, dnf_available_repos: list[Re ctx.actions.copied_dir(dir, tree) return dir -# Some RPMs are problematic and don't work with cow -def _disable_reflink(rpm: RpmInfo, repo: RepoInfo): - if rpm.nevra.name == "foo-not-reflinked": - return True - # @oss-disable - # @oss-enable return False - def _best_rpm_artifact( *, rpm_info: RpmInfo, @@ -52,9 +44,6 @@ def _best_rpm_artifact( if not reflink_flavor: return rpm_info.raw_rpm else: - if _disable_reflink(rpm_info, repo): - return rpm_info.raw_rpm - # The default behavior is to fail the build if the flavor is reflinkable # and the rpm does not have any reflinkable artifacts. This is a safety # mechanism to ensure we don't silently regress rpm reflink support. If diff --git a/antlir/antlir2/test_images/rpms/BUCK b/antlir/antlir2/test_images/rpms/BUCK index 32126a9ced..33bd7058df 100644 --- a/antlir/antlir2/test_images/rpms/BUCK +++ b/antlir/antlir2/test_images/rpms/BUCK @@ -369,19 +369,3 @@ image_sh_test( layer = simple, test = "test-history.sh", ) - -test_rpms( - name = "mix-reflink-and-not", - expected = expected_t(installed = [ - "foo", - "foo-not-reflinked", - ]), - features = [ - feature.rpms_install(rpms = [ - "foo", - "foo-not-reflinked", - ]), - ":test-deps", - ], - flavor = "//antlir/antlir2/test_images:test-image-flavor", -) diff --git a/antlir/antlir2/test_images/rpms/centos8/BUCK b/antlir/antlir2/test_images/rpms/centos8/BUCK index 2734ff051a..5d46152e07 100644 --- a/antlir/antlir2/test_images/rpms/centos8/BUCK +++ b/antlir/antlir2/test_images/rpms/centos8/BUCK @@ -31,18 +31,3 @@ test_rpms( ], flavor = "//antlir/antlir2/facebook/flavor/centos8:centos8", ) - -test_rpms( - name = "mix-reflink-and-not", - expected = expected_t(installed = [ - "foo", - "foo-not-reflinked", - ]), - features = [ - feature.rpms_install(rpms = [ - "foo", - "foo-not-reflinked", - ] + _RPM_DEPS_OF_TEST), - ], - flavor = "//antlir/antlir2/facebook/flavor/centos8:centos8", -) diff --git a/antlir/rpm/dnf2buck/repo.bzl b/antlir/rpm/dnf2buck/repo.bzl index 2c222340bc..e330c0a75d 100644 --- a/antlir/rpm/dnf2buck/repo.bzl +++ b/antlir/rpm/dnf2buck/repo.bzl @@ -8,7 +8,6 @@ load(":rpm.bzl", "RpmInfo", "nevra_to_string", "package_href") RepoInfo = provider(fields = [ "all_rpms", # All RpmInfos contained in this repo "base_url", # Optional upstream URL that was used to populate this target - "disable_rpm_reflink", # Disable rpm reflink. WARNING: this will SUBSTANTIALLY slow down installations "dnf_conf_json", # JSON serialized dnf.conf KV for this repo "gpg_keys", # Optional artifact against which signatures will be checked "id", # Repo name @@ -116,7 +115,6 @@ def _impl(ctx: AnalysisContext) -> list[Provider]: urlgen = urlgen_config, all_rpms = rpm_infos, proxy_config = proxy_config, - disable_rpm_reflink = ctx.attrs.disable_rpm_reflink, dnf_conf_json = dnf_conf_json, ), ] @@ -136,10 +134,6 @@ repo_attrs = { doc = "base key for recently-deleted packages in manifold", default = None, ), - "disable_rpm_reflink": attrs.bool( - doc = "Disable rpm reflink. WARNING: this will SUBSTANTIALLY slow down installations", - default = False, - ), "dnf_conf": attrs.dict(attrs.string(), attrs.string(), default = {}), "gpg_keys": attrs.list(attrs.source(doc = "GPG keys that packages are signed with"), default = []), "makerepo": attrs.default_only(attrs.exec_dep(default = "//antlir/rpm/dnf2buck:makerepo")),