diff --git a/images/base-devel/debian-pkgs.sh b/images/base-devel/debian-pkgs.sh index 4cad313..2dec42b 100644 --- a/images/base-devel/debian-pkgs.sh +++ b/images/base-devel/debian-pkgs.sh @@ -1,3 +1,3 @@ #!/bin/sh -PKGS="make cmake zlib1g libarchive13 libcurl4 libjsoncpp24 libuv1 librhash0 libstdc++6 libgcc-s1 libnettle8 libacl1 liblzma5 libzstd1 liblz4-1 libbz2-1.0 libxml2 libnghttp2-14 libidn2-0 librtmp1 libssh-4 libpsl5 libgssapi-krb5-2 libldap-2.4-2 libbrotli1 libicu67 libunistring2 libgnutls30 libhogweed6 libgmp10 libkrb5-3 libk5crypto3 libcom-err2 libkrb5support0 libsasl2-2 libp11-kit0 libtasn1-6 libkeyutils1 libffi7 libssh2-1 libgcrypt20 libgpg-error0 wget curl git" +PKGS="binutils binutils-common binutils-x86-64-linux-gnu clang clang-11 cmake cpp cpp-10 curl gcc gcc-10 git lib32gcc-s1 lib32stdc++6 libacl1 libarchive13 libasan6 libatomic1 libbinutils libbrotli1 libbsd0 libbz2-1.0 libc-dev-bin libc6-dev libc6-i386 libcc1-0 libclang-common-11-dev libclang1-11 libclang-cpp11 libcom-err2 libcrypt-dev libctf-nobfd0 libctf0 libcurl4 libedit2 libffi7 libgc1 libgcc-10-dev libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libisl23 libitm1 libjsoncpp24 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 libllvm11 liblsan0 liblz4-1 liblzma5 libmd0 libmpc3 libmpfr6 libnettle8 libnghttp2-14 libnsl-dev libobjc-10-dev libobjc4 libp11-kit0 libpsl5 libquadmath0 librhash0 librtmp1 libsasl2-2 libssh-4 libssh2-1 libstdc++-10-dev libstdc++6 libtasn1-6 libtinfo6 libtirpc-dev libtsan0 libubsan1 libunistring2 libuv1 libxml2 libz3-4 libzstd1 linux-libc-dev make wget zlib1g" diff --git a/images/base-devel/rockylinux-pkgs.sh b/images/base-devel/rockylinux-pkgs.sh index 1795224..a85ee2c 100644 --- a/images/base-devel/rockylinux-pkgs.sh +++ b/images/base-devel/rockylinux-pkgs.sh @@ -1,3 +1,3 @@ #!/bin/sh -PKGS="make cmake audit-libs bzip2-libs cyrus-sasl-lib keyutils-libs krb5-libs libarchive libacl libattr libbrotli libcap libcap-ng libcom_err libcurl libevent libffi libgcc libidn2 libnghttp2 libpsl libselinux libsepol libsigsegv libssh libssh-config libstdc++ libtasn1 libunistring libuuid libuv libverto libxcrypt libxml2 libzstd lua-libs lz4-libs ncurses-libs openldap openssl-libs pcre2 xz-libs zlib wget curl-minimal git" +PKGS="cmake audit-libs binutils bzip2-libs checkpolicy clang clang-libs clang-resource-filesystem cyrus-sasl-lib cpp diffutils gcc gcc-c++ gcc-toolset-12-binutils gcc-toolset-12-binutils-gold gcc-toolset-12-gcc gcc-toolset-12-gcc-c++ gcc-toolset-12-libstdc++-devel gcc-toolset-12-runtime glibc-devel glibc-headers gmp groff-base keyutils-libs krb5-libs libarchive libacl libattr libbrotli libcap libcap-ng libcom_err libcurl libedit libevent libffi libgcc libidn2 libmpc libnghttp2 libpipeline libpkgconf libpsl libselinux libselinux-utils libstdc++-devel libsepol libsigsegv libssh libssh-config libstdc++ libtasn1 libunistring libuuid libuv libverto libxcrypt libxcrypt-devel libxml2 libzstd llvm-libs lua-libs lz4-libs make mpfr ncurses-libs openldap openssl-libs pcre2 pkgconf pkgconf-m4 pkgconf-pkg-config policycoreutils procps-ng xz-libs zlib wget curl-minimal git" diff --git a/images/base-devel/stacker.yaml b/images/base-devel/stacker.yaml index 8df90e1..7241095 100644 --- a/images/base-devel/stacker.yaml +++ b/images/base-devel/stacker.yaml @@ -29,8 +29,10 @@ build-base-devel: install_pkgs /rootfs_diff $PKGS # install busybox install_busybox /rootfs_diff - # cleanup unnecessary files, do not use the cleanup_rootfs function as it deletes # binaries we intentionally installed under /rootfs_diff/usr/bin/ and /rootfs_diff/usr/sbin/ + [ ! -f "/rootfs_diff/usr/bin/ld" ] && ln -sf /usr/bin/ld.bfd /rootfs_diff/usr/bin/ld + [ ! -f "/rootfs_diff/usr/bin/cc" ] && ln -sf /usr/bin/gcc /rootfs_diff/usr/bin/cc + # cleanup unnecessary files, do not use the cleanup_rootfs function as it deletes rm -rf /rootfs_diff/tmp/* rm -rf /rootfs_diff/var/* # remove all docs @@ -63,10 +65,25 @@ test-base-devel: from: type: built tag: base-devel-${{ARCH}} + import: + - ../test/test.c run: | ls -l / make --version cmake --version wget --help curl --version + gcc --version + clang --version + cc --version + # looks like rustc errors if this folder is not created + # on Rockylinux it is not + mkdir -p /tmp + # test compiling + cp /stacker/test.c . + gcc test.c -o test_gcc + clang test.c -o test_clang + # test output binaries + ./test_gcc + ./test_clang build_only: true diff --git a/images/base-devel/ubuntu-pkgs.sh b/images/base-devel/ubuntu-pkgs.sh index 7734182..ad25b45 100644 --- a/images/base-devel/ubuntu-pkgs.sh +++ b/images/base-devel/ubuntu-pkgs.sh @@ -1,3 +1,3 @@ #!/bin/sh -PKGS="make cmake zlib1g libarchive13 libcurl4 libjsoncpp25 libuv1 librhash0 libstdc++6 libgcc-s1 libnettle8 libacl1 liblzma5 libzstd1 liblz4-1 libbz2-1.0 libxml2 libnghttp2-14 libidn2-0 librtmp1 libssh-4 libpsl5 libgssapi-krb5-2 libldap-2.5-0 libbrotli1 libicu70 libunistring2 libgnutls30 libhogweed6 libgmp10 libkrb5-3 libk5crypto3 libcom-err2 libkrb5support0 libsasl2-2 libp11-kit0 libtasn1-6 libkeyutils1 libffi8 wget curl git" +PKGS="binutils binutils-common binutils-x86-64-linux-gnu clang clang-14 cmake cpp cpp-11 curl gcc gcc-11 gcc-11-base git lib32gcc-s1 lib32stdc++6 libacl1 libarchive13 libasan6 libatomic1 libbinutils libbrotli1 libbsd0 libbz2-1.0 libc-dev-bin libc6-dev libc6-i386 libcc1-0 libclang-common-14-dev libclang-cpp14 libclang1-14 libcom-err2 libcrypt-dev libctf-nobfd0 libctf0 libcurl4 libedit2 libgc1 libgcc-11-dev libgcc-s1 libgmp10 libgnutls30 libgomp1 libgssapi-krb5-2 libhogweed6 libicu70 libidn2-0 libisl23 libitm1 libjsoncpp25 libk5crypto3 libkeyutils1 libffi8 libkrb5-3 libkrb5support0 libldap-2.5-0 libllvm14 liblsan0 liblz4-1 liblzma5 libmd0 libmpc3 libmpfr6 libnettle8 libnghttp2-14 libnsl-dev libobjc-11-dev libobjc4 libp11-kit0 libpsl5 libquadmath0 librhash0 librtmp1 libsasl2-2 libssh-4 libstdc++-11-dev libstdc++6 libtasn1-6 libtinfo6 libtirpc-dev libtsan0 libubsan1 libunistring2 libuv1 libxml2 libzstd1 linux-libc-dev llvm-14-linker-tools make rpcsvc-proto wget zlib1g"