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

Diff of /eclass/eutils.eclass

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

Revision 1.76 Revision 1.88
1# Copyright 1999-2004 Gentoo Technologies, Inc. 1# Copyright 1999-2004 Gentoo Technologies, Inc.
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.76 2004/01/26 23:40:07 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.88 2004/04/18 20:45:23 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
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"
496 then 500 then
497 eerror "No username specified !" 501 eerror "No username specified !"
498 die "Cannot call enewuser without a username" 502 die "Cannot call enewuser without a username"
499 fi 503 fi
500 504
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 505 # lets see if the username already exists
507 if [ "${euser}" == "${realuser}" ] 506 if [ "${euser}" == "`getent passwd \"${euser}\" | cut -d: -f1`" ]
508 then 507 then
509 return 0 508 return 0
510 fi 509 fi
511 einfo "Adding user '${euser}' to your system ..." 510 einfo "Adding user '${euser}' to your system ..."
512 511
517 local euid="$1"; shift 516 local euid="$1"; shift
518 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 517 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ]
519 then 518 then
520 if [ "${euid}" -gt 0 ] 519 if [ "${euid}" -gt 0 ]
521 then 520 then
522 opts="${opts} -u ${euid}" 521 if [ ! -z "`getent passwd ${euid}`" ]
522 then
523 euid="next"
524 fi
523 else 525 else
524 eerror "Userid given but is not greater than 0 !" 526 eerror "Userid given but is not greater than 0 !"
525 die "${euid} is not a valid UID" 527 die "${euid} is not a valid UID"
526 fi 528 fi
527 else 529 else
528 euid="next available" 530 euid="next"
529 fi 531 fi
532 if [ "${euid}" == "next" ]
533 then
534 for euid in `seq 101 999` ; do
535 [ -z "`getent passwd ${euid}`" ] && break
536 done
537 fi
538 opts="${opts} -u ${euid}"
530 einfo " - Userid: ${euid}" 539 einfo " - Userid: ${euid}"
531 540
532 # handle shell 541 # handle shell
533 local eshell="$1"; shift 542 local eshell="$1"; shift
534 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 543 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ]
555 564
556 # handle groups 565 # handle groups
557 local egroups="$1"; shift 566 local egroups="$1"; shift
558 if [ ! -z "${egroups}" ] 567 if [ ! -z "${egroups}" ]
559 then 568 then
560 local realgroup=
561 local oldifs="${IFS}" 569 local oldifs="${IFS}"
562 export IFS="," 570 export IFS=","
563 for g in ${egroups} 571 for g in ${egroups}
564 do 572 do
565 chgrp ${g} ${tmpfile} >& /dev/null 573 if [ -z "`getent group \"${g}\"`" ]
566 realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
567 if [ "${g}" != "${realgroup}" ]
568 then 574 then
569 eerror "You must add ${g} to the system first" 575 eerror "You must add group ${g} to the system first"
570 die "${g} is not a valid GID" 576 die "${g} is not a valid GID"
571 fi 577 fi
572 done 578 done
573 export IFS="${oldifs}" 579 export IFS="${oldifs}"
574 opts="${opts} -g ${egroups}" 580 opts="${opts} -g ${egroups}"
618 then 624 then
619 eerror "No group specified !" 625 eerror "No group specified !"
620 die "Cannot call enewgroup without a group" 626 die "Cannot call enewgroup without a group"
621 fi 627 fi
622 628
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 629 # see if group already exists
629 if [ "${egroup}" == "${realgroup}" ] 630 if [ "${egroup}" == "`getent group \"${egroup}\" | cut -d: -f1`" ]
630 then 631 then
631 return 0 632 return 0
632 fi 633 fi
633 einfo "Adding group '${egroup}' to your system ..." 634 einfo "Adding group '${egroup}' to your system ..."
634 635
639 local egid="$1"; shift 640 local egid="$1"; shift
640 if [ ! -z "${egid}" ] 641 if [ ! -z "${egid}" ]
641 then 642 then
642 if [ "${egid}" -gt 0 ] 643 if [ "${egid}" -gt 0 ]
643 then 644 then
645 if [ -z "`getent group ${egid}`" ]
646 then
644 opts="${opts} -g ${egid}" 647 opts="${opts} -g ${egid}"
648 else
649 egid="next available; requested gid taken"
650 fi
645 else 651 else
646 eerror "Groupid given but is not greater than 0 !" 652 eerror "Groupid given but is not greater than 0 !"
647 die "${egid} is not a valid GID" 653 die "${egid} is not a valid GID"
648 fi 654 fi
649 else 655 else
696 702
697 local exec="${1}" 703 local exec="${1}"
698 local name="${2:-${PN}}" 704 local name="${2:-${PN}}"
699 local icon="${3:-${PN}.png}" 705 local icon="${3:-${PN}.png}"
700 local type="${4}" 706 local type="${4}"
707 local subdir="${6}"
701 local path="${5:-${GAMES_PREFIX}}" 708 local path="${5:-${GAMES_PREFIX}}"
702 if [ -z "${type}" ] 709 if [ -z "${type}" ]
703 then 710 then
704 case ${CATEGORY} in 711 case ${CATEGORY} in
705 "app-emulation") 712 "app-emulation")
706 type=Emulator 713 type=Emulator
714 subdir="Emulation"
707 ;; 715 ;;
708 "games-"*) 716 "games-"*)
709 type=Game 717 type=Game
718 subdir="Games"
710 ;; 719 ;;
711 "net-"*) 720 "net-"*)
712 type=Network; 721 type=Network
722 subdir="${type}"
713 ;; 723 ;;
714 *) 724 *)
715 type= 725 type=
726 subdir=
716 ;; 727 ;;
717 esac 728 esac
718 fi 729 fi
719 local desktop="${T}/${exec}.desktop" 730 local desktop="${T}/${exec}.desktop"
720 731
750 # done 761 # done
751 #fi 762 #fi
752 763
753 if [ -d "/usr/share/applnk" ] 764 if [ -d "/usr/share/applnk" ]
754 then 765 then
755 insinto /usr/share/applnk/${type} 766 insinto /usr/share/applnk/${subdir}
756 doins ${desktop} 767 doins ${desktop}
757 fi 768 fi
758 769
759 return 0 770 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} 771}
900 772
901# for internal use only (unpack_pdv and unpack_makeself) 773# for internal use only (unpack_pdv and unpack_makeself)
902find_unpackable_file() { 774find_unpackable_file() {
903 local src="$1" 775 local src="$1"
1239# remember, you can only go forward in the cd chain, you can't go back. 1111# remember, you can only go forward in the cd chain, you can't go back.
1240cdrom_load_next_cd() { 1112cdrom_load_next_cd() {
1241 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1113 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1242 local var= 1114 local var=
1243 1115
1116 if [ ! -z "${CD_ROOT}" ] ; then
1117 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1118 return
1119 fi
1120
1244 unset CDROM_ROOT 1121 unset CDROM_ROOT
1245 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1122 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1246 if [ -z "${!var}" ] ; then 1123 if [ -z "${!var}" ] ; then
1247 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1124 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1248 cdrom_locate_file_on_cd ${!var} 1125 cdrom_locate_file_on_cd ${!var}

Legend:
Removed from v.1.76  
changed lines
  Added in v.1.88

  ViewVC Help
Powered by ViewVC 1.1.20