Merge pull request #1605 from SUSE/for-deploy-Tumbleweed

🤖: Update build recipes for Tumbleweed
SUSE · Sep 6, 2024 · 9bbb178 · 9bbb178
2 parents b799193 + db1ffc1
commit 9bbb178
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/gcc-13-image/Dockerfile b/gcc-13-image/Dockerfile
@@ -21,7 +21,7 @@
 
 FROM opensuse/tumbleweed:latest
 
-RUN set -euo pipefail; zypper -n in --no-recommends gcc13 gcc13-c++ make gcc gcc-c++ curl findutils gawk git-core procps util-linux; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; zypper -n in --no-recommends gcc13 gcc13-c++ make curl findutils gawk git-core procps util-linux; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.bci.gcc
@@ -42,3 +42,8 @@ LABEL org.opensuse.release-stage="released"
 LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/gcc-13-image/README.md"
 ENV GCC_VERSION="%%gcc_version%%"
 
+# symlink all versioned gcc & g++ binaries to unversioned
+# ones in /usr/local/bin so that plain gcc works
+RUN set -euo pipefail; for gcc_bin in $(rpm -ql gcc13 gcc13-c++ |grep ^/usr/bin/ ); do \
+        ln -sf $gcc_bin $(echo "$gcc_bin" | sed -e 's|/usr/bin/|/usr/local/bin/|' -e 's|-13$||'); \
+    done
diff --git a/gcc-13-image/gcc-13-image.changes b/gcc-13-image/gcc-13-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Sep  6 05:46:48 UTC 2024 - Dirk Mueller <dmueller@suse.com>
+
+- main gcc is 14; switch linking/packages
+
 -------------------------------------------------------------------
 Fri Aug 23 10:27:45 UTC 2024 - Dan Čermák <dcermak@suse.com>
 

diff --git a/gcc-14-image/Dockerfile b/gcc-14-image/Dockerfile
@@ -22,7 +22,7 @@
 
 FROM opensuse/tumbleweed:latest
 
-RUN set -euo pipefail; zypper -n in --no-recommends gcc14 gcc14-c++ make curl findutils gawk git-core procps util-linux; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+RUN set -euo pipefail; zypper -n in --no-recommends gcc14 gcc14-c++ make gcc gcc-c++ curl findutils gawk git-core procps util-linux; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.bci.gcc
@@ -43,8 +43,3 @@ LABEL org.opensuse.release-stage="released"
 LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/gcc-14-image/README.md"
 ENV GCC_VERSION="%%gcc_version%%"
 
-# symlink all versioned gcc & g++ binaries to unversioned
-# ones in /usr/local/bin so that plain gcc works
-RUN set -euo pipefail; for gcc_bin in $(rpm -ql gcc14 gcc14-c++ |grep ^/usr/bin/ ); do \
-        ln -sf $gcc_bin $(echo "$gcc_bin" | sed -e 's|/usr/bin/|/usr/local/bin/|' -e 's|-14$||'); \
-    done
diff --git a/gcc-14-image/gcc-14-image.changes b/gcc-14-image/gcc-14-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Sep  6 05:46:48 UTC 2024 - Dirk Mueller <dmueller@suse.com>
+
+- main gcc is 14; switch linking/packages
+
 -------------------------------------------------------------------
 Fri Aug 23 10:27:45 UTC 2024 - Dan Čermák <dcermak@suse.com>