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

Made code improvements in bldpkg script

Browse source
This commit is contained in:
PktSurf 2022-07-16 17:45:16 +05:30
parent 6f1e30cee2
commit a597075434
1 changed files with 33 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
bldpkg
View file

@ -1,7 +1,9 @@
#!/bin/bash
# Part of the SMLinux distribution
# http://git.pktsurf.in/smlinux
#
# Bash script to build SMLinux-specific and general Slackware packages
#
# Copyright (c) 2022 PktSurf <smlinux@pktsurf.in>
#
# Permission to use, copy, modify, and distribute this software for any
@ -100,7 +102,7 @@ case "$1" in
if [ -f "$srcdirpath.SMBuild" ]; then
source "$srcdirpath.SMBuild"
else
echo "No suitable package build file found to source from. Aborting!"
echo "[ERROR] No suitable <package.SMBuild> file found to source and build from."
exit 1
fi
esac
@ -108,46 +110,46 @@ esac
# Validate the build file. If any of the following variables are not set in the build file, abort.
for buildvariables in app version build homepage desc requires ; do
if [[ ! "${!buildvariables}" ]] ; then
echo "[ERROR] Required variable \"${buildvariables}\" is not set. Please check your build file. Aborting!"
echo "[ERROR] Required variable \"${buildvariables}\" is not set. Please check your build file."
exit 1
fi
done
# Validate $app
if ! echo "$app" | egrep -q '^[a-z0-9-]+$' ; then
echo "Only lower case, numeric characters and dash allowed in the '"'app'"' variable in the build file. Aborting!"
echo "[ERROR] Only lower case, numeric characters and dash allowed in the '"'app'"' variable in the build file."
exit 1
fi
# Validate $version
if ! echo "$version" | egrep -q '^[a-z0-9.]+$' ; then
echo "Only lower case, numeric characters and a period allowed in the '"'version'"' variable in the build file. Aborting!"
echo "[ERROR] Only lower case, numeric characters and a period allowed in the '"'version'"' variable in the build file."
exit 1
fi
# Validate $homepage
if ! echo "$homepage" | egrep -q '^http://|^https://|^ftp://' ; then
echo "Invalid URL in the '"'homepage'"' variable in the build file. Aborting!"
echo "[ERROR] Invalid URL in the '"'homepage'"' variable in the build file."
exit 1
fi
# Validate $download
if [ -n "$download" ]; then
if ! echo "$download" | egrep -q '^http://|^https://|^ftp://' ; then
echo "Invalid URL in the '"'download'"' variable in the build file. Aborting!"
echo "[ERROR] Invalid URL in the '"'download'"' variable in the build file."
exit 1
fi
fi
# Validate $desc
if [ "$(echo "$desc" | wc -c)" -gt 100 ] ; then
echo "Package description exceeds 100 characters in the build file. Aborting!"
echo "[ERROR] Package description should not exceed 100 characters in the build file."
exit 1
fi
# Check if build() function exists in the build file
if [[ ! "$(grep '^build()' "$srcdirpath".SMBuild)" ]] ; then
echo "[ERROR] build() function does not exist in your build file. Aborting!"
echo "[ERROR] build() function does not exist in your build file."
exit 1
fi
@ -158,7 +160,7 @@ sleep 0.5
# Only verify source checksums if skipchecksum is not set in the build file
if [ -z "$skipchecksum" ] ; then
if [ -z "$sha512sums" ] ; then
echo "[ERROR] sha512 checksums don't exist in $srcdirpath.SMBuild !"
echo "[ERROR] SHA512 checksums don't exist in $srcdirpath.SMBuild !"
echo "[ERROR] Please run 'bldpkg genchecksum' to add them"
exit 1
fi
@ -188,7 +190,7 @@ applypatch() {
if [ -f /etc/bldpkg.conf ] ; then
source /etc/bldpkg.conf
else
echo "[ERROR] /etc/bldpkg.conf not found! Aborting!"
echo "[ERROR] /etc/bldpkg.conf not found!"
exit 1
fi
@ -203,7 +205,7 @@ if [ "$checkdependencies" == "1" ] ; then
echo "[INFO] Found dependency $packagedep"
# If count is 0, we exit, because we are in trouble
elif [ "$depcount" == "0" ] ; then
echo "[ERROR] Did not find dependency $packagedep ! Aborting!"
echo "[ERROR] Did not find dependency $packagedep ."
exit 1
# If count is greater than or equal to 2, we are in slightly less trouble
elif [ "$depcount" -ge "2" ] ; then
@ -228,16 +230,16 @@ inarray() {
# Check if $parenttmp is set and is a directory
if [ -z "$parenttmp" ] ; then
echo "[ERROR] parenttmp variable not set in /etc/bldpkg.conf. Aborting!"
echo "[ERROR] parenttmp variable not set in /etc/bldpkg.conf."
exit 1
elif [ ! -d "$parenttmp" ] ; then
echo "[ERROR] parenttmp variable set to '"$tmpfsdir"' in /etc/bldpkg.conf is not a directory. Aborting!"
echo "[ERROR] parenttmp variable set to '"$tmpfsdir"' in /etc/bldpkg.conf is not a directory."
exit 1
fi
# Attempt to write to the $parenttmp directory. This directory is used for everything related to the build process outside #the source directory $srcdir
if ! touch "$parenttmp"/.smlinuxwritetest ; then
echo "[ERROR] $parenttmp is not writable. Aborting!"
echo "[ERROR] $parenttmp is not writable."
exit 1
fi
@ -272,8 +274,7 @@ fi
# Validate compressor and set extension
validpkgextensions=( "tgz" "tbz" "tlz" "txz" )
if ! inarray "${pkgext}" "${validpkgextensions[@]}" ; then
echo "[ERROR] $pkgext is not a valid package extension for an SMLinux"
echo "[ERROR] installer file! Aborting!"
echo "[ERROR] $pkgext is not a valid package extension for an SMLinux installer file."
exit 1
fi
@ -286,7 +287,7 @@ case "$pkgext" in
tbz) compressor=bzip2
compressopts="$bzipopts"
export compressopts ;;
tlz) compressor=lzip
tlz) compressor=lzip
compressopts="$lzipopts"
export compressopts ;;
txz) compressor=xz
@ -296,7 +297,7 @@ esac
# Borrowed from slackware's installpkg utility
if ! $compressor --help > /dev/null 2>&1 ; then
echo "[ERROR] Compressor validation FAILED! Aborting!"
echo "[ERROR] '"$compressor"' Compressor validation failed."
exit 1
fi
@ -325,7 +326,7 @@ if [ "$swapcheck" = "1" ]; then
if [ "$swapcheck" -lt "$swapsize" ]; then
echo "[ERROR] Insufficient swap to build '"$app"' which is listed"
echo "[ERROR] in $packagesrequiringswap. Kindly add/increase"
echo "[ERROR] swap size on this system and try again. Aborting!"
echo "[ERROR] swap size on this system and try again."
exit 1
fi
fi
@ -390,7 +391,6 @@ if [ "$globaldistcc" = "1" ] ; then
echo "[ERROR] Oops! Distcc binary was not found but building with it"
echo "[ERROR] was requested! Either ensure distcc is in your "'$PATH'" or"
echo "[ERROR] disable this option in bldpkg.conf file."
echo "[ERROR] Aborting!"
exit 1
fi
@ -401,7 +401,7 @@ if [ "$globaldistcc" = "1" ] ; then
elif [ ! -d "$distccsympath" ] ; then
echo "[ERROR] $distccsympath directory containing symlinks to distcc"
echo "[ERROR] does not exist! Kindly create it and create symlinks"
echo "[ERROR] based on instructions in bldpkg.conf! Aborting!"
echo "[ERROR] based on instructions in bldpkg.conf!"
exit 1
fi
@ -411,12 +411,12 @@ if [ "$globaldistcc" = "1" ] ; then
# We use "realpath" to follow the $distccsympath/$f symlink and act on the exit code.
if [ "$(realpath -e "$distccsympath/$f")" != "$distccbinpath" ] ; then
echo "[ERROR] $distccsympath/$f does not point to $distccbinpath. "
echo "[ERROR] Kindly fix this! Aborting!"
echo "[ERROR] Kindly fix this!"
exit 1
fi
else
echo "[ERROR] $f either does not exist or is not a symlink inside"
echo "[ERROR] $distccsympath. Kindly fix this! Aborting!"
echo "[ERROR] $distccsympath. Kindly fix this! "
exit 1
fi
@ -467,7 +467,6 @@ if [ "$globalccache" = "1" ]; then
echo "[ERROR] Oops! ccache binary was not found but building with it"
echo "[ERROR] was requested! Either ensure ccache is in your "'$PATH'" or"
echo "[ERROR] disable this option in bldpkg.conf."
echo "[ERROR] Aborting!"
exit 1
fi
@ -477,7 +476,7 @@ if [ "$globalccache" = "1" ]; then
elif [ ! -d "$ccachesympath" ] ; then
echo "[ERROR] $ccachesympath directory containing symlinks to ccache"
echo "[ERROR] does not exist! Kindly create it and create symlinks"
echo "[ERROR] based on instructions in bldpkg.conf. Aborting!"
echo "[ERROR] based on instructions in bldpkg.conf."
exit 1
fi
@ -486,12 +485,12 @@ if [ "$globalccache" = "1" ]; then
# We use "realpath" to follow the $ccachesympath/$f symlink and act on the exit code
if [ "$(realpath -e "$ccachesympath/$f")" != "$ccachebinpath" ] ; then
echo "[ERROR] $ccachesympath/$f does not point to $ccachebinpath. "
echo "[ERROR] Kindly fix this! Aborting!"
echo "[ERROR] Kindly fix this!"
exit 1
fi
else
echo "[ERROR] $f either does not exist or is not a symlink inside $ccachesympath"
echo "[ERROR] Kindly fix this! Aborting!"
echo "[ERROR] Kindly fix this!"
exit 1
fi
@ -540,7 +539,6 @@ if [ "$globalsccache" = "1" ]; then
echo "[ERROR] Oops! sccache binary was not found but building with it"
echo "[ERROR] was requested! Either ensure sccache is in your "'$PATH'" or"
echo "[ERROR] disable this option in bldpkg.conf."
echo "[ERROR] Aborting!"
exit 1
fi
@ -550,7 +548,7 @@ if [ "$globalsccache" = "1" ]; then
elif [ ! -d "$sccachepath" ] ; then
echo "[ERROR] $sccachepath directory containing symlinks to ccache"
echo "[ERROR] does not exist! Kindly create it and create symlinks"
echo "[ERROR] based on instructions in bldpkg.conf. Aborting!"
echo "[ERROR] based on instructions in bldpkg.conf."
exit 1
fi
@ -564,12 +562,12 @@ if [ "$globalsccache" = "1" ]; then
if [ ! -e "$sccachepath/$f" ] ; then
echo "[ERROR] $f either does not exist inside $sccachepath"
echo "[ERROR] Kindly fix this! Aborting!"
echo "[ERROR] Kindly fix this!"
exit 1
# If the hard link's inode number does not match the original binary's inode number, throw an error and exit
elif [ "$sccache_hardlink_file_inode_num" != "$sccache_binary_inode_num" ] ; then
echo "[ERROR] File '"$f"' inside $sccachepath is not a hard link!"
echo "[ERROR] Kindly fix this! Aborting!"
echo "[ERROR] Kindly fix this!"
exit 1
fi
@ -655,7 +653,7 @@ elif [ "$arch" = "x86_64" ]; then
export builddist CFLAGS CXXFLAGS
else
echo "[ERROR] Sorry! '$arch' CPU architecture not supported by SMLinux! Aborting!"
echo "[ERROR] Sorry! '$arch' CPU architecture not supported by SMLinux!"
exit 1
fi
@ -811,7 +809,7 @@ mkfinalpkg() {
# Check if /lib64 was created inside $pkg
if [ -d "$pkg/lib64" ] ; then
echo "[ERROR] $app has /lib64 directory. Musl does not support multilib."
echo "[ERROR] Please fix the build options and ensure the /lib64 is not created. Aborting! "
echo "[ERROR] Please fix the build options and ensure the /lib64 is not created."
exit 1
fi
@ -819,7 +817,7 @@ mkfinalpkg() {
for directory in usr sbin ; do
if [ -d "$pkg/$directory" ] ; then
echo "[ERROR] $app has $directory directory which is a symlink to /bin on SMLinux."
echo "[ERROR] Please fix the build options and ensure $directory is not created. Aborting!"
echo "[ERROR] Please fix the build options and ensure $directory is not created."
exit 1
fi
done