mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-14 15:25:23 +01:00
Various fixes from rebase
This took a while so a bunch of stuff got broken in rebase.
This commit is contained in:
fosslinux
parent
b614b3021d
commit
25f37ba926
28 changed files with 196 additions and 90 deletions
|
|
@ -8,7 +8,8 @@ cc012bc860406dcf42f64431bcd3d2fa7560c02915a601aba9cd597a39329baa bash-5.1.tar.g
|
|||
b10d7e9e354be72aee4e4911cf19dd27b5c527d4e7200857365b5fcdeea0dffb bison-2.3.tar.bz2
|
||||
27d05534699735dc69e86add5b808d6cb35900ad3fd63fa82e3eb644336abfa0 bison-3.4.2.tar.xz
|
||||
6f7cfc0ac6717afb6ba1f41b0da43a713ba0dd97dec1227e32effc12d79f08c1 coreutils-8.32.tar.gz
|
||||
54437ae4211867de7ad55723f68b94c29cb2f08a23f431e0bbbc9f34ee384f47 dist-3.5-236.tar.gz
|
||||
bbff0e6b5047e773f3c3b084d80546cc1be4e354c09e419c2d0ef6116253511a curl-7.83.0.tar.xz?viasf=1
|
||||
05fa4f6ea9f05adf8f577699cb3f5b88b20dfce86b0d0cebbfb072fe5933d38f dist_3.5-236.orig.tar.gz
|
||||
c40385e142989c91989413f3c5a31282b2ffdca16b69cd3ecfde537b8a474921 flex-2.5.33.tar.gz
|
||||
436a0ddc67b1ac0b0405b61a9675bca9e075c8156f4debd1d06f3a56c7cd289d gc-8.0.4.tar.gz
|
||||
92e61c6dc3a0a449e62d72a38185fda550168a86702dea07125ebd3ec3996282 gcc-4.7.4.tar.bz2
|
||||
|
|
@ -24,8 +25,8 @@ f9aad85de1f41d57c9368d304020ffbf354a5e56db1297f022c3d12181134e56 gnulib-901694b
|
|||
12cfa21abf618a274017d6b18e95fc6582519d7c08e2403e5c5772ccdd5b85f4 gnulib-d279bc.tar.gz
|
||||
a285dc300c3d9c25cc06e38827ef40f6073ec3b9b0fcb5bba433f943be92d8d4 gnulib-e017871.tar.gz
|
||||
588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2 gperf-3.1.tar.gz
|
||||
14cda9c416506dfadf60c14fc623ff01ef99b87564a78d0a29c5d17143c97609 guile-3.0.7.tar.gz
|
||||
f57d86c70620271bfceb7a9be0c81744a033f08adc7ceba832c9917ab3e691b7 guile-3.0.7.tar.xz
|
||||
14cda9c416506dfadf60c14fc623ff01ef99b87564a78d0a29c5d17143c97609 guile-psyntax-bootstrapping.tar.gz
|
||||
f0b19ff39c3c9a5898a219497ababbadab99d8178acc980155c7e1271089b5a0 libarchive-3.5.2.tar.xz
|
||||
587edf60817f56daf1e1ab38a4b3c729b8e846ff67b4f62a6157183708f099af libatomic_ops-7.6.10.tar.gz
|
||||
72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056 libffi-3.3.tar.gz
|
||||
|
|
@ -33,14 +34,15 @@ eb8fb2c3e4b6e2d336608377050892b54c3c983b646c561836550863003c05d7 libunistring-0
|
|||
e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7 make-4.2.1.tar.gz
|
||||
17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459 mpc-1.2.1.tar.gz
|
||||
0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f mpfr-4.1.0.tar.xz
|
||||
f455f341e787c1167328e80a84f77b9a557d595066dda6486a1874d72da68800 nss-3.78.tar.gz
|
||||
0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 openssl-1.1.1l.tar.gz
|
||||
ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd patch-2.7.6.tar.xz
|
||||
9385f2c8c2ca8b1dc4a7c31903f1f8dc8f2ba867dc2a9e5c93012ed6b564e826 perl-5.10.1.tar.bz2
|
||||
57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 perl-5.32.1.tar.xz
|
||||
3ec396d97debb6c1a112c1c6ff58b03a55866b75cd4fe06b74295ac9c5fc5ff2 perl-5f2dc80.tar.bz2
|
||||
1d179b41283f12ad83f9758430f6ddc49bdf20db5c396aeae7e51ebb4e4afd29 perl_5.32.1.orig-regen-configure.tar.gz
|
||||
6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591 pkg-config-0.29.2.tar.gz
|
||||
63bebd26879c5e1eea4352f0d03c991f966aeb3ddeb3c7445c902568d5411d28 tar-1.34.tar.xz
|
||||
988403c1542d15ad044600b909997ba3079b10e03224c61188117f3676b02caa texinfo-6.7.tar.xz
|
||||
0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a xbps-0.59.1.tar.gz
|
||||
0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a 0.59.1.tar.gz
|
||||
166c48d2842519bc4f96333bff9e265f8cdda44d38e40594ef3f9bbb52890490 xz-5.0.5.tar.bz2
|
||||
7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18 zlib-1.2.12.tar.xz
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
urls="http://ftp.mozilla.org/pub/security/nss/releases/NSS_3_78_RTM/src/nss-3.78.tar.gz"
|
||||
|
||||
src_compile() {
|
||||
cp nss/lib/ckfw/builtins/certdata.txt .
|
||||
cp -a nss/lib/ckfw/builtins/certdata.txt .
|
||||
mk-ca-bundle -n -s ALL -m
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -24,5 +24,6 @@ src_configure() {
|
|||
LDFLAGS="-static" ./configure \
|
||||
--prefix="${PREFIX}" \
|
||||
--with-openssl \
|
||||
--with-ca-bundle=/etc/ssl/certs.pem
|
||||
--with-ca-bundle=/etc/ssl/certs.pem \
|
||||
--build=i386-unknown-linux-musl
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
# SPDX-FileCopyrightText: 1998-2021 Daniel Stenberg <daniel@haxx.se>
|
||||
#
|
||||
# SPDX-License-Identifier: curl
|
||||
|
||||
my $pi = 3.1415;
|
||||
foreach my $i (1 .. 200) {
|
||||
printf "%d, ", sin($i/200 * 2 * $pi) * 500000 + 500000;
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
|
||||
#
|
||||
# SPDX-License-Identifier: curl
|
||||
|
||||
Regenerating help is not trivial. Help is unnecessary.
|
||||
Disable help.
|
||||
|
||||
diff --color -ru src/Makefile.inc src/Makefile.inc
|
||||
--- src/Makefile.inc 2022-05-09 16:48:37.195346967 +1000
|
||||
+++ src/Makefile.inc 2022-05-09 16:49:46.503187644 +1000
|
||||
|
|
|
|||
17
sysc/init
17
sysc/init
|
|
@ -1,14 +1,12 @@
|
|||
#!/usr/bin/bash
|
||||
|
||||
# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
||||
# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
|
||||
# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
set -e
|
||||
|
||||
# shellcheck source=sysa/helpers.sh
|
||||
. /usr/src/helpers.sh
|
||||
|
||||
export PATH=/usr/bin:/usr/sbin
|
||||
export PREFIX=/usr
|
||||
export SOURCES=/usr/src
|
||||
|
|
@ -16,6 +14,9 @@ export DESTDIR=/tmp/destdir
|
|||
export DISTFILES=/distfiles
|
||||
export SRCDIR="${SOURCES}"
|
||||
|
||||
# shellcheck source=sysa/helpers.sh
|
||||
. "${SOURCES}/helpers.sh"
|
||||
|
||||
echo
|
||||
echo "Installing packages into sysc"
|
||||
|
||||
|
|
@ -36,6 +37,8 @@ install_tar binutils-2.14 0
|
|||
install_tar bzip2-1.0.8 0
|
||||
install_tar bison-3.4.1 2
|
||||
install_tar coreutils-6.10 0
|
||||
install_tar curl-7.83.0 0
|
||||
install_tar dhcpcd-9.4.1 0
|
||||
install_tar diffutils-2.7 0
|
||||
install_tar findutils-4.2.33 0
|
||||
install_tar flex-2.6.4 0
|
||||
|
|
@ -55,8 +58,10 @@ install_tar util-linux-2.19.1 0
|
|||
ln -s /usr/bin/bash /usr/bin/sh
|
||||
|
||||
# Check tarballs
|
||||
cd "${DISTFILES}"
|
||||
sha256sum -c /SHA256SUMS.sources
|
||||
if [ -d "${DISTFILES}" ]; then
|
||||
cd "${DISTFILES}"
|
||||
sha256sum -c "${SOURCES}/SHA256SUMS.sources"
|
||||
fi
|
||||
|
||||
# Begin sysc bootstrapping process
|
||||
cd "${SOURCES}"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
||||
SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space>
|
||||
|
||||
SPDX-License-Identifier: Artistic-1.0
|
||||
|
||||
|
|
|
|||
24
sysc/run.sh
24
sysc/run.sh
|
|
@ -27,11 +27,31 @@ create_fhs() {
|
|||
echo 'nameserver 1.1.1.1' > /etc/resolv.conf
|
||||
}
|
||||
|
||||
populate_device_nodes ""
|
||||
populate_device_nodes
|
||||
|
||||
create_fhs
|
||||
|
||||
mkdir -p "${DISTFILES}"
|
||||
# Obtain network connection
|
||||
if [ "${CHROOT}" = "False" ]; then
|
||||
dhcpcd --waitip=4
|
||||
# Ensure network accessible
|
||||
timeout=120
|
||||
while ! curl example.com >/dev/null 2>&1; do
|
||||
sleep 1
|
||||
# shellcheck disable=SC2219
|
||||
let timeout--
|
||||
if [ "${timeout}" -le 0 ]; then
|
||||
echo "Timeout reached for internet to become accessible"
|
||||
false
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
if [ -e "${SOURCES}/distfiles" ]; then
|
||||
mv "${SOURCES}/distfiles" /
|
||||
else
|
||||
mkdir -p "${DISTFILES}"
|
||||
fi
|
||||
|
||||
build bash-5.1
|
||||
|
||||
|
|
|
|||
|
|
@ -108,4 +108,7 @@ echo "Bootstrapping completed."
|
|||
|
||||
cd "/"
|
||||
|
||||
exec env -i PATH="${PATH}" PREFIX="${PREFIX}" SOURCES="${SOURCES}" DESTDIR="${DESTDIR}" DISTFILES="${DISTFILES}" bash after.sh
|
||||
if [ -e after.sh ]; then
|
||||
FILE=after.sh
|
||||
fi
|
||||
exec env -i PATH="${PATH}" PREFIX="${PREFIX}" SOURCES="${SOURCES}" DESTDIR="${DESTDIR}" DISTFILES="${DISTFILES}" bash ${FILE}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
# TODO: add mechanism to change output filename to something nicer
|
||||
urls="https://github.com/void-linux/xbps/archive/refs/tags/0.59.1.tar.gz"
|
||||
|
||||
src_configure() {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
urls="https://www.zlib.net/zlib-1.2.12.tar.xz"
|
||||
urls="https://zlib.net/zlib-1.2.12.tar.xz"
|
||||
|
||||
src_configure() {
|
||||
./configure --prefix="${PREFIX}" --libdir="${PREFIX}/lib/musl" --static
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue