| 1 |
vapier |
1.18 |
# Copyright 1999-2003 Gentoo Technologies, Inc.
|
| 2 |
azarah |
1.1 |
# Distributed under the terms of the GNU General Public License v2
|
| 3 |
vapier |
1.24 |
# $Header: /home/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.23 2003/03/01 03:38:40 vapier Exp $
|
| 4 |
vapier |
1.18 |
#
|
| 5 |
azarah |
1.1 |
# Author: Martin Schlemmer <azarah@gentoo.org>
|
| 6 |
vapier |
1.18 |
#
|
| 7 |
azarah |
1.1 |
# This eclass is for general purpose functions that most ebuilds
|
| 8 |
vapier |
1.7 |
# have to implement themselves.
|
| 9 |
azarah |
1.1 |
#
|
| 10 |
|
|
# NB: If you add anything, please comment it!
|
| 11 |
|
|
|
| 12 |
|
|
ECLASS=eutils
|
| 13 |
|
|
INHERITED="$INHERITED $ECLASS"
|
| 14 |
|
|
|
| 15 |
azarah |
1.12 |
newdepend "!bootstrap? ( sys-devel/patch )"
|
| 16 |
azarah |
1.1 |
|
| 17 |
vapier |
1.22 |
DESCRIPTION="Based on the ${ECLASS} eclass"
|
| 18 |
azarah |
1.1 |
|
| 19 |
|
|
# This function generate linker scripts in /usr/lib for dynamic
|
| 20 |
|
|
# libs in /lib. This is to fix linking problems when you have
|
| 21 |
|
|
# the .so in /lib, and the .a in /usr/lib. What happens is that
|
| 22 |
|
|
# in some cases when linking dynamic, the .a in /usr/lib is used
|
| 23 |
|
|
# instead of the .so in /lib due to gcc/libtool tweaking ld's
|
| 24 |
|
|
# library search path. This cause many builds to fail.
|
| 25 |
|
|
# See bug #4411 for more info.
|
| 26 |
|
|
#
|
| 27 |
|
|
# To use, simply call:
|
| 28 |
|
|
#
|
| 29 |
|
|
# gen_usr_ldscript libfoo.so
|
| 30 |
|
|
#
|
| 31 |
|
|
# Note that you should in general use the unversioned name of
|
| 32 |
|
|
# the library, as ldconfig should usually update it correctly
|
| 33 |
|
|
# to point to the latest version of the library present.
|
| 34 |
|
|
#
|
| 35 |
|
|
# <azarah@gentoo.org> (26 Oct 2002)
|
| 36 |
|
|
#
|
| 37 |
|
|
gen_usr_ldscript() {
|
| 38 |
|
|
|
| 39 |
|
|
# Just make sure it exists
|
| 40 |
|
|
dodir /usr/lib
|
| 41 |
|
|
|
| 42 |
|
|
cat > ${D}/usr/lib/$1 <<"END_LDSCRIPT"
|
| 43 |
|
|
/* GNU ld script
|
| 44 |
|
|
Because Gentoo have critical dynamic libraries
|
| 45 |
|
|
in /lib, and the static versions in /usr/lib, we
|
| 46 |
|
|
need to have a "fake" dynamic lib in /usr/lib,
|
| 47 |
|
|
otherwise we run into linking problems.
|
| 48 |
|
|
See bug #4411 on http://bugs.gentoo.org/ for
|
| 49 |
|
|
more info. */
|
| 50 |
|
|
GROUP ( /lib/libxxx )
|
| 51 |
|
|
END_LDSCRIPT
|
| 52 |
|
|
|
| 53 |
|
|
dosed "s:libxxx:$1:" /usr/lib/$1
|
| 54 |
azarah |
1.5 |
|
| 55 |
|
|
return 0
|
| 56 |
azarah |
1.2 |
}
|
| 57 |
|
|
|
| 58 |
azarah |
1.5 |
# Simple function to draw a line consisting of '=' the same length as $*
|
| 59 |
|
|
#
|
| 60 |
|
|
# <azarah@gentoo.org> (11 Nov 2002)
|
| 61 |
|
|
#
|
| 62 |
|
|
draw_line() {
|
| 63 |
|
|
local i=0
|
| 64 |
|
|
local str_length=""
|
| 65 |
|
|
|
| 66 |
|
|
# Handle calls that do not have args, or wc not being installed ...
|
| 67 |
|
|
if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
|
| 68 |
|
|
then
|
| 69 |
|
|
echo "==============================================================="
|
| 70 |
|
|
return 0
|
| 71 |
|
|
fi
|
| 72 |
|
|
|
| 73 |
|
|
# Get the length of $*
|
| 74 |
|
|
str_length="$(echo -n "$*" | wc -m)"
|
| 75 |
|
|
|
| 76 |
|
|
while [ "$i" -lt "${str_length}" ]
|
| 77 |
|
|
do
|
| 78 |
|
|
echo -n "="
|
| 79 |
|
|
|
| 80 |
|
|
i=$((i + 1))
|
| 81 |
|
|
done
|
| 82 |
|
|
|
| 83 |
|
|
echo
|
| 84 |
|
|
|
| 85 |
|
|
return 0
|
| 86 |
|
|
}
|
| 87 |
azarah |
1.2 |
|
| 88 |
|
|
# Default directory where patches are located
|
| 89 |
|
|
EPATCH_SOURCE="${WORKDIR}/patch"
|
| 90 |
|
|
# Default extension for patches
|
| 91 |
|
|
EPATCH_SUFFIX="patch.bz2"
|
| 92 |
|
|
# Default options for patch
|
| 93 |
|
|
EPATCH_OPTS=""
|
| 94 |
azarah |
1.6 |
# List of patches not to apply. Not this is only file names,
|
| 95 |
|
|
# and not the full path ..
|
| 96 |
|
|
EPATCH_EXCLUDE=""
|
| 97 |
azarah |
1.9 |
# Change the printed message for a single patch.
|
| 98 |
|
|
EPATCH_SINGLE_MSG=""
|
| 99 |
azarah |
1.2 |
|
| 100 |
|
|
# This function is for bulk patching, or in theory for just one
|
| 101 |
|
|
# or two patches.
|
| 102 |
|
|
#
|
| 103 |
|
|
# It should work with .bz2, .gz, .zip and plain text patches.
|
| 104 |
|
|
# Currently all patches should be the same format.
|
| 105 |
|
|
#
|
| 106 |
|
|
# You do not have to specify '-p' option to patch, as it will
|
| 107 |
|
|
# try with -p0 to -p5 until it succeed, or fail at -p5.
|
| 108 |
|
|
#
|
| 109 |
|
|
# Above EPATCH_* variables can be used to control various defaults,
|
| 110 |
|
|
# bug they should be left as is to ensure an ebuild can rely on
|
| 111 |
|
|
# them for.
|
| 112 |
|
|
#
|
| 113 |
azarah |
1.3 |
# Patches are applied in current directory.
|
| 114 |
|
|
#
|
| 115 |
|
|
# Bulk Patches should preferibly have the form of:
|
| 116 |
azarah |
1.2 |
#
|
| 117 |
|
|
# ??_${ARCH}_foo.${EPATCH_SUFFIX}
|
| 118 |
|
|
#
|
| 119 |
|
|
# For example:
|
| 120 |
|
|
#
|
| 121 |
|
|
# 01_all_misc-fix.patch.bz2
|
| 122 |
|
|
# 02_sparc_another-fix.patch.bz2
|
| 123 |
|
|
#
|
| 124 |
|
|
# This ensures that there are a set order, and you can have ARCH
|
| 125 |
|
|
# specific patches.
|
| 126 |
|
|
#
|
| 127 |
azarah |
1.3 |
# If you however give an argument to epatch(), it will treat it as a
|
| 128 |
|
|
# single patch that need to be applied if its a file. If on the other
|
| 129 |
|
|
# hand its a directory, it will set EPATCH_SOURCE to this.
|
| 130 |
|
|
#
|
| 131 |
azarah |
1.2 |
# <azarah@gentoo.org> (10 Nov 2002)
|
| 132 |
|
|
#
|
| 133 |
|
|
epatch() {
|
| 134 |
|
|
local PIPE_CMD=""
|
| 135 |
|
|
local STDERR_TARGET="${T}/$$.out"
|
| 136 |
azarah |
1.8 |
local PATCH_TARGET="${T}/$$.patch"
|
| 137 |
|
|
local PATCH_SUFFIX=""
|
| 138 |
azarah |
1.3 |
local SINGLE_PATCH="no"
|
| 139 |
azarah |
1.4 |
local x=""
|
| 140 |
azarah |
1.3 |
|
| 141 |
|
|
if [ "$#" -gt 1 ]
|
| 142 |
|
|
then
|
| 143 |
|
|
eerror "Invalid arguments to epatch()"
|
| 144 |
|
|
die "Invalid arguments to epatch()"
|
| 145 |
|
|
fi
|
| 146 |
|
|
|
| 147 |
|
|
if [ -n "$1" -a -f "$1" ]
|
| 148 |
|
|
then
|
| 149 |
|
|
SINGLE_PATCH="yes"
|
| 150 |
|
|
|
| 151 |
azarah |
1.4 |
local EPATCH_SOURCE="$1"
|
| 152 |
|
|
local EPATCH_SUFFIX="${1##*\.}"
|
| 153 |
azarah |
1.3 |
|
| 154 |
|
|
elif [ -n "$1" -a -d "$1" ]
|
| 155 |
|
|
then
|
| 156 |
azarah |
1.4 |
local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
|
| 157 |
azarah |
1.3 |
else
|
| 158 |
azarah |
1.8 |
if [ ! -d ${EPATCH_SOURCE} ]
|
| 159 |
|
|
then
|
| 160 |
azarah |
1.19 |
if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
|
| 161 |
|
|
then
|
| 162 |
|
|
EPATCH_SOURCE="$1"
|
| 163 |
|
|
fi
|
| 164 |
|
|
|
| 165 |
azarah |
1.8 |
echo
|
| 166 |
azarah |
1.11 |
eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
|
| 167 |
|
|
eerror
|
| 168 |
|
|
eerror " ${EPATCH_SOURCE}"
|
| 169 |
azarah |
1.8 |
echo
|
| 170 |
|
|
die "Cannot find \$EPATCH_SOURCE!"
|
| 171 |
|
|
fi
|
| 172 |
|
|
|
| 173 |
azarah |
1.4 |
local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
|
| 174 |
azarah |
1.3 |
fi
|
| 175 |
azarah |
1.2 |
|
| 176 |
|
|
case ${EPATCH_SUFFIX##*\.} in
|
| 177 |
|
|
bz2)
|
| 178 |
|
|
PIPE_CMD="bzip2 -dc"
|
| 179 |
azarah |
1.8 |
PATCH_SUFFIX="bz2"
|
| 180 |
azarah |
1.2 |
;;
|
| 181 |
azarah |
1.6 |
gz|Z|z)
|
| 182 |
azarah |
1.2 |
PIPE_CMD="gzip -dc"
|
| 183 |
azarah |
1.8 |
PATCH_SUFFIX="gz"
|
| 184 |
azarah |
1.2 |
;;
|
| 185 |
azarah |
1.6 |
ZIP|zip)
|
| 186 |
azarah |
1.2 |
PIPE_CMD="unzip -p"
|
| 187 |
azarah |
1.8 |
PATCH_SUFFIX="zip"
|
| 188 |
azarah |
1.2 |
;;
|
| 189 |
|
|
*)
|
| 190 |
|
|
PIPE_CMD="cat"
|
| 191 |
azarah |
1.8 |
PATCH_SUFFIX="patch"
|
| 192 |
azarah |
1.2 |
;;
|
| 193 |
|
|
esac
|
| 194 |
|
|
|
| 195 |
azarah |
1.3 |
if [ "${SINGLE_PATCH}" = "no" ]
|
| 196 |
|
|
then
|
| 197 |
|
|
einfo "Applying various patches (bugfixes/updates)..."
|
| 198 |
|
|
fi
|
| 199 |
|
|
for x in ${EPATCH_SOURCE}
|
| 200 |
azarah |
1.2 |
do
|
| 201 |
|
|
# New ARCH dependant patch naming scheme...
|
| 202 |
|
|
#
|
| 203 |
|
|
# ???_arch_foo.patch
|
| 204 |
|
|
#
|
| 205 |
|
|
if [ -f ${x} ] && \
|
| 206 |
azarah |
1.9 |
[ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ]
|
| 207 |
azarah |
1.2 |
then
|
| 208 |
|
|
local count=0
|
| 209 |
|
|
local popts="${EPATCH_OPTS}"
|
| 210 |
azarah |
1.6 |
|
| 211 |
|
|
if [ -n "${EPATCH_EXCLUDE}" ]
|
| 212 |
|
|
then
|
| 213 |
azarah |
1.9 |
if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ]
|
| 214 |
azarah |
1.6 |
then
|
| 215 |
|
|
continue
|
| 216 |
|
|
fi
|
| 217 |
|
|
fi
|
| 218 |
azarah |
1.3 |
|
| 219 |
|
|
if [ "${SINGLE_PATCH}" = "yes" ]
|
| 220 |
|
|
then
|
| 221 |
azarah |
1.9 |
if [ -n "${EPATCH_SINGLE_MSG}" ]
|
| 222 |
|
|
then
|
| 223 |
|
|
einfo "${EPATCH_SINGLE_MSG}"
|
| 224 |
|
|
else
|
| 225 |
|
|
einfo "Applying ${x##*/}..."
|
| 226 |
|
|
fi
|
| 227 |
azarah |
1.3 |
else
|
| 228 |
|
|
einfo " ${x##*/}..."
|
| 229 |
|
|
fi
|
| 230 |
azarah |
1.2 |
|
| 231 |
azarah |
1.8 |
echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
|
| 232 |
|
|
echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
|
| 233 |
azarah |
1.2 |
|
| 234 |
|
|
# Allow for prefix to differ ... im lazy, so shoot me :/
|
| 235 |
|
|
while [ "${count}" -lt 5 ]
|
| 236 |
|
|
do
|
| 237 |
azarah |
1.5 |
# Generate some useful debug info ...
|
| 238 |
azarah |
1.8 |
draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
|
| 239 |
|
|
echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
|
| 240 |
|
|
|
| 241 |
|
|
if [ "${PATCH_SUFFIX}" != "patch" ]
|
| 242 |
|
|
then
|
| 243 |
|
|
echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
|
| 244 |
|
|
echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
|
| 245 |
|
|
else
|
| 246 |
|
|
PATCH_TARGET="${x}"
|
| 247 |
|
|
fi
|
| 248 |
azarah |
1.5 |
|
| 249 |
azarah |
1.8 |
echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
|
| 250 |
|
|
echo "patch ${popts} -p${count} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
|
| 251 |
azarah |
1.5 |
|
| 252 |
azarah |
1.8 |
echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
|
| 253 |
|
|
draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
|
| 254 |
|
|
|
| 255 |
|
|
if [ "${PATCH_SUFFIX}" != "patch" ]
|
| 256 |
|
|
then
|
| 257 |
|
|
if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1
|
| 258 |
|
|
then
|
| 259 |
|
|
echo
|
| 260 |
|
|
eerror "Could not extract patch!"
|
| 261 |
|
|
#die "Could not extract patch!"
|
| 262 |
|
|
count=5
|
| 263 |
|
|
break
|
| 264 |
|
|
fi
|
| 265 |
|
|
fi
|
| 266 |
azarah |
1.5 |
|
| 267 |
azarah |
1.19 |
if (cat ${PATCH_TARGET} | patch ${popts} --dry-run -f -p${count}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1
|
| 268 |
azarah |
1.2 |
then
|
| 269 |
azarah |
1.8 |
draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
|
| 270 |
|
|
echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
|
| 271 |
|
|
echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
|
| 272 |
|
|
echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
|
| 273 |
|
|
draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
|
| 274 |
|
|
|
| 275 |
azarah |
1.19 |
cat ${PATCH_TARGET} | patch ${popts} -p${count} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1
|
| 276 |
azarah |
1.8 |
|
| 277 |
|
|
if [ "$?" -ne 0 ]
|
| 278 |
|
|
then
|
| 279 |
|
|
cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
|
| 280 |
|
|
echo
|
| 281 |
|
|
eerror "A dry-run of patch command succeeded, but actually"
|
| 282 |
|
|
eerror "applying the patch failed!"
|
| 283 |
|
|
#die "Real world sux compared to the dreamworld!"
|
| 284 |
|
|
count=5
|
| 285 |
|
|
fi
|
| 286 |
|
|
|
| 287 |
|
|
rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
|
| 288 |
|
|
|
| 289 |
azarah |
1.2 |
break
|
| 290 |
|
|
fi
|
| 291 |
|
|
|
| 292 |
|
|
count=$((count + 1))
|
| 293 |
|
|
done
|
| 294 |
|
|
|
| 295 |
azarah |
1.8 |
if [ "${PATCH_SUFFIX}" != "patch" ]
|
| 296 |
|
|
then
|
| 297 |
|
|
rm -f ${PATCH_TARGET}
|
| 298 |
|
|
fi
|
| 299 |
|
|
|
| 300 |
azarah |
1.2 |
if [ "${count}" -eq 5 ]
|
| 301 |
|
|
then
|
| 302 |
azarah |
1.8 |
echo
|
| 303 |
azarah |
1.2 |
eerror "Failed Patch: ${x##*/}!"
|
| 304 |
|
|
eerror
|
| 305 |
|
|
eerror "Include in your bugreport the contents of:"
|
| 306 |
|
|
eerror
|
| 307 |
azarah |
1.8 |
eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}"
|
| 308 |
|
|
echo
|
| 309 |
azarah |
1.2 |
die "Failed Patch: ${x##*/}!"
|
| 310 |
|
|
fi
|
| 311 |
azarah |
1.8 |
|
| 312 |
|
|
rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
|
| 313 |
azarah |
1.3 |
|
| 314 |
|
|
eend 0
|
| 315 |
azarah |
1.2 |
fi
|
| 316 |
|
|
done
|
| 317 |
azarah |
1.3 |
if [ "${SINGLE_PATCH}" = "no" ]
|
| 318 |
|
|
then
|
| 319 |
|
|
einfo "Done with patching"
|
| 320 |
azarah |
1.10 |
fi
|
| 321 |
|
|
}
|
| 322 |
|
|
|
| 323 |
|
|
# This function check how many cpu's are present, and then set
|
| 324 |
|
|
# -j in MAKEOPTS accordingly.
|
| 325 |
|
|
#
|
| 326 |
|
|
# Thanks to nall <nall@gentoo.org> for this.
|
| 327 |
|
|
#
|
| 328 |
|
|
get_number_of_jobs() {
|
| 329 |
azarah |
1.13 |
local jobs=0
|
| 330 |
|
|
|
| 331 |
azarah |
1.10 |
if [ ! -r /proc/cpuinfo ]
|
| 332 |
|
|
then
|
| 333 |
|
|
return 1
|
| 334 |
|
|
fi
|
| 335 |
|
|
|
| 336 |
azarah |
1.14 |
# This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
|
| 337 |
|
|
if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
|
| 338 |
|
|
then
|
| 339 |
|
|
ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
|
| 340 |
azarah |
1.17 |
ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
|
| 341 |
|
|
ADMINPARAM="${ADMINPARAM/-j}"
|
| 342 |
azarah |
1.14 |
fi
|
| 343 |
|
|
|
| 344 |
azarah |
1.17 |
export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
|
| 345 |
azarah |
1.10 |
|
| 346 |
zwelch |
1.21 |
if [ "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
|
| 347 |
|
|
"${ARCH}" = "arm" -o "${ARCH}" = "mips" ]
|
| 348 |
azarah |
1.10 |
then
|
| 349 |
zwelch |
1.21 |
# these archs will always have "[Pp]rocessor"
|
| 350 |
|
|
jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
|
| 351 |
azarah |
1.10 |
|
| 352 |
|
|
elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
|
| 353 |
|
|
then
|
| 354 |
|
|
# sparc always has "ncpus active"
|
| 355 |
azarah |
1.13 |
jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
|
| 356 |
azarah |
1.10 |
|
| 357 |
|
|
elif [ "${ARCH}" = "alpha" ]
|
| 358 |
|
|
then
|
| 359 |
|
|
# alpha has "cpus active", but only when compiled with SMP
|
| 360 |
azarah |
1.13 |
if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
|
| 361 |
azarah |
1.10 |
then
|
| 362 |
azarah |
1.13 |
jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
|
| 363 |
azarah |
1.10 |
else
|
| 364 |
azarah |
1.13 |
jobs=2
|
| 365 |
azarah |
1.10 |
fi
|
| 366 |
|
|
|
| 367 |
|
|
elif [ "${ARCH}" = "ppc" ]
|
| 368 |
|
|
then
|
| 369 |
|
|
# ppc has "processor", but only when compiled with SMP
|
| 370 |
azarah |
1.13 |
if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
|
| 371 |
azarah |
1.10 |
then
|
| 372 |
azarah |
1.13 |
jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
|
| 373 |
azarah |
1.10 |
else
|
| 374 |
azarah |
1.13 |
jobs=2
|
| 375 |
azarah |
1.10 |
fi
|
| 376 |
|
|
else
|
| 377 |
azarah |
1.13 |
jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
|
| 378 |
azarah |
1.10 |
die "Unknown ARCH -- ${ARCH}!"
|
| 379 |
azarah |
1.3 |
fi
|
| 380 |
azarah |
1.13 |
|
| 381 |
|
|
# Make sure the number is valid ...
|
| 382 |
|
|
if [ "${jobs}" -lt 1 ]
|
| 383 |
|
|
then
|
| 384 |
|
|
jobs=1
|
| 385 |
|
|
fi
|
| 386 |
azarah |
1.14 |
|
| 387 |
azarah |
1.15 |
if [ -n "${ADMINPARAM}" ]
|
| 388 |
azarah |
1.14 |
then
|
| 389 |
azarah |
1.15 |
if [ "${jobs}" -gt "${ADMINPARAM}" ]
|
| 390 |
|
|
then
|
| 391 |
|
|
einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..."
|
| 392 |
|
|
export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
|
| 393 |
|
|
else
|
| 394 |
|
|
einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..."
|
| 395 |
|
|
export MAKEOPTS="${MAKEOPTS} -j${jobs}"
|
| 396 |
|
|
fi
|
| 397 |
azarah |
1.14 |
fi
|
| 398 |
azarah |
1.1 |
}
|
| 399 |
|
|
|
| 400 |
vapier |
1.23 |
# Simplify/standardize adding users to the system
|
| 401 |
|
|
# vapier@gentoo.org
|
| 402 |
|
|
#
|
| 403 |
|
|
# enewuser(username, uid, shell, homedir, groups, extra options)
|
| 404 |
|
|
#
|
| 405 |
|
|
# Default values if you do not specify any:
|
| 406 |
|
|
# username: REQUIRED !
|
| 407 |
|
|
# uid: next available (see useradd(8))
|
| 408 |
|
|
# shell: /bin/false
|
| 409 |
|
|
# homedir: /dev/null
|
| 410 |
|
|
# groups: none
|
| 411 |
|
|
# extra: comment of 'added by portage for ${PN}'
|
| 412 |
|
|
enewuser() {
|
| 413 |
|
|
# get the username
|
| 414 |
|
|
local euser="$1"; shift
|
| 415 |
|
|
if [ -z "${euser}" ] ; then
|
| 416 |
|
|
eerror "No username specified !"
|
| 417 |
|
|
die "Cannot call enewuser without a username"
|
| 418 |
|
|
fi
|
| 419 |
|
|
einfo "Adding user '${euser}' to your system ..."
|
| 420 |
|
|
|
| 421 |
|
|
# setup a file for testing usernames/groups
|
| 422 |
|
|
local tmpfile="`mktemp -p ${T}`"
|
| 423 |
|
|
touch ${tmpfile}
|
| 424 |
|
|
chown ${euser} ${tmpfile} >& /dev/null
|
| 425 |
|
|
local realuser="`ls -l ${tmpfile} | awk '{print $3}'`"
|
| 426 |
|
|
|
| 427 |
|
|
# see if user already exists
|
| 428 |
|
|
if [ "${euser}" == "${realuser}" ] ; then
|
| 429 |
|
|
einfo "${euser} already exists on your system :)"
|
| 430 |
|
|
return 0
|
| 431 |
|
|
fi
|
| 432 |
|
|
|
| 433 |
|
|
# options to pass to useradd
|
| 434 |
|
|
local opts=""
|
| 435 |
|
|
|
| 436 |
|
|
# handle uid
|
| 437 |
|
|
local euid="$1"; shift
|
| 438 |
|
|
if [ ! -z "${euid}" ] ; then
|
| 439 |
|
|
if [ ${euid} -gt 0 ] ; then
|
| 440 |
|
|
opts="${opts} -u ${euid}"
|
| 441 |
|
|
else
|
| 442 |
|
|
eerror "Userid given but is not greater than 0 !"
|
| 443 |
|
|
die "${euid} is not a valid UID"
|
| 444 |
|
|
fi
|
| 445 |
|
|
else
|
| 446 |
|
|
euid="next available"
|
| 447 |
|
|
fi
|
| 448 |
|
|
einfo " - Userid: ${euid}"
|
| 449 |
|
|
|
| 450 |
|
|
# handle shell
|
| 451 |
|
|
local eshell="$1"; shift
|
| 452 |
|
|
if [ ! -z "${eshell}" ] ; then
|
| 453 |
|
|
if [ ! -e ${eshell} ] ; then
|
| 454 |
|
|
eerror "A shell was specified but it does not exist !"
|
| 455 |
|
|
die "${eshell} does not exist"
|
| 456 |
|
|
fi
|
| 457 |
|
|
else
|
| 458 |
|
|
eshell=/bin/false
|
| 459 |
|
|
fi
|
| 460 |
|
|
einfo " - Shell: ${eshell}"
|
| 461 |
|
|
opts="${opts} -s ${eshell}"
|
| 462 |
|
|
|
| 463 |
|
|
# handle homedir
|
| 464 |
|
|
local ehome="$1"; shift
|
| 465 |
|
|
if [ -z "${ehome}" ] ; then
|
| 466 |
|
|
ehome=/dev/null
|
| 467 |
|
|
fi
|
| 468 |
|
|
einfo " - Home: ${ehome}"
|
| 469 |
|
|
opts="${opts} -d ${ehome}"
|
| 470 |
|
|
|
| 471 |
|
|
# handle groups
|
| 472 |
|
|
local egroups="$1"; shift
|
| 473 |
|
|
if [ ! -z "${egroups}" ] ; then
|
| 474 |
|
|
local realgroup
|
| 475 |
|
|
local oldifs="${IFS}"
|
| 476 |
|
|
export IFS=","
|
| 477 |
|
|
for g in ${egroups} ; do
|
| 478 |
|
|
chgrp ${g} ${tmpfile} >& /dev/null
|
| 479 |
|
|
realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
|
| 480 |
|
|
if [ "${g}" != "${realgroup}" ] ; then
|
| 481 |
|
|
eerror "You must add ${g} to the system first"
|
| 482 |
|
|
die "${g} is not a valid GID"
|
| 483 |
|
|
fi
|
| 484 |
|
|
done
|
| 485 |
|
|
export IFS="${oldifs}"
|
| 486 |
|
|
opts="${opts} -g ${egroups}"
|
| 487 |
|
|
else
|
| 488 |
|
|
egroups="(none)"
|
| 489 |
|
|
fi
|
| 490 |
|
|
einfo " - Groups: ${egroups}"
|
| 491 |
|
|
|
| 492 |
|
|
# handle extra and add the user
|
| 493 |
|
|
local eextra="$@"
|
| 494 |
|
|
local oldsandbox="${oldsandbox}"
|
| 495 |
|
|
export SANDBOX_ON="0"
|
| 496 |
|
|
if [ -z "${eextra}" ] ; then
|
| 497 |
|
|
useradd ${opts} ${euser} \
|
| 498 |
|
|
-c "added by portage for ${PN}" \
|
| 499 |
|
|
|| die "enewuser failed"
|
| 500 |
|
|
else
|
| 501 |
|
|
einfo " - Extra: ${eextra}"
|
| 502 |
|
|
useradd ${opts} ${euser} ${eextra} \
|
| 503 |
|
|
|| die "enewuser failed"
|
| 504 |
|
|
fi
|
| 505 |
|
|
export SANDBOX_ON="${oldsandbox}"
|
| 506 |
|
|
|
| 507 |
|
|
if [ ! -e ${ehome} ] && [ ! -e ${D}/${ehome} ] ; then
|
| 508 |
|
|
einfo " - Creating ${ehome} in ${D}"
|
| 509 |
|
|
dodir ${ehome}
|
| 510 |
|
|
fperms ${euser} ${ehome}
|
| 511 |
|
|
fi
|
| 512 |
|
|
}
|
| 513 |
|
|
|
| 514 |
|
|
# Simplify/standardize adding groups to the system
|
| 515 |
|
|
# vapier@gentoo.org
|
| 516 |
|
|
#
|
| 517 |
|
|
# enewgroup(group, gid)
|
| 518 |
|
|
#
|
| 519 |
|
|
# Default values if you do not specify any:
|
| 520 |
|
|
# groupname: REQUIRED !
|
| 521 |
|
|
# gid: next available (see groupadd(8))
|
| 522 |
|
|
# extra: none
|
| 523 |
|
|
enewgroup() {
|
| 524 |
|
|
# get the group
|
| 525 |
|
|
local egroup="$1"; shift
|
| 526 |
|
|
if [ -z "${egroup}" ] ; then
|
| 527 |
|
|
eerror "No group specified !"
|
| 528 |
|
|
die "Cannot call enewgroup without a group"
|
| 529 |
|
|
fi
|
| 530 |
|
|
einfo "Adding group '${egroup}' to your system ..."
|
| 531 |
|
|
|
| 532 |
|
|
# setup a file for testing groupname
|
| 533 |
|
|
local tmpfile="`mktemp -p ${T}`"
|
| 534 |
|
|
touch ${tmpfile}
|
| 535 |
|
|
chgrp ${egroup} ${tmpfile} >& /dev/null
|
| 536 |
|
|
local realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
|
| 537 |
|
|
|
| 538 |
|
|
# see if group already exists
|
| 539 |
|
|
if [ "${egroup}" == "${realgroup}" ] ; then
|
| 540 |
|
|
einfo "${egroup} already exists on your system :)"
|
| 541 |
|
|
return 0
|
| 542 |
|
|
fi
|
| 543 |
|
|
|
| 544 |
|
|
# options to pass to useradd
|
| 545 |
|
|
local opts=""
|
| 546 |
|
|
|
| 547 |
|
|
# handle gid
|
| 548 |
|
|
local egid="$1"; shift
|
| 549 |
|
|
if [ ! -z "${egid}" ] ; then
|
| 550 |
|
|
if [ ${egid} -gt 0 ] ; then
|
| 551 |
|
|
opts="${opts} -g ${egid}"
|
| 552 |
|
|
else
|
| 553 |
|
|
eerror "Groupid given but is not greater than 0 !"
|
| 554 |
|
|
die "${egid} is not a valid GID"
|
| 555 |
|
|
fi
|
| 556 |
|
|
else
|
| 557 |
|
|
egid="next available"
|
| 558 |
|
|
fi
|
| 559 |
|
|
einfo " - Groupid: ${egid}"
|
| 560 |
|
|
|
| 561 |
|
|
# handle extra
|
| 562 |
|
|
local eextra="$@"
|
| 563 |
|
|
opts="${opts} ${eextra}"
|
| 564 |
|
|
|
| 565 |
|
|
# add the group
|
| 566 |
|
|
local oldsandbox="${oldsandbox}"
|
| 567 |
|
|
export SANDBOX_ON="0"
|
| 568 |
|
|
groupadd ${opts} ${egroup} || die "enewgroup failed"
|
| 569 |
|
|
export SANDBOX_ON="${oldsandbox}"
|
| 570 |
vapier |
1.24 |
}
|
| 571 |
|
|
|
| 572 |
|
|
# Simple script to replace 'dos2unix' binaries
|
| 573 |
|
|
# vapier@gentoo.org
|
| 574 |
|
|
#
|
| 575 |
|
|
# edos2unix(file, <more files>...)
|
| 576 |
|
|
edos2unix() {
|
| 577 |
|
|
for f in $@ ; do
|
| 578 |
|
|
cp ${f} ${T}/
|
| 579 |
|
|
sed 's/\r$//' ${T}/${f}.old > ${f}
|
| 580 |
|
|
done
|
| 581 |
vapier |
1.23 |
}
|