Enhance buildtools

build_container.sh

@@ -27,7 +27,6 @@ workdir=$workdir/$TAG
 
 cp build-install-dumb-init.sh $workdir
 cp install-buildtools.sh $workdir
-cp install-buildtools-make.sh $workdir
 cd $workdir
 
 baseimage=`grep FROM Dockerfile | sed -e 's/FROM //'`

distro-entry.sh

@@ -4,21 +4,15 @@
 # SPDX-License-Identifier: GPL-2.0-only
 #
 
-RELEASE="4.1"
+ARCH="$(uname -m)"
 
-if [ "$(uname -m)" = "aarch64" ]; then
-    SETUPSCRIPT="environment-setup-aarch64-pokysdk-linux"
-elif [ "$(uname -m)" = "x86_64" ]; then
-    SETUPSCRIPT="environment-setup-x86_64-pokysdk-linux"
-fi
+# Search the environment setup script with the higher version number
+SETUPSCRIPT="$(find /opt/poky -type f -name environment-setup-${ARCH}-pokysdk-linux 2>/dev/null | sort -r | head -n 1)"
 
 # This entry point is so that we can do distro specific changes to the launch.
-if [ -e /opt/poky/${RELEASE}/${SETUPSCRIPT} ]; then
+if [ ! -z "${SETUPSCRIPT}" ]; then
     # Buildtools has been installed so enable it
-    . /opt/poky/${RELEASE}/${SETUPSCRIPT} || exit 1
-elif [ -e /opt/poky/${RELEASE}/${SETUPSCRIPT} ]; then
-    # Buildtools(-make) has been installed so enable it
-    . /opt/poky/${RELEASE}/${SETUPSCRIPT} || exit 1
+    . ${SETUPSCRIPT} || exit 1
 fi
 
 exec "$@"

dockerfiles/alma/alma-8/alma-8-base/Dockerfile

@@ -67,7 +67,7 @@ RUN dnf install -y 'dnf-command(config-manager)' && \
 # of -make, install all the buildtools
 
 COPY install-buildtools.sh /
-RUN bash /install-buildtools.sh && \
+RUN bash /install-buildtools.sh extended && \
     rm /install-buildtools.sh
 
 COPY build-install-dumb-init.sh /

dockerfiles/alma/alma-9/alma-9-base/Dockerfile

@@ -64,9 +64,9 @@ RUN dnf install -y 'dnf-command(config-manager)' && \
 
 # Install buildtools-make. The original reason this was needed was due to a
 # sanity check for make 4.1.2
-COPY install-buildtools-make.sh /
-RUN bash /install-buildtools-make.sh && \
-    rm /install-buildtools-make.sh
+COPY install-buildtools.sh /
+RUN bash /install-buildtools.sh make && \
+    rm /install-buildtools.sh
 
 COPY build-install-dumb-init.sh /
 RUN  bash build-install-dumb-init.sh && \

dockerfiles/centos/centos-7/centos-7-base/Dockerfile

@@ -57,7 +57,7 @@ RUN yum -y install epel-release centos-release-scl && \
 # build recent Yocto Project releases. Install the buildtools tarball to
 # provide the required tools.
 COPY install-buildtools.sh /
-RUN bash /install-buildtools.sh && \
+RUN bash /install-buildtools.sh extended && \
     rm /install-buildtools.sh
 
 COPY build-install-dumb-init.sh /

dockerfiles/debian/debian-10/debian-10-base/Dockerfile

@@ -58,7 +58,7 @@ RUN apt-get clean && \
 # of -make, install all the buildtools
 
 COPY install-buildtools.sh /
-RUN bash /install-buildtools.sh && \
+RUN bash /install-buildtools.sh extended && \
     rm /install-buildtools.sh
 
 COPY build-install-dumb-init.sh /

dockerfiles/fedora/fedora-40/fedora-40-base/Dockerfile

@@ -74,7 +74,7 @@ RUN dnf -y update && \
 # Install buildtools for wget
 
 COPY install-buildtools.sh /
-RUN bash /install-buildtools.sh && \
+RUN bash /install-buildtools.sh extended && \
     rm /install-buildtools.sh
 
 COPY build-install-dumb-init.sh /

dockerfiles/opensuse/opensuse-15.4/opensuse-15.4-base/Dockerfile

@@ -54,7 +54,7 @@ RUN zypper --non-interactive install \
 # of -make, install all the buildtools
 
 COPY install-buildtools.sh /
-RUN bash /install-buildtools.sh && \
+RUN bash /install-buildtools.sh extended && \
     rm /install-buildtools.sh
 
 COPY build-install-dumb-init.sh /

dockerfiles/opensuse/opensuse-15.5/opensuse-15.5-base/Dockerfile

@@ -51,7 +51,7 @@ RUN zypper --non-interactive install \
 # of -make, install all the buildtools
 
 COPY install-buildtools.sh /
-RUN bash /install-buildtools.sh && \
+RUN bash /install-buildtools.sh extended && \
     rm /install-buildtools.sh
 
 COPY build-install-dumb-init.sh /

dockerfiles/ubuntu/ubuntu-18.04/ubuntu-18.04-base/Dockerfile

@@ -58,7 +58,7 @@ RUN apt-get update && \
 # Install buildtools due to python 3.8
 
 COPY install-buildtools.sh /
-RUN bash /install-buildtools.sh && \
+RUN bash /install-buildtools.sh extended && \
     rm /install-buildtools.sh
 
 COPY build-install-dumb-init.sh /

install-buildtools.sh

@@ -9,22 +9,38 @@
 set -e
 
 RELEASE="4.1"
-if [ "$(uname -m)" = "aarch64" ]; then
-    BUILDTOOLS="aarch64-buildtools-extended-nativesdk-standalone-${RELEASE}.sh"
-    SHA256SUM="d5c0dd3e43c62f0465a9335f450d9f5f6861e4b3d39b0f04174bd50e6861c96e"
-elif [ "$(uname -m)" = "x86_64" ]; then
-    BUILDTOOLS="x86_64-buildtools-extended-nativesdk-standalone-${RELEASE}.sh"
-    SHA256SUM="d360ac01016c848f713d6dd7848f25d0a5319e96e2dd279ab37ffcbd7320dbbe"
+
+ARCH="$(uname -m)"
+case "${ARCH}" in
+    aarch64|x86_64)
+        ;;
+    *)
+        echo "Unsupported architecture '${ARCH}', can't install buildtools."
+        exit 1
+        ;;
+esac
+
+if [ $# -eq 0 ]; then
+    BUILDTOOLS="${ARCH}-buildtools-nativesdk-standalone-${RELEASE}.sh"
 else
-    echo "Unsupported architecture, can't install buildtools-make."
-    exit 1
+    TYPE="${1}"
+    case "${TYPE}" in
+        docs|extended|make)
+            ;;
+        *)
+            echo "Invalid buildtools type '${TYPE}'."
+            exit 1
+            ;;
+    esac
+    BUILDTOOLS="${ARCH}-buildtools-${TYPE}-nativesdk-standalone-${RELEASE}.sh"
 fi
 
+
+wget https://downloads.yoctoproject.org/releases/yocto/yocto-${RELEASE}/buildtools/${BUILDTOOLS}.sha256sum
 wget https://downloads.yoctoproject.org/releases/yocto/yocto-${RELEASE}/buildtools/${BUILDTOOLS}
 
-echo "${SHA256SUM} ${BUILDTOOLS}" > SHA256SUMS
-sha256sum -c SHA256SUMS
-rm SHA256SUMS
+sha256sum -c ${BUILDTOOLS}.sha256sum
+rm ${BUILDTOOLS}.sha256sum
 
 bash ${BUILDTOOLS} -y
 rm ${BUILDTOOLS}