opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-02 02:26:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:containers/podman into volumes

Browse Source
This commit is contained in:
Daniel J Walsh
2023-08-01 14:09:29 -04:00
parent 33b8c451e5 608f484e9b
commit ee9fb3680d
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/source/markdown/podman-build.1.md.in
View File

@ -23,8 +23,10 @@ directory, Podman uses the Containerfile's parent directory as its build context
Containerfiles ending with a ".in" suffix are preprocessed via CPP(1). This Containerfiles ending with a ".in" suffix are preprocessed via CPP(1). This
can be useful to decompose Containerfiles into several reusable parts that can can be useful to decompose Containerfiles into several reusable parts that can
be used via CPP's **#include** directive. Notice, a Containerfile.in file can be used via CPP's **#include** directive. Containerfiles ending in .in are
still be used by other tools when manually preprocessing them via `cpp -E`. restricted to no comment lines unless they are CPP commands.
Note, a Containerfile.in file can still be used by other tools when manually
preprocessing them via `cpp -E`.
When the URL is an archive, the contents of the URL is downloaded to a temporary When the URL is an archive, the contents of the URL is downloaded to a temporary
location and extracted before execution. location and extracted before execution.

12
rpm/podman.spec
View File

@ -7,12 +7,18 @@
%global debug_package %{nil} %global debug_package %{nil}
%endif %endif
# RHEL 8's default %%gobuild macro doesn't account for the BUILDTAGS variable, so we # RHEL's default %%gobuild macro doesn't account for the BUILDTAGS variable, so we
# set it separately here and do not depend on RHEL 8's go-srpm-macros package. # set it separately here and do not depend on RHEL's go-[s]rpm-macros package
%if %{defined rhel} && 0%{?rhel} == 8 # until that's fixed.
# c9s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227328
# c8s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227331
%if %{defined rhel} && !%{defined eln}
%define gobuild(o:) go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "-linkmode=external -compressdwarf=false ${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**}; %define gobuild(o:) go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "-linkmode=external -compressdwarf=false ${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};
# python3 dep conditional for rhel8
%if %{?rhel} == 8
%define rhel8py3 1 %define rhel8py3 1
%endif %endif
%endif
%global gomodulesmode GO111MODULE=on %global gomodulesmode GO111MODULE=on