andrius
/
live-bootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: andrius:68c6544df0858f135ff1ad5ee2ae5e38f2be2ecd
Branches Tags
andrius:master
andrius:wip
andrius:ekaitz
andrius:mes-x86_64
..
compare: andrius:3ffd3b96b3a8aa286960b7b3a0e329403aae6ce6
Branches Tags
andrius:master
andrius:wip
andrius:ekaitz
andrius:mes-x86_64

No commits in common. "68c6544df0858f135ff1ad5ee2ae5e38f2be2ecd" and "3ffd3b96b3a8aa286960b7b3a0e329403aae6ce6" have entirely different histories.
68c6544df0 ... 3ffd3b96b3

4 changed files with 12 additions and 13 deletions
Show Stats Expand all files Collapse all files

2
sysa/SHA256SUMS.pkgs
View File

@ -93,7 +93,7 @@ df12820e27abfe07c4c27bb2f9abf2e0758b797d5d3036e29d6c57cfb5aa12d6 openssl-1.1.1l
c69e0197ebc1bf9f9fc68a06d4c649c934784077058c24a484da59a153132816 pkg-config-0.29.2_0.tar.bz2
8a0248fbf8fe1764580698415cc3628585d4dd054ddf63040f400e18cbaef7a4 sed-4.0.9_0.tar.bz2
177553732a080e25ba5778525743543e9da012122f4ad0d314a425ca87a3c2bd sed-4.8_0.tar.bz2
f3be04bb46c9ac80180defa46c274214ab00b5b4dd9c8a3a6de162e43ef0fa20 tar-1.34_0.tar.bz2
1245905d8942a10cccf21850a521db19c9a65ab35cef4c6bbb72672773851048 tar-1.34_0.tar.bz2
5e7fdb405574717e3759144fab500954817ab8852d2da6111d43cb9fe77f01ac tcc-0.9.27_0.tar.bz2
42b8eabbd299737541b57b3aa362eeeb20499449901fc2a4895302ce0117080c tcc-0.9.27_1.tar.bz2
db57c6ef39965f0562d2aefe3c06571df50ba1265446d97f2714d80518862cef tcc-0.9.27_2.tar.bz2

13
sysa/helpers.sh
View File

@ -376,14 +376,6 @@ src_checksum() {
src_apply() {
local pkg="${1}" revision="${2}"
# Make sure we have at least one copy of tar
if [[ "${pkg}" == tar-* ]]; then
mkdir -p /tmp
cp "${PREFIX}/bin/tar" "/tmp/tar"
TAR_PREFIX="/tmp/"
fi
# Overwriting files is mega busted, so do it manually
# shellcheck disable=SC2162
if [ -e /tmp/filelist.txt ]; then
@ -399,10 +391,9 @@ src_apply() {
BZIP2_PREFIX="/tmp/"
fi
"${BZIP2_PREFIX}bzip2" -dc "/usr/src/repo/${pkg}_${revision}.tar.bz2" | \
"${TAR_PREFIX}tar" -C / -xpf -
tar -C / -xpf -
unset BZIP2_PREFIX
unset TAR_PREFIX
rm -f "/tmp/bzip2" "/tmp/tar"
rm -f "/tmp/bzip2"
}
# Check if bash function exists

7
sysc/run2.sh
View File

@ -118,4 +118,9 @@ fi
echo "Bootstrapping completed."
cd "/"
exec env -i PATH="${PATH}" PREFIX="${PREFIX}" SOURCES="${SOURCES}" DESTDIR="${DESTDIR}" DISTFILES="${DISTFILES}" HOME="${HOME}" SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}" bash "${SOURCES}/after.sh"
if [ -e after.sh ]; then
FILE=after.sh
fi
exec env -i PATH="${PATH}" PREFIX="${PREFIX}" SOURCES="${SOURCES}" DESTDIR="${DESTDIR}" DISTFILES="${DISTFILES}" HOME="${HOME}" SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}" bash "${FILE}"

3
sysc/tar-1.34/tar-1.34.sh
View File

@ -32,4 +32,7 @@ src_compile() {
src_install() {
make install PREFIX="${PREFIX}" MAKEINFO="true" DESTDIR="${DESTDIR}"
# Manually install tar (cannot replace tar while running)
cp "${DESTDIR}${PREFIX}/bin/tar" "${PREFIX}/bin/tar"
rm "${DESTDIR}${PREFIX}/bin/tar"
}