moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

makepkg: do not run prepare() with --noextract 

This is partial revert of 8454daa7fe (makepkg: run pkgver() and
prepare() with --noextract).

Reasoning for the reversion (copied from FS#43498):

    Running prepare() when --noextract is used no longer allows running
    'makepkg -o && makepkg -e' with any PKGBUILD that applies patches in
    prepare(). [1]

    Sure there's --noprepare which restores the old behavior, but that's
    a lot of extra typing for what I believe is a much more common use
    of --noextract.

    For OP's use case of doing git bisects, you can specify the commit
    in the source array and thus skip --noextract since makepkg will
    checkout the correct commit each time.

    [1] I often extract the sources using 'makepkg -o', manually edit
    some source files, and then use 'makepkg -e' to package it (while
    possibly repeating the edit/package steps).

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Evangelos Foutras 2016-02-17 09:11:38 +02:00 committed by Allan McRae
parent a724235b61
commit c034a3322b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/makepkg.8.txt
View File

@ -55,11 +55,11 @@ Options
installed.
*-e, \--noextract*::
Do not extract source files; use whatever source already exists in the
$srcdir/ directory. This is handy if you want to go into $srcdir/ and
manually patch or tweak code, then make a package out of the result.
Keep in mind that creating a patch may be a better solution to allow
others to use your PKGBUILD.
Do not extract source files or run the prepare() function (if present);
use whatever source already exists in the $srcdir/ directory. This is
handy if you want to go into $srcdir/ and manually patch or tweak code,
then make a package out of the result. Keep in mind that creating a
patch may be a better solution to allow others to use your PKGBUILD.
*\--verifysource*::
For each source file in the source array of PKGBUILD, download the file

6
scripts/makepkg.sh.in
View File

@ -2214,6 +2214,9 @@ if (( !REPKG )); then
fi
extract_sources
if (( PREPAREFUNC )); then
run_prepare
fi
fi
if (( PKGVERFUNC )); then
@ -2221,9 +2224,6 @@ if (( !REPKG )); then
basever=$(get_full_version)
check_build_status
fi
if (( PREPAREFUNC )); then
run_prepare
fi
fi
if (( NOBUILD )); then