From 962250da23024224fc9e0be782b16ae08df46671 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 2 May 2013 15:06:04 -0400 Subject: Update for the new devtools-par (major) * `src/devtools`: Redo to get devtools from another location, and patch it * `src/chroot-tools/{chcleanup,chroot.conf}`: Only install 'base-devel' by default * libremkchroot: deprecate in favor of `librechroot make` * librechroot: - redo option parsing to be a "sub-command" (git-like) interface, instead of having esoteric flags (pacman-like). - add more documentation. - allow COPY to be an absolute path - generally clean up and use updated functions from `makechrootpkg.sh` * libremakepkg: - allow COPY to be an absolute path - update to work with the new `makechrootpkg.sh`: - `makechrootpkg.sh:chroot_exec()` -> `libremakepkg:run()` - `makechrootpkg.sh:chroot_init()` -> `libremakepkg:chroot_init()` - All functions from `makechrootpkg.sh` are wrapped, because they don't work with `set -euE`. - Other small changes --- src/chroot-tools/libremkchroot | 68 ------------------------------------------ 1 file changed, 68 deletions(-) delete mode 100755 src/chroot-tools/libremkchroot (limited to 'src/chroot-tools/libremkchroot') diff --git a/src/chroot-tools/libremkchroot b/src/chroot-tools/libremkchroot deleted file mode 100755 index 6a13792..0000000 --- a/src/chroot-tools/libremkchroot +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash -euE -# libremkchroot - -# Copyright 2011, 2012 Luke Shumaker -# -# This file is part of Parabola. -# -# Parabola 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. -# -# Parabola 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. -# -# You should have received a copy of the GNU General Public License -# along with Parabola. If not, see . - -. /usr/share/libretools/conf.sh -load_conf_libretools_chroot - -. "$(which libremessages)" - -cmd=${0##*/} - -usage() { - echo "Usage: $cmd [OPTIONS] [CHROOT]" - echo 'This script will create a chroot to build packages in.' - echo "Use \`librechroot' to interact with the chroot after it is created." - echo '' - echo "The default CHROOT is \`${CHROOT}'." - echo '' - echo 'Options:' - echo ' -h Show this message' - echo '' - echo ' -C Location of pacman config file.' - echo ' -M Location of makepkg config file.' -} - -main() { - archroot_args=(-f); - while getopts 'hC:M:' arg; do - case "$arg" in - C|M) archroot_args+=("-$arg" "$OPTARG");; - - h) usage; exit 0;; - *) usage; exit 1;; - esac - done - shift $(($OPTIND - 1)) - case $# in - 0) :;; - 1) CHROOT="$1";; - *) usage; exit 1;; - esac - - if (( EUID )); then - error "This script must be run as root" - exit 1 - fi - - mkdir -p "${CHROOTDIR}/${CHROOT}" - archroot "${archroot_args[@]}" "${CHROOTDIR}/${CHROOT}/root" -i base base-devel sudo "${CHROOTEXTRAPKG[@]}" -} - -main "$@" -- cgit v1.2.3-2-g168b