Merge remote-tracking branch 'cryptocrack/for-pierre'
This commit is contained in:
commit
b06b9f6010
|
@ -1,2 +1,15 @@
|
||||||
*~
|
*~
|
||||||
devtools-*.tar.gz
|
devtools-*.tar.gz
|
||||||
|
archbuild
|
||||||
|
archco
|
||||||
|
archrelease
|
||||||
|
archrm
|
||||||
|
bash_completion
|
||||||
|
checkpkg
|
||||||
|
commitpkg
|
||||||
|
finddeps
|
||||||
|
lddd
|
||||||
|
makechrootpkg
|
||||||
|
mkarchroot
|
||||||
|
rebuildpkgs
|
||||||
|
zsh_completion
|
||||||
|
|
13
Makefile
13
Makefile
|
@ -47,7 +47,16 @@ ARCHBUILD_LINKS = \
|
||||||
multilib-build \
|
multilib-build \
|
||||||
multilib-testing-build
|
multilib-testing-build
|
||||||
|
|
||||||
all:
|
all: $(BINPROGS) $(SBINPROGS) bash_completion zsh_completion
|
||||||
|
|
||||||
|
%: %.in
|
||||||
|
@echo "GEN $@"
|
||||||
|
@sed -e "s|@pkgdatadir[@]|$(DESTDIR)$(PREFIX)/share/devtools|g" "$<" >"$@"
|
||||||
|
@chmod a-w "$@"
|
||||||
|
@chmod +x "$@"
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -f $(BINPROGS) $(SBINPROGS) bash_completion zsh_completion
|
||||||
|
|
||||||
install:
|
install:
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/bin
|
install -dm0755 $(DESTDIR)$(PREFIX)/bin
|
||||||
|
@ -78,4 +87,4 @@ dist:
|
||||||
upload:
|
upload:
|
||||||
scp devtools-$(V).tar.gz gerolde.archlinux.org:/srv/ftp/other/devtools/
|
scp devtools-$(V).tar.gz gerolde.archlinux.org:/srv/ftp/other/devtools/
|
||||||
|
|
||||||
.PHONY: all install uninstall dist upload
|
.PHONY: all clean install uninstall dist upload
|
||||||
|
|
|
@ -54,8 +54,8 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
|
||||||
rm -rf "${chroots}/${repo}-${arch}"
|
rm -rf "${chroots}/${repo}-${arch}"
|
||||||
mkdir -p "${chroots}/${repo}-${arch}"
|
mkdir -p "${chroots}/${repo}-${arch}"
|
||||||
setarch "${arch}" mkarchroot \
|
setarch "${arch}" mkarchroot \
|
||||||
-C "/usr/share/devtools/pacman-${repo}.conf" \
|
-C "@pkgdatadir@/pacman-${repo}.conf" \
|
||||||
-M "/usr/share/devtools/makepkg-${arch}.conf" \
|
-M "@pkgdatadir@/makepkg-${arch}.conf" \
|
||||||
"${chroots}/${repo}-${arch}/root" \
|
"${chroots}/${repo}-${arch}/root" \
|
||||||
"${base_packages[@]}"
|
"${base_packages[@]}"
|
||||||
else
|
else
|
|
@ -46,15 +46,14 @@ for tag in "$@"; do
|
||||||
while read -r file; do
|
while read -r file; do
|
||||||
trash+=("repos/$tag/$file")
|
trash+=("repos/$tag/$file")
|
||||||
done < <(svn ls "repos/$tag")
|
done < <(svn ls "repos/$tag")
|
||||||
svn rm -q "${trash[@]}"
|
[[ $trash ]] && svn rm -q "${trash[@]}"
|
||||||
else
|
else
|
||||||
mkdir -p "repos/$tag"
|
mkdir -p "repos/$tag"
|
||||||
svn add --parents -q "repos/$tag"
|
svn add --parents -q "repos/$tag"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for file in "${known_files[@]}"; do
|
# copy all files at once from trunk to the subdirectory in repos/
|
||||||
svn copy -q -r HEAD "$trunk/$file" "repos/$tag/"
|
svn copy -q -r HEAD ${known_files[@]/#/$trunk/} "repos/$tag/"
|
||||||
done
|
|
||||||
|
|
||||||
echo 'done'
|
echo 'done'
|
||||||
done
|
done
|
|
@ -24,7 +24,7 @@ if [[ $arch == 'any' ]]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
STARTDIR=$(pwd)
|
STARTDIR=$(pwd)
|
||||||
TEMPDIR=$(mktemp -d /tmp/checkpkg-script.XXXX)
|
TEMPDIR=$(mktemp -d --tmpdir checkpkg-script.XXXX)
|
||||||
cd "$TEMPDIR"
|
cd "$TEMPDIR"
|
||||||
|
|
||||||
for _pkgname in "${pkgname[@]}"; do
|
for _pkgname in "${pkgname[@]}"; do
|
|
@ -3,7 +3,9 @@
|
||||||
# finddeps - find packages that depend on a given depname
|
# finddeps - find packages that depend on a given depname
|
||||||
#
|
#
|
||||||
|
|
||||||
if [ "$1" = '' ]; then
|
match=$1
|
||||||
|
|
||||||
|
if [[ -z $match ]]; then
|
||||||
echo 'usage: finddeps <depname>'
|
echo 'usage: finddeps <depname>'
|
||||||
echo ''
|
echo ''
|
||||||
echo 'Find packages that depend on a given depname.'
|
echo 'Find packages that depend on a given depname.'
|
||||||
|
@ -12,35 +14,24 @@ if [ "$1" = '' ]; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
match=$1
|
find . -type d | while read d; do
|
||||||
tld=$(pwd)
|
if [[ -f "$d/PKGBUILD" ]]; then
|
||||||
|
unset pkgname depends makedepends optdepends
|
||||||
for d in $(find . -type d); do
|
. "$d/PKGBUILD"
|
||||||
cd $d
|
|
||||||
if [ -f PKGBUILD ]; then
|
|
||||||
unset pkgname depends makedepends
|
|
||||||
. PKGBUILD
|
|
||||||
for dep in "${depends[@]}"; do
|
for dep in "${depends[@]}"; do
|
||||||
# lose the version comparator, if any
|
# lose the version comparator, if any
|
||||||
depname=${dep%%[<>=]*}
|
depname=${dep%%[<>=]*}
|
||||||
if [ "$depname" = "$match" ]; then
|
[[ $depname = $match ]] && echo "$d (depends)"
|
||||||
echo "$d (depends)"
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
for dep in "${makedepends[@]}"; do
|
for dep in "${makedepends[@]}"; do
|
||||||
# lose the version comparator, if any
|
# lose the version comparator, if any
|
||||||
depname=${dep%%[<>=]*}
|
depname=${dep%%[<>=]*}
|
||||||
if [ "$depname" = "$match" ]; then
|
[[ $depname = $match ]] && echo "$d (makedepends)"
|
||||||
echo "$d (makedepends)"
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
for dep in "${optdepends[@]/:*}"; do
|
for dep in "${optdepends[@]/:*}"; do
|
||||||
# lose the version comaparator, if any
|
# lose the version comaparator, if any
|
||||||
depname=${dep%%[<>=]*}
|
depname=${dep%%[<>=]*}
|
||||||
if [ "$depname" = "$match" ]; then
|
[[ $depname = $match ]] && echo "$d (optdepends)"
|
||||||
echo "$d (optdepends)"
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
cd $tld
|
|
||||||
done
|
done
|
|
@ -9,7 +9,7 @@ IFS="${IFS}:"
|
||||||
libdirs="/lib /usr/lib /usr/local/lib $(cat /etc/ld.so.conf.d/*)"
|
libdirs="/lib /usr/lib /usr/local/lib $(cat /etc/ld.so.conf.d/*)"
|
||||||
extras=
|
extras=
|
||||||
|
|
||||||
TEMPDIR=$(mktemp -d /tmp/lddd-script.XXXX)
|
TEMPDIR=$(mktemp -d --tmpdir lddd-script.XXXX)
|
||||||
|
|
||||||
echo 'Go out and drink some tea, this will take a while :) ...'
|
echo 'Go out and drink some tea, this will take a while :) ...'
|
||||||
# Check ELF binaries in the PATH and specified dir trees.
|
# Check ELF binaries in the PATH and specified dir trees.
|
|
@ -8,27 +8,23 @@
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
FORCE='n'
|
shopt -s nullglob
|
||||||
RUN=''
|
|
||||||
MAKEPKG_ARGS='-s --noconfirm'
|
|
||||||
REPACK=''
|
|
||||||
WORKDIR=$PWD
|
|
||||||
|
|
||||||
update_first='0'
|
makepkg_args='-s --noconfirm -L'
|
||||||
clean_first='0'
|
repack=false
|
||||||
install_pkg=''
|
update_first=false
|
||||||
add_to_db=0
|
clean_first=false
|
||||||
|
install_pkg=
|
||||||
chrootdir=''
|
add_to_db=false
|
||||||
|
run_namcap=false
|
||||||
APPNAME=$(basename "${0}")
|
chrootdir=
|
||||||
|
|
||||||
default_copy=$USER
|
default_copy=$USER
|
||||||
[[ -n $SUDO_USER ]] && default_copy=$SUDO_USER
|
[[ -n $SUDO_USER ]] && default_copy=$SUDO_USER
|
||||||
[[ -z $default_copy || $default_copy = root ]] && default_copy=copy
|
[[ -z $default_copy || $default_copy = root ]] && default_copy=copy
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
echo "usage ${APPNAME} [options] -r <chrootdir> [--] [makepkg args]"
|
echo "usage ${0##*/} [options] -r <chrootdir> [--] [makepkg args]"
|
||||||
echo ' Run this script in a PKGBUILD dir to build a package inside a'
|
echo ' Run this script in a PKGBUILD dir to build a package inside a'
|
||||||
echo ' clean chroot. All unrecognized arguments passed to this script'
|
echo ' clean chroot. All unrecognized arguments passed to this script'
|
||||||
echo ' will be passed to makepkg.'
|
echo ' will be passed to makepkg.'
|
||||||
|
@ -41,7 +37,7 @@ usage() {
|
||||||
echo 'command:'
|
echo 'command:'
|
||||||
echo ' mkarchroot <chrootdir>/root base base-devel sudo'
|
echo ' mkarchroot <chrootdir>/root base base-devel sudo'
|
||||||
echo ''
|
echo ''
|
||||||
echo "Default makepkg args: $MAKEPKG_ARGS"
|
echo "Default makepkg args: $makepkg_args"
|
||||||
echo ''
|
echo ''
|
||||||
echo 'Flags:'
|
echo 'Flags:'
|
||||||
echo '-h This help'
|
echo '-h This help'
|
||||||
|
@ -54,27 +50,29 @@ usage() {
|
||||||
echo '-I <pkg> Install a package into the working copy of the chroot'
|
echo '-I <pkg> Install a package into the working copy of the chroot'
|
||||||
echo '-l <copy> The directory to use as the working copy of the chroot'
|
echo '-l <copy> The directory to use as the working copy of the chroot'
|
||||||
echo ' Useful for maintaining multiple copies.'
|
echo ' Useful for maintaining multiple copies.'
|
||||||
|
echo '-n Run namcap on the package'
|
||||||
echo " Default: $default_copy"
|
echo " Default: $default_copy"
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
while getopts 'hcudr:I:l:' arg; do
|
while getopts 'hcudr:I:l:n' arg; do
|
||||||
case "${arg}" in
|
case "$arg" in
|
||||||
h) usage ;;
|
h) usage ;;
|
||||||
c) clean_first=1 ;;
|
c) clean_first=true ;;
|
||||||
u) update_first=1 ;;
|
u) update_first=true ;;
|
||||||
d) add_to_db=1 ;;
|
d) add_to_db=true ;;
|
||||||
r) chrootdir="$OPTARG" ;;
|
r) chrootdir="$OPTARG" ;;
|
||||||
I) install_pkg="$OPTARG" ;;
|
I) install_pkg="$OPTARG" ;;
|
||||||
l) copy="$OPTARG" ;;
|
l) copy="$OPTARG" ;;
|
||||||
*) MAKEPKG_ARGS="$MAKEPKG_ARGS -$arg $OPTARG" ;;
|
n) run_namcap=true ;;
|
||||||
|
*) makepkg_args="$makepkg_args -$arg $OPTARG" ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
# Canonicalize chrootdir, getting rid of trailing /
|
# Canonicalize chrootdir, getting rid of trailing /
|
||||||
chrootdir=$(readlink -e "$chrootdir")
|
chrootdir=$(readlink -e "$chrootdir")
|
||||||
|
|
||||||
if [[ ${copy:0:1} = "/" ]]; then
|
if [[ ${copy:0:1} = / ]]; then
|
||||||
copydir=$copy
|
copydir=$copy
|
||||||
else
|
else
|
||||||
[[ -z $copy ]] && copy=$default_copy
|
[[ -z $copy ]] && copy=$default_copy
|
||||||
|
@ -82,35 +80,35 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Pass all arguments after -- right to makepkg
|
# Pass all arguments after -- right to makepkg
|
||||||
MAKEPKG_ARGS="$MAKEPKG_ARGS ${*:$OPTIND}"
|
makepkg_args="$makepkg_args ${*:$OPTIND}"
|
||||||
|
|
||||||
# See if -R was passed to makepkg
|
# See if -R was passed to makepkg
|
||||||
for arg in ${*:$OPTIND}; do
|
for arg in ${*:$OPTIND}; do
|
||||||
if [ "$arg" = '-R' ]; then
|
if [[ $arg = -R ]]; then
|
||||||
REPACK=1
|
repack=1
|
||||||
break;
|
break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ "$EUID" != '0' ]; then
|
if (( EUID )); then
|
||||||
echo 'This script must be run as root.'
|
echo 'This script must be run as root.'
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -f PKGBUILD -a -z "$install_pkg" ]; then
|
if [[ ! -f PKGBUILD && -z $install_pkg ]]; then
|
||||||
echo 'This must be run in a directory containing a PKGBUILD.'
|
echo 'This must be run in a directory containing a PKGBUILD.'
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -d "$chrootdir" ]; then
|
if [[ ! -d $chrootdir ]]; then
|
||||||
echo "No chroot dir defined, or invalid path '$chrootdir'"
|
echo "No chroot dir defined, or invalid path '$chrootdir'"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -d "$chrootdir/root" ]; then
|
if [[ ! -d $chrootdir/root ]]; then
|
||||||
echo 'Missing chroot dir root directory.'
|
echo 'Missing chroot dir root directory.'
|
||||||
echo "Try using: mkarchroot $chrootdir/root base base-devel sudo"
|
echo "Try using: mkarchroot $chrootdir/root base base-devel sudo"
|
||||||
usage
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
umask 0022
|
umask 0022
|
||||||
|
@ -124,7 +122,7 @@ if ! flock -n 9; then
|
||||||
echo "done"
|
echo "done"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -d "$copydir" -o "$clean_first" -eq "1" ]; then
|
if [[ ! -d $copydir ]] || $clean_first; then
|
||||||
# Get a read lock on the root chroot to make
|
# Get a read lock on the root chroot to make
|
||||||
# sure we don't clone a half-updated chroot
|
# sure we don't clone a half-updated chroot
|
||||||
exec 8>"$chrootdir/root.lock"
|
exec 8>"$chrootdir/root.lock"
|
||||||
|
@ -138,8 +136,9 @@ if [ ! -d "$copydir" -o "$clean_first" -eq "1" ]; then
|
||||||
echo -n 'creating clean working copy...'
|
echo -n 'creating clean working copy...'
|
||||||
use_rsync=false
|
use_rsync=false
|
||||||
if type -P btrfs >/dev/null; then
|
if type -P btrfs >/dev/null; then
|
||||||
[ -d $copydir ] && btrfs subvolume delete "$copydir" &>/dev/null
|
[[ -d $copydir ]] && btrfs subvolume delete "$copydir" &>/dev/null
|
||||||
btrfs subvolume snapshot "$chrootdir/root" "$copydir" &>/dev/null || use_rsync=true
|
btrfs subvolume snapshot "$chrootdir/root" "$copydir" &>/dev/null ||
|
||||||
|
use_rsync=true
|
||||||
else
|
else
|
||||||
use_rsync=true
|
use_rsync=true
|
||||||
fi
|
fi
|
||||||
|
@ -154,152 +153,151 @@ if [ ! -d "$copydir" -o "$clean_first" -eq "1" ]; then
|
||||||
exec 8>&-
|
exec 8>&-
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$install_pkg" ]; then
|
if [[ -n $install_pkg ]]; then
|
||||||
pkgname="$(basename "$install_pkg")"
|
pkgname="${install_pkg##*/}"
|
||||||
cp "$install_pkg" "$copydir/$pkgname"
|
cp "$install_pkg" "$copydir/$pkgname"
|
||||||
|
|
||||||
mkarchroot -r "pacman -U /$pkgname --noconfirm" "$copydir"
|
mkarchroot -r "pacman -U /$pkgname --noconfirm" "$copydir"
|
||||||
ret=$?
|
ret=$?
|
||||||
|
|
||||||
rm "$copydir/$pkgname"
|
rm "$copydir/$pkgname"
|
||||||
|
|
||||||
# Exit early, we've done all we need to
|
# Exit early, we've done all we need to
|
||||||
exit $ret
|
exit $ret
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $update_first -eq 1 ]; then
|
$update_first && mkarchroot -u "$copydir"
|
||||||
mkarchroot -u "$copydir"
|
|
||||||
fi
|
|
||||||
|
|
||||||
[ -d "$copydir/build" ] || mkdir "$copydir/build"
|
mkdir -p "$copydir/build"
|
||||||
|
|
||||||
if [ "$REPACK" != "1" ]; then
|
# Remove anything in there UNLESS -R (repack) was passed to makepkg
|
||||||
# Remove anything in there UNLESS -R (repack) was passed to makepkg
|
$repack || rm -rf "$copydir"/build/*
|
||||||
rm -rf "$copydir/build/"*
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Read .makepkg.conf even if called via sudo
|
# Read .makepkg.conf even if called via sudo
|
||||||
if [ -n "${SUDO_USER}" ]; then
|
if [[ -n $SUDO_USER ]]; then
|
||||||
makepkg_conf="/$(eval echo ~${SUDO_USER})/.makepkg.conf"
|
makepkg_conf="$(eval echo ~$SUDO_USER)/.makepkg.conf"
|
||||||
else
|
else
|
||||||
makepkg_conf="~/.makepkg.conf"
|
makepkg_conf="$HOME/.makepkg.conf"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Get SRC/PKGDEST from makepkg.conf
|
# Get SRC/PKGDEST from makepkg.conf
|
||||||
if [ -f "${makepkg_conf}" ]; then
|
if [[ -f $makepkg_conf ]]; then
|
||||||
eval $(grep '^SRCDEST=' "${makepkg_conf}")
|
eval $(grep '^SRCDEST=' "$makepkg_conf")
|
||||||
eval $(grep '^PKGDEST=' "${makepkg_conf}")
|
eval $(grep '^PKGDEST=' "$makepkg_conf")
|
||||||
|
eval $(grep '^MAKEFLAGS=' "$makepkg_conf")
|
||||||
eval $(grep '^MAKEFLAGS=' "${makepkg_conf}")
|
eval $(grep '^PACKAGER=' "$makepkg_conf")
|
||||||
eval $(grep '^PACKAGER=' "${makepkg_conf}")
|
|
||||||
fi
|
fi
|
||||||
[ -z "${SRCDEST}" ] && eval $(grep '^SRCDEST=' /etc/makepkg.conf)
|
|
||||||
[ -z "${PKGDEST}" ] && eval $(grep '^PKGDEST=' /etc/makepkg.conf)
|
|
||||||
|
|
||||||
[ -d "$copydir/pkgdest" ] || mkdir "$copydir/pkgdest"
|
[[ -z $SRCDEST ]] && eval $(grep '^SRCDEST=' /etc/makepkg.conf)
|
||||||
if ! grep 'PKGDEST="/pkgdest"' "$copydir/etc/makepkg.conf" >/dev/null 2>&1; then
|
[[ -z $PKGDEST ]] && eval $(grep '^PKGDEST=' /etc/makepkg.conf)
|
||||||
|
[[ -z $MAKEFLAGS ]] && eval $(grep '^MAKEFLAGS=' /etc/makepkg.conf)
|
||||||
|
[[ -z $PACKAGER ]] && eval $(grep '^PACKAGER=' /etc/makepkg.conf)
|
||||||
|
|
||||||
|
# Use PKGBUILD directory if PKGDEST or SRCDEST don't exist
|
||||||
|
[[ -d $PKGDEST ]] || PKGDEST=.
|
||||||
|
[[ -d $SRCDEST ]] || SRCDEST=.
|
||||||
|
|
||||||
|
mkdir -p "$copydir/pkgdest"
|
||||||
|
if ! grep -q 'PKGDEST="/pkgdest"' "$copydir/etc/makepkg.conf"; then
|
||||||
echo 'PKGDEST="/pkgdest"' >> "$copydir/etc/makepkg.conf"
|
echo 'PKGDEST="/pkgdest"' >> "$copydir/etc/makepkg.conf"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[ -d "$copydir/srcdest" ] || mkdir "$copydir/srcdest"
|
mkdir -p "$copydir/srcdest"
|
||||||
if ! grep 'SRCDEST="/srcdest"' "$copydir/etc/makepkg.conf" >/dev/null 2>&1; then
|
if ! grep -q 'SRCDEST="/srcdest"' "$copydir/etc/makepkg.conf"; then
|
||||||
echo 'SRCDEST="/srcdest"' >> "$copydir/etc/makepkg.conf"
|
echo 'SRCDEST="/srcdest"' >> "$copydir/etc/makepkg.conf"
|
||||||
fi
|
fi
|
||||||
[ -z "${MAKEFLAGS}" ] && eval $(grep '^MAKEFLAGS=' /etc/makepkg.conf)
|
|
||||||
if [ -n "${MAKEFLAGS}" ]; then
|
if [[ -n $MAKEFLAGS ]]; then
|
||||||
sed -i '/^MAKEFLAGS=/d' "$copydir/etc/makepkg.conf"
|
sed -i '/^MAKEFLAGS=/d' "$copydir/etc/makepkg.conf"
|
||||||
echo "MAKEFLAGS='${MAKEFLAGS}'" >> "$copydir/etc/makepkg.conf"
|
echo "MAKEFLAGS='${MAKEFLAGS}'" >> "$copydir/etc/makepkg.conf"
|
||||||
fi
|
fi
|
||||||
[ -z "${PACKAGER}" ] && eval $(grep '^PACKAGER=' /etc/makepkg.conf)
|
|
||||||
if [ -n "${PACKAGER}" ]; then
|
if [[ -n $PACKAGER ]]; then
|
||||||
sed -i '/^PACKAGER=/d' "$copydir/etc/makepkg.conf"
|
sed -i '/^PACKAGER=/d' "$copydir/etc/makepkg.conf"
|
||||||
echo "PACKAGER='${PACKAGER}'" >> "$copydir/etc/makepkg.conf"
|
echo "PACKAGER='${PACKAGER}'" >> "$copydir/etc/makepkg.conf"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Set target CARCH as it might be used within the PKGBUILD to select correct sources
|
# Set target CARCH as it might be used within the PKGBUILD to select correct sources
|
||||||
eval $(grep '^CARCH=' "$copydir/etc/makepkg.conf")
|
eval $(grep '^CARCH=' "$copydir/etc/makepkg.conf")
|
||||||
export CARCH
|
export CARCH
|
||||||
# Copy PKGBUILD and sources
|
|
||||||
source=($(. PKGBUILD; echo ${source[@]}))
|
|
||||||
cp PKGBUILD "$copydir/build/"
|
|
||||||
for f in ${source[@]}; do
|
|
||||||
basef=$(echo $f | sed 's|::.*||' | sed 's|^.*://.*/||g')
|
|
||||||
if [ -f "$basef" ]; then
|
|
||||||
cp "$basef" "$copydir/srcdest/"
|
|
||||||
elif [ -f "$SRCDEST/$basef" ]; then
|
|
||||||
cp "$SRCDEST/$basef" "$copydir/srcdest/"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
( . PKGBUILD
|
# Copy PKGBUILD and sources
|
||||||
for i in 'changelog' 'install'; do
|
cp PKGBUILD "$copydir/build/"
|
||||||
filelist=$(sed -n "s/^[[:space:]]*$i=//p" PKGBUILD)
|
(
|
||||||
for file in $filelist; do
|
source PKGBUILD
|
||||||
# evaluate any bash variables used
|
for file in "${source[@]}"; do
|
||||||
eval file=${file}
|
file="${file%%::*}"
|
||||||
if [[ -f "$file" ]]; then
|
file="${file##*://*/}"
|
||||||
cp "$file" "$copydir/build/"
|
if [[ -f $file ]]; then
|
||||||
|
cp "$file" "$copydir/srcdest/"
|
||||||
|
elif [[ -f $SRCDEST/$file ]]; then
|
||||||
|
cp "$SRCDEST/$file" "$copydir/srcdest/"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
done
|
|
||||||
|
# Find all changelog and install files, even inside functions
|
||||||
|
for i in changelog install; do
|
||||||
|
sed -n "s/^[[:space:]]*$i=//p" PKGBUILD | while IFS= read -r file; do
|
||||||
|
# evaluate any bash variables used
|
||||||
|
eval file="$file"
|
||||||
|
[[ -f $file ]] && cp "$file" "$copydir/build/"
|
||||||
|
done
|
||||||
|
done
|
||||||
)
|
)
|
||||||
|
|
||||||
chown -R nobody "$copydir/build"
|
chown -R nobody "$copydir"/{build,pkgdest,srcdest}
|
||||||
chown -R nobody "$copydir/srcdest"
|
|
||||||
chown -R nobody "$copydir/pkgdest"
|
|
||||||
|
|
||||||
echo 'nobody ALL = NOPASSWD: /usr/bin/pacman' > "$copydir/etc/sudoers.d/nobody-pacman"
|
echo 'nobody ALL = NOPASSWD: /usr/bin/pacman' > "$copydir/etc/sudoers.d/nobody-pacman"
|
||||||
chmod 440 "$copydir/etc/sudoers.d/nobody-pacman"
|
chmod 440 "$copydir/etc/sudoers.d/nobody-pacman"
|
||||||
|
|
||||||
#This is a little gross, but this way the script is recreated every time in the
|
# This is a little gross, but this way the script is recreated every time in the
|
||||||
#working copy
|
# working copy
|
||||||
(cat <<EOF
|
cat >"$copydir/chrootbuild" <<EOF
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
export LANG=C
|
export LANG=C
|
||||||
cd /build
|
|
||||||
export HOME=/build
|
export HOME=/build
|
||||||
sudo -u nobody makepkg $MAKEPKG_ARGS || touch BUILD_FAILED
|
|
||||||
[ -f BUILD_FAILED ] && exit 1
|
cd /build
|
||||||
which namcap &>/dev/null && namcap /build/PKGBUILD /pkgdest/*.pkg.tar.* > /build/namcap.log
|
sudo -u nobody makepkg $makepkg_args || touch BUILD_FAILED
|
||||||
|
|
||||||
|
[[ -f BUILD_FAILED ]] && exit 1
|
||||||
|
|
||||||
|
if $run_namcap; then
|
||||||
|
pacman -S --needed --noconfirm namcap
|
||||||
|
namcap /build/PKGBUILD /pkgdest/*.pkg.tar.* > /build/namcap.log
|
||||||
|
fi
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
EOF
|
EOF
|
||||||
) > "$copydir/chrootbuild"
|
|
||||||
chmod +x "$copydir/chrootbuild"
|
chmod +x "$copydir/chrootbuild"
|
||||||
|
|
||||||
if mkarchroot -r "/chrootbuild" "$copydir"; then
|
if mkarchroot -r "/chrootbuild" "$copydir"; then
|
||||||
for pkgfile in "${copydir}"/pkgdest/*.pkg.tar.*; do
|
for pkgfile in "$copydir"/pkgdest/*.pkg.tar.*; do
|
||||||
[ -e "$pkgfile" ] || continue
|
if $add_to_db; then
|
||||||
if [ "$add_to_db" -eq "1" ]; then
|
mkdir -p "$copydir/repo"
|
||||||
mkdir -p "${copydir}/repo"
|
pushd "$copydir/repo" >/dev/null
|
||||||
pushd "${copydir}/repo" >/dev/null
|
|
||||||
cp "$pkgfile" .
|
cp "$pkgfile" .
|
||||||
repo-add repo.db.tar.gz "$(basename "$pkgfile")"
|
repo-add repo.db.tar.gz "${pkgfile##*/}"
|
||||||
popd >/dev/null
|
popd >/dev/null
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -d "$PKGDEST" ]; then
|
mv "$pkgfile" "$PKGDEST"
|
||||||
mv "$pkgfile" "${PKGDEST}"
|
|
||||||
else
|
|
||||||
mv "$pkgfile" "${WORKDIR}"
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
|
|
||||||
for l in "${copydir}"/build/{namcap,*-{build,check,package,package_*}}.log; do
|
for l in "$copydir"/build/{namcap,*-{build,check,package,package_*}}.log; do
|
||||||
[ -f "$l" ] && mv "$l" "${WORKDIR}"
|
[[ -f $l ]] && mv "$l" .
|
||||||
done
|
done
|
||||||
else
|
else
|
||||||
#just in case. We returned 1, make sure we fail
|
# Just in case. We returned 1, make sure we fail
|
||||||
touch "${copydir}/build/BUILD_FAILED"
|
touch "$copydir/build/BUILD_FAILED"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for f in "${copydir}"/srcdest/*; do
|
for f in "$copydir"/srcdest/*; do
|
||||||
[ -e "$f" ] || continue
|
mv "$f" "$SRCDEST"
|
||||||
if [ -d "$SRCDEST" ]; then
|
|
||||||
mv "$f" "${SRCDEST}"
|
|
||||||
else
|
|
||||||
mv "$f" "${WORKDIR}"
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ -e "${copydir}/build/BUILD_FAILED" ]; then
|
if [[ -e $copydir/build/BUILD_FAILED ]]; then
|
||||||
echo "Build failed, check $copydir/build"
|
echo "Build failed, check $copydir/build"
|
||||||
rm "${copydir}/build/BUILD_FAILED"
|
rm "$copydir/build/BUILD_FAILED"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
Loading…
Reference in New Issue