webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-16 22:13:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

make.sh: Move download and check to lfsmake2 and out of the common check

Browse Source 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2024-07-05 10:24:15 +00:00
parent 0754f99f95
commit 84dc563161
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
make.sh
View File

@@ -682,18 +682,6 @@ lfsmakecommoncheck() {
echo -ne "`date -u '+%b %e %T'`: Building $* " >> $LOGFILE
cd $BASEDIR/lfs && make -s -f $* LFS_BASEDIR=$BASEDIR BUILD_ARCH="${BUILD_ARCH}" \
MESSAGE="$1\t " download >> $LOGFILE 2>&1
if [ $? -ne 0 ]; then
exiterror "Download error in $1"
fi
cd $BASEDIR/lfs && make -s -f $* LFS_BASEDIR=$BASEDIR BUILD_ARCH="${BUILD_ARCH}" \
MESSAGE="$1\t b2sum" b2 >> $LOGFILE 2>&1
if [ $? -ne 0 ]; then
exiterror "BLAKE2 checksum error in $1, check file in cache or signature"
fi
return 0 # pass all!
}
@@ -828,6 +816,11 @@ lfsmake2() {
lfsmakecommoncheck "${pkg}"
[ $? == 1 ] && return 0
# Download source outside of the toolchain
if ! run_command --quiet "${pkg}" download b2sum; then
exiterror "Downloading ${pkg}"
fi
# Run install on the package
if ! run_command --chroot "${pkg}" install; then
exiterror "Building ${pkg}"