[master] rpm: drop unnecessary build-deps #1010
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,15 +34,13 @@ BuildRequires: cmake | |
| BuildRequires: gcc | ||
| BuildRequires: git | ||
| BuildRequires: glibc-static | ||
| BuildRequires: libtool | ||
| BuildRequires: libtool-ltdl-devel | ||
| BuildRequires: make | ||
| BuildRequires: pkgconfig | ||
| BuildRequires: pkgconfig(systemd) | ||
| BuildRequires: systemd-devel | ||
| BuildRequires: tar | ||
|
There was a problem hiding this comment. This one was originally added in fda74c4 (through #314). My guess is that some script at some point incorrectly used git rev-parse --verify HEAD
fda74c4df83554ae2662184b4a5a1a1eaaf6927a
git grep 'which '
deb/common/docker-ce.docker.init: # see also init_is_upstart in /lib/lsb/init-functions (which isn't available in Ubuntu 12.04, or we'd use it directly)
deb/gen-deb-ver: # be compared to determine which happened later, the commit hash identifes
rpm/gen-rpm-ver: # be compared to determine which happened later, the commit hash identifes
static/gen-static-ver: # be compared to determine which happened later, the commit hash identifes
git grep 'command '
deb/common/docker-ce.postinst: echo "You can use the 'docker engine update' command to update your system, or switch to using the Enterprise packages."
deb/common/rules: dh $@ --with=bash-completion $(shell command -v dh_systemd_enable > /dev/null 2>&1 && echo --with=systemd)
deb/gen-deb-ver: # as a pre-release before version v0.0.0, so that the go command prefers any
rpm/gen-rpm-ver: # as a pre-release before version v0.0.0, so that the go command prefers any
static/gen-static-ver: # as a pre-release before version v0.0.0, so that the go command prefers any
git checkout master
git rev-parse --verify HEAD
2f0c865a12578226abe568ca772c9ca06e58516b
git grep 'which '
Jenkinsfile: // Otherwise it accidentally pulls armel images which then breaks the verify step
Jenkinsfile: // in Jenkins' BlueOcean view, which truncates names....
Jenkinsfile: // in Jenkins' BlueOcean view, which truncates names....
Jenkinsfile: // in Jenkins' BlueOcean view, which truncates names....
Jenkinsfile: // in Jenkins' BlueOcean view, which truncates names....
LICENSE: form, that is based on (or derived from) the Work and for which the
LICENSE: with the Work to which such Contribution(s) was submitted. If You
README.md:which can be found in the "rpm" and "deb" subdirectories, as well as scripts to
deb/build-deb:# - pkgRevision (usually "-0", see above), which allows updating packages with
deb/build-deb:# we prefix the codename with a tilde (~), which effectively excludes it from
deb/build-deb:# EPOCH because of our use of CalVer, which made version comparing not work in
deb/common/rules:# zstd compression, which is non-standard, and breaks 'dpkg-sig --verify'
deb/gen-deb-ver:# non-pre-release versions, which would prevent users from updating from a pre-
deb/gen-deb-ver: # be compared to determine which happened later, the commit hash identifes
deb/gen-deb-ver: # Using BSD date (macOS), which doesn't support the --date option
rpm/SPECS/docker-ce.spec:# Provides modprobe, which we use to load br_netfilter if not loaded.
rpm/gen-rpm-ver:# - Version: > 1 : Only to be used for packaging-only changes (new package built for a version for which a package was already built/released)
rpm/gen-rpm-ver:# in this field, which is still allowed, but considered deprecated; see
rpm/gen-rpm-ver:# non-pre-release versions, which would prevent users from updating from a pre-
rpm/gen-rpm-ver:# > The tilde symbol (‘~’) is used before a version component which must sort
rpm/gen-rpm-ver:# > which wouldn’t otherwise sort appropriately.
rpm/gen-rpm-ver: # be compared to determine which happened later, the commit hash identifes
rpm/gen-rpm-ver: # Using BSD date (macOS), which doesn't support the --date option
static/gen-static-ver: # be compared to determine which happened later, the commit hash identifes
static/gen-static-ver: # Using BSD date (macOS), which doesn't support the --date option
verify: # may still be using "rawhide", which is not present on our package
git grep 'command '
deb/gen-deb-ver: # as a pre-release before version v0.0.0, so that the go command prefers any
install-containerd-helpers: if command -v dnf5; then
install-containerd-helpers: elif command -v dnf; then
rpm/gen-rpm-ver: # as a pre-release before version v0.0.0, so that the go command prefers any
static/gen-static-ver: # as a pre-release before version v0.0.0, so that the go command prefers any |
||
|
|
||
| # conflicting packages | ||
| Conflicts: docker | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This one was added in 7824214, as part of #554
It was to fix a failure when compiling tini;
Looks indeed that it's no longer needed (or at least, CI is happy), but perhaps I should make this a separate commit that's a clean revert of the other one to help correlate / track down history.