diff options
| author | Neville Cain <neville.cain@qonto.eu> | 2019-12-29 21:04:56 +0100 |
|---|---|---|
| committer | Neville Cain <neville.cain@qonto.eu> | 2020-01-04 23:54:57 +0100 |
| commit | 16b793a45aca4cee998ff65f37bebadcf51c7618 (patch) | |
| tree | 54109b9ce3b236e56449e8e28586dcdb1346796e /contrib/spec | |
| parent | 9e03aa14b63f9351926071ba0a8b7064154cb0fe (diff) | |
| download | podman-16b793a45aca4cee998ff65f37bebadcf51c7618.tar.gz podman-16b793a45aca4cee998ff65f37bebadcf51c7618.tar.bz2 podman-16b793a45aca4cee998ff65f37bebadcf51c7618.zip | |
Generate binaries only if they are changes in src code.
Changes I am making:
1. The target `.gopathok` was listed in `.PHONY` which
looks wrong as it regenerates `.gopathok` every time we
re-run it, which was a part of the issue. I removed it
to avoid that. If `.gopathok` is present', makefile
should not need to rerun it.
2. Ensure the binaries are created only if they don't
exist by adding `bin/podman`
and `bin/podman-remote`.
3. Add a `SOURCES = $(shell find . -name "*.go")` and put
it as a dependency of the podman binaries target. It allows us
to re-generate the binaries only when there is a change in the
source files. The downside is it increases the running time of
the command that generates them (20 seconds on my virtual machine
running Centos 7). If this is a problem, we could introduce a
hidden file that would list all the files to track, that
would need to be updated only when a dev is introducing new files.
4. Fixed the make package-install as it does not work with yum.
I updated the build_rpm.sh to ensure it works on centos 7
and centos 8 with no pre-required installation.
Closes #4367
Signed-off-by: Neville Cain <neville.cain@qonto.eu>
Diffstat (limited to 'contrib/spec')
| -rw-r--r-- | contrib/spec/podman.spec.in | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index 9676a3fb4..63f569a51 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -39,7 +39,7 @@ # People want conmon packaged with the copr rpm %global import_path_conmon github.com/containers/conmon %global git_conmon https://%{import_path_conmon} -%global commit_conmon 6f3572558b97bc60dd8f8c7f0807748e6ce2c440 +%global commit_conmon d532caebc788fafdd2a305b68cd1983b4039bea4 %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman @@ -79,7 +79,6 @@ Requires: runc Requires: skopeo-containers Requires: containernetworking-plugins >= 0.6.0-3 Requires: iptables -Requires: oci-systemd-hook %if 0%{?rhel} <= 7 Requires: container-selinux %else |