[cpp-linbuild] 23/25: Factor out RPM macros to Docker host

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository cpp-linbuild.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-linbuild.git;a=commit;h=45661fddf4263963737f33c6d4615d18e4f908d3

commit 45661fddf4263963737f33c6d4615d18e4f908d3
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Sun Feb 28 23:21:17 2021 +0000

    Factor out RPM macros to Docker host
---
 common/macros/macros.shibboleth  | 11 +++++++++++
 os/amazonlinux2/image/Dockerfile | 12 ++----------
 os/centos6/image/Dockerfile      | 12 ++----------
 os/centos7/image/Dockerfile      | 12 ++----------
 os/centos8/image/Dockerfile      | 12 ++----------
 5 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/common/macros/macros.shibboleth b/common/macros/macros.shibboleth
new file mode 100644
index 0000000..b3207a3
--- /dev/null
+++ b/common/macros/macros.shibboleth
@@ -0,0 +1,11 @@
+%shibbuildbase /opt/build
+%shibextbase %{shibbuildbase}/external
+%shibintbase %{shibbuildbase}/internal
+%_topdir %{shibextbase}
+%_builddir %{shibintbase}/BUILD
+%_buildrootdir %{shibintbase}/BUILDROOT
+%_specdir %{shibextbase}/in/SPECS
+%_sourcedir %{shibextbase}/in/SOURCES
+%_rpmdir %{shibextbase}/out/RPMS
+%_srcrpmdir %{shibextbase}/out/SRPMS
+%packager PLACE HOLDER <USER at EXAMPLE.COM>
diff --git a/os/amazonlinux2/image/Dockerfile b/os/amazonlinux2/image/Dockerfile
index ef9bb93..5c15ed9 100644
--- a/os/amazonlinux2/image/Dockerfile
+++ b/os/amazonlinux2/image/Dockerfile
@@ -18,15 +18,7 @@ ENV EXT_BASE=${BUILD_BASE}/external
 
 RUN mkdir -p \
     ${INT_BASE}/{BUILD,BUILDROOT} \
-    ${EXT_BASE}/{in,out}
-
-RUN echo "%_topdir ${EXT_BASE}" > ~/.rpmmacros
-RUN echo "%_builddir ${INT_BASE}/BUILD" >> ~/.rpmmacros
-RUN echo "%_buildrootdir ${INT_BASE}/BUILDROOT" >> ~/.rpmmacros
-RUN echo "%_specdir ${EXT_BASE}/in/SPECS" >> ~/.rpmmacros
-RUN echo "%_sourcedir ${EXT_BASE}/in/SOURCES" >> ~/.rpmmacros
-RUN echo "%_rpmdir ${EXT_BASE}/out/RPMS" >> ~/.rpmmacros
-RUN echo "%_srcrpmdir ${EXT_BASE}/out/SRPMS" >> ~/.rpmmacros
-RUN echo "%packager PLACE HOLDER <USER at EXAMPLE.COM>" >> ~/.rpmmacros
+    ${EXT_BASE}/{in,out} \
+    && ln -s ${EXT_BASE}/in/macros/macros.shibboleth /etc/rpm/
 
 WORKDIR ${EXT_BASE}/in/SPECS
diff --git a/os/centos6/image/Dockerfile b/os/centos6/image/Dockerfile
index c685ad7..10c3b2c 100644
--- a/os/centos6/image/Dockerfile
+++ b/os/centos6/image/Dockerfile
@@ -18,15 +18,7 @@ ENV EXT_BASE=${BUILD_BASE}/external
 
 RUN mkdir -p \
     ${INT_BASE}/{BUILD,BUILDROOT} \
-    ${EXT_BASE}/{in,out}
-
-RUN echo "%_topdir ${EXT_BASE}" > ~/.rpmmacros
-RUN echo "%_builddir ${INT_BASE}/BUILD" >> ~/.rpmmacros
-RUN echo "%_buildrootdir ${INT_BASE}/BUILDROOT" >> ~/.rpmmacros
-RUN echo "%_specdir ${EXT_BASE}/in/SPECS" >> ~/.rpmmacros
-RUN echo "%_sourcedir ${EXT_BASE}/in/SOURCES" >> ~/.rpmmacros
-RUN echo "%_rpmdir ${EXT_BASE}/out/RPMS" >> ~/.rpmmacros
-RUN echo "%_srcrpmdir ${EXT_BASE}/out/SRPMS" >> ~/.rpmmacros
-RUN echo "%packager PLACE HOLDER <USER at EXAMPLE.COM>" >> ~/.rpmmacros
+    ${EXT_BASE}/{in,out} \
+    && ln -s ${EXT_BASE}/in/macros/macros.shibboleth /etc/rpm/
 
 WORKDIR ${EXT_BASE}/in/SPECS
diff --git a/os/centos7/image/Dockerfile b/os/centos7/image/Dockerfile
index d8a6a0b..5e286db 100644
--- a/os/centos7/image/Dockerfile
+++ b/os/centos7/image/Dockerfile
@@ -16,15 +16,7 @@ ENV EXT_BASE=${BUILD_BASE}/external
 
 RUN mkdir -p \
     ${INT_BASE}/{BUILD,BUILDROOT} \
-    ${EXT_BASE}/{in,out}
-
-RUN echo "%_topdir ${EXT_BASE}" > ~/.rpmmacros
-RUN echo "%_builddir ${INT_BASE}/BUILD" >> ~/.rpmmacros
-RUN echo "%_buildrootdir ${INT_BASE}/BUILDROOT" >> ~/.rpmmacros
-RUN echo "%_specdir ${EXT_BASE}/in/SPECS" >> ~/.rpmmacros
-RUN echo "%_sourcedir ${EXT_BASE}/in/SOURCES" >> ~/.rpmmacros
-RUN echo "%_rpmdir ${EXT_BASE}/out/RPMS" >> ~/.rpmmacros
-RUN echo "%_srcrpmdir ${EXT_BASE}/out/SRPMS" >> ~/.rpmmacros
-RUN echo "%packager PLACE HOLDER <USER at EXAMPLE.COM>" >> ~/.rpmmacros
+    ${EXT_BASE}/{in,out} \
+    && ln -s ${EXT_BASE}/in/macros/macros.shibboleth /etc/rpm/
 
 WORKDIR ${EXT_BASE}/in/SPECS
diff --git a/os/centos8/image/Dockerfile b/os/centos8/image/Dockerfile
index 9908380..e2a7e3c 100644
--- a/os/centos8/image/Dockerfile
+++ b/os/centos8/image/Dockerfile
@@ -18,15 +18,7 @@ ENV EXT_BASE=${BUILD_BASE}/external
 
 RUN mkdir -p \
     ${INT_BASE}/{BUILD,BUILDROOT} \
-    ${EXT_BASE}/{in,out}
-
-RUN echo "%_topdir ${EXT_BASE}" > ~/.rpmmacros
-RUN echo "%_builddir ${INT_BASE}/BUILD" >> ~/.rpmmacros
-RUN echo "%_buildrootdir ${INT_BASE}/BUILDROOT" >> ~/.rpmmacros
-RUN echo "%_specdir ${EXT_BASE}/in/SPECS" >> ~/.rpmmacros
-RUN echo "%_sourcedir ${EXT_BASE}/in/SOURCES" >> ~/.rpmmacros
-RUN echo "%_rpmdir ${EXT_BASE}/out/RPMS" >> ~/.rpmmacros
-RUN echo "%_srcrpmdir ${EXT_BASE}/out/SRPMS" >> ~/.rpmmacros
-RUN echo "%packager PLACE HOLDER <USER at EXAMPLE.COM>" >> ~/.rpmmacros
+    ${EXT_BASE}/{in,out} \
+    && ln -s ${EXT_BASE}/in/macros/macros.shibboleth /etc/rpm/
 
 WORKDIR ${EXT_BASE}/in/SPECS

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.