Merge oe-devel@oe-devel.bkbits.net:packages.bb

into handhelds.org:/home/kergoth/code/packages.bb

2004/12/07 04:58:25-06:00 ti.com!kergoth
More updates per the core rename.

2004/12/07 04:46:51-06:00 ti.com!kergoth
Update soundtracker per the core rename.

2004/12/07 04:44:14-06:00 ti.com!kergoth
Merge

2004/12/07 04:42:38-06:00 ti.com!kergoth
Updates per the recent rename of the oe core from 'oe' to 'bitbake'.

BKrev: 41b6293b91LRHSxMOt6WnrZVAdLbFw

88 files changed, 0 insertions, 3537 deletions

diff --git a/classes/base_srpm.oeclass b/classes/autotools.bbclass
index e69de29bb2..e69de29bb2 100644
--- a/classes/base_srpm.oeclass
+++ b/classes/autotools.bbclass
diff --git a/classes/autotools.oeclass b/classes/autotools.oeclass
deleted file mode 100644
index 86a7f208eb..0000000000
--- a/classes/autotools.oeclass
+++ /dev/null
@@ -1,142 +0,0 @@
-inherit base
-
-def autotools_dep_prepend(d):
-	import oe;
-	pn = oe.data.getVar('PN', d, 1)
-	deps = ''
-
-	if pn in ['autoconf-native', 'automake-native']:
-		return deps
-	deps += 'autoconf-native automake-native '
-
-	if not pn in ['libtool', 'libtool-native', 'libtool-cross']:
-		deps += 'libtool-native '
-
-	return deps + 'gnu-config-native '
-
-EXTRA_OEMAKE = ""
-DEPENDS_prepend = "${@autotools_dep_prepend(d)}"
-acpaths = "default"
-EXTRA_AUTORECONF = "--exclude=autopoint"
-
-def autotools_set_crosscompiling(d):
-	import oe
-	if not oe.data.inherits_class('native', d):
-		return " cross_compiling=yes"
-	return ""
-
-# EXTRA_OECONF_append = "${@autotools_set_crosscompiling(d)}"
-
-oe_runconf () {
-	if [ -x ${S}/configure ] ; then
-		cfgcmd="${S}/configure \
-		    --build=${BUILD_SYS} \
-		    --host=${HOST_SYS} \
-		    --target=${TARGET_SYS} \
-		    --prefix=${prefix} \
-		    --exec_prefix=${exec_prefix} \
-		    --bindir=${bindir} \
-		    --sbindir=${sbindir} \
-		    --libexecdir=${libexecdir} \
-		    --datadir=${datadir} \
-		    --sysconfdir=${sysconfdir} \
-		    --sharedstatedir=${sharedstatedir} \
-		    --localstatedir=${localstatedir} \
-		    --libdir=${libdir} \
-		    --includedir=${includedir} \
-		    --oldincludedir=${oldincludedir} \
-		    --infodir=${infodir} \
-		    --mandir=${mandir} \
-			${EXTRA_OECONF} \
-		    $@"
-		oenote "Running $cfgcmd..."
-		$cfgcmd || oefatal "oe_runconf failed" 
-	else
-		oefatal "no configure script found"
-	fi
-}
-
-autotools_do_configure() {
-	case ${PN} in
-	autoconf*)
-	;;
-	automake*)
-	;;
-	*)
-		# WARNING: gross hack follows:
-		# An autotools built package generally needs these scripts, however only
-		# automake or libtoolize actually install the current versions of them.
-		# This is a problem in builds that do not use libtool or automake, in the case
-		# where we -need- the latest version of these scripts.  e.g. running a build
-		# for a package whose autotools are old, on an x86_64 machine, which the old
-		# config.sub does not support.  Work around this by installing them manually
-		# regardless.
-		( for ac in `find ${S} -name configure.in -o -name configure.ac`; do
-			rm -f `dirname $ac`/configure
-			done )
-		if [ -e ${S}/configure.in -o -e ${S}/configure.ac ]; then
-			olddir=`pwd`
-			cd ${S}
-			if [ x"${acpaths}" = xdefault ]; then
-				acpaths=
-				for i in `find ${S} -maxdepth 2 -name \*.m4|grep -v 'aclocal.m4'| \
-					grep -v 'acinclude.m4' | sed -e 's,\(.*/\).*$,\1,'|sort -u`; do
-					acpaths="$acpaths -I $i"
-				done
-			else
-				acpaths="${acpaths}"
-			fi
-			install -d ${STAGING_DIR}/${HOST_SYS}/share/aclocal
-			acpaths="$acpaths -I ${STAGING_DIR}/${HOST_SYS}/share/aclocal"
-			# autoreconf is too shy to overwrite aclocal.m4 if it doesn't look
-			# like it was auto-generated.  Work around this by blowing it away
-			# by hand, unless the package specifically asked not to run aclocal.
-			if ! echo ${EXTRA_AUTORECONF} | grep -q "aclocal"; then
-				rm -f aclocal.m4
-			fi
-			if [ -e configure.in ]; then
-			  CONFIGURE_AC=configure.in
-			else
-			  CONFIGURE_AC=configure.ac
-			fi
-			if grep "^AM_GLIB_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
-			  if grep "sed.*POTFILES" configure.ac >/dev/null; then
-			    : do nothing -- we still have an old unmodified configure.ac
-			  else
-			    oenote Executing glib-gettextize --force --copy
-			    echo "no" | glib-gettextize --force --copy
-			  fi
-			fi
-			if grep "^AC_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then
-			  oenote Executing intltoolize --copy --force --automake
-			  intltoolize --copy --force --automake
-			fi
-			oenote Executing autoreconf --verbose --install --force ${EXTRA_AUTORECONF} $acpaths
-			mkdir -p m4
-			autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || oefatal "autoreconf execution failed."
-			cd $olddir
-		fi
-	;;
-	esac
-	if [ -e ${S}/configure ]; then
-		oe_runconf
-	else
-		oenote "nothing to configure"
-	fi
-}
-
-autotools_do_install() {
-	oe_runmake 'DESTDIR=${D}' install
-}
-
-STAGE_TEMP="${WORKDIR}/temp-staging"
-
-autotools_stage_includes() {
-	rm -rf ${STAGE_TEMP}
-	mkdir -p ${STAGE_TEMP}
-	make DESTDIR="${STAGE_TEMP}" install
-	cp -a ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
-	rm -rf ${STAGE_TEMP}
-}
-
-EXPORT_FUNCTIONS do_configure do_install
diff --git a/classes/binconfig.oeclass b/classes/base.bbclass
index e69de29bb2..e69de29bb2 100644
--- a/classes/binconfig.oeclass
+++ b/classes/base.bbclass
diff --git a/classes/base.oeclass b/classes/base.oeclass
deleted file mode 100644
index 66136074c7..0000000000
--- a/classes/base.oeclass
+++ /dev/null
@@ -1,734 +0,0 @@
-PATCHES_DIR="${S}"
-
-def base_dep_prepend(d):
-	import oe;
-	#
-	# Ideally this will check a flag so we will operate properly in
-	# the case where host == build == target, for now we don't work in
-	# that case though.
-	#
-	deps = ""
-	if not oe.data.getVar('INHIBIT_DEFAULT_DEPS', d):
-		deps += "patcher-native"
-		if (oe.data.getVar('HOST_SYS', d, 1) !=
-	     	    oe.data.getVar('BUILD_SYS', d, 1)):
-			deps += " virtual/${TARGET_PREFIX}gcc virtual/libc "
-	return deps
-
-def base_read_file(filename):
-	import oe
-	try:
-		f = file( filename, "r" )
-	except IOError, reason:
-		raise oe.build.FuncFailed("can't read from file '%s' (%s)", (filename,reason))
-	else:
-		return f.read().strip()
-	return None
-
-DEPENDS_prepend="${@base_dep_prepend(d)} "
-
-def base_set_filespath(path, d):
-	import os, oe
-	filespath = []
-	for p in path:
-		overrides = oe.data.getVar("OVERRIDES", d, 1) or ""
-		overrides = overrides + ":"
-		for o in overrides.split(":"):
-			filespath.append(os.path.join(p, o))
-	oe.data.setVar("FILESPATH", ":".join(filespath), d)
-
-FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ], d)}"
-
-def oe_filter(f, str, d):
-	from re import match
-	return " ".join(filter(lambda x: match(f, x, 0), str.split()))
-
-def oe_filter_out(f, str, d):
-	from re import match
-	return " ".join(filter(lambda x: not match(f, x, 0), str.split()))
-
-die() {
-	oefatal "$*"
-}
-
-oenote() {
-	echo "NOTE:" "$*"
-}
-
-oewarn() {
-	echo "WARNING:" "$*"
-}
-
-oefatal() {
-	echo "FATAL:" "$*"
-	exit 1
-}
-
-oedebug() {
-	test $# -ge 2 || {
-		echo "Usage: oedebug level \"message\""
-		exit 1
-	}
-
-	test ${OEDEBUG:-0} -ge $1 && {
-		shift
-		echo "DEBUG:" $*
-	}
-}
-
-oe_runmake() {
-	if [ x"$MAKE" = x ]; then MAKE=make; fi
-	oenote ${MAKE} ${EXTRA_OEMAKE} "$@"
-	${MAKE} ${EXTRA_OEMAKE} "$@" || die "oemake failed"
-}
-
-oe_soinstall() {
-	# Purpose: Install shared library file and
-	#          create the necessary links
-	# Example:
-	#
-	# oe_
-	#
-	#oenote installing shared library $1 to $2
-	#
-	libname=`basename $1`
-	install -m 755 $1 $2/$libname
-	sonamelink=`${HOST_PREFIX}readelf -d $1 |grep 'Library soname:' |sed -e 's/.*\[\(.*\)\].*/\1/'`
-	solink=`echo $libname | sed -e 's/\.so\..*/.so/'`
-	ln -sf $libname $2/$sonamelink
-	ln -sf $libname $2/$solink
-}
-
-oe_libinstall() {
-	# Purpose: Install a library, in all its forms
-	# Example
-	#
-	# oe_libinstall libltdl ${STAGING_LIBDIR}/
-	# oe_libinstall -C src/libblah libblah ${D}/${libdir}/
-	dir=""
-	libtool=""
-	silent=""
-	require_static=""
-	require_shared=""
-	while [ "$#" -gt 0 ]; do
-		case "$1" in
-		-C)
-			shift
-			dir="$1"
-			;;
-		-s)
-			silent=1
-			;;
-		-a)
-			require_static=1
-			;;
-		-so)
-			require_shared=1
-			;;
-		-*)
-			oefatal "oe_libinstall: unknown option: $1"
-			;;
-		*)
-			break;
-			;;
-		esac
-		shift
-	done
-
-	libname="$1"
-	shift
-	destpath="$1"
-	if [ -z "$destpath" ]; then
-		oefatal "oe_libinstall: no destination path specified"
-	fi
-
-	__runcmd () {
-		if [ -z "$silent" ]; then
-			echo >&2 "oe_libinstall: $*"
-		fi
-		$*
-	}
-
-	if [ -z "$dir" ]; then
-		dir=`pwd`
-	fi
-	if [ -d "$dir/.libs" ]; then
-		dir=$dir/.libs
-	fi
-	olddir=`pwd`
-	__runcmd cd $dir
-
-	lafile=$libname.la
-	if [ -f "$lafile" ]; then
-		# libtool archive
-		eval `cat $lafile|grep "^library_names="`
-		libtool=1
-	else
-		library_names="$libname.so* $libname.dll.a"
-	fi
-
-	__runcmd install -d $destpath/
-	dota=$libname.a
-	if [ -f "$dota" -o -n "$require_static" ]; then
-		__runcmd install -m 0644 $dota $destpath/
-	fi
-	dotlai=$libname.lai
-	if [ -f "$dotlai" -o -n "$libtool" ]; then
-		__runcmd install -m 0644 $dotlai $destpath/$libname.la
-	fi
-
-	for name in $library_names; do
-		files=`eval echo $name`
-		for f in $files; do
-			if [ ! -e "$f" ]; then
-				if [ -n "$libtool" ]; then
-					oefatal "oe_libinstall: $dir/$f not found."
-				fi
-			elif [ -L "$f" ]; then
-				__runcmd cp -P "$f" $destpath/
-			elif [ ! -L "$f" ]; then
-				libfile="$f"
-				__runcmd install -m 0755 $libfile $destpath/
-			fi
-		done
-	done
-
-	if [ -z "$libfile" ]; then
-		if  [ -n "$require_shared" ]; then
-			oefatal "oe_libinstall: unable to locate shared library"
-		fi
-	elif [ -z "$libtool" ]; then
-		# special case hack for non-libtool .so.#.#.# links
-		baselibfile=`basename "$libfile"`
-		if (echo $baselibfile | grep -qE '^lib.*\.so\.[0-9.]*$'); then
-			sonamelink=`${HOST_PREFIX}readelf -d $li