kylekrein/live-bootstrap
1
0
Fork 0
mirror of https://github.com/fosslinux/live-bootstrap.git synced 2026-03-19 17:53:00 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Various fixes from rebase

Browse source 
This took a while so a bunch of stuff got broken in rebase.
This commit is contained in:
fosslinux 2022-05-23 15:56:18 +10:00
parent b614b3021d
commit 25f37ba926
28 changed files with 196 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

34
sysa/helpers.sh
View file

@ -8,7 +8,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later
# shellcheck source=/dev/null
. bootstrap.cfg
. "${SOURCES}/bootstrap.cfg"
# Get a list of files
get_files() {
@ -198,11 +198,19 @@ build() {
# Default get function that downloads source tarballs.
default_src_get() {
if ! [ -z "${urls}" ] && command -v curl >/dev/null 2>&1; then
# shellcheck disable=SC2153
cd "${DISTFILES}"
# shellcheck disable=SC2154
if [ -n "${urls}" ] && command -v curl >/dev/null 2>&1; then
# shellcheck disable=SC2153
for i in ${urls}; do
curl -L "${i}" --output "${DISTFILES}/$(basename "${i}")"
if ! [ -e "$(basename "${i}")" ]; then
curl -L "${i}" --output "$(basename "${i}")"
grep "$(basename "${i}")" "${SOURCES}/SHA256SUMS.sources" | sha256sum -c
fi
done
fi
cd -
}
# Default unpacking function that unpacks all source tarballs.
@ -396,17 +404,17 @@ canonicalise_all_files_timestamp() {
populate_device_nodes() {
# http://www.linuxfromscratch.org/lfs/view/6.1/chapter06/devices.html
mkdir -p "${1}/dev"
test -c "${1}/dev/null" || (rm -f "${1}/dev/null" &&
mknod -m 666 "${1}/dev/null" c 1 3)
test -c "${1}/dev/zero" || mknod -m 666 "${1}/dev/zero" c 1 5
test -c "${1}/dev/random" || mknod -m 444 "${1}/dev/random" c 1 8
test -c "${1}/dev/urandom" || mknod -m 444 "${1}/dev/urandom" c 1 9
mkdir -p "/dev"
test -c "/dev/null" || (rm -f "/dev/null" &&
mknod -m 666 "/dev/null" c 1 3)
test -c "/dev/zero" || mknod -m 666 "/dev/zero" c 1 5
test -c "/dev/random" || mknod -m 444 "/dev/random" c 1 8
test -c "/dev/urandom" || mknod -m 444 "/dev/urandom" c 1 9
if [ "${CHROOT}" = False ]; then
test -c "${1}/dev/ptmx" || mknod -m 666 "${1}/dev/ptmx" c 5 2
test -c "${1}/dev/tty" || mknod -m 666 "${1}/dev/tty" c 5 0
test -c "${1}/dev/console" || mknod -m 666 "${1}/dev/console" c 5 1
test -c "/dev/ptmx" || mknod -m 666 "/dev/ptmx" c 5 2
test -c "/dev/tty" || mknod -m 666 "/dev/tty" c 5 0
test -c "/dev/console" || mknod -m 666 "/dev/console" c 5 1
fi
}
@ -422,7 +430,7 @@ sys_transfer() {
# Transfer misc files
cp "${SOURCES}/helpers.sh" "${SOURCES}/SHA256SUMS.pkgs" "${SOURCES}/bootstrap.cfg" "${dest}/${PREFIX}/src"
cp -r "${sys_sources}/*" "${dest}/${PREFIX}/src"
cp -r "${sys_sources}/"* "${dest}/${PREFIX}/src"
cp -f "${sys_sources}/init" "${dest}/"
cp -r "${PREFIX}/src/repo" "${dest}/${PREFIX}/src"