From c345145c9fa3d86c09ee153142ea8bf706be0e50 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 6 Jun 2015 15:12:49 -0600 Subject: Remove fullpkg and treepkg, in favor of dagpkg. --- src/fullpkg/Makefile | 3 - src/fullpkg/fullpkg | 54 ----------- src/fullpkg/fullpkg-build | 206 ---------------------------------------- src/fullpkg/fullpkg-find | 234 ---------------------------------------------- 4 files changed, 497 deletions(-) delete mode 100644 src/fullpkg/Makefile delete mode 100755 src/fullpkg/fullpkg delete mode 100755 src/fullpkg/fullpkg-build delete mode 100755 src/fullpkg/fullpkg-find (limited to 'src/fullpkg') diff --git a/src/fullpkg/Makefile b/src/fullpkg/Makefile deleted file mode 100644 index 8860e93..0000000 --- a/src/fullpkg/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -include ../../common.mk - -fullpkg-build.pot: LIBREXGETTEXT_FLAGS+=--simple=list_pkgs:2 diff --git a/src/fullpkg/fullpkg b/src/fullpkg/fullpkg deleted file mode 100755 index e053c6e..0000000 --- a/src/fullpkg/fullpkg +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/env bash -# Builds packages from ABS recursively. It tries to find dependencies that -# aren't built or need update and then makepkg them in order. - -# Copyright (C) 2011 Nicolás Reynolds -# Copyright (C) 2011-2012 Joshua Ismael Haase Hernández (xihh) -# -# License: GNU GPLv3+ -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -. libremessages - -usage() { - print "Usage: %s [OPTIONS] [BUILD_DIR]" "${0##*/}" - print "A (libre)makepkg wrapper that will also build dependencies" - echo - prose "More directly, it wraps fullpkg-find and fullpkg-build; - fullpkg-find finds the dependencies, and sets them up in - BUILD_DIR; then fullpkg-build builds them." - echo - prose "This script will check dependencies, build them if possible and - stage the packages on its repo." - echo - prose "If no BUILD_DIR is specified, it will create a temporary - directory." - echo - print "Options:" - flag '-h' "Show this message" -} - -while getopts 'h' arg; do - case "$arg" in - h) usage; exit 0 ;; - esac -done - -shift $(( OPTIND - 1 )) - -build_dir="${1:-$(mktemp --tmpdir -d fullpkg.XXXXXXXXXX)}" -fullpkg-find "$build_dir" && fullpkg-build -N "$build_dir" - -exit 0 diff --git a/src/fullpkg/fullpkg-build b/src/fullpkg/fullpkg-build deleted file mode 100755 index 97da33f..0000000 --- a/src/fullpkg/fullpkg-build +++ /dev/null @@ -1,206 +0,0 @@ -#!/usr/bin/env bash -# set -x # uncomment for debug -# Builds packages from ABS recursively. It tries to find dependencies that -# aren't built or need update and then makepkg them in order. - -# Copyright (C) 2011 Joshua Ismael Haase Hernández (xihh) -# Copyright (C) 2011 Nicolás Reynolds -# Copyright (C) 2013 Luke Shumaker -# -# License: GNU GPLv3+ -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# TODO move __build to chroot - -. libremessages -. "$(librelib conf.sh)" -load_files makepkg -load_files libretools -check_vars libretools FULLBUILDCMD || exit 1 -# The following variables are actually optional -#check_vars libretools HOOKPKGBUILDMOD HOOKLOCALRELEASE || exit 1 - -## List packages on log that are on status -## usage: list_pkgs -# -## status: nonfree, built, failed, unstaged -list_pkgs() { - msg="$2" - local pkgs=($(grep "$1:" $build_dir/log)) && { - msg "$2" - printf '%s\n' "${pkgs[@]}" | cut -d: -f2 - } -} - -## Check all build_dir, fails if one PKGBUILD is nonfree -check_nonfree() { - find "$build_dir" -name PKGBUILD \ - -exec pkgbuild-check-nonfree {} + - local s=$? - pkgbuild-summarize-nonfree -q $s || return $s -} - -# 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} - - return $? -} - -successful_build() { - - if [[ "$RUN" != "$FULLBUILDCMD" ]]; then - return 0 # Custom command or download sources - fi - - if source .INFO && [[ -n "$repo" ]]; then - - if [[ ! -z "$HOOKLOCALRELEASE" ]]; then - "$HOOKLOCALRELEASE" "$repo" - fi - - msg "Updating pacman db and packages" - sudo pacman -Sy || true - - fi - - echo "built:$(basename $PWD)" >>$build_dir/log -} - -build_description() { - list_pkgs "nonfree" "Those packages contain nonfree deps:" - list_pkgs "built" "Those packages were built and staged:" - list_pkgs "failed" "Those packages failed to build:" - list_pkgs "unstaged" "Those packages couldn't be staged (missing reponame):" -} - -__build() { - pushd ${build_dir} >/dev/null - - build_packages=($(sort -gr $buildorder | cut -d: -f2)) # greater levels must be built first - - while [[ ${#build_packages[@]} -ge 1 ]]; do - - pushd "$build_dir/${build_packages[0]}" >/dev/null - - if [[ -n "${HOOKPKGBUILDMOD}" ]]; then - ${HOOKPKGBUILDMOD} || true - fi - - eval "$RUN"; r=$? - - case $r in - - 0) successful_build ;; - - *) error "There were errors while trying to build the package." - echo "failed:$(basename $PWD)" >>$build_dir/log - ;; - esac - - remove_buildorder "${build_packages[0]}" $buildorder || true - - # which is next package? - build_packages=($(sort -gr $buildorder | cut -d: -f2)) - popd > /dev/null - done - - popd >/dev/null -} - -# End inmediately but print a useful message -trap_exit() { - error "$@" - warning "Leftover files left on $build_dir" - mv .BUILDORDER BUILDORDER - exit 1 -} - -# Trap signals from makepkg -set -E -trap 'trap_exit "(fullpkg-build) TERM signal caught. Exiting..."' TERM HUP QUIT -trap 'trap_exit "(fullpkg-build) Aborted by user! Exiting..."' INT -trap 'trap_exit "(fullpkg-build) An unknown error has occurred. Exiting..."' ERR - -CLEANUP="false" -CHECKNONFREE="true" -RUN="$FULLBUILDCMD" -MESSAGE="$(_ 'Building packages')" - -usage() { - print "Usage: %s [OPTIONS] [BUILD_DIR]" "${0##*/}" - print "Builds packages in BUILD_DIR, as set up by fullpkg-find" - echo - prose "Builds packages from BUILD_DIR; create BUILD_DIR using:" - print ' $ fullpkg-find BUILD_DIR' - echo - prose "If no BUILD_DIR is specified, it uses the current directory." - echo - print "Options:" - flag "-c" "Clean BUILD_DIR on successful build" - flag "-N" "Don't check for freedom issues." #Also made by fullpkg-find - flag "-r $(_ CMD)" "Use CMD instead of \${FULLBUILDCMD}" - flag "-g" "Get sources for building packages on BUILD_DIR" - flag "-h" "Show this message" -} - -while getopts 'hNr:g' arg; do - case $arg in - h) usage; exit 0 ;; - c) CLEAN ;; - N) CHECKNONFREE="false" ;; - r) RUN="$OPTARG" - MESSAGE="$(_ 'Executing custom action')";; - g) RUN='makepkg -g > /dev/null' - MESSAGE="$(_ 'Downloading packages')";; - esac -done - -shift $(( OPTIND - 1 )) -build_dir="${1:-`pwd`}" -buildorder="${build_dir}/BUILDORDER" - -if [[ ! -e "$buildorder" ]]; then - error "This is not a build_dir. Make one using fullpkg." - usage - exit 1 -else - # backup BUILDORDER - cp "$buildorder" "$build_dir/.BUILDORDER" -fi - -if "$CHECKNONFREE"; then - check_nonfree -fi - -msg "$MESSAGE" -__build - -if [[ "$RUN" != "$FULLBUILDCMD" ]]; then - # Used for downloading or custom command - mv "$build_dir/.BUILDORDER" "$buildorder" - exit 0 -elif "$CLEANUP"; then - find "$build_dir" -mindepth 1 -delete -fi - -build_description - -plain "Test packages on and if they work fine librerelease." - -exit 0 diff --git a/src/fullpkg/fullpkg-find b/src/fullpkg/fullpkg-find deleted file mode 100755 index ac2099f..0000000 --- a/src/fullpkg/fullpkg-find +++ /dev/null @@ -1,234 +0,0 @@ -#!/usr/bin/env bash -# set -x # uncomment for debug - -# Copyright (C) 2011-2012 Joshua Ismael Haase Hernández (xihh) -# Copyright (C) 2011-2012 Nicolás Reynolds -# Copyright (C) 2012 Michał Masłowski -# Copyright (C) 2013-2014 Luke Shumaker -# -# The copy_files() function is taken from makechrootpkg: -# Copyright (C) 2007 Armin Luntzer -# Copyright (C) 2007 Jason Chu -# Copyright (C) 2007, 2011 Dan McGee -# Copyright (C) 2007-2008 Travis Willard -# Copyright (C) 2007-2009 Aaron Griffin -# Copyright (C) 2008 Simo Leone -# Copyright (C) 2009 Biru Ionut -# Copyright (C) 2009 Evangelos Foutras -# Copyright (C) 2009 Francois Charette -# Copyright (C) 2009 Nezmer -# Copyright (C) 2009 Ronald van Haren -# Copyright (C) 2009-2011 Andrea Scarpino -# Copyright (C) 2009-2012 Allan McRae -# Copyright (C) 2009-2012 Eric Bélanger -# Copyright (C) 2009-2012 Pierre Schmitz -# Copyright (C) 2010 Byron Clark -# Copyright (C) 2011 Ionut Biru -# Copyright (C) 2011 Lukas Fleischer -# Copyright (C) 2011-2012 Florian Pritz -# Copyright (C) 2011-2013 Jan Alexander Steffens (heftig) -# Copyright (C) 2013 Sébastien Luttringer -# -# Because of the code from makechrootpkg, this file is GPLv2, instead of GPLv3 -# like most of libretools. -# -# License: GNU GPLv2 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - - -# Builds packages from ABS recursively. It tries to find dependencies that -# aren't built or need update and then makepkg them in order. - -# TODO: fullpkg-find should find packages wich depend on the -# package to be build, so we can avoid "missing $name.so errors" - -# Get repo name. Asumes ${ABSROOT}/repo/package/PKGBUILD -guess_repo() { - basename "$(dirname "$(pwd)")" -} - -# This function is stolen from makechrootpkg. -copy_files() { - - local copydir="$build_dir/${pkgbase:-${pkgname[0]}}" - mkdir -p "$copydir" - - # Copy PKGBUILD and sources - cp PKGBUILD "$copydir" - ( - load_PKGBUILD - for file in "${source[@]}"; do - file="${file%%::*}" - file="${file##*://*/}" - if [[ -f $file ]]; then - cp "$file" "$copydir/" - elif [[ -f $SRCDEST/$file ]]; then - cp "$SRCDEST/$file" "$copydir/" - fi - done - - # Find all changelog and install files, even inside functions - for i in 'changelog' 'install'; do - while read -r file; do - # evaluate any bash variables used - eval file=\"$(sed "s/^\\(['\"]\\)\\(.*\\)\\1\$/\\2/" <<< "$file")\" - [[ -f $file ]] && cp "$file" "$copydir" - done < <(sed -n "s/^[[:space:]]*$i=//p" PKGBUILD) - done - ) -} - -# Checks ABSROOT and look for target pkg deps. Adds them if not built or outdated. -find_deps() { - # Check this level - load_PKGBUILD - - local repo="${repo:-$(guess_repo)}" - local pkgbase="${pkgbase:-${pkgname[0]}}" - - # Checking any package built, since otherwise e.g. kdebase would - # be always considered outdated: there is no package built named kdebase. - # TODO: maybe check for the package requested in case of recursive calls, - # instead of the first one listed? - if is_built "${pkgname[0]}" "$(get_full_version "${pkgname[0]}")"; then - exit 0 # pkg is built and updated - fi - - # greater levels are built first - echo "${LEVEL}:${pkgbase}" >>"$build_dir/BUILDORDER" - # PKGBUILD is already there - if [[ -d "${build_dir}/${pkgbase}" ]]; then - exit 0 - # Copy dir to build_dir - else - copy_files - - # to identify repo later - echo "repo=$repo" > "${build_dir}/${pkgbase}/.INFO" - fi - - # current package plus a space for every level - msg2 "%${LEVEL}s%s" '' "${pkgbase}-$(get_full_version)" - - ## Check next levels - declare -i next_level=$LEVEL+1 - - # All deps - local deps=("${depends[@]}" "${makedepends[@]}" "${checkdepends[@]}") - # Strip version specifiers - deps=("${deps[@]%%[=<>]*}") - # Filter out duplicates - read -d $'\n' -a deps <<<"$(printf '%s\n' "${deps[@]}"|sort -u)" - - local _dep - for _dep in "${deps[@]}"; do - - local found=false - # May fail, e.g. since abslibre-mips64el doesn't include - # arch=any packages. - local pkgdir=$(toru -p ${_dep}) || true - - if [[ -n "$pkgdir" ]] && [[ -d "${pkgdir}" ]; then - found=true - - pushd "${pkgdir}" > /dev/null - # runs itself on dep's PKGBUILD dir - "$0" -l "${next_level}" "${build_dir}" || return $? - popd > /dev/null - fi - - if ! (( found )); then - echo "dep_not_found:$_dep" >>$build_dir/log - fi - - done - - ## End variable block - - unset next_level dir -} - -. libremessages -. "$(librelib conf.sh)" -load_files makepkg - -LEVEL=0 -MAXLEVEL=20 -CLEANFIRST='false' -UPDATEDB='true' - -usage() { - print "Usage: %s [OPTIONS] [BUILD_DIR]" "${0##*/}" - print "Finds package dependencies and sets up a build order" - echo - prose "Run this from a directory containing a PKGBUILD." - echo - prose "This script will create a BUILD_DIR for recursive building; it - tries to find dependencies that aren't built or need update." - echo - prose "If no BUILD_DIR is specified, it will create a temporary - directory." - echo - print "Options:" - flag "-h" "Show this message" - flag "-A <$(_ ABSROOT)>" "Use ABSROOT as the root of the ABS tree" - flag "-c" "Clean BUILD_DIR before working." - flag "-m <$(_ MAX_LEVEL)>" "Limit the depth of the dependency recursion" - flag "-n" "Don't update pacman DB" -} - -while getopts 'hA:l:cmn' arg; do - case "$arg" in - h) usage; exit 0 ;; - A) ABSROOT="$OPTARG" ;; - l) LEVEL="$OPTARG" ;; # hidden option to know dep level. - c) CLEANFIRST='true' ;; - m) MAXLEVEL="$OPTARG" ;; - n) UPDATEDB='false' ;; - esac -done - -if [[ ! -r PKGBUILD ]]; then - error "This directory doesn't contain a PKGBUILD" - usage - exit 1 -fi - -shift $(( OPTIND - 1 )) -build_dir="${1}" - -if [[ "$LEVEL" -eq 0 ]]; then - - build_dir="${1:-$(mktemp -d /tmp/fullpkg.XXXXXX)}" - - if [[ ! -d "$build_dir" ]]; then - mkdir -p "$build_dir" - elif "$CLEANFIRST"; then - # Erase files already in dir - msg "Cleaning up files in dir" - find "$build_dir" -mindepth 1 -delete - fi - - if "$UPDATEDB"; then - msg "Updating pacman db" - sudo pacman -Sy --noconfirm || true - fi - - # make files for log and buildorder - touch "${build_dir}"/{log,BUILDORDER} - buildorder="${build_dir}/BUILDORDER" - - msg "Checking dependencies" -fi - -find_deps - -exit 0 -- cgit v1.2.3-2-g168b