diff options
| -rwxr-xr-x | createworkdir | 4 | ||||
| -rwxr-xr-x | fullpkg | 21 | ||||
| -rwxr-xr-x | prfullpkg | 403 | ||||
| -rwxr-xr-x | prmipsrelease | 100 | ||||
| -rw-r--r-- | prtools.conf | 4 |
5 files changed, 517 insertions, 15 deletions
diff --git a/createworkdir b/createworkdir index a28d198..53298f6 100755 --- a/createworkdir +++ b/createworkdir @@ -28,7 +28,7 @@ custom_config=$XDG_CONFIG_HOME/libretools/libretools.conf # Create the WORKDIR [[ ! -d ${WORKDIR} ]] && { msg "Creating WORKDIR on ${WORKDIR}" - stdnull "mkdir -p ${WORKDIR}" ||{ + mkdir -p ${WORKDIR} ||{ error "Could not create ${WORKDIR}" exit 1 } @@ -50,7 +50,7 @@ custom_config=$XDG_CONFIG_HOME/libretools/libretools.conf # Create the staging dirs for _repo in ${REPOS[@]}; do [[ ! -d ${WORKDIR}/staging/${_repo} ]] && { - stdnull "mkdir -p ${WORKDIR}/staging/${_repo}" || { + mkdir -p ${WORKDIR}/staging/${_repo} || { error "Can't create ${WORKDIR}/staging/${_repo}" exit 1 } @@ -11,7 +11,7 @@ if [ -z $XDG_CONFIG_HOME ]; then error "There's no XDG_CONFIG_HOME var set" exit 1 fi -# set and ban_file +# set ban_file [ -e $XDG_CONFIG_HOME/libretools/libretools.conf ] && \ source $XDG_CONFIG_HOME/libretools/libretools.conf ban_file=$XDG_CONFIG_HOME/libretools/ban @@ -35,6 +35,7 @@ function usage { echo " -m max_level : check deps until this level" echo " -r \"command\" : use this instead of \"$FULLBUILDCMD\"" echo + exit 1 } ## Build order management ## @@ -89,7 +90,6 @@ function find_deps { local fullver=$(get_full_version ${epoch} ${pkgver} ${pkgrel}) # If package and correct ${fullver} is built exit -# TODO?: If this package is in force_build: skip this step if is_built "${pkgbase}>=${fullver}"; then exit 0 fi @@ -121,9 +121,6 @@ function find_deps { # Increase build level declare -i next_level=$level+1 -# Pass the offline flag to children - [[ "$OFFLINE" -eq true ]] - for _dep in ${deps[@]}; do for _repo in ${REPOS[@]}; do # try to find $_dep on each repo from dirname @@ -136,10 +133,11 @@ function find_deps { [ $? -eq 20 ] && return 20 popd > /dev/null break 1 # found, go to next dep - + done # if search pkgname in repo doesn't work # this should find pkgsplits - elif _dir=($(find "$ABSROOT/${_repo}" -type f -name PKGBUILD -print0 2>/dev/null | \ + for _repo in ${REPOS[@]}; do + if _dir=($(find "$ABSROOT/${_repo}" -type f -name PKGBUILD -print0 2>/dev/null | \ "xargs" -0 -e grep -HEw "pkgname=|pkgbase=|provides=" | grep -w "$_dep" 2>&1)); then _dir=$(dirname $(echo $_dir | cut -d: -f1)) @@ -150,7 +148,6 @@ function find_deps { [ $? -eq 20 ] && return 20 popd > /dev/null break 1 # found, go to next dep - else echo "dep_not_found:$_dep:$_repo" >> $build_dir/log fi @@ -278,15 +275,14 @@ check_deps_only='n' do_cleanup='n' max_level=21 OFFLINE=false -while getopts 'ha:b:cCd:l:nm:r:o' arg; do +while getopts 'ha:b:cCd:l:nm:r:' arg; do case $arg in - h) usage; exit 0 ;; + h) usage ;; a) ABSROOT="$OPTARG" ;; b) build_only='y' build_dir="$OPTARG" [ -z ${build_dir} ] && { usage - exit 1 } [ ! -r ${build_dir}/BUILDORDER ] && { error "${build_dir}/BUILDORDER doesn't exist." @@ -301,7 +297,6 @@ while getopts 'ha:b:cCd:l:nm:r:o' arg; do n) noupdate='y';; m) max_level=$OPTARG ;; r) FULLBUILDCMD="$OPTARG" ;; - o) OFFLINE=true ;; esac done @@ -312,7 +307,7 @@ if [ ${build_only} == 'n' ]; then [ ! -r PKGBUILD ] && { error "This isn't a build directory" - usage && exit 1 + usage } # Add mips64el if missing from arch=() and it isn't an 'any' package diff --git a/prfullpkg b/prfullpkg new file mode 100755 index 0000000..458eefa --- /dev/null +++ b/prfullpkg @@ -0,0 +1,403 @@ +#!/bin/bash +# TO TEST: (on find_deps) +# * Detect pkgnames by provides, replaces, etc. instead of dir tree + +source /etc/makepkg.conf +source /etc/abs.conf +source /etc/libretools.conf +source /etc/libretools.d/prtools.conf + +# Avoid /libretools dir doesn't exist errors +if [ -z $XDG_CONFIG_HOME ]; then + error "There's no XDG_CONFIG_HOME var set" + exit 1 +fi +# set ban_file +[ -e $XDG_CONFIG_HOME/libretools/libretools.conf ] && \ + source $XDG_CONFIG_HOME/libretools/libretools.conf +ban_file=$XDG_CONFIG_HOME/libretools/ban + + +##### START FUNCTIONS ##### + +function usage { + echo "cd to a dir containing a PKGBUILD and run:" + echo "$0 [options]" + printf "This script will check dependencies, build them if possible " + printf "and stage the packages on it's repo." + echo + echo "OPTIONS:" + echo " -h : this message." + echo " -a absdir : set absdir as ABSROOT." + echo " -b build_dir : use a fullpkg build_dir and only build." + echo " -c : check deps only, do not build." + echo " -d build_dir : use this dir to build. Defaults to mktemp." + echo " -n : don't update pacman db." + echo " -m max_level : check deps until this level" + echo " -r \"command\" : use this instead of \"$FULLBUILDCMD\"" +# echo " -t : build from testing" + echo + exit 1 +} + + +## Build order management ## + +# Removes a package from the buildorder +# $1 package name +# $2 buildorder file +remove_buildorder() { + grep -Evw "${1}" ${2} > ${2}2 + mv -f ${2}2 ${2} +} + +# Guesses the repo name according to the parent dir of the current package +# assuming the form ${ABSROOT}/package/repo/PKGBUILD +guess_repo() { + basename $(pwd) +} + +## +# usage : get_full_version( $epoch, $pkgver, $pkgrel ) +# return : full version spec, including epoch (if necessary), pkgver, pkgrel +## +get_full_version() { + if [[ $1 -eq 0 ]]; then + # zero epoch case, don't include it in version + echo $2-$3 + else + echo $1:$2-$3 + fi +} + +# Usage: cleanup [ $(basename $PWD) ] from PKGBUILD dir +# cleans the build_dir +function cleanup { +# Do nothing OR +# Already cleaned + [[ "${do_cleanup}" = "n" || ! -d ${build_dir} ]] && return 0 + +# Only do cleanup on level 0 + msg "Cleaning up..." + [ $level -eq 0 ] && rm -rf $build_dir/* +} + +# Check PKGBUILD and find non built or outdated deps +# on ABSROOT which should be abslibre-misp64el +function find_deps { + ## Check this level. + source PKGBUILD + local repo=${repo:-$(guess_repo)} + local pkgbase=${pkgbase:-${pkgname[0]}} + local epoch=${epoch:-0} + local fullver=$(get_full_version ${epoch} ${pkgver} ${pkgrel}) + +# If package and correct ${fullver} is built exit + if is_built "${pkgbase}>=${fullver}"; then + exit 0 + fi + +# Tell which packages are deeper in deps (even if they are on build_dir) +# so we can build them first. + echo "${level}:${pkgbase}" >> "${build_dir}/BUILDORDER" + +# if pkgbuild directory is on build_dir, do not copy and exit + if [ -d "${build_dir}/${pkgbase}" ]; then + exit 0 + else +# Copy dir to build_dir + mkdir ${build_dir}/${pkgbase} + cp -r $(pwd)/* ${build_dir}/${pkgbase} +# Info to eval later + echo "repo=$repo" > "${build_dir}/${pkgbase}/.INFO" + fi + +# Inform the current package plus a space for every level for indent + msg2 "%${level}s${pkgbase}-${fullver}" + +## Check next levels +# Clean version checking + deps=$(echo "${depends[@]} ${makedepends[@]}" | \ + sed "s/[=<>]\+[^ ]\+//g" | \ + tr ' ' "\n" | \ + sort -u) + + # Increase build level + declare -i next_level=$level+1 + + for _dep in ${deps[@]}; do + if [ -d "${ABSROOT}/${_dep}" ]; then + # search in REPOS array order + for _repo in ${REPOS[@]}; do + if [ -e "${ABSROOT}/${_dep}/${_repo}/PKGBUILD" ]; then + + pushd "${ABSROOT}/${_dep}/${_repo}" > /dev/null + $0 -c -d ${build_dir} -l ${next_level} + [ $? -eq 20 ] && return 20 # probable circular deps + popd > /dev/null + break 1 # found, go to next dep + + fi + done + + else # pkgsplit, needs guess + + for _repo in ${REPOS[@]}; do + if _dir=($(find "$ABSROOT/" -type f \ + -wholename "*/${_repo}/PKGBUILD" -print0 2>/dev/null | \ + "xargs" -0 -e grep -HEw "pkgname=|pkgbase=|provides=" | \ + grep -w "$_dep" 2>&1)) ; + then + + _dir=$(dirname $(echo $_dir | cut -d: -f1)) + plain "guess for $_dep -> $_dir" + + pushd "$_dir" > /dev/null + $0 -c -d ${build_dir} -l ${next_level} + [ $? -eq 20 ] && return 20 # probable circular dep + popd > /dev/null + break 1 # found, go to next dep + fi + done + fi + done + + unset next_level dir + # unset PKGBUILD variables + unset pkgname pkgver pkgrel epoch pkgdesc arch url license groups depends \ + makedepens checkdepends optdepends provides conflicts replaces backup \ + options install changelog source noextract md5sums build check package +} + +function _pkg_build () { + pushd ${build_dir} > /dev/null + # packages to build are on $buildorder + # greater levels must be built first + build_packages=($(sort -gr $buildorder | cut -d: -f2)) + + while [ ${#build_packages[@]} -ge 1 ]; do + pushd $build_dir/${build_packages[0]} > /dev/null + source PKGBUILD + + msg2 "${pkgbase:-${pkgname[0]}} $pkgver-$pkgrel" + + msg2 "Checking for non free deps" + pkgbuild-check-nonfree || { + if [ $? -eq 15 ]; then # this error means nonfree others means fail. +# log they have nonfree deps and so didn't build + echo "nonfree:$(basename $PWD)" >> $build_dir/log +# take out package from $buildorder + remove_buildorder "$(basename $PWD)" $buildorder +# continue building next package + continue + fi + } + + msg2 "Building $(basename $PWD)" +# this buildcmd is on libretools.conf + $FULLBUILDCMD; r=$? + case $r in +###### Succesfull Build ###### + 0) + plain "The build was succesful." + source .INFO && [ -n $repo ] && { + +# Calls a local release script if it's used + [ -z $HOOKLOCALRELEASE ] || \ + find -name "*.pkg.tar.?z" -print0 | \ + xargs -0 $HOOKLOCALRELEASE $repo + +# Stage for releasing + librestage $repo || { + echo "unstaged:$(basename $PWD)" >> $build_dir/log + } + + msg "Updating pacman db and packages" + sudo pacman -Sy || true + } + + echo "built:$(basename $PWD)" >> $build_dir/log + ;; +###### Failed Build ###### + *) + error "There were errors while trying to build the package." + echo "failed:$(basename $PWD)" >> $build_dir/log + ;; + esac + +# Package was built or failed: take it out of $buildorder + remove_buildorder "${build_packages[0]}" $buildorder || true + +# Set build_packages before next cycle run + build_packages=($(sort -gr $buildorder | cut -d: -f2)) + popd > /dev/null + done + + pkgs=($(grep "nonfree:" $build_dir/log)) && { + error "Those packages contain nonfree deps:" + echo ${pkgs[@]} | tr " " "\n" | cut -d: -f2 + } + + pkgs=($(grep "built:" $build_dir/log)) && { + msg "Those packages were built and staged:" + echo ${pkgs[@]} | tr " " "\n" | cut -d: -f2 + } + + pkgs=($(grep "failed:" $build_dir/log)) && { + error "Those packages failed to build:" + echo ${pkgs[@]} | tr " " "\n" | cut -d: -f2 + } + + pkgs=($(grep "unstaged:" $build_dir/log)) && { + error "Those packages couldn't be staged because of missing reponame:" + echo ${pkgs[@]} | tr " " "\n" | cut -d: -f2 + } + + popd > /dev/null +} + +# End inmediately but print a useful message +trap_exit() { + + error "$@" + warning "Leftover files left on $build_dir" + + exit 1 +} + +## END FUNCTIONS ## + +## Trap signals +# From makepkg +set -E +trap 'cleanup' 0 +trap 'trap_exit "TERM signal caught. Exiting..."' TERM HUP QUIT +trap 'trap_exit "Aborted by user! Exiting..."' INT +trap 'trap_exit "An unknown error has occurred. Exiting..."' ERR + +force_build="" +level=0 +noupdate='n' +build_only='n' +check_deps_only='n' +do_cleanup='n' +max_level=21 +OFFLINE=false +while getopts 'ha:b:cCd:l:nm:r:' arg; do + case $arg in + h) usage ;; + a) ABSROOT="$OPTARG" ;; + b) build_only='y' + build_dir="$OPTARG" + [ -z ${build_dir} ] && { + usage + } + [ ! -r ${build_dir}/BUILDORDER ] && { + error "${build_dir}/BUILDORDER doesn't exist." + exit 1 + };; + c) check_deps_only='y' ;; + C) do_cleanup='y';; + d) build_dir="$OPTARG" ;; +# hidden option to know what to build first. +# if $level > 0 it will not build + l) level=$OPTARG ;; + n) noupdate='y';; + m) max_level=$OPTARG ;; + r) FULLBUILDCMD="$OPTARG" ;; + esac +done + +if [ ${build_only} == 'n' ]; then + +# Check if we are actually on a build directory +# Do this early + + [ ! -r PKGBUILD ] && { + error "This isn't a build directory" + usage + } + + # Add mips64el if missing from arch=() and it isn't an 'any' package + if ! grep mips64el PKGBUILD >/dev/null; then + warning "Adding mips64el arch" + sed -i "s/^\(arch=([^)anym]\+\))/\1 'mips64el')/" "PKGBUILD" + fi + +fi + +# Only on level 0 +if [ $level -eq 0 ]; then + # if build_dir exist use it, else make a build_dir + build_dir=${build_dir:-$(mktemp -d /tmp/fullpkg.XXXXXX)} + mkdir -p ${build_dir} # in case of -d option + + # make files for log and buildorder + touch ${build_dir}/{log,BUILDORDER} + buildorder=${build_dir}/BUILDORDER + + [ ${noupdate} = 'n' ] && { + msg "Updating pacman db and packages" + sudo pacman -Syu --noconfirm || true + } + +# Build only + [ ${build_only} == 'y' ] && { + msg "Build Packages" + _pkg_build + exit 0 + } + + msg "Checking dependencies" +fi + +## if $level = 20 it's highly likely there are circular deps +[ $level -ge $max_level ] && exit 20 + +# Tries to find deps and build order +find_deps || { + # if find_deps finds circular deps + # it should exit with status 20 + [ $? -eq 20 ] && { + # only show message on level 0 + [ $level -eq 0 ] && error "Check for circular deps on $build_dir/BUILDORDER"; + } + exit 20 +} + +# levels greater than 0 must only check deps +[ $check_deps_only = 'y' -o $level -gt 0 ] && exit 0 + +# check BUILDORDER to not include banned deps and +[ $level -eq 0 -a -d $build_dir ] && { +# Check for banned deps + if [ -w $ban_file -a -r $ban_file ]; then + chmod o+rw $ban_file || error "Ban file is not readable/writable ($ban_file)" + + else + rsync -e ssh -aq $PARABOLAHOST:mips64el/ban >/dev/null 2>&1 || { + warning "Failed to get ban list" && [ -r ${ban_file} ] && { + +# Use local copy of ban file if it is avaliable and continue. + search=$(cat ${ban_file} | tr "\n" "|") +# Keep track of banned files + egrep -w "$search" ${buildorder} >> ${build_dir}/banned +# Take banned packages out from buildorder + egrep -vw "$search" ${buildorder} > ${buildorder}2 + mv -f ${buildorder}2 ${buildorder} + unset search + } + } + fi +} + +## START Building +msg "Building packages:" + +# Build the package +_pkg_build + +echo +msg2 "Check if your system works fine and librerelease if it does" + +exit 0 diff --git a/prmipsrelease b/prmipsrelease new file mode 100755 index 0000000..cd4d4ba --- /dev/null +++ b/prmipsrelease @@ -0,0 +1,100 @@ +#!/bin/bash +# Lic: GPLv3+ +# Author: Nicolas Reynolds <fauno@kiwwwi.com.ar> +# Local release of mips64el packages + clean ABS sync +# Called by HOOKLOCALRELEASE + +# $1 repo +# $2+ packages + +source /etc/makepkg.conf +source /etc/libretools.conf +source /etc/libretools.d/prtools.conf + +usage() { + echo "$0 repo package1 [ package2 ... packageN ]" + echo + echo " release packages locally on ${PKGDEST}/stage3." + echo " and make a clean ABS sync " +} + +## +# usage : get_full_version( $epoch, $pkgver, $pkgrel ) +# return : full version spec, including epoch (if necessary), pkgver, pkgrel +## +get_full_version() { + if [[ $1 -eq 0 ]]; then + # zero epoch case, don't include it in version + echo $2-$3 + else + echo $1:$2-$3 + fi +} + +repo=$1; shift +repo-add ${PKGDEST}/stage3.db.tar.gz $@ + +# Get all needed sources +source PKGBUILD +fullver=$(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}) +pkgbase=${pkgbase:-$pkgname[0]} + +msg "Adding packages to [stage3]..." +repo-add $@ +for name in ${pkgname[@]}; do + msg2 "${name} ${fullver}" + repo-add ${PKGDEST}/stage3.db.tar.gz ${PKGDEST}/${name}-${fullver}-*.pkg.tar.* +done + +# Copy PKGBUILD and sources + +msg "Adding clean source to $WORKDIR/abs/${CARCH}/$repo/$pkgbase" +dest_dir="$WORKDIR/abs/${CARCH}/$repo/$pkgbase" +mkdir -p ${dest_dir} >/dev/null +rm -rf ${dest_dir}/* #if package existed already there + +# Set target CARCH as it might be used within the PKGBUILD to select correct sources +eval $(grep '^CARCH=' "$copydir/etc/makepkg.conf") +export CARCH +source=($(. "PKGBUILD"; echo ${source[@]})) +cp --remove-destination "PKGBUILD" "${dest_dir}" || echo "copy 1" +for f in ${source[@]}; do + basef=$(echo $f | sed 's|::.*||' | sed 's|^.*://.*/||g') + if [ -f "$basef" ]; then + cp --remove-destination "$basef" "${dest_dir}" + fi +done + +( . PKGBUILD + for i in 'changelog' 'install'; do + filelist=$(sed -n "s/^[[:space:]]*$i=//p" PKGBUILD) + for file in $filelist; do + # evaluate any bash variables used + eval file=${file} + if [ -f "$file" ]; then + cp --remove-destination "$file" "${dest_dir}" + fi + done + done +) +# END add clean abs + +# Commit the changes + + pushd "$dest_dir" >/dev/null + + source "${dest_dir}/PKGBUILD" + epoch=${epoch:-0} + fullver=$(get_full_version ${epoch} ${pkgver} ${pkgrel}) + pkgbase=${pkgbase:-${pkgname[0]}} + + git add "${dest_dir}/." # add using .gitignore + + git commit -m "${pkgbase}-${fullver} ${repo}" >/dev/null && \ + msg2 "${pkgbase} ${fullver} ${repo}" + + popd >/dev/null + +# END commit + +exit $? diff --git a/prtools.conf b/prtools.conf new file mode 100644 index 0000000..5b41216 --- /dev/null +++ b/prtools.conf @@ -0,0 +1,4 @@ + +# Absroot for libretools-pr +ABSROOT=$WORKDIR/prabs +HOOKLOCALRELEASE="prmipsrelease"
\ No newline at end of file |