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

Diff of /eclass/eutils.eclass

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

Revision 1.71 Revision 1.91
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.71 2003/11/30 11:42:09 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.91 2004/07/23 11:11:57 usata 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
15newdepend "!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
… …
258 else 258 else
259 PATCH_TARGET="${x}" 259 PATCH_TARGET="${x}"
260 fi 260 fi
261 261
262 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 262 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
263 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##*/}
264 264
265 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 265 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
266 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 266 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
267 267
268 if [ "${PATCH_SUFFIX}" != "patch" ] 268 if [ "${PATCH_SUFFIX}" != "patch" ]
… …
275 count=5 275 count=5
276 break 276 break
277 fi 277 fi
278 fi 278 fi
279 279
280 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
281 then 281 then
282 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 282 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
283 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 283 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
284 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 284 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
285 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 285 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
286 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 286 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
287 287
288 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
289 289
290 if [ "$?" -ne 0 ] 290 if [ "$?" -ne 0 ]
291 then 291 then
292 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##*/}
293 echo 293 echo
… …
422 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))" 422 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
423 else 423 else
424 jobs=2 424 jobs=2
425 fi 425 fi
426 426
427 elif [ "${ARCH}" = "ppc" ] 427 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
428 then 428 then
429 # ppc has "processor", but only when compiled with SMP 429 # ppc has "processor", but only when compiled with SMP
430 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ] 430 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
431 then 431 then
432 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))" 432 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
433 else 433 else
434 jobs=2 434 jobs=2
435 fi 435 fi
436 elif [ "${ARCH}" = "s390" ]
437 then
438 # s390 has "# processors : "
439 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
436 else 440 else
437 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))" 441 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
438 die "Unknown ARCH -- ${ARCH}!" 442 die "Unknown ARCH -- ${ARCH}!"
439 fi 443 fi
440 444
… …
456 fi 460 fi
457 fi 461 fi
458} 462}
459 463
460# Cheap replacement for when debianutils (and thus mktemp) 464# Cheap replacement for when debianutils (and thus mktemp)
461# do not exist on the users system 465# does not exist on the users system
462# vapier@gentoo.org 466# vapier@gentoo.org
463# 467#
464# Takes just 1 parameter (the directory to create tmpfile in) 468# Takes just 1 parameter (the directory to create tmpfile in)
465mymktemp() { 469mymktemp() {
466 local topdir="$1" 470 local topdir="$1"
… …
471 mktemp -p ${topdir} 475 mktemp -p ${topdir}
472 else 476 else
473 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 477 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
474 touch ${tmp} 478 touch ${tmp}
475 echo ${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
476 fi 500 fi
477} 501}
478 502
479# Simplify/standardize adding users to the system 503# Simplify/standardize adding users to the system
480# vapier@gentoo.org 504# vapier@gentoo.org
… …
496 then 520 then
497 eerror "No username specified !" 521 eerror "No username specified !"
498 die "Cannot call enewuser without a username" 522 die "Cannot call enewuser without a username"
499 fi 523 fi
500 524
501 # setup a file for testing usernames/groups
502 local tmpfile="`mymktemp ${T}`"
503 chown ${euser} ${tmpfile} >& /dev/null
504 local realuser="`ls -l ${tmpfile} | awk '{print $3}'`"
505
506 # see if user already exists 525 # lets see if the username already exists
507 if [ "${euser}" == "${realuser}" ] 526 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ]
508 then 527 then
509 return 0 528 return 0
510 fi 529 fi
511 einfo "Adding user '${euser}' to your system ..." 530 einfo "Adding user '${euser}' to your system ..."
512 531
… …
517 local euid="$1"; shift 536 local euid="$1"; shift
518 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 537 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ]
519 then 538 then
520 if [ "${euid}" -gt 0 ] 539 if [ "${euid}" -gt 0 ]
521 then 540 then
522 opts="${opts} -u ${euid}" 541 if [ ! -z "`egetent passwd ${euid}`" ]
542 then
543 euid="next"
544 fi
523 else 545 else
524 eerror "Userid given but is not greater than 0 !" 546 eerror "Userid given but is not greater than 0 !"
525 die "${euid} is not a valid UID" 547 die "${euid} is not a valid UID"
526 fi 548 fi
527 else 549 else
528 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`"
529 fi 559 fi
560 for euid in ${pwrange} ; do
561 [ -z "`egetent passwd ${euid}`" ] && break
562 done
563 fi
564 opts="${opts} -u ${euid}"
530 einfo " - Userid: ${euid}" 565 einfo " - Userid: ${euid}"
531 566
532 # handle shell 567 # handle shell
533 local eshell="$1"; shift 568 local eshell="$1"; shift
534 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 569 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ]
… …
555 590
556 # handle groups 591 # handle groups
557 local egroups="$1"; shift 592 local egroups="$1"; shift
558 if [ ! -z "${egroups}" ] 593 if [ ! -z "${egroups}" ]
559 then 594 then
560 local realgroup=
561 local oldifs="${IFS}" 595 local oldifs="${IFS}"
562 export IFS="," 596 export IFS=","
563 for g in ${egroups} 597 for g in ${egroups}
564 do 598 do
565 chgrp ${g} ${tmpfile} >& /dev/null 599 if [ -z "`egetent group \"${g}\"`" ]
566 realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
567 if [ "${g}" != "${realgroup}" ]
568 then 600 then
569 eerror "You must add ${g} to the system first" 601 eerror "You must add group ${g} to the system first"
570 die "${g} is not a valid GID" 602 die "${g} is not a valid GID"
571 fi 603 fi
572 done 604 done
573 export IFS="${oldifs}" 605 export IFS="${oldifs}"
574 opts="${opts} -g ${egroups}" 606 opts="${opts} -g ${egroups}"
… …
579 611
580 # handle extra and add the user 612 # handle extra and add the user
581 local eextra="$@" 613 local eextra="$@"
582 local oldsandbox="${SANDBOX_ON}" 614 local oldsandbox="${SANDBOX_ON}"
583 export SANDBOX_ON="0" 615 export SANDBOX_ON="0"
616 if [ "${ARCH}" == "macos" ];
617 then
618 ### Make the user
584 if [ -z "${eextra}" ] 619 if [ -z "${eextra}" ]
585 then 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
586 useradd ${opts} ${euser} \ 639 useradd ${opts} ${euser} \
587 -c "added by portage for ${PN}" \ 640 -c "added by portage for ${PN}" \
588 || die "enewuser failed" 641 || die "enewuser failed"
589 else 642 else
590 einfo " - Extra: ${eextra}" 643 einfo " - Extra: ${eextra}"
591 useradd ${opts} ${euser} ${eextra} \ 644 useradd ${opts} ${euser} ${eextra} \
592 || die "enewuser failed" 645 || die "enewuser failed"
646 fi
593 fi 647 fi
594 export SANDBOX_ON="${oldsandbox}" 648 export SANDBOX_ON="${oldsandbox}"
595 649
596 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ] 650 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
597 then 651 then
… …
618 then 672 then
619 eerror "No group specified !" 673 eerror "No group specified !"
620 die "Cannot call enewgroup without a group" 674 die "Cannot call enewgroup without a group"
621 fi 675 fi
622 676
623 # setup a file for testing groupname
624 local tmpfile="`mymktemp ${T}`"
625 chgrp ${egroup} ${tmpfile} >& /dev/null
626 local realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
627
628 # see if group already exists 677 # see if group already exists
629 if [ "${egroup}" == "${realgroup}" ] 678 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ]
630 then 679 then
631 return 0 680 return 0
632 fi 681 fi
633 einfo "Adding group '${egroup}' to your system ..." 682 einfo "Adding group '${egroup}' to your system ..."
634 683
… …
639 local egid="$1"; shift 688 local egid="$1"; shift
640 if [ ! -z "${egid}" ] 689 if [ ! -z "${egid}" ]
641 then 690 then
642 if [ "${egid}" -gt 0 ] 691 if [ "${egid}" -gt 0 ]
643 then 692 then
693 if [ -z "`egetent group ${egid}`" ]
694 then
695 if [ "${ARCH}" == "macos" ] ; then
696 opts="${opts} ${egid}"
697 else
644 opts="${opts} -g ${egid}" 698 opts="${opts} -g ${egid}"
699 fi
700 else
701 egid="next available; requested gid taken"
702 fi
645 else 703 else
646 eerror "Groupid given but is not greater than 0 !" 704 eerror "Groupid given but is not greater than 0 !"
647 die "${egid} is not a valid GID" 705 die "${egid} is not a valid GID"
648 fi 706 fi
649 else 707 else
… …
656 opts="${opts} ${eextra}" 714 opts="${opts} ${eextra}"
657 715
658 # add the group 716 # add the group
659 local oldsandbox="${SANDBOX_ON}" 717 local oldsandbox="${SANDBOX_ON}"
660 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
661 groupadd ${opts} ${egroup} || die "enewgroup failed" 739 groupadd ${opts} ${egroup} || die "enewgroup failed"
740 fi
662 export SANDBOX_ON="${oldsandbox}" 741 export SANDBOX_ON="${oldsandbox}"
663} 742}
664 743
665# Simple script to replace 'dos2unix' binaries 744# Simple script to replace 'dos2unix' binaries
666# vapier@gentoo.org 745# vapier@gentoo.org
… …
687# name: the name that will show up in the menu 766# name: the name that will show up in the menu
688# icon: give your little like a pretty little icon ... 767# icon: give your little like a pretty little icon ...
689# this can be relative (to /usr/share/pixmaps) or 768# this can be relative (to /usr/share/pixmaps) or
690# a full path to an icon 769# a full path to an icon
691# type: what kind of application is this ? for categories: 770# type: what kind of application is this ? for categories:
692# http://www.freedesktop.org/standards/menu/draft/menu-spec/menu-spec.html 771# http://www.freedesktop.org/standards/menu-spec/
693# path: if your app needs to startup in a specific dir 772# path: if your app needs to startup in a specific dir
694make_desktop_entry() { 773make_desktop_entry() {
695 [ -z "$1" ] && eerror "You must specify the executable" && return 1 774 [ -z "$1" ] && eerror "You must specify the executable" && return 1
696 775
697 local exec="${1}" 776 local exec="${1}"
698 local name="${2:-${PN}}" 777 local name="${2:-${PN}}"
699 local icon="${3:-${PN}.png}" 778 local icon="${3:-${PN}.png}"
700 local type="${4}" 779 local type="${4}"
780 local subdir="${6}"
701 local path="${5:-${GAMES_PREFIX}}" 781 local path="${5:-${GAMES_PREFIX}}"
702 if [ -z "${type}" ] 782 if [ -z "${type}" ]
703 then 783 then
704 case ${CATEGORY} in 784 case ${CATEGORY} in
705 "app-emulation") 785 "app-emulation")
706 type=Emulator 786 type=Emulator
787 subdir="Emulation"
707 ;; 788 ;;
708 "games-"*) 789 "games-"*)
709 type=Game 790 type=Game
791 subdir="Games"
710 ;; 792 ;;
711 "net-"*) 793 "net-"*)
712 type=Network; 794 type=Network
795 subdir="${type}"
713 ;; 796 ;;
714 *) 797 *)
715 type= 798 type=
799 subdir=
716 ;; 800 ;;
717 esac 801 esac
718 fi 802 fi
719 local desktop="${T}/${exec}.desktop" 803 local desktop="${T}/${exec}.desktop"
720 804
… …
750 # done 834 # done
751 #fi 835 #fi
752 836
753 if [ -d "/usr/share/applnk" ] 837 if [ -d "/usr/share/applnk" ]
754 then 838 then
755 insinto /usr/share/applnk/${type} 839 insinto /usr/share/applnk/${subdir}
756 doins ${desktop} 840 doins ${desktop}
757 fi 841 fi
758 842
759 return 0 843 return 0
760}
761
762# new convenience patch wrapper function to eventually replace epatch(),
763# $PATCHES, $PATCHES1, src_unpack:patch, src_unpack:autopatch and
764# /usr/bin/patch
765# Features:
766# - bulk patch handling similar to epatch()'s
767# - automatic patch level detection like epatch()'s
768# - automatic patch uncompression like epatch()'s
769# - doesn't have the --dry-run overhead of epatch() - inspects patchfiles
770# manually instead
771# - once I decide it's production-ready, it'll be called from base_src_unpack
772# to handle $PATCHES to avoid defining src_unpack just to use xpatch
773
774# accepts zero or more parameters specifying patchfiles and/or patchdirs
775
776# known issues:
777# - only supports unified style patches (does anyone _really_ use anything
778# else?)
779# - because it doesn't use --dry-run there is a risk of it failing
780# to find the files to patch, ie detect the patchlevel, properly. It doesn't use
781# any of the backup heuristics that patch employs to discover a filename.
782# however, this isn't dangerous because if it works for the developer who's
783# writing the ebuild, it'll always work for the users, and if it doesn't,
784# then we'll fix it :-)
785# - no support as yet for patches applying outside $S (and not directly in $WORKDIR).
786xpatch() {
787
788 debug-print-function ${FUNCNAME} $*
789
790 local list=
791 local list2=
792 declare -i plevel
793
794 # parse patch sources
795 for x in $*
796 do
797 debug-print "${FUNCNAME}: parsing parameter ${x}"
798 if [ -f "${x}" ]
799 then
800 list="${list} ${x}"
801 elif [ -d "${x}" ]
802 then
803 # handles patchdirs like epatch() for now: no recursion.
804 # patches are sorted by filename, so with an xy_foo naming scheme you'll get the right order.
805 # only patches with _$ARCH_ or _all_ in their filenames are applied.
806 for file in `ls -A ${x}`
807 do
808 debug-print "${FUNCNAME}: parsing in subdir: file ${file}"
809 if [ -f "${x}/${file}" -a "${file}" != "${file/_all_}" -o \
810 "${file}" != "${file/_$ARCH_}" ]
811 then
812 list2="${list2} ${x}/${file}"
813 fi
814 done
815 list="`echo ${list2} | sort` ${list}"
816 else
817 die "Couldn't find ${x}"
818 fi
819 done
820
821 debug-print "${FUNCNAME}: final list of patches: ${list}"
822
823 for x in ${list};
824 do
825 debug-print "${FUNCNAME}: processing ${x}"
826 # deal with compressed files. /usr/bin/file is in the system profile, or should be.
827 case "`/usr/bin/file -b ${x}`" in
828 *gzip*)
829 patchfile="${T}/current.patch"
830 ungzip -c "${x}" > "${patchfile}"
831 ;;
832 *bzip2*)
833 patchfile="${T}/current.patch"
834 bunzip2 -c "${x}" > "${patchfile}"
835 ;;
836 *text*)
837 patchfile="${x}"
838 ;;
839 *)
840 die "Could not determine filetype of patch ${x}"
841 ;;
842 esac
843 debug-print "${FUNCNAME}: patchfile=${patchfile}"
844
845 # determine patchlevel. supports p0 and higher with either $S or $WORKDIR as base.
846 target="`/bin/grep -m 1 '^+++ ' ${patchfile}`"
847 debug-print "${FUNCNAME}: raw target=${target}"
848 # strip target down to the path/filename, remove leading +++
849 target="${target/+++ }"; target="${target%% *}"
850 # duplicate slashes are discarded by patch wrt the patchlevel. therefore we need
851 # to discard them as well to calculate the correct patchlevel.
852 target="${target//\/\//\/}"
853 debug-print "${FUNCNAME}: stripped target=${target}"
854
855 # look for target
856 for basedir in "${S}" "${WORKDIR}" "${PWD}"; do
857 debug-print "${FUNCNAME}: looking in basedir=${basedir}"
858 cd "${basedir}"
859
860 # try stripping leading directories
861 target2="${target}"
862 plevel=0
863 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
864 while [ ! -f "${target2}" ]
865 do
866 target2="${target2#*/}" # removes piece of target2 upto the first occurence of /
867 plevel=$((plevel+1))
868 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
869 [ "${target2}" == "${target2/\/}" ] && break
870 done
871 test -f "${target2}" && break
872
873 # try stripping filename - needed to support patches creating new files
874 target2="${target%/*}"
875 plevel=0
876 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
877 while [ ! -d "${target2}" ]
878 do
879 target2="${target2#*/}" # removes piece of target2 upto the first occurence of /
880 plevel=$((plevel+1))
881 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
882 [ "${target2}" == "${target2/\/}" ] && break
883 done
884 test -d "${target2}" && break
885
886 done
887
888 test -f "${basedir}/${target2}" || test -d "${basedir}/${target2}" \
889 || die "Could not determine patchlevel for ${x}"
890 debug-print "${FUNCNAME}: determined plevel=${plevel}"
891 # do the patching
892 ebegin "Applying patch ${x##*/}..."
893 /usr/bin/patch -p${plevel} < "${patchfile}" > /dev/null \
894 || die "Failed to apply patch ${x}"
895 eend $?
896
897 done
898
899} 844}
900 845
901# for internal use only (unpack_pdv and unpack_makeself) 846# for internal use only (unpack_pdv and unpack_makeself)
902find_unpackable_file() { 847find_unpackable_file() {
903 local src="$1" 848 local src="$1"
… …
996 fi 941 fi
997 else 942 else
998 if [ ${istar} -eq 1 ] ; then 943 if [ ${istar} -eq 1 ] ; then
999 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \ 944 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \
1000 | head -c $((${metaskip}-${tailskip})) \ 945 | head -c $((${metaskip}-${tailskip})) \
1001 | tar -xf - 946 | tar --no-same-owner -xf -
1002 else 947 else
1003 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \ 948 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \
1004 | head -c $((${metaskip}-${tailskip})) \ 949 | head -c $((${metaskip}-${tailskip})) \
1005 > ${datafile} 950 > ${datafile}
1006 fi 951 fi
… …
1063 local tmpfile="`mymktemp ${T}`" 1008 local tmpfile="`mymktemp ${T}`"
1064 tail -n +${skip} ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1009 tail -n +${skip} ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1065 local filetype="`file -b ${tmpfile}`" 1010 local filetype="`file -b ${tmpfile}`"
1066 case ${filetype} in 1011 case ${filetype} in
1067 *tar\ archive) 1012 *tar\ archive)
1068 tail -n +${skip} ${src} | tar -xf - 1013 tail -n +${skip} ${src} | tar --no-same-owner -xf -
1069 ;; 1014 ;;
1070 bzip2*) 1015 bzip2*)
1071 tail -n +${skip} ${src} | bzip2 -dc | tar -xf - 1016 tail -n +${skip} ${src} | bzip2 -dc | tar --no-same-owner -xf -
1072 ;; 1017 ;;
1073 gzip*) 1018 gzip*)
1074 tail -n +${skip} ${src} | tar -xzf - 1019 tail -n +${skip} ${src} | tar --no-same-owner -xzf -
1075 ;; 1020 ;;
1076 *) 1021 *)
1077 false 1022 false
1078 ;; 1023 ;;
1079 esac 1024 esac
… …
1101 local l="`basename ${lic}`" 1046 local l="`basename ${lic}`"
1102 1047
1103 # here is where we check for the licenses the user already 1048 # here is where we check for the licenses the user already
1104 # accepted ... if we don't find a match, we make the user accept 1049 # accepted ... if we don't find a match, we make the user accept
1105 local alic 1050 local alic
1106 for alic in ${ACCEPT_LICENSE} ; do 1051 for alic in "${ACCEPT_LICENSE}" ; do
1107 [ "${alic}" == "*" ] && return 0 1052 [ "${alic}" == "*" ] && return 0
1108 [ "${alic}" == "${l}" ] && return 0 1053 [ "${alic}" == "${l}" ] && return 0
1109 done 1054 done
1110 1055
1111 local licmsg="`mymktemp ${T}`" 1056 local licmsg="`mymktemp ${T}`"
… …
1131 eerror "You MUST accept the license to continue! Exiting!" 1076 eerror "You MUST accept the license to continue! Exiting!"
1132 die "Failed to accept license" 1077 die "Failed to accept license"
1133 ;; 1078 ;;
1134 esac 1079 esac
1135} 1080}
1081
1082# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates
1083# the whole 'non-interactive' policy, but damnit I want CD support !
1084#
1085# with these cdrom functions we handle all the user interaction and
1086# standardize everything. all you have to do is call cdrom_get_cds()
1087# and when the function returns, you can assume that the cd has been
1088# found at CDROM_ROOT.
1089#
1090# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1091# etc... if you want to give the cds better names, then just export
1092# the CDROM_NAME_X variables before calling cdrom_get_cds().
1093#
1094# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1095#
1096# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1097# - this will attempt to locate a cd based upon a file that is on
1098# the cd ... the more files you give this function, the more cds
1099# the cdrom functions will handle
1100cdrom_get_cds() {
1101 # first we figure out how many cds we're dealing with by
1102 # the # of files they gave us
1103 local cdcnt=0
1104 local f=
1105 for f in "$@" ; do
1106 cdcnt=$((cdcnt + 1))
1107 export CDROM_CHECK_${cdcnt}="$f"
1108 done
1109 export CDROM_TOTAL_CDS=${cdcnt}
1110 export CDROM_CURRENT_CD=1
1111
1112 # now we see if the user gave use CD_ROOT ...
1113 # if they did, let's just believe them that it's correct
1114 if [ ! -z "${CD_ROOT}" ] ; then
1115 export CDROM_ROOT="${CD_ROOT}"
1116 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1117 return
1118 fi
1119 # do the same for CD_ROOT_X
1120 if [ ! -z "${CD_ROOT_1}" ] ; then
1121 local var=
1122 cdcnt=0
1123 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do
1124 cdcnt=$((cdcnt + 1))
1125 var="CD_ROOT_${cdcnt}"
1126 if [ -z "${!var}" ] ; then
1127 eerror "You must either use just the CD_ROOT"
1128 eerror "or specify ALL the CD_ROOT_X variables."
1129 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1130 die "could not locate CD_ROOT_${cdcnt}"
1131 fi
1132 export CDROM_ROOTS_${cdcnt}="${!var}"
1133 done
1134 export CDROM_ROOT=${CDROM_ROOTS_1}
1135 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1136 return
1137 fi
1138
1139 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then
1140 einfon "This ebuild will need the "
1141 if [ -z "${CDROM_NAME}" ] ; then
1142 echo "cdrom for ${PN}."
1143 else
1144 echo "${CDROM_NAME}."
1145 fi
1146 echo
1147 einfo "If you do not have the CD, but have the data files"
1148 einfo "mounted somewhere on your filesystem, just export"
1149 einfo "the variable CD_ROOT so that it points to the"
1150 einfo "directory containing the files."
1151 echo
1152 else
1153 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1154 cdcnt=0
1155 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do
1156 cdcnt=$((cdcnt + 1))
1157 var="CDROM_NAME_${cdcnt}"
1158 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}"
1159 done
1160 echo
1161 einfo "If you do not have the CDs, but have the data files"
1162 einfo "mounted somewhere on your filesystem, just export"
1163 einfo "the following variables so they point to the right place:"
1164 einfon ""
1165 cdcnt=0
1166 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do
1167 cdcnt=$((cdcnt + 1))
1168 echo -n " CD_ROOT_${cdcnt}"
1169 done
1170 echo
1171 einfo "Or, if you have all the files in the same place, or"
1172 einfo "you only have one cdrom, you can export CD_ROOT"
1173 einfo "and that place will be used as the same data source"
1174 einfo "for all the CDs."
1175 echo
1176 fi
1177 export CDROM_CURRENT_CD=0
1178 cdrom_load_next_cd
1179}
1180
1181# this is only used when you need access to more than one cd.
1182# when you have finished using the first cd, just call this function.
1183# when it returns, CDROM_ROOT will be pointing to the second cd.
1184# remember, you can only go forward in the cd chain, you can't go back.
1185cdrom_load_next_cd() {
1186 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1187 local var=
1188
1189 if [ ! -z "${CD_ROOT}" ] ; then
1190 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1191 return
1192 fi
1193
1194 unset CDROM_ROOT
1195 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1196 if [ -z "${!var}" ] ; then
1197 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1198 cdrom_locate_file_on_cd ${!var}
1199 else
1200 export CDROM_ROOT="${!var}"
1201 fi
1202
1203 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1204}
1205
1206# this is used internally by the cdrom_get_cds() and cdrom_load_next_cd()
1207# functions. this should *never* be called from an ebuild.
1208# all it does is try to locate a give file on a cd ... if the cd isn't
1209# found, then a message asking for the user to insert the cdrom will be
1210# displayed and we'll hang out here until:
1211# (1) the file is found on a mounted cdrom
1212# (2) the user hits CTRL+C
1213cdrom_locate_file_on_cd() {
1214 while [ -z "${CDROM_ROOT}" ] ; do
1215 local dir="$(dirname ${@})"
1216 local file="$(basename ${@})"
1217 local mline=""
1218 local showedmsg=0
1219
1220 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do
1221 [ -d "${mline}/${dir}" ] || continue
1222 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \
1223 && export CDROM_ROOT=${mline}
1224 done
1225
1226 if [ -z "${CDROM_ROOT}" ] ; then
1227 echo
1228 if [ ${showedmsg} -eq 0 ] ; then
1229 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then
1230 if [ -z "${CDROM_NAME}" ] ; then
1231 einfo "Please insert the cdrom for ${PN} now !"
1232 else
1233 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1234 fi
1235 else
1236 if [ -z "${CDROM_NAME_1}" ] ; then
1237 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1238 else
1239 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1240 einfo "Please insert+mount the ${!var} cdrom now !"
1241 fi
1242 fi
1243 showedmsg=1
1244 fi
1245 einfo "Press return to scan for the cd again"
1246 einfo "or hit CTRL+C to abort the emerge."
1247 read
1248 fi
1249 done
1250}
Legend:
Removed from v.1.71  
changed lines
  Added in v.1.91
  ViewVC Help
Powered by ViewVC 1.1.20