From 6a9627ff52a9b4c156b31cfbe3e7b94af5caef0e Mon Sep 17 00:00:00 2001 From: "Lance R. Vick" Date: Wed, 13 Mar 2024 18:50:24 -0700 Subject: [PATCH] revert: remove node for determinism blockers --- packages/nodejs/Containerfile | 43 ----------------------------------- src/packages.mk | 27 ++++++---------------- 2 files changed, 7 insertions(+), 63 deletions(-) delete mode 100644 packages/nodejs/Containerfile diff --git a/packages/nodejs/Containerfile b/packages/nodejs/Containerfile deleted file mode 100644 index d53e6ce..0000000 --- a/packages/nodejs/Containerfile +++ /dev/null @@ -1,43 +0,0 @@ -FROM scratch as base -ENV VERSION=20.11.1 -ENV SRC_HASH=4af1ba6ea848cc05908b8a62b02fb27684dd52b2a7988ee82b0cfa72deb90b94 -ENV SRC_FILE=node-v${VERSION}.tar.gz -ENV SRC_SITE=https://nodejs.org/dist/v${VERSION}/${SRC_FILE} - -FROM base as fetch -ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} . - -FROM fetch as build -COPY --from=stagex/busybox . / -COPY --from=stagex/gcc . / -COPY --from=stagex/binutils . / -COPY --from=stagex/make . / -COPY --from=stagex/musl . / -COPY --from=stagex/openssl . / -COPY --from=stagex/python . / -COPY --from=stagex/bzip2 . / -COPY --from=stagex/ninja . / -COPY --from=stagex/zlib . / -COPY --from=stagex/linux-headers . / -RUN tar -xf ${SRC_FILE} -WORKDIR node-v${VERSION} -RUN --network=none <<-EOF - set -eux - python configure.py \ - --prefix=/usr \ - --ninja \ - --shared-openssl \ - --shared-zlib \ - --openssl-use-def-ca-store - make BUILDTYPE=Release -EOF - -FROM build as install -RUN --network=none <<-EOF - set -eux - make DESTDIR=/rootfs install - find /rootfs -exec touch -hcd "@0" "{}" + -EOF - -FROM stagex/filesystem as package -COPY --from=install /rootfs/. / diff --git a/src/packages.mk b/src/packages.mk index 24eab87..99a159d 100644 --- a/src/packages.mk +++ b/src/packages.mk @@ -529,13 +529,18 @@ out/gzip/index.json: \ iputils: out/iputils/index.json out/iputils/index.json: \ packages/iputils/Containerfile \ - out/filesystem/index.json \ out/binutils/index.json \ out/busybox/index.json \ + out/filesystem/index.json \ + out/gcc/index.json \ out/libcap/index.json \ + out/libxslt/index.json \ + out/linux-headers/index.json \ out/meson/index.json \ out/musl/index.json \ - out/gcc/index.json + out/ninja/index.json \ + out/python/index.json \ + out/zlib/index.json $(call build,iputils) .PHONY: keyfork @@ -1013,24 +1018,6 @@ out/ninja/index.json: \ out/python/index.json $(call build,ninja) -.PHONY: nodejs -nodejs: out/nodejs/index.json -out/nodejs/index.json: \ - packages/nodejs/Containerfile \ - out/binutils/index.json \ - out/busybox/index.json \ - out/bzip2/index.json \ - out/filesystem/index.json \ - out/gcc/index.json \ - out/linux-headers/index.json \ - out/make/index.json \ - out/musl/index.json \ - out/ninja/index.json \ - out/openssl/index.json \ - out/python/index.json \ - out/zlib/index.json - $(call build,nodejs) - .PHONY: npth npth: out/npth/index.json out/npth/index.json: \