From f6edfe17ac233c84b91b6b6a6d64ce81cf333de5 Mon Sep 17 00:00:00 2001 From: SUSE Update Bot Date: Thu, 5 Sep 2024 22:20:43 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A4=96:=20Update=20build=20recipes=20?= =?UTF-8?q?from=20templates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gcc-13-image/Dockerfile | 7 ++++++- gcc-14-image/Dockerfile | 7 +------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gcc-13-image/Dockerfile b/gcc-13-image/Dockerfile index 367bd3c00..7aedc1bb4 100644 --- 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-14-image/Dockerfile b/gcc-14-image/Dockerfile index 19ced8b61..f1bb0a1c2 100644 --- 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 From db1ffc1acd0f1c4d31b529b3fba1f90724ecacd2 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 6 Sep 2024 05:46:48 +0000 Subject: [PATCH 2/2] Update changelogs for gcc-13-image, gcc-14-image --- gcc-13-image/gcc-13-image.changes | 5 +++++ gcc-14-image/gcc-14-image.changes | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/gcc-13-image/gcc-13-image.changes b/gcc-13-image/gcc-13-image.changes index 4fd6bd9b8..6ede35f1d 100644 --- 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 + +- main gcc is 14; switch linking/packages + ------------------------------------------------------------------- Fri Aug 23 10:27:45 UTC 2024 - Dan Čermák diff --git a/gcc-14-image/gcc-14-image.changes b/gcc-14-image/gcc-14-image.changes index de956756c..23ba92d5e 100644 --- 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 + +- main gcc is 14; switch linking/packages + ------------------------------------------------------------------- Fri Aug 23 10:27:45 UTC 2024 - Dan Čermák