diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-06-06 13:58:02 -0600 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-06-06 13:58:02 -0600 |
| commit | c2a75424db117c90d4662d4970fafc4c04910666 (patch) | |
| tree | 2760753e0dbeeeaddeed91ad9da368608a11c29c | |
| parent | b04dc724f01f47107b31b791950d22c27aca7d9b (diff) | |
| parent | f5ef88ec591efa169c927e3a9d80386a59d60568 (diff) | |
Merge branch 'archlinux'
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | commitpkg.in | 2 | ||||
| -rw-r--r-- | makechrootpkg.in | 4 |
3 files changed, 4 insertions, 4 deletions
@@ -1,4 +1,4 @@ -V=20150514 +V=20150606 PREFIX = /usr/local diff --git a/commitpkg.in b/commitpkg.in index 65876a3..323f9af 100644 --- a/commitpkg.in +++ b/commitpkg.in @@ -147,7 +147,7 @@ for _arch in ${arch[@]}; do if [[ -n $GPGKEY ]]; then SIGNWITHKEY="-u ${GPGKEY}" fi - gpg --detach-sign --use-agent ${SIGNWITHKEY} "${pkgfile}" || die + gpg --detach-sign --use-agent --no-armor ${SIGNWITHKEY} "${pkgfile}" || die fi if ! gpg --verify "$sigfile" >/dev/null 2>&1; then die "Signature %s.sig is incorrect!" "$pkgfile" diff --git a/makechrootpkg.in b/makechrootpkg.in index 8f07dc1..78e3894 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -385,10 +385,10 @@ $update_first && arch-nspawn "$copydir" \ [[ -n ${install_pkgs[*]} ]] && install_packages -prepare_chroot - download_sources +prepare_chroot + if arch-nspawn "$copydir" \ --bind-ro="$PWD:/startdir_host" \ --bind-ro="$SRCDEST:/srcdest_host" \ |