/[gentoo-x86]/eclass/eutils.eclass
Gentoo

Diff of /eclass/eutils.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.35 Revision 1.93
1# Copyright 1999-2003 Gentoo Technologies, Inc. 1# Copyright 1999-2004 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.35 2003/06/22 05:44:04 drobbins Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.93 2004/08/10 01:11:14 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12ECLASS=eutils 12ECLASS=eutils
13INHERITED="$INHERITED $ECLASS" 13INHERITED="$INHERITED $ECLASS"
14 14
15DEPEND="$DEPEND !bootstrap? ( sys-devel/patch )" 15DEPEND="!bootstrap? ( sys-devel/patch )"
16 16
17DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
18 18
19# This function generate linker scripts in /usr/lib for dynamic 19# This function generate linker scripts in /usr/lib for dynamic
20# libs in /lib. This is to fix linking problems when you have 20# libs in /lib. This is to fix linking problems when you have
88# Default directory where patches are located 88# Default directory where patches are located
89EPATCH_SOURCE="${WORKDIR}/patch" 89EPATCH_SOURCE="${WORKDIR}/patch"
90# Default extension for patches 90# Default extension for patches
91EPATCH_SUFFIX="patch.bz2" 91EPATCH_SUFFIX="patch.bz2"
92# Default options for patch 92# Default options for patch
93# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
93EPATCH_OPTS="" 94EPATCH_OPTS="-g0"
94# List of patches not to apply. Not this is only file names, 95# List of patches not to apply. Not this is only file names,
95# and not the full path .. 96# and not the full path ..
96EPATCH_EXCLUDE="" 97EPATCH_EXCLUDE=""
97# Change the printed message for a single patch. 98# Change the printed message for a single patch.
98EPATCH_SINGLE_MSG="" 99EPATCH_SINGLE_MSG=""
257 else 258 else
258 PATCH_TARGET="${x}" 259 PATCH_TARGET="${x}"
259 fi 260 fi
260 261
261 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 262 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
262 echo "patch ${popts} -p${count} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 263 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
263 264
264 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 265 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
265 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 266 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
266 267
267 if [ "${PATCH_SUFFIX}" != "patch" ] 268 if [ "${PATCH_SUFFIX}" != "patch" ]
274 count=5 275 count=5
275 break 276 break
276 fi 277 fi
277 fi 278 fi
278 279
279 if (cat ${PATCH_TARGET} | patch ${popts} --dry-run -f -p${count}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 280 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1
280 then 281 then
281 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 282 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
282 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 283 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
283 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 284 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
284 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 285 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
285 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 286 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
286 287
287 cat ${PATCH_TARGET} | patch ${popts} -p${count} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 288 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1
288 289
289 if [ "$?" -ne 0 ] 290 if [ "$?" -ne 0 ]
290 then 291 then
291 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 292 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
292 echo 293 echo
401 fi 402 fi
402 403
403 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`" 404 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
404 405
405 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \ 406 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
406 "${ARCH}" = "arm" -o "${ARCH}" = "mips" ] 407 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
407 then 408 then
408 # these archs will always have "[Pp]rocessor" 409 # these archs will always have "[Pp]rocessor"
409 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))" 410 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
410 411
411 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ] 412 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
421 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))" 422 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
422 else 423 else
423 jobs=2 424 jobs=2
424 fi 425 fi
425 426
426 elif [ "${ARCH}" = "ppc" ] 427 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
427 then 428 then
428 # ppc has "processor", but only when compiled with SMP 429 # ppc has "processor", but only when compiled with SMP
429 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ] 430 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
430 then 431 then
431 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))" 432 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
432 else 433 else
433 jobs=2 434 jobs=2
434 fi 435 fi
436 elif [ "${ARCH}" = "s390" ]
437 then
438 # s390 has "# processors : "
439 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
435 else 440 else
436 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))" 441 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
437 die "Unknown ARCH -- ${ARCH}!" 442 die "Unknown ARCH -- ${ARCH}!"
438 fi 443 fi
439 444
451 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}" 456 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
452 else 457 else
453 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..." 458 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..."
454 export MAKEOPTS="${MAKEOPTS} -j${jobs}" 459 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
455 fi 460 fi
461 fi
462}
463
464# Cheap replacement for when debianutils (and thus mktemp)
465# does not exist on the users system
466# vapier@gentoo.org
467#
468# Takes just 1 parameter (the directory to create tmpfile in)
469mymktemp() {
470 local topdir="$1"
471
472 [ -z "${topdir}" ] && topdir=/tmp
473 if [ "`which mktemp 2>/dev/null`" ]
474 then
475 mktemp -p ${topdir}
476 else
477 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
478 touch ${tmp}
479 echo ${tmp}
480 fi
481}
482
483# Small wrapper for getent (Linux) and nidump (Mac OS X)
484# used in enewuser()/enewgroup()
485# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
486#
487# egetent(database, key)
488egetent() {
489 if [ "${ARCH}" == "macos" ] ; then
490 case "$2" in
491 *[!0-9]*) # Non numeric
492 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
493 ;;
494 *) # Numeric
495 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
496 ;;
497 esac
498 else
499 getent $1 $2
456 fi 500 fi
457} 501}
458 502
459# Simplify/standardize adding users to the system 503# Simplify/standardize adding users to the system
460# vapier@gentoo.org 504# vapier@gentoo.org
470# groups: none 514# groups: none
471# extra: comment of 'added by portage for ${PN}' 515# extra: comment of 'added by portage for ${PN}'
472enewuser() { 516enewuser() {
473 # get the username 517 # get the username
474 local euser="$1"; shift 518 local euser="$1"; shift
475 if [ -z "${euser}" ] ; then 519 if [ -z "${euser}" ]
520 then
476 eerror "No username specified !" 521 eerror "No username specified !"
477 die "Cannot call enewuser without a username" 522 die "Cannot call enewuser without a username"
478 fi 523 fi
524
525 # lets see if the username already exists
526 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ]
527 then
528 return 0
529 fi
479 einfo "Adding user '${euser}' to your system ..." 530 einfo "Adding user '${euser}' to your system ..."
480 531
481 # setup a file for testing usernames/groups
482 local tmpfile="`mktemp -p ${T}`"
483 touch ${tmpfile}
484 chown ${euser} ${tmpfile} >& /dev/null
485 local realuser="`ls -l ${tmpfile} | awk '{print $3}'`"
486
487 # see if user already exists
488 if [ "${euser}" == "${realuser}" ] ; then
489 einfo "${euser} already exists on your system :)"
490 return 0
491 fi
492
493 # options to pass to useradd 532 # options to pass to useradd
494 local opts="" 533 local opts=
495 534
496 # handle uid 535 # handle uid
497 local euid="$1"; shift 536 local euid="$1"; shift
498 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] ; then 537 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ]
538 then
499 if [ ${euid} -gt 0 ] ; then 539 if [ "${euid}" -gt 0 ]
500 opts="${opts} -u ${euid}" 540 then
541 if [ ! -z "`egetent passwd ${euid}`" ]
542 then
543 euid="next"
544 fi
501 else 545 else
502 eerror "Userid given but is not greater than 0 !" 546 eerror "Userid given but is not greater than 0 !"
503 die "${euid} is not a valid UID" 547 die "${euid} is not a valid UID"
504 fi 548 fi
505 else 549 else
506 euid="next available" 550 euid="next"
551 fi
552 if [ "${euid}" == "next" ]
553 then
554 local pwrange
555 if [ "${ARCH}" == "macos" ] ; then
556 pwrange="`jot 898 101`"
557 else
558 pwrange="`seq 101 999`"
507 fi 559 fi
560 for euid in ${pwrange} ; do
561 [ -z "`egetent passwd ${euid}`" ] && break
562 done
563 fi
564 opts="${opts} -u ${euid}"
508 einfo " - Userid: ${euid}" 565 einfo " - Userid: ${euid}"
509 566
510 # handle shell 567 # handle shell
511 local eshell="$1"; shift 568 local eshell="$1"; shift
512 if [ ! -z "${eshell}" ] ; then 569 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ]
570 then
513 if [ ! -e ${eshell} ] ; then 571 if [ ! -e "${eshell}" ]
572 then
514 eerror "A shell was specified but it does not exist !" 573 eerror "A shell was specified but it does not exist !"
515 die "${eshell} does not exist" 574 die "${eshell} does not exist"
516 fi 575 fi
517 else 576 else
518 eshell=/bin/false 577 eshell="/bin/false"
519 fi 578 fi
520 einfo " - Shell: ${eshell}" 579 einfo " - Shell: ${eshell}"
521 opts="${opts} -s ${eshell}" 580 opts="${opts} -s ${eshell}"
522 581
523 # handle homedir 582 # handle homedir
524 local ehome="$1"; shift 583 local ehome="$1"; shift
525 if [ -z "${ehome}" ] ; then 584 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ]
585 then
526 ehome=/dev/null 586 ehome="/dev/null"
527 fi 587 fi
528 einfo " - Home: ${ehome}" 588 einfo " - Home: ${ehome}"
529 opts="${opts} -d ${ehome}" 589 opts="${opts} -d ${ehome}"
530 590
531 # handle groups 591 # handle groups
532 local egroups="$1"; shift 592 local egroups="$1"; shift
533 if [ ! -z "${egroups}" ] ; then 593 if [ ! -z "${egroups}" ]
534 local realgroup 594 then
535 local oldifs="${IFS}" 595 local oldifs="${IFS}"
536 export IFS="," 596 export IFS=","
537 for g in ${egroups} ; do 597 for g in ${egroups}
538 chgrp ${g} ${tmpfile} >& /dev/null 598 do
539 realgroup="`ls -l ${tmpfile} | awk '{print $4}'`" 599 if [ -z "`egetent group \"${g}\"`" ]
540 if [ "${g}" != "${realgroup}" ] ; then 600 then
541 eerror "You must add ${g} to the system first" 601 eerror "You must add group ${g} to the system first"
542 die "${g} is not a valid GID" 602 die "${g} is not a valid GID"
543 fi 603 fi
544 done 604 done
545 export IFS="${oldifs}" 605 export IFS="${oldifs}"
546 opts="${opts} -g ${egroups}" 606 opts="${opts} -g ${egroups}"
549 fi 609 fi
550 einfo " - Groups: ${egroups}" 610 einfo " - Groups: ${egroups}"
551 611
552 # handle extra and add the user 612 # handle extra and add the user
553 local eextra="$@" 613 local eextra="$@"
554 local oldsandbox="${oldsandbox}" 614 local oldsandbox="${SANDBOX_ON}"
555 export SANDBOX_ON="0" 615 export SANDBOX_ON="0"
616 if [ "${ARCH}" == "macos" ];
617 then
618 ### Make the user
556 if [ -z "${eextra}" ] ; then 619 if [ -z "${eextra}" ]
620 then
621 dscl . create /users/${euser} uid ${euid}
622 dscl . create /users/${euser} shell ${eshell}
623 dscl . create /users/${euser} home ${ehome}
624 dscl . create /users/${euser} realname "added by portage for ${PN}"
625 ### Add the user to the groups specified
626 for g in ${egroups}
627 do
628 dscl . merge /groups/${g} users ${euser}
629 done
630 else
631 einfo "Extra options are not supported on macos yet"
632 einfo "Please report the ebuild along with the info below"
633 einfo "eextra: ${eextra}"
634 die "Required function missing"
635 fi
636 else
637 if [ -z "${eextra}" ]
638 then
557 useradd ${opts} ${euser} \ 639 useradd ${opts} ${euser} \
558 -c "added by portage for ${PN}" \ 640 -c "added by portage for ${PN}" \
559 || die "enewuser failed" 641 || die "enewuser failed"
560 else 642 else
561 einfo " - Extra: ${eextra}" 643 einfo " - Extra: ${eextra}"
562 useradd ${opts} ${euser} ${eextra} \ 644 useradd ${opts} ${euser} ${eextra} \
563 || die "enewuser failed" 645 || die "enewuser failed"
646 fi
564 fi 647 fi
565 export SANDBOX_ON="${oldsandbox}" 648 export SANDBOX_ON="${oldsandbox}"
566 649
567 if [ ! -e ${ehome} ] && [ ! -e ${D}/${ehome} ] ; then 650 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
651 then
568 einfo " - Creating ${ehome} in ${D}" 652 einfo " - Creating ${ehome} in ${D}"
569 dodir ${ehome} 653 dodir ${ehome}
570 fperms ${euser} ${ehome} 654 fowners ${euser} ${ehome}
655 fperms 755 ${ehome}
571 fi 656 fi
572} 657}
573 658
574# Simplify/standardize adding groups to the system 659# Simplify/standardize adding groups to the system
575# vapier@gentoo.org 660# vapier@gentoo.org
581# gid: next available (see groupadd(8)) 666# gid: next available (see groupadd(8))
582# extra: none 667# extra: none
583enewgroup() { 668enewgroup() {
584 # get the group 669 # get the group
585 local egroup="$1"; shift 670 local egroup="$1"; shift
586 if [ -z "${egroup}" ] ; then 671 if [ -z "${egroup}" ]
672 then
587 eerror "No group specified !" 673 eerror "No group specified !"
588 die "Cannot call enewgroup without a group" 674 die "Cannot call enewgroup without a group"
589 fi 675 fi
676
677 # see if group already exists
678 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ]
679 then
680 return 0
681 fi
590 einfo "Adding group '${egroup}' to your system ..." 682 einfo "Adding group '${egroup}' to your system ..."
591 683
592 # setup a file for testing groupname
593 local tmpfile="`mktemp -p ${T}`"
594 touch ${tmpfile}
595 chgrp ${egroup} ${tmpfile} >& /dev/null
596 local realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
597
598 # see if group already exists
599 if [ "${egroup}" == "${realgroup}" ] ; then
600 einfo "${egroup} already exists on your system :)"
601 return 0
602 fi
603
604 # options to pass to useradd 684 # options to pass to useradd
605 local opts="" 685 local opts=
606 686
607 # handle gid 687 # handle gid
608 local egid="$1"; shift 688 local egid="$1"; shift
609 if [ ! -z "${egid}" ] ; then 689 if [ ! -z "${egid}" ]
690 then
610 if [ ${egid} -gt 0 ] ; then 691 if [ "${egid}" -gt 0 ]
692 then
693 if [ -z "`egetent group ${egid}`" ]
694 then
695 if [ "${ARCH}" == "macos" ] ; then
696 opts="${opts} ${egid}"
697 else
611 opts="${opts} -g ${egid}" 698 opts="${opts} -g ${egid}"
699 fi
700 else
701 egid="next available; requested gid taken"
702 fi
612 else 703 else
613 eerror "Groupid given but is not greater than 0 !" 704 eerror "Groupid given but is not greater than 0 !"
614 die "${egid} is not a valid GID" 705 die "${egid} is not a valid GID"
615 fi 706 fi
616 else 707 else
621 # handle extra 712 # handle extra
622 local eextra="$@" 713 local eextra="$@"
623 opts="${opts} ${eextra}" 714 opts="${opts} ${eextra}"
624 715
625 # add the group 716 # add the group
626 local oldsandbox="${oldsandbox}" 717 local oldsandbox="${SANDBOX_ON}"
627 export SANDBOX_ON="0" 718 export SANDBOX_ON="0"
719 if [ "${ARCH}" == "macos" ];
720 then
721 if [ ! -z "${eextra}" ];
722 then
723 einfo "Extra options are not supported on macos yet"
724 einfo "Please report the ebuild along with the info below"
725 einfo "eextra: ${eextra}"
726 die "Required function missing"
727 fi
728
729 # If we need the next available
730 case ${egid} in
731 *[!0-9]*) # Non numeric
732 for egid in `jot 898 101`; do
733 [ -z "`egetent group ${egid}`" ] && break
734 done
735 esac
736 dscl . create /groups/${egroup} gid ${egid}
737 dscl . create /groups/${egroup} passwd '*'
738 else
628 groupadd ${opts} ${egroup} || die "enewgroup failed" 739 groupadd ${opts} ${egroup} || die "enewgroup failed"
740 fi
629 export SANDBOX_ON="${oldsandbox}" 741 export SANDBOX_ON="${oldsandbox}"
630} 742}
631 743
632# Simple script to replace 'dos2unix' binaries 744# Simple script to replace 'dos2unix' binaries
633# vapier@gentoo.org 745# vapier@gentoo.org
634# 746#
635# edos2unix(file, <more files>...) 747# edos2unix(file, <more files>...)
636edos2unix() { 748edos2unix() {
637 for f in $@ ; do 749 for f in "$@"
750 do
638 cp ${f} ${T}/edos2unix 751 cp "${f}" ${T}/edos2unix
639 sed 's/\r$//' ${T}/edos2unix > ${f} 752 sed 's/\r$//' ${T}/edos2unix > "${f}"
640 done 753 done
641} 754}
642 755
643# new convenience patch wrapper function to eventually replace epatch(), 756# Make a desktop file !
644# $PATCHES, $PATCHES1, src_unpack:patch, src_unpack:autopatch and 757# Great for making those icons in kde/gnome startmenu !
645# /usr/bin/patch 758# Amaze your friends ! Get the women ! Join today !
646# Features: 759# gnome2 /usr/share/applications
647# - bulk patch handling similar to epatch()'s 760# gnome1 /usr/share/gnome/apps/
648# - automatic patch level detection like epatch()'s 761# KDE ${KDEDIR}/share/applnk /usr/share/applnk
649# - automatic patch uncompression like epatch()'s 762#
650# - doesn't have the --dry-run overhead of epatch() - inspects patchfiles 763# make_desktop_entry(<binary>, [name], [icon], [type], [path])
651# manually instead 764#
652# - once I decide it's production-ready, it'll be called from base_src_unpack 765# binary: what binary does the app run with ?
653# to handle $PATCHES to avoid defining src_unpack just to use xpatch 766# name: the name that will show up in the menu
767# icon: give your little like a pretty little icon ...
768# this can be relative (to /usr/share/pixmaps) or
769# a full path to an icon
770# type: what kind of application is this ? for categories:
771# http://www.freedesktop.org/standards/menu-spec/
772# path: if your app needs to startup in a specific dir
773make_desktop_entry() {
774 [ -z "$1" ] && eerror "You must specify the executable" && return 1
654 775
655# accepts zero or more parameters specifying patchfiles and/or patchdirs 776 local exec="${1}"
777 local name="${2:-${PN}}"
778 local icon="${3:-${PN}.png}"
779 local type="${4}"
780 local subdir="${6}"
781 local path="${5:-${GAMES_PREFIX}}"
782 if [ -z "${type}" ]
783 then
784 case ${CATEGORY} in
785 "app-emulation")
786 type=Emulator
787 subdir="Emulation"
788 ;;
789 "games-"*)
790 type=Game
791 subdir="Games"
792 ;;
793 "net-"*)
794 type=Network
795 subdir="${type}"
796 ;;
797 *)
798 type=
799 subdir=
800 ;;
801 esac
802 fi
803 local desktop="${T}/${exec}.desktop"
656 804
657# known issues: 805echo "[Desktop Entry]
658# - only supports unified style patches (does anyone _really_ use anything 806Encoding=UTF-8
659# else?) 807Version=0.9.2
660# - because it doesn't use --dry-run there is a risk of it failing 808Name=${name}
661# to find the files to patch, ie detect the patchlevel, properly. It doesn't use 809Type=Application
662# any of the backup heuristics that patch employs to discover a filename. 810Comment=${DESCRIPTION}
663# however, this isn't dangerous because if it works for the developer who's 811Exec=${exec}
664# writing the ebuild, it'll always work for the users, and if it doesn't, 812Path=${path}
665# then we'll fix it :-) 813Icon=${icon}
666# - no support as yet for patches applying outside $S (and not directly in $WORKDIR). 814Categories=Application;${type};" > ${desktop}
667xpatch() {
668 815
669 debug-print-function $FUNCNAME $* 816 if [ -d "/usr/share/applications" ]
817 then
818 insinto /usr/share/applications
819 doins ${desktop}
820 fi
670 821
822 #if [ -d "/usr/share/gnome/apps" ]
823 #then
824 # insinto /usr/share/gnome/apps/Games
825 # doins ${desktop}
826 #fi
827
828 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ]
829 #then
830 # for ver in /usr/kde/*
831 # do
832 # insinto ${ver}/share/applnk/Games
833 # doins ${desktop}
834 # done
835 #fi
836
837 if [ -d "/usr/share/applnk" ]
838 then
839 insinto /usr/share/applnk/${subdir}
840 doins ${desktop}
841 fi
842
843 return 0
844}
845
846# for internal use only (unpack_pdv and unpack_makeself)
847find_unpackable_file() {
671 local list="" 848 local src="$1"
672 local list2="" 849 if [ -z "${src}" ]
673 declare -i plevel 850 then
851 src="${DISTDIR}/${A}"
852 else
853 if [ -e "${DISTDIR}/${src}" ]
854 then
855 src="${DISTDIR}/${src}"
856 elif [ -e "${PWD}/${src}" ]
857 then
858 src="${PWD}/${src}"
859 elif [ -e "${src}" ]
860 then
861 src="${src}"
862 fi
863 fi
864 [ ! -e "${src}" ] && die "Could not find requested archive ${src}"
865 echo "${src}"
866}
674 867
675 # parse patch sources 868# Unpack those pesky pdv generated files ...
676 for x in $*; do 869# They're self-unpacking programs with the binary package stuffed in
677 debug-print "$FUNCNAME: parsing parameter $x" 870# the middle of the archive. Valve seems to use it a lot ... too bad
871# it seems to like to segfault a lot :(. So lets take it apart ourselves.
872#
873# Usage: unpack_pdv [file to unpack] [size of off_t]
874# - you have to specify the off_t size ... i have no idea how to extract that
875# information out of the binary executable myself. basically you pass in
876# the size of the off_t type (in bytes) on the machine that built the pdv
877# archive. one way to determine this is by running the following commands:
878# strings <pdv archive> | grep lseek
879# strace -elseek <pdv archive>
880# basically look for the first lseek command (we do the strings/grep because
881# sometimes the function call is _llseek or something) and steal the 2nd
882# parameter. here is an example:
883# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
884# lseek
885# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
886# lseek(3, -4, SEEK_END) = 2981250
887# thus we would pass in the value of '4' as the second parameter.
888unpack_pdv() {
889 local src="`find_unpackable_file $1`"
890 local sizeoff_t="$2"
891
892 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :("
893
894 local shrtsrc="`basename ${src}`"
895 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
896 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
897 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
898
899 # grab metadata for debug reasons
900 local metafile="`mymktemp ${T}`"
901 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
902
903 # rip out the final file name from the metadata
904 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`"
905 datafile="`basename ${datafile}`"
906
907 # now lets uncompress/untar the file if need be
908 local tmpfile="`mymktemp ${T}`"
909 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
910
911 local iscompressed="`file -b ${tmpfile}`"
912 if [ "${iscompressed:0:8}" == "compress" ] ; then
913 iscompressed=1
914 mv ${tmpfile}{,.Z}
915 gunzip ${tmpfile}
916 else
917 iscompressed=0
918 fi
919 local istar="`file -b ${tmpfile}`"
920 if [ "${istar:0:9}" == "POSIX tar" ] ; then
921 istar=1
922 else
923 istar=0
924 fi
925
926 #for some reason gzip dies with this ... dd cant provide buffer fast enough ?
927 #dd if=${src} ibs=${metaskip} count=1 \
928 # | dd ibs=${tailskip} skip=1 \
929 # | gzip -dc \
930 # > ${datafile}
931 if [ ${iscompressed} -eq 1 ] ; then
932 if [ ${istar} -eq 1 ] ; then
933 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \
934 | head -c $((${metaskip}-${tailskip})) \
935 | tar -xzf -
936 else
937 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \
938 | head -c $((${metaskip}-${tailskip})) \
939 | gzip -dc \
940 > ${datafile}
941 fi
942 else
943 if [ ${istar} -eq 1 ] ; then
944 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \
945 | head -c $((${metaskip}-${tailskip})) \
946 | tar --no-same-owner -xf -
947 else
948 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \
949 | head -c $((${metaskip}-${tailskip})) \
950 > ${datafile}
951 fi
952 fi
953 true
954 #[ -s "${datafile}" ] || die "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
955 #assert "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
956}
957
958# Unpack those pesky makeself generated files ...
959# They're shell scripts with the binary package tagged onto
960# the end of the archive. Loki utilized the format as does
961# many other game companies.
962#
963# Usage: unpack_makeself [file to unpack] [offset]
964# - If the file is not specified then unpack will utilize ${A}.
965# - If the offset is not specified then we will attempt to extract
966# the proper offset from the script itself.
967unpack_makeself() {
968 local src="`find_unpackable_file $1`"
969 local skip="$2"
970
971 local shrtsrc="`basename ${src}`"
972 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
973 if [ -z "${skip}" ]
974 then
975 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
976 local skip=0
977 case ${ver} in
978 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
979 skip=`grep -a ^skip= ${src} | cut -d= -f2`
980 ;;
981 2.0|2.0.1)
982 skip=`grep -a ^$'\t'tail ${src} | awk '{print $2}' | cut -b2-`
983 ;;
984 2.1.1)
985 skip=`grep -a ^offset= ${src} | awk '{print $2}' | cut -b2-`
986 let skip="skip + 1"
987 ;;
988 2.1.2)
989 skip=`grep -a ^offset= ${src} | awk '{print $3}' | head -n 1`
990 let skip="skip + 1"
991 ;;
992 2.1.3)
993 skip=`grep -a ^offset= ${src} | awk '{print $3}'`
994 let skip="skip + 1"
995 ;;
996 *)
997 eerror "I'm sorry, but I was unable to support the Makeself file."
998 eerror "The version I detected was '${ver}'."
999 eerror "Please file a bug about the file ${shrtsrc} at"
1000 eerror "http://bugs.gentoo.org/ so that support can be added."
1001 die "makeself version '${ver}' not supported"
1002 ;;
1003 esac
1004 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1005 fi
1006
1007 # lets grab the first few bytes of the file to figure out what kind of archive it is
1008 local tmpfile="`mymktemp ${T}`"
1009 tail -n +${skip} ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1010 local filetype="`file -b ${tmpfile}`"
1011 case ${filetype} in
1012 *tar\ archive)
1013 tail -n +${skip} ${src} | tar --no-same-owner -xf -
1014 ;;
1015 bzip2*)
1016 tail -n +${skip} ${src} | bzip2 -dc | tar --no-same-owner -xf -
1017 ;;
1018 gzip*)
1019 tail -n +${skip} ${src} | tar --no-same-owner -xzf -
1020 ;;
1021 compress*)
1022 tail -n +${skip} ${src} | gunzip | tar --no-same-owner -xf -
1023 ;;
1024 *)
1025 eerror "Unknown filetype \"${filetype}\" ?"
1026 false
1027 ;;
1028 esac
1029 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})"
1030}
1031
1032# Display a license for user to accept.
1033#
1034# Usage: check_license [license]
1035# - If the file is not specified then ${LICENSE} is used.
1036check_license() {
1037 local lic=$1
678 if [ -f "$x" ]; then 1038 if [ -z "${lic}" ] ; then
679 list="$list $x" 1039 lic="${PORTDIR}/licenses/${LICENSE}"
1040 else
1041 if [ -e "${PORTDIR}/licenses/${src}" ] ; then
1042 lic="${PORTDIR}/licenses/${src}"
1043 elif [ -e "${PWD}/${src}" ] ; then
1044 lic="${PWD}/${src}"
680 elif [ -d "$x" ]; then 1045 elif [ -e "${src}" ] ; then
681 # handles patchdirs like epatch() for now: no recursion. 1046 lic="${src}"
682 # patches are sorted by filename, so with an xy_foo naming scheme you'll get the right order. 1047 fi
683 # only patches with _$ARCH_ or _all_ in their filenames are applied. 1048 fi
684 for file in `ls -A $x`; do 1049 [ ! -f "${lic}" ] && die "Could not find requested license ${src}"
685 debug-print "$FUNCNAME: parsing in subdir: file $file" 1050 local l="`basename ${lic}`"
686 if [ -f "$x/$file" ] && [ "${file}" != "${file/_all_}" -o "${file}" != "${file/_$ARCH_}" ]; then 1051
687 list2="$list2 $x/$file" 1052 # here is where we check for the licenses the user already
1053 # accepted ... if we don't find a match, we make the user accept
1054 local alic
1055 for alic in "${ACCEPT_LICENSE}" ; do
1056 [ "${alic}" == "*" ] && return 0
1057 [ "${alic}" == "${l}" ] && return 0
1058 done
1059
1060 local licmsg="`mymktemp ${T}`"
1061 cat << EOF > ${licmsg}
1062**********************************************************
1063The following license outlines the terms of use of this
1064package. You MUST accept this license for installation to
1065continue. When you are done viewing, hit 'q'. If you
1066CTRL+C out of this, the install will not run!
1067**********************************************************
1068
1069EOF
1070 cat ${lic} >> ${licmsg}
1071 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1072 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1073 read alic
1074 case ${alic} in
1075 yes|Yes|y|Y)
1076 return 0
1077 ;;
1078 *)
1079 echo;echo;echo
1080 eerror "You MUST accept the license to continue! Exiting!"
1081 die "Failed to accept license"
1082 ;;
1083 esac
1084}
1085
1086# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates
1087# the whole 'non-interactive' policy, but damnit I want CD support !
1088#
1089# with these cdrom functions we handle all the user interaction and
1090# standardize everything. all you have to do is call cdrom_get_cds()
1091# and when the function returns, you can assume that the cd has been
1092# found at CDROM_ROOT.
1093#
1094# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1095# etc... if you want to give the cds better names, then just export
1096# the CDROM_NAME_X variables before calling cdrom_get_cds().
1097#
1098# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1099#
1100# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1101# - this will attempt to locate a cd based upon a file that is on
1102# the cd ... the more files you give this function, the more cds
1103# the cdrom functions will handle
1104cdrom_get_cds() {
1105 # first we figure out how many cds we're dealing with by
1106 # the # of files they gave us
1107 local cdcnt=0
1108 local f=
1109 for f in "$@" ; do
1110 cdcnt=$((cdcnt + 1))
1111 export CDROM_CHECK_${cdcnt}="$f"
1112 done
1113 export CDROM_TOTAL_CDS=${cdcnt}
1114 export CDROM_CURRENT_CD=1
1115
1116 # now we see if the user gave use CD_ROOT ...
1117 # if they did, let's just believe them that it's correct
1118 if [ ! -z "${CD_ROOT}" ] ; then
1119 export CDROM_ROOT="${CD_ROOT}"
1120 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1121 return
1122 fi
1123 # do the same for CD_ROOT_X
1124 if [ ! -z "${CD_ROOT_1}" ] ; then
1125 local var=
1126 cdcnt=0
1127 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do
1128 cdcnt=$((cdcnt + 1))
1129 var="CD_ROOT_${cdcnt}"
1130 if [ -z "${!var}" ] ; then
1131 eerror "You must either use just the CD_ROOT"
1132 eerror "or specify ALL the CD_ROOT_X variables."
1133 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1134 die "could not locate CD_ROOT_${cdcnt}"
1135 fi
1136 export CDROM_ROOTS_${cdcnt}="${!var}"
1137 done
1138 export CDROM_ROOT=${CDROM_ROOTS_1}
1139 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1140 return
1141 fi
1142
1143 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then
1144 einfon "This ebuild will need the "
1145 if [ -z "${CDROM_NAME}" ] ; then
1146 echo "cdrom for ${PN}."
1147 else
1148 echo "${CDROM_NAME}."
1149 fi
1150 echo
1151 einfo "If you do not have the CD, but have the data files"
1152 einfo "mounted somewhere on your filesystem, just export"
1153 einfo "the variable CD_ROOT so that it points to the"
1154 einfo "directory containing the files."
1155 echo
1156 else
1157 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1158 cdcnt=0
1159 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do
1160 cdcnt=$((cdcnt + 1))
1161 var="CDROM_NAME_${cdcnt}"
1162 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}"
1163 done
1164 echo
1165 einfo "If you do not have the CDs, but have the data files"
1166 einfo "mounted somewhere on your filesystem, just export"
1167 einfo "the following variables so they point to the right place:"
1168 einfon ""
1169 cdcnt=0
1170 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do
1171 cdcnt=$((cdcnt + 1))
1172 echo -n " CD_ROOT_${cdcnt}"
1173 done
1174 echo
1175 einfo "Or, if you have all the files in the same place, or"
1176 einfo "you only have one cdrom, you can export CD_ROOT"
1177 einfo "and that place will be used as the same data source"
1178 einfo "for all the CDs."
1179 echo
1180 fi
1181 export CDROM_CURRENT_CD=0
1182 cdrom_load_next_cd
1183}
1184
1185# this is only used when you need access to more than one cd.
1186# when you have finished using the first cd, just call this function.
1187# when it returns, CDROM_ROOT will be pointing to the second cd.
1188# remember, you can only go forward in the cd chain, you can't go back.
1189cdrom_load_next_cd() {
1190 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1191 local var=
1192
1193 if [ ! -z "${CD_ROOT}" ] ; then
1194 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1195 return
1196 fi
1197
1198 unset CDROM_ROOT
1199 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1200 if [ -z "${!var}" ] ; then
1201 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1202 cdrom_locate_file_on_cd ${!var}
1203 else
1204 export CDROM_ROOT="${!var}"
1205 fi
1206
1207 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1208}
1209
1210# this is used internally by the cdrom_get_cds() and cdrom_load_next_cd()
1211# functions. this should *never* be called from an ebuild.
1212# all it does is try to locate a give file on a cd ... if the cd isn't
1213# found, then a message asking for the user to insert the cdrom will be
1214# displayed and we'll hang out here until:
1215# (1) the file is found on a mounted cdrom
1216# (2) the user hits CTRL+C
1217cdrom_locate_file_on_cd() {
1218 while [ -z "${CDROM_ROOT}" ] ; do
1219 local dir="$(dirname ${@})"
1220 local file="$(basename ${@})"
1221 local mline=""
1222 local showedmsg=0
1223
1224 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do
1225 [ -d "${mline}/${dir}" ] || continue
1226 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \
1227 && export CDROM_ROOT=${mline}
1228 done
1229
1230 if [ -z "${CDROM_ROOT}" ] ; then
1231 echo
1232 if [ ${showedmsg} -eq 0 ] ; then
1233 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then
1234 if [ -z "${CDROM_NAME}" ] ; then
1235 einfo "Please insert the cdrom for ${PN} now !"
1236 else
1237 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1238 fi
1239 else
1240 if [ -z "${CDROM_NAME_1}" ] ; then
1241 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1242 else
1243 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1244 einfo "Please insert+mount the ${!var} cdrom now !"
1245 fi
1246 fi
1247 showedmsg=1
1248 fi
1249 einfo "Press return to scan for the cd again"
1250 einfo "or hit CTRL+C to abort the emerge."
1251 read
1252 fi
1253 done
1254}
1255
1256# Make sure that LINGUAS only contains languages that
1257# a package can support
1258#
1259# usage: strip-linguas <allow LINGUAS>
1260# strip-linguas -i <directories of .po files>
1261# strip-linguas -u <directories of .po files>
1262#
1263# The first form allows you to specify a list of LINGUAS.
1264# The -i builds a list of po files found in all the
1265# directories and uses the intersection of the lists.
1266# The -u builds a list of po files found in all the
1267# directories and uses the union of the lists.
1268strip-linguas() {
1269 local ls newls
1270 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then
1271 local op="$1"; shift
1272 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1273 local d f
1274 for d in "$@" ; do
1275 if [ "${op}" == "-u" ] ; then
1276 newls="${ls}"
1277 else
1278 newls=""
1279 fi
1280 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1281 if [ "${op}" == "-i" ] ; then
1282 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}"
1283 else
1284 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}"
688 fi 1285 fi
689 done 1286 done
690 list="`echo $list2 | sort` $list" 1287 ls="${newls}"
1288 done
1289 ls="${ls//.po}"
1290 else
1291 ls="$@"
1292 fi
1293
1294 ls=" ${ls} "
1295 newls=""
1296 for f in ${LINGUAS} ; do
1297 if [ "${ls/ ${f} /}" != "${ls}" ] ; then
1298 nl="${newls} ${f}"
691 else 1299 else
692 die "Couldn't find $x" 1300 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
693 fi 1301 fi
694 done 1302 done
695 1303 if [ -z "${newls}" ] ; then
696 debug-print "$FUNCNAME: final list of patches: $list" 1304 unset LINGUAS
697 1305 else
698 for x in $list; do 1306 export LINGUAS="${newls}"
699 debug-print "$FUNCNAME: processing $x" 1307 fi
700 # deal with compressed files. /usr/bin/file is in the system profile, or should be.
701 case "`/usr/bin/file -b $x`" in
702 *gzip*) patchfile="${T}/current.patch"; ungzip -c "$x" > "${patchfile}";;
703 *bzip2*) patchfile="${T}/current.patch"; bunzip2 -c "$x" > "${patchfile}";;
704 *text*) patchfile="$x";;
705 *) die "Could not determine filetype of patch $x";;
706 esac
707 debug-print "$FUNCNAME: patchfile=$patchfile"
708
709 # determine patchlevel. supports p0 and higher with either $S or $WORKDIR as base.
710 target="`/bin/grep -m 1 '^+++ ' $patchfile`"
711 debug-print "$FUNCNAME: raw target=$target"
712 # strip target down to the path/filename, remove leading +++
713 target="${target/+++ }"; target="${target%% *}"
714 # duplicate slashes are discarded by patch wrt the patchlevel. therefore we need
715 # to discard them as well to calculate the correct patchlevel.
716 target="${target//\/\//\/}"
717 debug-print "$FUNCNAME: stripped target=$target"
718
719 # look for target
720 for basedir in "$S" "$WORKDIR" "${PWD}"; do
721 debug-print "$FUNCNAME: looking in basedir=$basedir"
722 cd "$basedir"
723
724 # try stripping leading directories
725 target2="$target"
726 plevel=0
727 debug-print "$FUNCNAME: trying target2=$target2, plevel=$plevel"
728 while [ ! -f "$target2" ]; do
729 target2="${target2#*/}" # removes piece of target2 upto the first occurence of /
730 plevel=plevel+1
731 debug-print "$FUNCNAME: trying target2=$target2, plevel=$plevel"
732 [ "$target2" == "${target2/\/}" ] && break
733 done
734 test -f "$target2" && break
735
736 # try stripping filename - needed to support patches creating new files
737 target2="${target%/*}"
738 plevel=0
739 debug-print "$FUNCNAME: trying target2=$target2, plevel=$plevel"
740 while [ ! -d "$target2" ]; do
741 target2="${target2#*/}" # removes piece of target2 upto the first occurence of /
742 plevel=plevel+1
743 debug-print "$FUNCNAME: trying target2=$target2, plevel=$plevel"
744 [ "$target2" == "${target2/\/}" ] && break
745 done
746 test -d "$target2" && break
747
748 done
749
750 test -f "${basedir}/${target2}" || test -d "${basedir}/${target2}" || die "Could not determine patchlevel for $x"
751 debug-print "$FUNCNAME: determined plevel=$plevel"
752 # do the patching
753 ebegin "Applying patch ${x##*/}..."
754 /usr/bin/patch -p$plevel < "$patchfile" > /dev/null || die "Failed to apply patch $x"
755 eend $?
756
757 done
758
759} 1308}

Legend:
Removed from v.1.35  
changed lines
  Added in v.1.93

  ViewVC Help
Powered by ViewVC 1.1.20