update live-bootstrap in stage1

This commit is contained in:
Lance Vick 2024-02-06 01:20:58 -08:00
parent e42d9355e5
commit ab6ccf6678
Signed by: lrvick
GPG Key ID: 8E47A1EC35A1551D
1 changed files with 43 additions and 12 deletions

View File

@ -1,8 +1,8 @@
FROM scratch as base
ARG CORES=1
ARG VERSION=fc6eeb6bd75ea0d0025a79ea9fe45614bd60ba14
ARG VERSION=87c6fcc38d3d65a5b02ca0cc0ed5fd21b56be02e
ARG SRC_SITE=https://codeload.github.com/lrvick/live-bootstrap/legacy.tar.gz
ARG SRC_HASH=0c268b19cf9f4eefdaf45dab64ac393ccf8ee43de58f0721624cab358044bf78
ARG SRC_HASH=fbe6b0a919dcbecaa7cabacdcb2c5c88c8ce456371b571a5c170c7dd449b7ef6
FROM base as fetch
WORKDIR distfiles
@ -65,6 +65,8 @@ ADD --checksum=sha256:cdd49e55eae3bbf1f0a3f6580c974a0263cb86a6a08daa10fbf705b480
ADD --checksum=sha256:ce4b6a6655431147624aaf582632a36fe1ade262d5fab385c60f78942dd8d87b https://curl.se/download/curl-8.5.0.tar.bz2 ./
ADD --checksum=sha256:2bd3480bc93e6bff530872b8bc80cbcaa821449f7bf6aaf202fa12fb8c2e6f55 https://github.com/NetworkConfiguration/dhcpcd/archive/refs/tags/v10.0.1.tar.gz ./
ADD --checksum=sha256:d5f2489c4056a31528e3ada4adacc23d498532b0af1a980f2f76158162b139d6 https://mirrors.kernel.org/gnu/diffutils/diffutils-2.7.tar.gz ./
ADD --checksum=sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e https://mirrors.kernel.org/gnu/diffutils/diffutils-3.10.tar.xz ./
ADD --checksum=sha256:72e7bb2d1d75e63d1c46d33b8dd22e8eb60afdba4af3e7251151b5c2a6f00bfb http://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-5d2fe24.tar.gz ./
ADD --checksum=sha256:05fa4f6ea9f05adf8f577699cb3f5b88b20dfce86b0d0cebbfb072fe5933d38f http://deb.debian.org/debian/pool/main/d/dist/dist_3.5-236.orig.tar.gz ./
ADD --checksum=sha256:340e9de42a12d0c26dd7527e9ef055ac85586de5c61f6273ae19f88d04e55804 https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.7/e2fsprogs-1.45.7.tar.gz ./
ADD --checksum=sha256:64f117a4749dd4a1b6c54277f63f6cf1e0eb45d290cbedaf777fbe71b8880885 https://www.unicode.org/Public/11.0.0/ucd/CaseFolding.txt ./
@ -79,6 +81,7 @@ ADD --checksum=sha256:3751c7fba8dbc831cb8d7cc8aff21035459b8ce5155ef8b0880a27d028
ADD --checksum=sha256:813cd9405aceec5cfecbe96400d01e90ddad7b512d3034487176ce5258ab0f78 https://mirrors.kernel.org/gnu/findutils/findutils-4.2.33.tar.gz ./
ADD --checksum=sha256:0cfbf866bc39c31f25fa0e56af1e56c5e5c92fc1e5d51242ebafef7ea211f3d5 https://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-8e128e.tar.gz ./
ADD --checksum=sha256:6635f8b8a44694a374daccd528a8d22550e684d33dc967f7fa2d161b9d69deb4 https://github.com/mikaku/Fiwix/releases/download/v1.5.0-lb1/fiwix-1.5.0-lb1.tar.gz ./
ADD --checksum=sha256:bc79b890f35ca38d66ff89a6e3758226131e51ccbd10ef78d5ff150b7bd73689 http://download.nust.na/pub2/openpkg1/sources/DST/flex/flex-2.5.11.tar.gz ./
ADD --checksum=sha256:c40385e142989c91989413f3c5a31282b2ffdca16b69cd3ecfde537b8a474921 http://download.nust.na/pub2/openpkg1/sources/DST/flex/flex-2.5.33.tar.gz ./
ADD --checksum=sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995 https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz ./
ADD --checksum=sha256:5cc35def1ff4375a8b9a98c2ff79e95e80987d24f0d42fdbb7b7039b3ddb3fb0 https://mirrors.kernel.org/gnu/gawk/gawk-3.0.4.tar.gz ./
@ -95,11 +98,29 @@ ADD --checksum=sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cd
ADD --checksum=sha256:a32032bab36208509466654df12f507600dfe0313feebbcd218c32a70bf72a16 https://mirrors.kernel.org/gnu/grep/grep-2.4.tar.gz ./
ADD --checksum=sha256:5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c https://mirrors.kernel.org/gnu/grep/grep-3.7.tar.xz ./
ADD --checksum=sha256:e207c0bb72093c3a72dde302fcfaa1dbda12a62172d47b73565883a92209ebab http://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-8f4538a5.tar.gz ./
ADD --checksum=sha256:b79ea44af91b93d17cd3fe80bdae6ed43770678a9a5ae192ccea803ebb657ee1 https://mirrors.kernel.org/gnu/grub/grub-2.06.tar.xz ./
ADD --checksum=sha256:31d69d3d251e39135b5194ddc6f897910d344059f7494d96a739aecbf7ac2b66 https://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-d271f86.tar.gz ./
ADD --checksum=sha256:68dfc414d28257b9b5d6ddbb8b466c768c00ebdf6cbf7784364a9b6cad55ee8f http://ftp.unicode.org/Public/9.0.0/ucd/UnicodeData.txt ./UnicodeData-9.0.0.txt
ADD --checksum=sha256:f413ea8dbd3858de72f3148b47dd0586019761357d1481e3b65f3a025bc27f82 http://ftp.unicode.org/Public/9.0.0/ucd/PropList.txt ./PropList-9.0.0.txt
ADD --checksum=sha256:6662c7e30b572df5d948c092692f52bcc79ab36d49a063a73d6435042db6fb3b http://ftp.unicode.org/Public/9.0.0/ucd/DerivedCoreProperties.txt ./DerivedCoreProperties-9.0.0.txt
ADD --checksum=sha256:47cb62a53beea6d0263e2147331c7e751853c9327225d95bbe2d9e1dc3e1aa44 http://ftp.unicode.org/Public/9.0.0/ucd/ArabicShaping.txt ./ArabicShaping-9.0.0.txt
ADD --checksum=sha256:fba415952f5654145acad220dc2b878f815c673474d2bb4928934e3ba6ccca1d http://ftp.unicode.org/Public/9.0.0/ucd/Scripts.txt ./Scripts-9.0.0.txt
ADD --checksum=sha256:612127d4889032e55d82522e4a0c19793bda8aa8da14ecb3c696d17c83e6be13 http://ftp.unicode.org/Public/9.0.0/ucd/Blocks.txt ./Blocks-9.0.0.txt
ADD --checksum=sha256:909eef4adbeddbdddcd9487c856fe8cdbb8912aa8eb315ed7885b6ef65f4dc4c http://ftp.unicode.org/Public/3.0-Update1/PropList-3.0.1.txt ./
ADD --checksum=sha256:3382cb4980e0021e9d4312f2d099315cfab6100ce0ff63a22d6937bfa720bcb7 http://ftp.unicode.org/Public/9.0.0/ucd/EastAsianWidth.txt ./EastAsianWidth-9.0.0.txt
ADD --checksum=sha256:e2698584982ccd96e0c688bbcd4d2c48a23805baa0a0084388ef2e50ebd30aad http://ftp.unicode.org/Public/9.0.0/ucd/LineBreak.txt ./LineBreak-9.0.0.txt
ADD --checksum=sha256:cb2db065c77287e0f1d35b8c9b473d848b7566a1670439f67c357ca393084043 http://ftp.unicode.org/Public/9.0.0/ucd/auxiliary/WordBreakProperty.txt ./WordBreakProperty-9.0.0.txt
ADD --checksum=sha256:4bb8931857e0a698fd2ec4a51a84c6de33e48a50d8b4bf0b57d960c41d77a191 http://ftp.unicode.org/Public/9.0.0/ucd/auxiliary/GraphemeBreakProperty.txt ./GraphemeBreakProperty-9.0.0.txt
ADD --checksum=sha256:5623df16856ad4007c60bdfff6f054e087521becd24cb4006be69c3a1d851aee http://ftp.unicode.org/Public/9.0.0/ucd/CompositionExclusions.txt ./CompositionExclusions-9.0.0.txt
ADD --checksum=sha256:dfc4f159c5c68328114ff17cd520451714a72ff48657287e5fe2f64344980695 http://ftp.unicode.org/Public/9.0.0/ucd/SpecialCasing.txt ./SpecialCasing-9.0.0.txt
ADD --checksum=sha256:37d40cf8c2c35637f4a04e746814e1fc4eb764c272bed9238a87ee96a4866857 http://ftp.unicode.org/Public/9.0.0/ucd/CaseFolding.txt ./CaseFolding-9.0.0.txt
ADD --checksum=sha256:f57d86c70620271bfceb7a9be0c81744a033f08adc7ceba832c9917ab3e691b7 https://mirrors.kernel.org/gnu/guile/guile-3.0.7.tar.xz ./
ADD --checksum=sha256:1a2625ac72b2366e95792f3fe758fd2df775b4044a90a4a9787326e66c0d750d https://mirrors.kernel.org/gnu/guile/guile-3.0.9.tar.xz ./
ADD --checksum=sha256:f9aad85de1f41d57c9368d304020ffbf354a5e56db1297f022c3d12181134e56 https://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-901694b9.tar.gz ./
ADD --checksum=sha256:fc9973f1a9243fdc4b98d33d7704f3c71bfdc4c2ef96899b8f28cade7290a714 https://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-356a414e.tar.gz ./
ADD --checksum=sha256:14cda9c416506dfadf60c14fc623ff01ef99b87564a78d0a29c5d17143c97609 https://github.com/schierlm/guile-psyntax-bootstrapping/archive/refs/tags/guile-3.0.7.tar.gz ./
ADD --checksum=sha256:7454eb6935db17c6655576c2e1b0fabefd38b4d0936e0f87f48cd062ce91a057 https://mirrors.kernel.org/gnu/gzip/gzip-1.13.tar.xz ./
ADD --checksum=sha256:56f1221eb682c3502ee097f583f44673570753cb452346ad4806d94560c3fac9 http://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-5651802.tar.gz ./
ADD --checksum=sha256:1ca41818a23c9c59ef1d5e1d00c0d5eaa2285d931c0fb059637d7c0cc02ad967 https://mirrors.kernel.org/gnu/gzip/gzip-1.2.4.tar.gz ./
ADD --checksum=sha256:9f233d8b78e4351fe9dd2d50d83958a0e5af36f54e9818521458a08e058691ba http://downloads.sourceforge.net/project/heirloom/heirloom-devtools/070527/heirloom-devtools-070527.tar.bz2 ./
ADD --checksum=sha256:a4adadf76b496a6bc50795702253ecfcb6f0d159b68038f31a5362009340bca2 https://mirrors.kernel.org/gnu/help2man/help2man-1.36.4.tar.gz ./
@ -107,7 +128,9 @@ ADD --checksum=sha256:203c93e004ac7ad0e50423ff54d89e40fa99f45b207b2b892a4d70211f
ADD --checksum=sha256:af618de7848142f204b57811f703de3ae7aa3f5bc5d52226db35800fa8fc4dff https://github.com/horms/kexec-tools/archive/refs/tags/v2.0.22.tar.gz ./
ADD --checksum=sha256:f0b19ff39c3c9a5898a219497ababbadab99d8178acc980155c7e1271089b5a0 http://libarchive.org/downloads/libarchive-3.5.2.tar.xz ./
ADD --checksum=sha256:587edf60817f56daf1e1ab38a4b3c729b8e846ff67b4f62a6157183708f099af https://github.com/ivmai/libatomic_ops/releases/download/v7.6.10/libatomic_ops-7.6.10.tar.gz ./
ADD --checksum=sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33 https://libbsd.freedesktop.org/releases/libbsd-0.11.8.tar.xz ./
ADD --checksum=sha256:72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056 https://github.com/libffi/libffi/releases/download/v3.3/libffi-3.3.tar.gz ./
ADD --checksum=sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332 https://archive.hadrons.org/software/libmd/libmd-1.1.0.tar.xz ./
ADD --checksum=sha256:c4e63399b12f5858d11c44cea8e92f21cd564f8548e488dadc84046b424c80fc https://mirrors.kernel.org/gnu/libtool/libtool-2.2.4.tar.bz2 ./
ADD --checksum=sha256:4f7f217f057ce655ff22559ad221a0fd8ef84ad1fc5fcb6990cecc333aa1635d http://mirrors.kernel.org/gnu/libtool/libtool-2.4.7.tar.xz ./
ADD --checksum=sha256:719b399fe09a8f6ca14ba8c4a9a60ce9f93f4892effb50961ef3d8cd1a33ff65 http://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-a521820.tar.gz ./
@ -117,7 +140,7 @@ ADD --checksum=sha256:97ff15f9550c6e85c25173b3cf5c7e89a2d39fb923112f2c8bc2729cf6
ADD --checksum=sha256:af4214b851928a53ef470ed8729122b9db910a6c0769d5d46a5de0b3e96f74f3 https://linux-libre.fsfla.org/pub/linux-libre/releases/old/gen6/4.9.10-gnu/deblob-4.9 ./
ADD --checksum=sha256:97ff15f9550c6e85c25173b3cf5c7e89a2d39fb923112f2c8bc2729cf64bf6d8 https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.9.10.tar.gz ./
ADD --checksum=sha256:a90526665123d788fc23d14354468d22cc2e3e9e43a6c44ea452fbbec12b8451 https://github.com/rick-masters/lwext4/releases/download/v1.0.0-lb1/lwext4-1.0.0-lb1.tar.gz ./
ADD --checksum=sha256:093c993767f563a11e41c1cf887f4e9065247129679d4c1e213d0544d16d8303 https://mirrors.kernel.org/gnu/m4/m4-1.4.7.tar.gz ./
ADD --checksum=sha256:197fcb73c346fa669f143c3f0ec3144271f133647df00b2258bff1fd485cabe0 https://mirrors.kernel.org/gnu/m4/m4-1.4.10.tar.gz ./
ADD --checksum=sha256:e2c1a73f179c40c71e2fe8abf8a8a0688b8499538512984da4a76958d0402966 https://mirrors.kernel.org/gnu/make/make-3.82.tar.bz2 ./
ADD --checksum=sha256:e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7 http://ftp.gnu.org/gnu/make/make-4.2.1.tar.gz ./
ADD --checksum=sha256:325250b3567ed9203ba70161c835af01079e73ebed97b4b5bb77ca500b828940 https://mirrors.kernel.org/gnu/mes/mes-0.25.tar.gz ./
@ -126,6 +149,7 @@ ADD --checksum=sha256:17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30
ADD --checksum=sha256:0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f http://mirrors.kernel.org/gnu/mpfr/mpfr-4.1.0.tar.xz ./
ADD --checksum=sha256:1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 https://musl.libc.org/releases/musl-1.1.24.tar.gz ./
ADD --checksum=sha256:7a35eae33d5372a7c0da1188de798726f68825513b7ae3ebe97aaaa52114f039 https://musl.libc.org/releases/musl-1.2.4.tar.gz ./
ADD --checksum=sha256:4e98828056d6266bd8f2c93e6ecf12a63a71dbfd70a5ea99ccd4ab6d0745adf0 https://github.com/Duncaen/OpenDoas/releases/download/v6.8.2/opendoas-6.8.2.tar.xz ./
ADD --checksum=sha256:0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 http://mirror.math.princeton.edu/pub/openssl/source/old/1.1.1/openssl-1.1.1l.tar.gz ./
ADD --checksum=sha256:ecb5c6469d732bcf01d6ec1afe9e64f1668caba5bfdb103c28d7f537ba3cdb8a https://mirrors.kernel.org/gnu/patch/patch-2.5.9.tar.gz ./
ADD --checksum=sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd https://mirrors.kernel.org/gnu/patch/patch-2.7.6.tar.xz ./
@ -257,6 +281,7 @@ ADD --checksum=sha256:eb722fa698fb7e8823b835d9fd263e4cdb8f1c7b0d234edf7f0e3bd2cc
ADD --checksum=sha256:c365874794187f8444e5d22998cd5888ffa47f36def4b77517a808dec27c0600 https://mirrors.kernel.org/gnu/sed/sed-4.0.9.tar.gz ./
ADD --checksum=sha256:f79b0cfea71b37a8eeec8490db6c5f7ae7719c35587f21edb0617f370eeff633 https://mirrors.kernel.org/gnu/sed/sed-4.8.tar.xz ./
ADD --checksum=sha256:12cfa21abf618a274017d6b18e95fc6582519d7c08e2403e5c5772ccdd5b85f4 http://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-d279bc.tar.gz ./
ADD --checksum=sha256:6969279236fe3152768573a38c9f83cb9ca109851a5a990aec1fc672ac2cfcd2 https://github.com/shadow-maint/shadow/releases/download/4.14.3/shadow-4.14.3.tar.xz ./
ADD --checksum=sha256:c6c37e888b136ccefab903c51149f4b7bd659d69d4aea21245f61053a57aa60a https://mirrors.kernel.org/gnu/tar/tar-1.12.tar.gz ./
ADD --checksum=sha256:63bebd26879c5e1eea4352f0d03c991f966aeb3ddeb3c7445c902568d5411d28 http://mirrors.kernel.org/gnu/tar/tar-1.34.tar.xz ./
ADD --checksum=sha256:df807e694deea2dcba0c43af318394f3e3fcd52658c3b71b61dad0ce0c0cfb77 http://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-30820c.tar.gz ./
@ -288,15 +313,15 @@ FROM debian@sha256:bac353db4cc04bc672b14029964e686cd7bad56fe34b51f432c1a1304b992
COPY --from=fetch distfiles/live-bootstrap.tgz .
RUN <<-EOF
tar -xvf live-bootstrap.tgz
echo "" > lrvick-live-bootstrap-fc6eeb6/steps/lwext4-1.0.0-lb1/files/fiwix-file-list.txt
echo "" > lrvick-live-bootstrap-87c6fcc/steps/lwext4-1.0.0-lb1/files/fiwix-file-list.txt
EOF
FROM base as build
USER 0:0
COPY --from=stagex/stage0 . /
COPY --from=fetch distfiles external/distfiles
COPY --from=extract /lrvick-live-bootstrap-fc6eeb6/seed/* .
COPY --from=extract /lrvick-live-bootstrap-fc6eeb6/steps steps
COPY --from=extract /lrvick-live-bootstrap-87c6fcc/seed/* .
COPY --from=extract /lrvick-live-bootstrap-87c6fcc/steps steps
COPY <<-EOF steps/bootstrap.cfg
FORCE_TIMESTAMPS=False
CHROOT=True
@ -318,12 +343,18 @@ SHELL ["/x86/bin/kaem","--verbose","--strict","--file"]
RUN --network=none ./after.kaem
FROM build as install
ENV PATH=/bin:/usr/sbin:/usr/bin
RUN rm -rf /usr/lib/python*/__pycache__
RUN mkdir -p /rootfs/etc /rootfs/home/user /rootfs/tmp
RUN chown -R 1000:1000 /rootfs/home/user /rootfs/tmp
RUN cp -R $(ls -d /etc/* | grep -v '\(resolv.conf\|hosts\)') /rootfs/etc/
RUN cp -R lib usr bin var /rootfs/
USER 0:0
COPY <<-EOF install.kaem
set -ex
PATH=/bin:/usr/sbin:/usr/bin
mkdir -p /rootfs/etc /rootfs/home/user /rootfs/tmp
chown -R 1000:1000 /rootfs/home/user /rootfs/tmp
cp -R lib usr bin var etc /rootfs/
rm /rootfs/etc/hosts
rm /rootfs/etc/resolv.conf
EOF
SHELL ["/x86/bin/kaem","--verbose","--strict","--file"]
RUN --network=none ./install.kaem
FROM scratch as package
COPY --from=install /rootfs /