| 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.78 2004/02/09 17:08:44 brad_mssw 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. |
| … | |
… | |
| 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))" |
| … | |
… | |
| 755 | insinto /usr/share/applnk/${type} |
755 | insinto /usr/share/applnk/${type} |
| 756 | doins ${desktop} |
756 | doins ${desktop} |
| 757 | fi |
757 | fi |
| 758 | |
758 | |
| 759 | return 0 |
759 | 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). |
|
|
| 786 | xpatch() { |
|
|
| 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 | } |
760 | } |
| 900 | |
761 | |
| 901 | # for internal use only (unpack_pdv and unpack_makeself) |
762 | # for internal use only (unpack_pdv and unpack_makeself) |
| 902 | find_unpackable_file() { |
763 | find_unpackable_file() { |
| 903 | local src="$1" |
764 | local src="$1" |
Parent Directory
| 
Revision Log
| 
Patch