- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib/scripts (repo-add)
by Aaron Griffin 30 Mar '07

30 Mar '07

Date: Thursday, March 29, 2007 @ 23:33:19 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: repo-add (1.6 -> 1.7) commit 970d2e942eb29bf78fe89895ace4d781970b6e94 Author: Aaron Griffin <aaronmgriffin(a)gmail.com> Date: Thu Mar 29 21:30:40 2007 -0500 repo-add leaves .PKGINFO in the current directory * Misuse of 'tar xf', which should be 'tar tf' Signed-off-by: Aaron Griffin <aaronmgriffin(a)gmail.com> ----------+ repo-add | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/scripts/repo-add diff -u pacman-lib/scripts/repo-add:1.6 pacman-lib/scripts/repo-add:1.7 --- pacman-lib/scripts/repo-add:1.6 Tue Mar 13 11:01:15 2007 +++ pacman-lib/scripts/repo-add Thu Mar 29 23:33:19 2007 @@ -246,7 +246,7 @@ fi else if [ -f "$arg" ]; then - if ! tar xf "$arg" .PKGINFO 2>&1 >/dev/null; then + if ! tar tf "$arg" .PKGINFO 2>&1 >/dev/null; then echo "error: '$arg' is not a package file, skipping" else echo ":: adding package '$arg'"

1 0

[pacman-dev] [patch] makepkg (actually tar) can't extract .tar.Z archives.
by Andrew Fyfe 30 Mar '07

30 Mar '07

Found a bug last night when trying to build rcs, 'tar -xf' doesn't work when trying to extract .tar.Z archives. You need to use 'tar -xzf'. Patch attached. Andrew >From 2d6993d638a46da68c23927e609000764c4b2b0c Mon Sep 17 00:00:00 2001 From: Andrew Fyfe <andrew(a)neptune-one.net> Date: Thu, 29 Mar 2007 11:11:36 +0100 Subject: [PATCH 1/1] Fix bug where makepkg can't extract .tar.Z archives. For some reason 'tar -xf' doesn't work with .tar.Z, you need to use 'tar -xzf' to extract the archive. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> --- scripts/makepkg | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg b/scripts/makepkg index 5afb285..92d8ab2 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -809,6 +809,8 @@ else file_type=$(file -biz "$file") unset cmd case "$file_type" in + *application/x-tar*application/x-compress*) + cmd="tar -xzf $file" ;; *application/x-tar*) cmd="tar -xf $file" ;; *application/x-zip*) -- 1.5.0.5

2 1

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by Aaron Griffin 30 Mar '07

30 Mar '07

Date: Thursday, March 29, 2007 @ 23:24:10 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.65 -> 1.66) From: Andrew Fyfe <andrew(a)neptune-one.net> Date: Thu, 29 Mar 2007 11:11:36 +0100 Subject: [PATCH 1/1] Fix bug where makepkg can't extract .tar.Z archives. For some reason 'tar -xf' doesn't work with .tar.Z, you need to use 'tar -xzf' to extract the archive. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> Signed-off-by: Aaron Griffin <aaronmgriffin(a)gmail.com> ---------+ makepkg | 2 ++ 1 file changed, 2 insertions(+) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.65 pacman-lib/scripts/makepkg:1.66 --- pacman-lib/scripts/makepkg:1.65 Sun Mar 25 13:37:43 2007 +++ pacman-lib/scripts/makepkg Thu Mar 29 23:24:09 2007 @@ -809,6 +809,8 @@ file_type=$(file -biz "$file") unset cmd case "$file_type" in + *application/x-tar*application/x-compress*) + cmd="tar -xzf $file" ;; *application/x-tar*) cmd="tar -xf $file" ;; *application/x-zip*)

1 0

[pacman-dev] handling of provides/conflicts packages
by Scott Horowitz 29 Mar '07

29 Mar '07

So here's the scenario: mplayer is in current, mplayer-svn is in unstable. mplayer-svn provides and conflicts with mplayer. As is typically the case with packages in current, mplayer has no provides or conflicts for packages outside of current/extra (mplayer-svn in this case). If you have mplayer-svn installed and try to install mplayer, you get the following: $ pacman -S mplayer resolving dependencies... done. looking for inter-conflicts... :: mplayer conflicts with mplayer-svn. Remove mplayer-svn? [Y/n] y done. error: failed to prepare transaction (could not satisfy dependencies) :: mplayer-svn requires acidrip :: mplayer-svn requires mplayer-plugin First off, I think that "done" is probably a bug - mplayer-svn wasn't removed ;-) And secondly, it seems like pacman should be able to handle this swap of mplayer-svn->mplayer even when the mplayer pkgbuild doesn't have the provided/conflicts array set. I mean, if mplayer-svn provides mplayer, doesn't it imply the reverse? I obviously don't understand the technical details, but this behavior seems "broken" to me. Scott

5 6

[pacman-dev] handling of provides/conflicts
by Scott Horowitz 29 Mar '07

29 Mar '07

Scenario: mplayer-svn is in unstable, mplayer is in current. mplayer-svn has provides/conflicts for mplayer, mplayer does not for mplayer-svn (it seems typical that packages in current don't deal with packages outside of current/extra). If I have mplayer-svn installed and try to install mplayer, I get the following: $ pacman -S mplayer resolving dependencies... done. looking for inter-conflicts... :: mplayer conflicts with mplayer-svn. Remove mplayer-svn? [Y/n] done. error: failed to prepare transaction (could not satisfy dependencies) :: mplayer-svn requires acidrip :: mplayer-svn requires mplayer-plugin (First, two minor problems. The "done" is very confusing - I assume it's from the inter-conflicts statement, but it reads as removing mplayer-svn is done. Also, the "mplayer-svn requires acidrip" should read "acidrip requires mplayer-svn" (sorry yankees26).) But the point is that this behavior seems "broken" to me. Surely if mplayer-svn provides mplayer, you should be able to swap mplayer-svn for mplayer. Scott

3 3

[pacman-dev] Roadmap for 3.1
by Aaron Griffin 29 Mar '07

29 Mar '07

Looks like it's time to move towards a 3.1 release. Dan and I both have a lot of items listed in our TODO lists, though most of them are code changes (doesn't affect the end user much). So I'd like to open the floor up for ideas - what *functional* changes interest you all, as a user of pacman? I'm going to take some input here, and then compose a list of what I'd like to do for the 3.1 release. Keep in mind that, going forward, I'd like to do quick, smaller releases (every 1-2 months would be ideal) so not everything will get done right away. Also, as a side note, we're probably going to be moving to using git for development - making it easier for other users to contribute patches and things like that (still kinda pending on some side projects I'm working on, but I digress). Anyway, let me know. Thanks, Aaron

9 20

[pacman-dev] [patch] Spell check for PKGBUILDs :p (aka check-buildscript)
by Andrew Fyfe 29 Mar '07

29 Mar '07

I was looking at the commented out code in makepkg to unset all vars in PKGBUILD before including and I think I've cracked it. So I went to test it on arch's main, extra and unstable repo, and there's several PKGBUILDs with miss spelled vars. As a result I've created check-buildscript, this just runs some sanity/spell checks on a PKGBUILD script. People should run it before submitting a PKGBUILD. Andrew >From 1d77fdf087d37ed839c892484df26c471ed79f9a Mon Sep 17 00:00:00 2001 From: Andrew Fyfe <andrew(a)neptune-one.net> Date: Thu, 29 Mar 2007 16:24:59 +0100 Subject: [PATCH 1/1] Added check-buildscript check-buildscript does some basic sanity checks on a build script. People should run check-buildscript before they submit a build script. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> --- scripts/Makefile.am | 3 +- scripts/check-buildscript | 261 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 263 insertions(+), 1 deletions(-) create mode 100755 scripts/check-buildscript diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 57baee4..68d9ff6 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -4,6 +4,7 @@ bin_SCRIPTS = \ abs \ + check-buildscript \ gensync \ makepkg \ makeworld \ @@ -15,4 +16,4 @@ bin_SCRIPTS = \ EXTRA_DIST = $(bin_SCRIPTS) -abs gensync makepkg makeworld pacman-optimize rankmirrors repo-add repo-remove re-pacman updatesync: +abs check-buildscript gensync makepkg makeworld pacman-optimize rankmirrors repo-add repo-remove re-pacman updatesync: diff --git a/scripts/check-buildscript b/scripts/check-buildscript new file mode 100755 index 0000000..fddd2bf --- /dev/null +++ b/scripts/check-buildscript @@ -0,0 +1,261 @@ +#!/bin/bash +# +# check-buildscript - checks build script for errors. +# +# Copyright (c) 2007 by Andrew Fyfe <andrew(a)neptune-one.net> +# +# 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 2 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +# USA. +# + +# TODO: _PACMAN_VERSION needs to match version of pacman package. +# some autoconf foo is needed. +_PACMAN_VERSION='3.0.0' +_VERSION='1.0' +_BUG_REPORT_EMAIL='pacman-dev(a)archlinux.org' + +BUILDSCRIPT='PKGBUILD' + +set -e +trap 'echo -e "\033[1;31mBANG! \033[1;37mThat didnt sound good. \033[1;33m:(\033[1;0m" >&2' ERR + +_DEFAULT_VARS=(pkgname pkgver pkgrel pkgdesc arch url license depends + makedepends provides conflicts replaces backup install + options source noextract md5sums sha1sums groups) + +E_OK=0 +E_UNKNOWN=1 +E_BUILDSCRIPT_ERROR=2 +E_HAS_WARNINGS=4 + +_WARNINGS=0 + +# Source makepkg.conf; fail if it is not found +if [ -r /etc/makepkg.conf ]; then + source /etc/makepkg.conf +else + error "/etc/makepkg.conf not found. cannot continue" + exit 1 # $E_CONFIG_ERROR # TODO: error codes +fi + +# Source user-specific makepkg.conf overrides +[ -r ~/.makepkg.conf ] && source ~/.makepkg.conf + +plain() { + if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then + echo -e " \033[1;37m$1\033[1;0m" >&2 + else + echo " $1" >&2 + fi +} + +msg() { + if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then + echo -e "\033[1;32m==> \033[1;37m$1\033[1;0m" >&2 + else + echo "==> $1" >&2 + fi +} + +msg2() { + if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then + echo -e " \033[1;34m-> \033[1;37m$1\033[1;0m" >&2 + else + echo " -> $1" >&2 + fi +} + +warning() { + if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then + echo -e "\033[1;33m==> WARNING: \033[1;37m$1\033[1;0m" >&2 + else + echo "==> WARNING: $1" >&2 + fi +} + +error() { + if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then + echo -e "\033[1;31m==> ERROR: \033[1;37m$1\033[1;0m" >&2 + else + echo "==> ERROR: $1" >&2 + fi +} + +in_array() { + local needle=$1 + shift 1 + [ -z "$1" ] && return 1 + for i in $*; do + [ "$i" = "$needle" ] && return 0 + done + return 1 +} + +# check if option is present in BUILDENV +check_buildenv() { + local needle=$(echo $1 | tr [:upper:] [:lower:]) + local i + # use options from makepkg.conf + for i in ${BUILDENV[@]}; do + local lc=$(echo $i | tr [:upper:] [:lower:]) + if [ "$lc" = "$needle" ]; then + echo "y" + return + elif [ "$lc" = "!$needle" ]; then + echo "n" + return + fi + done + echo "unknown" + return +} + +usage () { + cat << EOF +check-buildscript version $_VERSION + +Usage: $0 [options] [build script] + +Options: + -m, --nocolor Disable colourized output messages. + + -h, --help Display this help then exit. + -V, --version Output version information then exit. + +If no build script is specified on the command line then +check-buildscript will check ./$BUILDSCRIPT + +Report bugs to <${_BUG_REPORT_EMAIL}> + +EOF +} + +version () { + echo "check-buildscript $_VERSION" + echo "pacman $_PACMAN_VERSION" +} + +check_hasBuild () { + msg2 "Checking for build() function..." + if ! grep -q ' *build *' $_BUILDSCRIPT; then + error "The build() function was not found." + plain "Please make sure you have a build() function in your build script." + exit $E_BUILDSCRIPT_ERROR + fi +} + +check_varNames () { + msg2 "Checking variable names..." + + local count=$(( \ + $(grep -n 'build *()' "$_BUILDSCRIPT" | cut -d : -f 1) )) + local vars="$(head -n $count "$_BUILDSCRIPT" | \ + grep '^[A-Za-z0-9\-\_]*=.*' | \ + sed 's/^$[A-Za-z0-9\-\_]*$=.*/\1/')" + + [ -z "$vars" ] && return + + local var extra_vars + for var in $vars; do + ! in_array $var ${_DEFAULT_VARS[@]} && extra_vars="$extra_vars $var" + done + + if [ -n "$extra_vars" ]; then + _WARNINGS=$(($_WARNINGS + 1)) + warning "$_BUILDSCRIPT contains the following non standard variables:" + + for var in $extra_vars; do + msg2 "$var" + done + + plain "" + plain "Please make sure these aren't misspelled variables." + plain "If they aren't just ignore this warning." + plain "" + fi +} + +check_hasChecksums () { + msg2 "Checking for checksums..." + + if [ "$(source "$_BUILDSCRIPT"; \ + [ -z "$md5sums" -a -z "$sha1sums" ] || \ + [ "$md5sums" = "generate" -a -z "$sha1sums" ]; \ + echo $?)" -eq 0 ]; then + _WARNINGS=$(($_WARNINGS + 1)) + warning "$_BUILDSCRIPT contains no checksums for the source files." + plain "Unless this package gets its source from cvs/svn please run" + plain "makepkg -g >>PKGBUILD" + plain "" + fi +} + + +## Begin script... +_OPT_SHORT="mhV" +_OPT_LONG="nocolor,help,version" +_OPT_TEMP="$(getopt -o $_OPT_SHORT --long $_OPT_LONG -n "$0" -- "$@" || true)" +eval set -- "$_OPT_TEMP" +unset _OPT_SHORT _OPT_LONG _OPT_TEMP + +while true; do + case $1 in + -m|--nocolor) USE_COLOR='n';; + + -h|--help) usage; exit $E_OK;; + -V|--version) version; exit $E_OK;; + + --) OPTIND=0; shift; break;; + *) usage; exit $E_UNKNOWN;; + esac +done + +if [ $# -eq 0 ]; then + if [ ! -r "$BUILDSCRIPT" ]; then + usage + exit $E_UNKNOWN + fi + + _FILES=$BUILDSCRIPT +else + _FILES=$* +fi + +for _BUILDSCRIPT in $_FILES; do + if [ ! -r "$_BUILDSCRIPT" ]; then + error "Unable to find $_BUILDSCRIPT" + exit $E_UNKNOWN + fi + + msg "Checking ${_BUILDSCRIPT}..." + + check_hasBuild + check_varNames + check_hasChecksums +done + +plain "" +if [ $_WARNINGS -eq 0 ]; then + msg "Your build script(s) looks ok. \033[1;33m:)" + exit $E_OK +elif [ $_WARNINGS -eq 1 ]; then + warning "There might be a problem. There was 1 warning." + exit $E_HAS_WARNINGS +else + warning "There might be a problem. There were $_WARNINGS warnings." + exit $E_HAS_WARNINGS +fi + +# vim:set ts=4 noet: -- 1.5.0.6

3 4

[pacman-dev] Package/repo priority
by Nagy Gabor 29 Mar '07

29 Mar '07

Hi! AFAIK, if a 'foo' package exists in more than one repo (both in extra and testing for example), then the repo which the package will be installed from is undefined (probably the first repo in pacman.conf). That would be nice, if we somehow could choose our source repo for 'foo'. I don't know how can this be implemented easily, but some suggestions: 'pacman -S repo/foo' or an option to change repo-priority (which is probably defined by their order in pacman.conf) or pacman could ask the user which package is going to be installed (however, this can be annoying). You may say that I shouldn't use 2 "intersecting" repos, but similar problem occurs in case of (multiple) provided packages, where "ask" seems to be the only usable solution. Anyway, using multiple repos can be useful (but not so efficient now): For example I'm using current, extra and community repos; yes, sometimes there are some buggy packages in current, it these cases that would be comfortable, if I can easily override my default current repo to 0.7.1 for example and downgrading my package or trying a newer one from testing. Bye, Nagy Gabor One more addition to the last example: Some mirrors keep older versions of packages, for example see ftp://ftp.estpak.ee/pub/archlinux/current/os/i686/, and it would be handy if there would be an other db to these repos (which would contain all older versions of packages), and here comes to picture the multiple packages problem again. For example in these cases the latest version should be the default target and user could override this.

3 5

[pacman-dev] [patch] makepkg3 -- Reduced fakeroot usage (take 2)
by Andrew Fyfe 29 Mar '07

29 Mar '07

Hi, The last set of patches were made late at night and contain several bugs. So I've redone them. I've split the patches up a bit more as well to make the changes clearer. The *-move.patch files just move large chunks into functions, the *-cleanup.patch files remove the fakeroot code. The number at the beginning denotes what order the patches should be applied in. I've tested these patches out against my base repo and all works as expected. It should fix all the fakeroot problems people are having, how ever I've never encountered the problem described on FS#6208. Andrew ------------------------------------------------------------ revno: 4 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: feature-create_package timestamp: Sun 2007-03-25 13:25:18 +0100 message: * Moved create package commands into create_package() diff -Naur old/scripts/makepkg new/scripts/makepkg --- old/scripts/makepkg 2007-03-25 19:34:35.489021785 +0100 +++ new/scripts/makepkg 2007-03-25 19:35:55.929605832 +0100 @@ -348,6 +348,95 @@ fi } +create_package () { + # get some package meta info + builddate=$(LC_ALL= ; LANG= ; date -u "+%a %b %e %H:%M:%S %Y") + if [ "$PACKAGER" != "" ]; then + packager="$PACKAGER" + else + packager="Arch Linux (http://www.archlinux.org)" + fi + size=$(du -cb "$startdir/pkg" | tail -n 1 | awk '{print $1}') + + # build a filelist - do this first to keep meta files out of the list + msg "Generating .FILELIST file..." + cd "$startdir/pkg" + tar cvf /dev/null * | sort >.FILELIST + + # write the .PKGINFO file + msg "Generating .PKGINFO file..." + cd "$startdir/pkg" + echo "# Generated by makepkg $myver" >.PKGINFO + echo -n "# " >>.PKGINFO + date >>.PKGINFO + echo "pkgname = $pkgname" >>.PKGINFO + echo "pkgver = $pkgver-$pkgrel" >>.PKGINFO + echo "pkgdesc = $pkgdesc" >>.PKGINFO + echo "url = $url" >>.PKGINFO + echo "builddate = $builddate" >>.PKGINFO + echo "packager = $packager" >>.PKGINFO + echo "size = $size" >>.PKGINFO + if [ "$CARCH" != "" ]; then + echo "arch = $CARCH" >>.PKGINFO + fi + + for it in "${license[@]}"; do + echo "license = $it" >>.PKGINFO + done + for it in "${replaces[@]}"; do + echo "replaces = $it" >>.PKGINFO + done + for it in "${groups[@]}"; do + echo "group = $it" >>.PKGINFO + done + for it in "${depends[@]}"; do + echo "depend = $it" >>.PKGINFO + done + for it in "${conflicts[@]}"; do + echo "conflict = $it" >>.PKGINFO + done + for it in "${provides[@]}"; do + echo "provides = $it" >>.PKGINFO + done + for it in "${backup[@]}"; do + echo "backup = $it" >>.PKGINFO + done + + # TODO maybe remove this at some point + # warn if license array is not present or empty + if [ "$license" = "" ]; then + warning "Please add a license line to your $BUILDSCRIPT!" + plain "example for GPL'ed software: license=('GPL')." + fi + + # check for an install script + if [ "$install" != "" ]; then + msg "Copying install script..." + cp "$startdir/$install" "$startdir/pkg/.INSTALL" + fi + + # do we have a changelog? + have_changelog=0 + if [ -f "$startdir/ChangeLog" ]; then + msg "Copying package changelog" + cp "$startdir/ChangeLog" "$startdir/pkg/.CHANGELOG" + have_changelog=1 + fi + + # tar it up + msg "Compressing package..." + cd "$startdir/pkg" + + pkg_file="$PKGDEST/$pkgname-$pkgver-$pkgrel-${CARCH}.${PKGEXT}" + comp_files=".PKGINFO .FILELIST ${install:+.INSTALL}" + [ $have_changelog -eq 1 ] && comp_files=".CHANGELOG $comp_files" + + if ! tar czf $pkg_file $comp_files *; then + error "Failed to create package file." + exit 1 + fi +} + installpackage() { if [ "$INSTALL" = "1" -a "$SUDO" = "1" ]; then msg "Installing package with pacman -U..." @@ -974,92 +1063,7 @@ find -depth -type d -empty -delete; fi -# get some package meta info -builddate=$(LC_ALL= ; LANG= ; date -u "+%a %b %e %H:%M:%S %Y") -if [ "$PACKAGER" != "" ]; then - packager="$PACKAGER" -else - packager="Arch Linux (http://www.archlinux.org)" -fi -size=$(du -cb "$startdir/pkg" | tail -n 1 | awk '{print $1}') - -# build a filelist - do this first to keep meta files out of the list -msg "Generating .FILELIST file..." -cd "$startdir/pkg" -tar cvf /dev/null * | sort >.FILELIST - -# write the .PKGINFO file -msg "Generating .PKGINFO file..." -cd "$startdir/pkg" -echo "# Generated by makepkg $myver" >.PKGINFO -echo -n "# " >>.PKGINFO -date >>.PKGINFO -echo "pkgname = $pkgname" >>.PKGINFO -echo "pkgver = $pkgver-$pkgrel" >>.PKGINFO -echo "pkgdesc = $pkgdesc" >>.PKGINFO -echo "url = $url" >>.PKGINFO -echo "builddate = $builddate" >>.PKGINFO -echo "packager = $packager" >>.PKGINFO -echo "size = $size" >>.PKGINFO -if [ "$CARCH" != "" ]; then - echo "arch = $CARCH" >>.PKGINFO -fi - -for it in "${license[@]}"; do - echo "license = $it" >>.PKGINFO -done -for it in "${replaces[@]}"; do - echo "replaces = $it" >>.PKGINFO -done -for it in "${groups[@]}"; do - echo "group = $it" >>.PKGINFO -done -for it in "${depends[@]}"; do - echo "depend = $it" >>.PKGINFO -done -for it in "${conflicts[@]}"; do - echo "conflict = $it" >>.PKGINFO -done -for it in "${provides[@]}"; do - echo "provides = $it" >>.PKGINFO -done -for it in "${backup[@]}"; do - echo "backup = $it" >>.PKGINFO -done - -# TODO maybe remove this at some point -# warn if license array is not present or empty -if [ "$license" = "" ]; then - warning "Please add a license line to your $BUILDSCRIPT!" - plain "example for GPL'ed software: license=('GPL')." -fi - -# check for an install script -if [ "$install" != "" ]; then - msg "Copying install script..." - cp "$startdir/$install" "$startdir/pkg/.INSTALL" -fi - -# do we have a changelog? -have_changelog=0 -if [ -f "$startdir/ChangeLog" ]; then - msg "Copying package changelog" - cp "$startdir/ChangeLog" "$startdir/pkg/.CHANGELOG" - have_changelog=1 -fi - -# tar it up -msg "Compressing package..." -cd "$startdir/pkg" - -pkg_file="$PKGDEST/$pkgname-$pkgver-$pkgrel-${CARCH}.${PKGEXT}" -comp_files=".PKGINFO .FILELIST ${install:+.INSTALL}" -[ $have_changelog -eq 1 ] && comp_files=".CHANGELOG $comp_files" - -if ! tar czf $pkg_file $comp_files *; then - error "Failed to create package file." - exit 1 -fi +create_package cd "$startdir" if [ "$CLEANUP" = "1" ]; then ------------------------------------------------------------ revno: 5 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: feature-create_package timestamp: Sun 2007-03-25 13:35:09 +0100 message: * cleaned up create_package() === modified file 'scripts/makepkg' --- old/scripts/makepkg 2007-03-25 12:25:18 +0000 +++ new/scripts/makepkg 2007-03-25 12:35:09 +0000 @@ -349,26 +349,26 @@ } create_package () { + cd "$startdir/pkg" + msg "Creating package..." + # get some package meta info - builddate=$(LC_ALL= ; LANG= ; date -u "+%a %b %e %H:%M:%S %Y") + local builddate=$(LC_ALL= LANG= date -u "+%a %b %e %H:%M:%S %Y") if [ "$PACKAGER" != "" ]; then - packager="$PACKAGER" + local packager="$PACKAGER" else - packager="Arch Linux (http://www.archlinux.org)" + local packager="Arch Linux (http://www.archlinux.org)" fi - size=$(du -cb "$startdir/pkg" | tail -n 1 | awk '{print $1}') + local size=$(du -sb | awk '{print $1}') # build a filelist - do this first to keep meta files out of the list - msg "Generating .FILELIST file..." - cd "$startdir/pkg" - tar cvf /dev/null * | sort >.FILELIST + msg2 "Generating .FILELIST file..." + tar -cvf /dev/null * | sort >.FILELIST # write the .PKGINFO file - msg "Generating .PKGINFO file..." - cd "$startdir/pkg" + msg2 "Generating .PKGINFO file..." echo "# Generated by makepkg $myver" >.PKGINFO - echo -n "# " >>.PKGINFO - date >>.PKGINFO + echo "# $(LC_ALL= LANG= date -u)" >>.PKGINFO echo "pkgname = $pkgname" >>.PKGINFO echo "pkgver = $pkgver-$pkgrel" >>.PKGINFO echo "pkgdesc = $pkgdesc" >>.PKGINFO @@ -380,6 +380,7 @@ echo "arch = $CARCH" >>.PKGINFO fi + local it for it in "${license[@]}"; do echo "license = $it" >>.PKGINFO done @@ -409,31 +410,31 @@ plain "example for GPL'ed software: license=('GPL')." fi + local comp_files + # check for an install script if [ "$install" != "" ]; then - msg "Copying install script..." - cp "$startdir/$install" "$startdir/pkg/.INSTALL" + msg2 "Copying install script..." + cp "$startdir/$install" .INSTALL + comp_files="$comp_files .INSTALL" fi # do we have a changelog? - have_changelog=0 if [ -f "$startdir/ChangeLog" ]; then - msg "Copying package changelog" - cp "$startdir/ChangeLog" "$startdir/pkg/.CHANGELOG" - have_changelog=1 + msg2 "Copying package changelog" + cp "$startdir/ChangeLog" .CHANGELOG + comp_files="$comp_files .CHANGELOG" fi # tar it up - msg "Compressing package..." - cd "$startdir/pkg" - - pkg_file="$PKGDEST/$pkgname-$pkgver-$pkgrel-${CARCH}.${PKGEXT}" - comp_files=".PKGINFO .FILELIST ${install:+.INSTALL}" - [ $have_changelog -eq 1 ] && comp_files=".CHANGELOG $comp_files" - - if ! tar czf $pkg_file $comp_files *; then + msg2 "Compressing package..." + + local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT}" + comp_files="$comp_files .PKGINFO .FILELIST" + + if ! tar -czf "$pkg_file" $comp_files *; then error "Failed to create package file." - exit 1 + exit 1 # TODO: error code fi } ------------------------------------------------------------ revno: 6 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: feature-tidy_install timestamp: Sun 2007-03-25 13:44:23 +0100 message: * moved the following into tidy_install() - Remove info/doc files - Move usr/share/man to usr/man - Compress man pages - Strip binaries and libraries - Remove libtool files - Remove empty directories diff -Naur old/scripts/makepkg new/scripts/makepkg --- old/scripts/makepkg 2007-03-25 19:39:05.156389252 +0100 +++ new/scripts/makepkg 2007-03-25 19:39:28.349710962 +0100 @@ -348,6 +348,67 @@ fi } +tidy_install () { + if [ "$(check_option docs)" = "n" ]; then + # remove info/doc files + msg "Removing info/doc files..." + cd "$startdir/pkg" + #fix flyspray bug #5021 + rm -rf ${DOC_DIRS[@]} + fi + + # move /usr/share/man files to /usr/man + if [ -d $startdir/pkg/usr/share/man ]; then + cd "$startdir" + mkdir -p pkg/usr/man + cp -a pkg/usr/share/man/* pkg/usr/man/ + rm -rf pkg/usr/share/man + fi + + # compress man pages + msg "Compressing man pages..." + find "$startdir"/pkg/{usr{,/local},opt/*}/man -type f 2>/dev/null | while read i ; do + ext="${i##*.}" + fn="${i##*/}" + if [ "$ext" != "gz" -a "$ext" != "bz2" ]; then + # update symlinks to this manpage + find "$startdir"/pkg/{usr{,/local},opt/*}/man -lname "$fn" 2> /dev/null | while read ln ; do + rm -f "$ln" + ln -sf "${fn}.gz" "${ln}.gz" + done + # compress the original + gzip -9 "$i" + fi + done + + cd "$startdir" + + # strip binaries + if [ "$(check_option strip)" = "y" ]; then + msg "Stripping debugging symbols from libraries..." + find pkg/{,usr,usr/local,opt/*}/lib -type f -not -name "*.dll" -not -name "*.exe" \ + -exec /usr/bin/strip --strip-debug '{}' \; 2>&1 \ + | grep -v "No such file" | grep -v "format not recognized" + msg "Stripping symbols from binaries..." + find pkg/{,usr,usr/local,opt/*}/{bin,sbin} -type f -not -name "*.dll" -not -name "*.exe" \ + -exec /usr/bin/strip '{}' \; 2>&1 \ + | grep -v "No such file" | grep -v "format not recognized" + fi + + # remove libtool (.la) files + if [ "$(check_option libtool)" = "n" ]; then + msg "Removing libtool .la files..." + find pkg -type f -name "*.la" -exec rm -f -- '{}' \; + fi + + # remove empty directories + if [ "$(check_option emptydirs)" = "n" ]; then + msg "Removing empty directories..." + cd "$startdir/pkg" + find -depth -type d -empty -delete; + fi +} + create_package () { cd "$startdir/pkg" msg "Creating package..." @@ -1005,64 +1066,7 @@ fi fi -if [ "$(check_option docs)" = "n" ]; then - # remove info/doc files - msg "Removing info/doc files..." - cd "$startdir/pkg" - #fix flyspray bug #5021 - rm -rf ${DOC_DIRS[@]} -fi - -# move /usr/share/man files to /usr/man -if [ -d $startdir/pkg/usr/share/man ]; then - cd "$startdir" - mkdir -p pkg/usr/man - cp -a pkg/usr/share/man/* pkg/usr/man/ - rm -rf pkg/usr/share/man -fi - -# compress man pages -msg "Compressing man pages..." -find "$startdir"/pkg/{usr{,/local},opt/*}/man -type f 2>/dev/null | while read i ; do - ext="${i##*.}" - fn="${i##*/}" - if [ "$ext" != "gz" -a "$ext" != "bz2" ]; then - # update symlinks to this manpage - find "$startdir"/pkg/{usr{,/local},opt/*}/man -lname "$fn" 2> /dev/null | while read ln ; do - rm -f "$ln" - ln -sf "${fn}.gz" "${ln}.gz" - done - # compress the original - gzip -9 "$i" - fi -done - -cd "$startdir" - -# strip binaries -if [ "$(check_option strip)" = "y" ]; then - msg "Stripping debugging symbols from libraries..." - find pkg/{,usr,usr/local,opt/*}/lib -type f -not -name "*.dll" -not -name "*.exe" \ - -exec /usr/bin/strip --strip-debug '{}' \; 2>&1 \ - | grep -v "No such file" | grep -v "format not recognized" - msg "Stripping symbols from binaries..." - find pkg/{,usr,usr/local,opt/*}/{bin,sbin} -type f -not -name "*.dll" -not -name "*.exe" \ - -exec /usr/bin/strip '{}' \; 2>&1 \ - | grep -v "No such file" | grep -v "format not recognized" -fi - -# remove libtool (.la) files -if [ "$(check_option libtool)" = "n" ]; then - msg "Removing libtool .la files..." - find pkg -type f -name "*.la" -exec rm -f -- '{}' \; -fi - -# remove empty directories -if [ "$(check_option emptydirs)" = "n" ]; then - msg "Removing empty directories..." - cd "$startdir/pkg" - find -depth -type d -empty -delete; -fi +tidy_install create_package ------------------------------------------------------------ revno: 7 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: feature-tidy_install timestamp: Sun 2007-03-25 13:53:16 +0100 message: * cleaned up tidy_install() * added 'LC_ALL=C LANG=C' to stip bin/lib find commands. On non en_US locales the greps can fail. === modified file 'scripts/makepkg' --- old/scripts/makepkg 2007-03-25 12:44:23 +0000 +++ new/scripts/makepkg 2007-03-25 12:53:16 +0000 @@ -349,62 +349,59 @@ } tidy_install () { + cd "$startdir/pkg" + msg "Tidying install..." + if [ "$(check_option docs)" = "n" ]; then - # remove info/doc files - msg "Removing info/doc files..." - cd "$startdir/pkg" + msg2 "Removing info/doc files..." #fix flyspray bug #5021 rm -rf ${DOC_DIRS[@]} fi - # move /usr/share/man files to /usr/man - if [ -d $startdir/pkg/usr/share/man ]; then - cd "$startdir" - mkdir -p pkg/usr/man - cp -a pkg/usr/share/man/* pkg/usr/man/ - rm -rf pkg/usr/share/man + if [ -d usr/share/man ]; then + msg2 "Moving usr/share/man files to usr/man" + mkdir -p usr/man + cp -a usr/share/man/* usr/man/ + rm -rf usr/share/man fi - # compress man pages - msg "Compressing man pages..." - find "$startdir"/pkg/{usr{,/local},opt/*}/man -type f 2>/dev/null | while read i ; do - ext="${i##*.}" - fn="${i##*/}" + msg2 "Compressing man pages..." + local manpage ext file link + find {usr{,/local},opt/*}/man -type f 2>/dev/null | while read manpage ; do + ext="${manpage##*.}" + file="${manpage##*/}" if [ "$ext" != "gz" -a "$ext" != "bz2" ]; then # update symlinks to this manpage - find "$startdir"/pkg/{usr{,/local},opt/*}/man -lname "$fn" 2> /dev/null | while read ln ; do - rm -f "$ln" - ln -sf "${fn}.gz" "${ln}.gz" + find {usr{,/local},opt/*}/man -lname "$file" 2>/dev/null | while read link ; do + rm -f "$link" + ln -sf "${file}.gz" "${link}.gz" done # compress the original - gzip -9 "$i" + gzip -9 "$manpage" fi done - cd "$startdir" - - # strip binaries if [ "$(check_option strip)" = "y" ]; then - msg "Stripping debugging symbols from libraries..." - find pkg/{,usr,usr/local,opt/*}/lib -type f -not -name "*.dll" -not -name "*.exe" \ + msg2 "Stripping debugging symbols from libraries..." + LC_ALL=C LANG=C \ + find {.,usr,usr/local,opt/*}/lib -type f -not -name "*.dll" -not -name "*.exe" \ -exec /usr/bin/strip --strip-debug '{}' \; 2>&1 \ | grep -v "No such file" | grep -v "format not recognized" - msg "Stripping symbols from binaries..." - find pkg/{,usr,usr/local,opt/*}/{bin,sbin} -type f -not -name "*.dll" -not -name "*.exe" \ + + msg2 "Stripping symbols from binaries..." + LC_ALL=C LANG=C \ + find {.,usr,usr/local,opt/*}/{bin,sbin} -type f -not -name "*.dll" -not -name "*.exe" \ -exec /usr/bin/strip '{}' \; 2>&1 \ | grep -v "No such file" | grep -v "format not recognized" fi - # remove libtool (.la) files if [ "$(check_option libtool)" = "n" ]; then - msg "Removing libtool .la files..." - find pkg -type f -name "*.la" -exec rm -f -- '{}' \; + msg2 "Removing libtool .la files..." + find -type f -name "*.la" -exec rm -f -- '{}' \; fi - # remove empty directories if [ "$(check_option emptydirs)" = "n" ]; then - msg "Removing empty directories..." - cd "$startdir/pkg" + msg2 "Removing empty directories..." find -depth -type d -empty -delete; fi } diff -Naur old/scripts/makepkg new/scripts/makepkg --- old/scripts/makepkg 2007-03-25 19:42:10.990979362 +0100 +++ new/scripts/makepkg 2007-03-25 19:47:52.000000000 +0100 @@ -348,6 +348,68 @@ fi } +run_build () { + # use distcc if it is requested (check buildenv and PKGBUILD opts) + if [ "$(check_buildenv distcc)" = "y" -a "$(check_option distcc)" != "n" ]; then + [ -d /usr/lib/distcc/bin ] && export PATH=/usr/lib/distcc/bin:$PATH + elif [ "$(check_option distcc)" = "n" ]; then + # if it is not wanted, clear the makeflags too + export MAKEFLAGS="" + fi + + # use ccache if it is requested (check buildenv and PKGBUILD opts) + if [ "$(check_buildenv ccache)" = "y" -a "$(check_option ccache)" != "n" ]; then + [ -d /usr/lib/ccache/bin ] && export PATH=/usr/lib/ccache/bin:$PATH + fi + + # clear user-specified makeflags if requested + if [ "$(check_option makeflags)" = "n" ]; then + export MAKEFLAGS="" + fi + + # build + msg "Starting build()..." + + # some applications (eg, blackbox) will not build with some languages + unset LC_ALL LANG + umask 0022 + + #check for "exit on syntax error" shell option + echo $SHELLOPTS | grep errexit 2>&1 >/dev/null + set_e=$? + + ret=0 + if [ "$LOGGING" = "1" ]; then + BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log" + if [ -f "$BUILDLOG" ]; then + i=1 + while true; do + if [ -f "$BUILDLOG.$i" ]; then + i=$(($i +1)) + else + break + fi + done + mv "$BUILDLOG" "$BUILDLOG.$i" + fi + + #use 'errexit' to bail on syntax error + [ $set_e -eq 1 ] && set -e + build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]} + [ $set_e -eq 1 ] && set +e + else + #use 'errexit' to bail on syntax error + [ $set_e -eq 1 ] && set -e + build 2>&1 || ret=$? + [ $set_e -eq 1 ] && set +e + fi + if [ $ret -gt 0 ]; then + error "Build Failed. Aborting..." + removedeps + exit 2 + fi +} + tidy_install () { cd "$startdir/pkg" msg "Tidying install..." @@ -1002,65 +1064,7 @@ fi mkdir -p "$startdir/pkg" - # use distcc if it is requested (check buildenv and PKGBUILD opts) - if [ "$(check_buildenv distcc)" = "y" -a "$(check_option distcc)" != "n" ]; then - [ -d /usr/lib/distcc/bin ] && export PATH=/usr/lib/distcc/bin:$PATH - elif [ "$(check_option distcc)" = "n" ]; then - # if it is not wanted, clear the makeflags too - export MAKEFLAGS="" - fi - - # use ccache if it is requested (check buildenv and PKGBUILD opts) - if [ "$(check_buildenv ccache)" = "y" -a "$(check_option ccache)" != "n" ]; then - [ -d /usr/lib/ccache/bin ] && export PATH=/usr/lib/ccache/bin:$PATH - fi - - # clear user-specified makeflags if requested - if [ "$(check_option makeflags)" = "n" ]; then - export MAKEFLAGS="" - fi - - # build - msg "Starting build()..." - - # some applications (eg, blackbox) will not build with some languages - unset LC_ALL LANG - umask 0022 - - #check for "exit on syntax error" shell option - echo $SHELLOPTS | grep errexit 2>&1 >/dev/null - set_e=$? - - ret=0 - if [ "$LOGGING" = "1" ]; then - BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log" - if [ -f "$BUILDLOG" ]; then - i=1 - while true; do - if [ -f "$BUILDLOG.$i" ]; then - i=$(($i +1)) - else - break - fi - done - mv "$BUILDLOG" "$BUILDLOG.$i" - fi - - #use 'errexit' to bail on syntax error - [ $set_e -eq 1 ] && set -e - build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]} - [ $set_e -eq 1 ] && set +e - else - #use 'errexit' to bail on syntax error - [ $set_e -eq 1 ] && set -e - build 2>&1 || ret=$? - [ $set_e -eq 1 ] && set +e - fi - if [ $ret -gt 0 ]; then - error "Build Failed. Aborting..." - removedeps - exit 2 - fi + run_build fi tidy_install ------------------------------------------------------------ revno: 9 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: feature-run_build timestamp: Sun 2007-03-25 14:13:21 +0100 message: * cleaned up run_build. * restore LC_ALL and LANG after running build(). diff -Naur old/scripts/makepkg new/scripts/makepkg --- old/scripts/makepkg 2007-03-25 20:13:25.241786827 +0100 +++ new/scripts/makepkg 2007-03-25 20:14:20.008907829 +0100 @@ -369,20 +369,22 @@ # build msg "Starting build()..." + cd "$startdir/src" # some applications (eg, blackbox) will not build with some languages - unset LC_ALL LANG + local _LC_ALL="$LC_ALL" ; LC_ALL='C' + local _LANG="$LANG" ; LANG='C' umask 0022 #check for "exit on syntax error" shell option echo $SHELLOPTS | grep errexit 2>&1 >/dev/null set_e=$? - ret=0 + local ret=0 if [ "$LOGGING" = "1" ]; then BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log" if [ -f "$BUILDLOG" ]; then - i=1 + local i=1 while true; do if [ -f "$BUILDLOG.$i" ]; then i=$(($i +1)) @@ -403,10 +405,15 @@ build 2>&1 || ret=$? [ $set_e -eq 1 ] && set +e fi + + # restore locales + export LC_ALL="$_LC_ALL" + export LANG="$_LANG" + if [ $ret -gt 0 ]; then error "Build Failed. Aborting..." removedeps - exit 2 + exit 2 # TODO: error code fi } ------------------------------------------------------------ revno: 10 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: feature-fakeroot timestamp: Sun 2007-03-25 14:31:05 +0100 message: * reduced use fakeroot to - run_build() - tidy_install() - create_package() * added check for inproper use of '-F'. * added yn_question() function. * added warning about running makepkg as root. diff -Naur old/scripts/makepkg new/scripts/makepkg --- old/scripts/makepkg 2007-03-25 19:55:48.273553640 +0100 +++ new/scripts/makepkg 2007-03-25 19:56:02.738377944 +0100 @@ -41,6 +41,7 @@ DEP_SRC=0 SUDO=0 FORCE=0 +INFAKEROOT=0 GENINTEG=0 INSTALL=0 NOBUILD=0 @@ -52,14 +53,6 @@ PACMAN_OPTS= -#determine if we are running with fakeroot -if [ "$1" = "-F" ]; then - INFAKEROOT=1 - shift -else - INFAKEROOT=0 -fi - ### SUBROUTINES ### plain() { @@ -102,6 +95,24 @@ fi } +yn_question () { + if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then + echo -en " \033[1;1m$1\033[1;0m " >&2 + else + echo -n " $1 " >&2 + fi + + local answer + read answer + answer="$(echo $answer | tr [:upper:] [:lower:])" + + if [ "$answer" = 'y' -o "$answer" = 'yes' ]; then + return 0 + else + return 1 + fi +} + strip_url() { echo "$1" | sed 's|^.*://.*/||g' } @@ -675,7 +686,7 @@ exit 1 ;; -*) - while getopts "bcCdefghiLmop:rRsS-" opt; do + while getopts "bcCdefFghiLmop:rRsS-" opt; do case $opt in b) DEP_SRC=1 ;; c) CLEANUP=1 ;; @@ -683,6 +694,7 @@ d) NODEPS=1 ;; e) NOEXTRACT=1 ;; f) FORCE=1 ;; + F) INFAKEROOT=1 ;; g) GENINTEG=1 ;; h) usage @@ -751,6 +763,46 @@ fi fi +if [ "$INFAKEROOT" = "0" ]; then + if [ $EUID -eq 0 ]; then + # Warn those who like to live dangerously. + warning "Running makepkg as root is a \033[1;31mBAD\033[1;37m idea!" + plain "" + plain "Running makepkg as root can result in permanent, catastropic damage to " + plain "your system." + plain "" + if ! yn_question "Are you sure you want to continue? [N/y]"; then + error "Aborting..." + exit 1 # $E_USER_ABORT + fi + elif [ "$(check_buildenv fakeroot)" = "y" ]; then + if [ ! $(type -p fakeroot) ]; then + warning "Fakeroot is not installed. Building as an unprivileged user" + plain "will result in non-root ownership of the packaged files. Install" + plain "the fakeroot package to correctly build as a non-root user." + plain "" + if ! yn_question "Are you sure you want to continue? [N/y]"; then + error "Aborting..." + exit 1 # $E_USER_ABORT + fi + fi + else + warning "Running makepkg as an unprivileged user will result in non-root" + plain "ownership of the packaged files. Try using the fakeroot environment by" + plain "placing 'fakeroot' in the BUILDENV array in /etc/makepkg.conf" + plain "" + if ! yn_question "Are you sure you want to continue? [N/y]"; then + error "Aborting..." + exit 1 # $E_USER_ABORT + fi + fi +else + if [ "$FAKEROOTKEY" = "" ]; then + error "Do not use the '-F' option. This option is only for use by makepkg." + exit 1 # TODO: error code + fi +fi + unset pkgname pkgver pkgrel pkgdesc url license groups provides md5sums force unset replaces depends conflicts backup source install build makedepends unset options noextract @@ -810,29 +862,20 @@ fi fi -# Enter the fakeroot environment if necessary. This will call the makepkg -# script again as the fake root user. We detect this by passing a sentinel -# option (-F) to makepkg. -if [ "$EUID" != "0" ]; then - if [ "$(check_buildenv fakeroot)" = "y" ]; then - if [ $(type -p fakeroot) ]; then - msg "Entering fakeroot environment" - fakeroot -- $0 -F $ARGLIST - exit $? - else - warning "Fakeroot is not installed. Building as an unprivileged user" - plain "will result in non-root ownership of the packaged files. Install" - plain "the fakeroot package to correctly build as a non-root user." - plain "" - sleep 1 - fi +# Run the bear minimum in fakeroot +# fix flyspray bug 6208 -- using makepkg with fakeroot gives an error +if [ "$INFAKEROOT" = "1" ]; then + if [ "$REPKG" = "1" ]; then + warning "Skipping build." else - warning "Running makepkg as an unprivileged user will result in non-root" - plain "ownership of the packaged files. Try using the fakeroot environment" - plain "by placing 'fakeroot' in the BUILDENV array in makepkg.conf." - plain "" - sleep 1 - fi + run_build + tidy_install + fi + + create_package + + msg "Leaveing fakeroot environment." + exit 0 # $E_OK fi msg "Making package: $pkgname $pkgver-$pkgrel ($(date))" @@ -1061,22 +1104,34 @@ if [ "$NOBUILD" = "1" ]; then msg "Sources are ready." exit 0 -elif [ "$REPKG" = "1" ]; then - warning "Skipping build" else # check for existing pkg directory - if [ -d "$startdir/pkg" ]; then + if [ -d "$startdir/pkg" -a "$REPKG" = "0" ]; then msg "Removing existing pkg/ directory..." rm -rf "$startdir/pkg" fi mkdir -p "$startdir/pkg" - run_build -fi + if [ $EUID -eq 0 ]; then + if [ "$REPKG" = "1" ]; then + warning "Skipping build." + else + run_build + tidy_install + fi + + create_package + else + msg "Entering fakeroot environment..." + cd "$startdir" -tidy_install + ret=0 + fakeroot -- $0 -F $ARGLIST || ret=$? + [ $ret -ne 0 ] && exit $ret -create_package + unset ret + fi +fi cd "$startdir" if [ "$CLEANUP" = "1" ]; then ------------------------------------------------------------ revno: 11 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: feature-fakeroot timestamp: Sun 2007-03-25 14:38:17 +0100 message: * removed fakeroot hacks from - handledeps() - removedeps() - installpackage() diff -Naur old/scripts/makepkg new/scripts/makepkg --- old/scripts/makepkg 2007-03-25 19:57:18.006667240 +0100 +++ new/scripts/makepkg 2007-03-25 19:59:19.305579669 +0100 @@ -207,7 +207,7 @@ local depstrip="" local striplist="" local haveperm=0 - if [ $ "$EUID" = "0" -a "$INFAKEROOT" != "1" $ -o "$SUDO" = 1 ]; then + if [ "$EUID" = "0" -o "$SUDO" = 1 ]; then haveperm=1 fi @@ -220,21 +220,11 @@ if [ "$DEP_BIN" = "1" -a "$SUDO" = "1" ]; then # install missing deps from binary packages (using pacman -S and sudo) msg "Installing missing dependencies..." - if [ "$INFAKEROOT" = "1" ]; then - # kinda hacky, but we need to make pacman think that we're NOT - # in fakeroot so it will go ahead and install the dependencies. - FAKEROOTKEY2=$FAKEROOTKEY - unset FAKEROOTKEY - fi sudo pacman $PACMAN_OPTS -S $striplist if [ $? -eq 1 ]; then error "Pacman failed to install missing dependencies." exit 1 fi - if [ "$INFAKEROOT" = "1" ]; then - export FAKEROOTKEY=$FAKEROOTKEY2 - unset FAKEROOTKEY2 - fi elif [ "$DEP_BIN" = "1" ]; then # install missing deps from binary packages (using pacman -S) msg "Installing missing dependencies..." @@ -344,15 +334,7 @@ if [ "$RMDEPS" = "1" -a "$SUDO" = "1" -a -n "$deplist" ]; then msg "Removing installed dependencies..." - if [ "$INFAKEROOT" = "1" ]; then - export FAKEROOTKEY2=$FAKEROOTKEY - unset FAKEROOTKEY - fi sudo pacman $PACMAN_OPTS -Rs $striplist - if [ "$INFAKEROOT" = "1" ]; then - export FAKEROOTKEY=$FAKEROOTKEY2 - unset FAKEROOTKEY2 - fi elif [ "$RMDEPS" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" -a -n "$deplist" ]; then msg "Removing installed dependencies..." pacman $PACMAN_OPTS -Rs $striplist @@ -579,16 +561,8 @@ installpackage() { if [ "$INSTALL" = "1" -a "$SUDO" = "1" ]; then msg "Installing package with pacman -U..." - if [ "$INFAKEROOT" = "1" ]; then - FAKEROOTKEY2=$FAKEROOTKEY - unset FAKEROOTKEY - fi sudo pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT} local exitcode=$? - if [ "$INFAKEROOT" = "1" ]; then - export FAKEROOTKEY=$FAKEROOTKEY2 - unset FAKEROOTKEY2 - fi exit $exitcode elif [ "$INSTALL" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" ]; then msg "Installing package with pacman -U..." ------------------------------------------------------------ revno: 12 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: feature-fake_install timestamp: Sun 2007-03-25 14:46:38 +0100 message: * modify run_build() to run other functions. * add fake_install() support. diff -Naur old/scripts/makepkg new/scripts/makepkg --- old/scripts/makepkg 2007-03-25 23:15:12.538842433 +0100 +++ new/scripts/makepkg 2007-03-25 23:16:46.192179436 +0100 @@ -342,6 +342,12 @@ } run_build () { + if [ "$(type -t $1)" != "function" ]; then + error "Unknown function '${1}'." + error "Aborting..." + exit 1 # TODO: error code + fi + # use distcc if it is requested (check buildenv and PKGBUILD opts) if [ "$(check_buildenv distcc)" = "y" -a "$(check_option distcc)" != "n" ]; then [ -d /usr/lib/distcc/bin ] && export PATH=/usr/lib/distcc/bin:$PATH @@ -361,7 +367,7 @@ fi # build - msg "Starting build()..." + msg "Starting ${1}()..." cd "$startdir/src" # some applications (eg, blackbox) will not build with some languages @@ -375,7 +381,7 @@ local ret=0 if [ "$LOGGING" = "1" ]; then - BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log" + BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}-${1}.log" if [ -f "$BUILDLOG" ]; then local i=1 while true; do @@ -390,12 +396,12 @@ #use 'errexit' to bail on syntax error [ $set_e -eq 1 ] && set -e - build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]} + $1 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]} [ $set_e -eq 1 ] && set +e else #use 'errexit' to bail on syntax error [ $set_e -eq 1 ] && set -e - build 2>&1 || ret=$? + $1 2>&1 || ret=$? [ $set_e -eq 1 ] && set +e fi @@ -842,7 +848,12 @@ if [ "$REPKG" = "1" ]; then warning "Skipping build." else - run_build + if [ "$(type -t fake_install)" != "function" ]; then + run_build build + else + run_build fake_install + fi + tidy_install fi @@ -1090,12 +1101,17 @@ if [ "$REPKG" = "1" ]; then warning "Skipping build." else - run_build + run_build build + [ "$(type -t fake_install)" = "function" ] && run_build fake_install tidy_install fi create_package else + if [ "$REPKG" = "0" -a "$(type -t fake_install)" = "function" ]; then + run_build build + fi + msg "Entering fakeroot environment..." cd "$startdir" @@ -1111,7 +1127,7 @@ if [ "$CLEANUP" = "1" ]; then msg "Cleaning up..." rm -rf src pkg - rm -rf ${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log* + rm -f ${pkgname}-${pkgver}-${pkgrel}-${CARCH}-{build,fake_install}.log* fi removedeps

2 2

[pacman-dev] pacman 3.0 in testing
by Aaron Griffin 28 Mar '07

28 Mar '07

Well, pacman 3.0 has gone to testing. It may take some time for everything to sync and all that jazz, but for those packagers using testing (and pacman 3.0) you will need an extra step for the time being when uploading packages. pacman will create packages tagged with the architecture, (i.e. pacman-3.0.0-1-i686.pkg.tar.gz) you will need to rename this WITHOUT the architecture until we update all the dev tools to use the new format (this includes the devtools package and the archlinux.org repo scripts). Enjoy! -- Aaron Griffin

6 6