pktsurf/smlinux
1
1
Fork 0
Code Issues 1 Pull requests Wiki Activity

Updated TODO in bldpkg script

Browse source
This commit is contained in:
PktSurf 2022-09-24 14:31:46 +05:30
parent 983adfe29f
commit 081ecb4d39
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
bldpkg
View file

@ -27,6 +27,7 @@
# -> Email the user about the outcome of the build? # -> Email the user about the outcome of the build?
# -> Increment warnings as they are issued during the build and show final warning total in the build summary # -> Increment warnings as they are issued during the build and show final warning total in the build summary
# -> Determine if the staging directory is empty at the end of the build, and if it is, error out # -> Determine if the staging directory is empty at the end of the build, and if it is, error out
# -> Add code to warn user if both, ccache and sccache are enabled in /etc/bldpkg.conf.
# Determine whether we are using bash version 4 and later. If not, exit. # Determine whether we are using bash version 4 and later. If not, exit.
if ((BASH_VERSINFO[0] < 4)) ; then if ((BASH_VERSINFO[0] < 4)) ; then
@ -479,7 +480,7 @@ fi
# Determine if $tmpfsdir is listed inside $protecteddirectories array # Determine if $tmpfsdir is listed inside $protecteddirectories array
if inarray "${parenttmp}" "${protecteddirectories[@]}" ; then if inarray "${parenttmp}" "${protecteddirectories[@]}" ; then
echo "############ ATTENTION ############" echo "############ ATTENTION ############"
echo "[ERROR] parenttmp IS SET TO '$tmpfsdir' WHICH IS A PROTECTED DIRECTORY!! EXITING!!" echo "[ERROR] parenttmp VARIABLE IS SET TO '$tmpfsdir' WHICH IS A PROTECTED DIRECTORY!! EXITING!!"
exit 1 exit 1
fi fi
@ -595,6 +596,7 @@ if [[ $usetmpfs = 1 ]] && [[ -n $tmpfsdir ]] && [[ -z $tmpfscheckfailed ]] ; the
# In the absence of tmpfs, we use the normal directory # In the absence of tmpfs, we use the normal directory
tmp="$nontmpfsdir/$app.src" tmp="$nontmpfsdir/$app.src"
readonly pkg
pkg="${pkg:-$nontmpfsdir/package-$app}" pkg="${pkg:-$nontmpfsdir/package-$app}"
else else
# We compile inside tmpfsdir. Set the tmpfsenabledforthispackage variable here to inform build # We compile inside tmpfsdir. Set the tmpfsenabledforthispackage variable here to inform build
@ -866,11 +868,11 @@ if [[ $globalsccache = 1 ]]; then
# If sccache=0 is set in the package build file to disable sccache, remove the value of sccachepath # If sccache=0 is set in the package build file to disable sccache, remove the value of sccachepath
# from $PATH and export it again # from $PATH and export it again
if [[ $sccache = 0 ]]; then if [[ $sccache = 0 ]]; then
PATH=$(echo "$PATH" | sed "s@$sccachepath:@@g") PATH="${PATH//$sccachepath:/}"
fi fi
else else
# Remove $sccachepath # Remove $sccachepath
PATH=$(echo "$PATH" | sed "s@$sccachepath:@@g") PATH="${PATH//$sccachepath:/}"
fi fi
# Apply CPU-specific compiler variables defined inside bldpkg.conf # Apply CPU-specific compiler variables defined inside bldpkg.conf
@ -952,10 +954,18 @@ compileonlyfor() {
# Function to remove old package directories and make new ones. # Function to remove old package directories and make new ones.
# To be invoked inside a package build file. # To be invoked inside a package build file.
mkandenterbuilddir() { mkandenterbuilddir() {
# $pkgdest is set in bldpkg.conf.
# Define $pkgdocs. Rest is defined in /etc/bldpkg.conf.
pkgdocs="$pkg/share/doc/$app-$version" pkgdocs="$pkg/share/doc/$app-$version"
# Remove any old $pkg staging directory left by any previous build.
rm -rf "$pkg" # Remove any old pkg staging directory left by any previous build having same application name
if ! inarray "${pkg}" "${protecteddirectories[@]}" ; then
rm -rf "$pkg"
else
echo "############ ATTENTION ############"
echo "[ERROR] 'pkg' VARIABLE IS SET TO '$pkg' WHICH IS A PROTECTED DIRECTORY! EXITING!"
exit 1
fi
# Now create all essential build-related directories # Now create all essential build-related directories
mkdir -p "$tmp" "$pkg/install" "$pkgdocs" "$pkgdest" mkdir -p "$tmp" "$pkg/install" "$pkgdocs" "$pkgdest"
@ -1263,6 +1273,10 @@ EOF
if [[ $preservebuilddir = 0 ]] ; then if [[ $preservebuilddir = 0 ]] ; then
if ! inarray "${tmp}" "${protecteddirectories[@]}" ; then if ! inarray "${tmp}" "${protecteddirectories[@]}" ; then
rm -rf "$tmp" rm -rf "$tmp"
else
echo "############ ATTENTION ############"
echo "[ERROR] 'tmp' VARIABLE IS SET TO '$tmp' WHICH IS A PROTECTED DIRECTORY! EXITING!"
exit 1
fi fi
fi fi
@ -1270,6 +1284,10 @@ EOF
if [[ $preservepackagedir = 0 ]] ; then if [[ $preservepackagedir = 0 ]] ; then
if ! inarray "${pkg}" "${protecteddirectories[@]}" ; then if ! inarray "${pkg}" "${protecteddirectories[@]}" ; then
rm -rf "$pkg" rm -rf "$pkg"
else
echo "############ ATTENTION ############"
echo "[ERROR] 'pkg' VARIABLE IS SET TO '$pkg' WHICH IS A PROTECTED DIRECTORY! EXITING!"
exit 1
fi fi
fi fi
} }