From a780643c4b6aa11e1a36965a69df7116477c7b4c Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Tue, 7 Dec 2004 22:05:47 +0000
Subject: 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
---
 classes/base.bbclass | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 classes/base.bbclass

(limited to 'classes/base.bbclass')

diff --git a/classes/base.bbclass b/classes/base.bbclass
new file mode 100644
index 0000000000..e69de29bb2
-- 
cgit v1.2.3


From d5e1c8f0a7f8dead22fa2cde9ff86a96a59346c3 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Thu, 9 Dec 2004 00:48:15 +0000
Subject: Make use of the newly added handling of the 'bbdepcmd' flag on our
 do_clean and do_mrproper tasks.

BKrev: 41b7a0cf24X1rl6Hldl8IE4d1FYxxw
---
 classes/base.bbclass | 736 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 736 insertions(+)

(limited to 'classes/base.bbclass')

diff --git a/classes/base.bbclass b/classes/base.bbclass
index e69de29bb2..09710b0a8b 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -0,0 +1,736 @@
+PATCHES_DIR="${S}"
+
+def base_dep_prepend(d):
+	import bb;
+	#
+	# 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 bb.data.getVar('INHIBIT_DEFAULT_DEPS', d):
+		deps += "patcher-native"
+		if (bb.data.getVar('HOST_SYS', d, 1) !=
+	     	    bb.data.getVar('BUILD_SYS', d, 1)):
+			deps += " virtual/${TARGET_PREFIX}gcc virtual/libc "
+	return deps
+
+def base_read_file(filename):
+	import bb
+	try:
+		f = file( filename, "r" )
+	except IOError, reason:
+		raise bb.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, bb
+	filespath = []
+	for p in path:
+		overrides = bb.data.getVar("OVERRIDES", d, 1) or ""
+		overrides = overrides + ":"
+		for o in overrides.split(":"):
+			filespath.append(os.path.join(p, o))
+	bb.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 $libfile |grep 'Library soname:' |sed -e 's/.*\[\(.*\)\].*/\1/'`
+			solink=`echo $baselibfile | sed -e 's/\.so\..*/.so/'`
+			if [ -n "$sonamelink" -a x"$baselibfile" != x"$sonamelink" ]; then
+				__runcmd ln -sf $baselibfile $destpath/$sonamelink
+			fi
+			__runcmd ln -sf $baselibfile $destpath/$solink
+		fi
+	fi
+
+	__runcmd cd "$olddir"
+}
+
+oe_machinstall() {
+	# Purpose: Install machine dependent files, if available
+	#          If not available, check if there is a default
+	#          If no default, just touch the destination
+	# Example:
+	#                $1  $2   $3         $4
+	# oe_machinstall -m 0644 fstab ${D}/etc/fstab
+	#
+	# TODO: Check argument number?
+	#
+	filename=`basename $3`
+	dirname=`dirname $3`
+
+	for o in `echo ${OVERRIDES} | tr ':' ' '`; do
+		if [ -e $dirname/$o/$filename ]; then
+			oenote $dirname/$o/$filename present, installing to $4
+			install $1 $2 $dirname/$o/$filename $4
+			return
+		fi
+	done
+#	oenote overrides specific file NOT present, trying default=$3...
+	if [ -e $3 ]; then
+		oenote $3 present, installing to $4
+		install $1 $2 $3 $4
+	else
+		oenote $3 NOT present, touching empty $4
+		touch $4
+	fi
+}
+
+addtask showdata
+do_showdata[nostamp] = "1"
+python do_showdata() {
+	import sys
+	# emit variables and shell functions
+	bb.data.emit_env(sys.__stdout__, d, True)
+	# emit the metadata which isnt valid shell
+	for e in d.keys():
+	    if bb.data.getVarFlag(e, 'python', d):
+	        sys.__stdout__.write("\npython %s () {\n%s}\n" % (e, bb.data.getVar(e, d, 1)))
+}
+
+addtask listtasks
+do_listtasks[nostamp] = "1"
+python do_listtasks() {
+	import sys
+	# emit variables and shell functions
+	#bb.data.emit_env(sys.__stdout__, d)
+	# emit the metadata which isnt valid shell
+	for e in d.keys():
+		if bb.data.getVarFlag(e, 'task', d):
+			sys.__stdout__.write("%s\n" % e)
+}
+
+addtask clean
+do_clean[dirs] = "${TOPDIR}"
+do_clean[nostamp] = "1"
+do_clean[bbdepcmd] = ""
+python base_do_clean() {
+	"""clear the build and temp directories"""
+	dir = bb.data.expand("${WORKDIR}", d)
+	if dir == '//': raise bb.build.FuncFailed("wrong DATADIR")
+	bb.note("removing " + dir)
+	os.system('rm -rf ' + dir)
+
+	dir = "%s.*" % bb.data.expand(bb.data.getVar('STAMP', d), d)
+	bb.note("removing " + dir)
+	os.system('rm -f '+ dir)
+}
+
+addtask mrproper
+do_mrproper[dirs] = "${TOPDIR}"
+do_mrproper[nostamp] = "1"
+do_mrproper[bbdepcmd] = ""
+python base_do_mrproper() {
+	"""clear downloaded sources, build and temp directories"""
+	dir = bb.data.expand("${DL_DIR}", d)
+	if dir == '/': bb.build.FuncFailed("wrong DATADIR")
+	bb.debug(2, "removing " + dir)
+	os.system('rm -rf ' + dir)
+	bb.build.exec_task('do_clean', d)
+}
+
+addtask fetch
+do_fetch[dirs] = "${DL_DIR}"
+do_fetch[nostamp] = "1"
+python base_do_fetch() {
+	import sys, copy
+
+	localdata = copy.deepcopy(d)
+	bb.data.update_data(localdata)
+
+	src_uri = bb.data.getVar('SRC_URI', localdata, 1)
+	if not src_uri:
+		return 1
+
+	try:
+		bb.fetch.init(src_uri.split())
+	except bb.fetch.NoMethodError:
+		(type, value, traceback) = sys.exc_info()
+		raise bb.build.FuncFailed("No method: %s" % value)
+
+	try:
+		bb.fetch.go(localdata)
+	except bb.fetch.MissingParameterError:
+		(type, value, traceback) = sys.exc_info()
+		raise bb.build.FuncFailed("Missing parameters: %s" % value)
+	except bb.fetch.FetchError:
+		(type, value, traceback) = sys.exc_info()
+		raise bb.build.FuncFailed("Fetch failed: %s" % value)
+}
+
+def oe_unpack_file(file, data, url = None):
+	import bb, os
+	if not url:
+		url = "file://%s" % file
+	dots = file.split(".")
+	if dots[-1] in ['gz', 'bz2', 'Z']:
+		efile = os.path.join(bb.data.getVar('WORKDIR', data, 1),os.path.basename('.'.join(dots[0:-1])))
+	else:
+		efile = file
+	cmd = None
+	if file.endswith('.tar'):
+		cmd = 'tar x --no-same-owner -f %s' % file
+	elif file.endswith('.tgz') or file.endswith('.tar.gz'):
+		cmd = 'tar xz --no-same-owner -f %s' % file
+	elif file.endswith('.tbz') or file.endswith('.tar.bz2'):
+		cmd = 'bzip2 -dc %s | tar x --no-same-owner -f -' % file
+	elif file.endswith('.gz') or file.endswith('.Z') or file.endswith('.z'):
+		cmd = 'gzip -dc %s > %s' % (file, efile)
+	elif file.endswith('.bz2'):
+		cmd = 'bzip2 -dc %s > %s' % (file, efile)
+	elif file.endswith('.zip'):
+		cmd = 'unzip -q %s' % file
+	elif os.path.isdir(file):
+		filesdir = os.path.realpath(bb.data.getVar("FILESDIR", data, 1))
+		destdir = "."
+		if file[0:len(filesdir)] == filesdir:
+			destdir = file[len(filesdir):file.rfind('/')]
+			destdir = destdir.strip('/')
+			if len(destdir) < 1:
+				destdir = "."
+			elif not os.access("%s/%s" % (os.getcwd(), destdir), os.F_OK):
+				os.makedirs("%s/%s" % (os.getcwd(), destdir))
+		cmd = 'cp -a %s %s/%s/' % (file, os.getcwd(), destdir)
+	else:
+		(type, host, path, user, pswd, parm) = bb.decodeurl(url)
+		if not 'patch' in parm:
+			destdir = bb.decodeurl(url)[1] or "."
+			bb.mkdirhier("%s/%s" % (os.getcwd(), destdir))
+			cmd = 'cp %s %s/%s/' % (file, os.getcwd(), destdir)
+	if not cmd:
+		return True
+	cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', data, 1), cmd)
+	bb.note("Unpacking %s to %s/" % (file, os.getcwd()))
+	ret = os.system(cmd)
+	return ret == 0
+
+addtask unpack after do_fetch
+do_unpack[dirs] = "${WORKDIR}"
+python base_do_unpack() {
+	import re, copy, os
+
+	localdata = copy.deepcopy(d)
+	bb.data.update_data(localdata)
+
+	src_uri = bb.data.getVar('SRC_URI', localdata)
+	if not src_uri:
+		return
+	src_uri = bb.data.expand(src_uri, localdata)
+	for url in src_uri.split():
+		try:
+			local = bb.data.expand(bb.fetch.localpath(url, localdata), localdata)
+		except bb.MalformedUrl, e:
+			raise FuncFailed('Unable to generate local path for malformed uri: %s' % e)
+		# dont need any parameters for extraction, strip them off
+		local = re.sub(';.*$', '', local)
+		local = os.path.realpath(local)
+		ret = oe_unpack_file(local, localdata, url)
+		if not ret:
+			raise bb.build.FuncFailed()
+}
+
+addtask patch after do_unpack
+do_patch[dirs] = "${WORKDIR}"
+python base_do_patch() {
+	import re
+
+	src_uri = bb.data.getVar('SRC_URI', d)
+	if not src_uri:
+		return
+	src_uri = bb.data.expand(src_uri, d)
+	for url in src_uri.split():
+#		bb.note('url is %s' % url)
+		(type, host, path, user, pswd, parm) = bb.decodeurl(url)
+		if not "patch" in parm:
+			continue
+		from bb.fetch import init, localpath
+		init([url])
+		url = bb.encodeurl((type, host, path, user, pswd, []))
+		local = '/' + localpath(url, d)
+		# patch!
+		dots = local.split(".")
+		if dots[-1] in ['gz', 'bz2', 'Z']:
+			efile = os.path.join(bb.data.getVar('WORKDIR', d),os.path.basename('.'.join(dots[0:-1])))
+		else:
+			efile = local
+		efile = bb.data.expand(efile, d)
+		patches_dir = bb.data.expand(bb.data.getVar('PATCHES_DIR', d), d)
+		bb.mkdirhier(patches_dir + "/.patches")
+		os.chdir(patches_dir)
+		cmd = "PATH=\"%s\" patcher" % bb.data.getVar("PATH", d, 1)
+		if "pnum" in parm:
+			cmd += " -p %s" % parm["pnum"]
+		# Getting rid of // at the front helps the Cygwin-Users of OE
+		if efile.startswith('//'):
+			efile = efile[1:]
+		cmd += " -R -n \"%s\" -i %s" % (os.path.basename(efile), efile)
+		ret = os.system(cmd)
+		if ret != 0:
+			raise bb.build.FuncFailed("'patcher' execution failed")
+}
+
+
+addhandler base_eventhandler
+python base_eventhandler() {
+	from bb import note, error, data
+	from bb.event import Handled, NotHandled, getName
+	import os
+
+	name = getName(e)
+	if name in ["PkgSucceeded"]:
+		note("package %s: build completed" % e.pkg)
+	if name in ["PkgStarted"]:
+		note("package %s: build %s" % (e.pkg, name[3:].lower()))
+	elif name in ["PkgFailed"]:
+		error("package %s: build %s" % (e.pkg, name[3:].lower()))
+	elif name in ["TaskStarted"]:
+		note("package %s: task %s %s" % (data.expand(data.getVar("PF", e.data), e.data), e.task, name[4:].lower()))
+	elif name in ["TaskSucceeded"]:
+		note("package %s: task %s completed" % (data.expand(data.getVar("PF", e.data), e.data), e.task))
+	elif name in ["TaskFailed"]:
+		error("package %s: task %s %s" % (data.expand(data.getVar("PF", e.data), e.data), e.task, name[4:].lower()))
+	elif name in ["UnsatisfiedDep"]:
+		note("package %s: dependency %s %s" % (e.pkg, e.dep, name[:-3].lower()))
+	elif name in ["BuildStarted", "BuildCompleted"]:
+		note("build %s %s" % (e.name, name[5:].lower()))
+	return NotHandled
+}
+
+addtask configure after do_unpack do_patch
+do_configure[dirs] = "${S} ${B}"
+
+base_do_configure() {
+	:
+}
+
+addtask compile after do_configure
+do_compile[dirs] = "${S} ${B}"
+base_do_compile() {
+	if [ -e Makefile -o -e makefile ]; then
+		oe_runmake || die "make failed"
+	else
+		oenote "nothing to compile"
+	fi
+}
+
+
+addtask stage after do_compile
+base_do_stage () {
+	:
+}
+
+do_populate_staging[dirs] = "${STAGING_DIR}/${TARGET_SYS}/bin ${STAGING_DIR}/${TARGET_SYS}/lib \
+			     ${STAGING_DIR}/${TARGET_SYS}/include \
+			     ${STAGING_DIR}/${BUILD_SYS}/bin ${STAGING_DIR}/${BUILD_SYS}/lib \
+			     ${STAGING_DIR}/${BUILD_SYS}/include \
+			     ${STAGING_DATADIR} \
+			     ${S} ${B}"
+
+addtask populate_staging after do_compile
+
+#python do_populate_staging () {
+#	if not bb.data.getVar('manifest', d):
+#		bb.build.exec_func('do_emit_manifest', d)
+#	if bb.data.getVar('do_stage', d):
+#		bb.build.exec_func('do_stage', d)
+#	else:
+#		bb.build.exec_func('manifest_do_populate_staging', d)
+#}
+
+python do_populate_staging () {
+	if bb.data.getVar('manifest_do_populate_staging', d):
+		bb.build.exec_func('manifest_do_populate_staging', d)
+	else:
+		bb.build.exec_func('do_stage', d)
+}
+
+#addtask install
+addtask install after do_compile
+do_install[dirs] = "${S} ${B}"
+
+base_do_install() {
+	:
+}
+
+#addtask populate_pkgs after do_compile
+#python do_populate_pkgs () {
+#	if not bb.data.getVar('manifest', d):
+#		bb.build.exec_func('do_emit_manifest', d)
+#	bb.build.exec_func('manifest_do_populate_pkgs', d)
+#	bb.build.exec_func('package_do_shlibs', d)
+#}
+
+base_do_package() {
+	:
+}
+
+addtask build after do_populate_staging
+do_build = ""
+do_build[nostamp] = "1"
+do_build[func] = "1"
+
+# Functions that update metadata based on files outputted
+# during the build process.
+
+SHLIBS = ""
+RDEPENDS_prepend = " ${SHLIBS}"
+
+python read_manifest () {
+	import sys
+	mfn = bb.data.getVar("MANIFEST", d, 1)
+	if os.access(mfn, os.R_OK):
+		# we have a manifest, so emit do_stage and do_populate_pkgs,
+		# and stuff some additional bits of data into the metadata store
+		mfile = file(mfn, "r")
+		manifest = bb.manifest.parse(mfile, d)
+		if not manifest:
+			return
+
+		bb.data.setVar('manifest', manifest, d)
+}
+
+python parse_manifest () {
+		manifest = bb.data.getVar("manifest", d)
+		if not manifest:
+			return
+		for func in ("do_populate_staging", "do_populate_pkgs"):
+			value = bb.manifest.emit(func, manifest, d)
+			if value:
+				bb.data.setVar("manifest_" + func, value, d)
+				bb.data.delVarFlag("manifest_" + func, "python", d)
+				bb.data.delVarFlag("manifest_" + func, "fakeroot", d)
+				bb.data.setVarFlag("manifest_" + func, "func", 1, d)
+		packages = []
+		for l in manifest:
+			if "pkg" in l and l["pkg"] is not None:
+				packages.append(l["pkg"])
+		bb.data.setVar("PACKAGES", " ".join(packages), d)
+}
+
+def explode_deps(s):
+	r = []
+	l = s.split()
+	flag = False
+	for i in l:
+		if i[0] == '(':
+			flag = True
+			j = []
+		if flag:
+			j.append(i)
+			if i.endswith(')'):
+				flag = False
+				r[-1] += ' ' + ' '.join(j)
+		else:
+			r.append(i)
+	return r
+
+python read_shlibdeps () {
+	packages = (bb.data.getVar('PACKAGES', d, 1) or "").split()
+	for pkg in packages:
+		rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0) or bb.data.getVar('RDEPENDS', d, 0) or "")
+		shlibsfile = bb.data.expand("${WORKDIR}/install/" + pkg + ".shlibdeps", d)
+		if os.access(shlibsfile, os.R_OK):
+			fd = file(shlibsfile)
+			lines = fd.readlines()
+			fd.close()
+			for l in lines:
+				rdepends.append(l.rstrip())
+		pcfile = bb.data.expand("${WORKDIR}/install/" + pkg + ".pcdeps", d)
+		if os.access(pcfile, os.R_OK):
+			fd = file(pcfile)
+			lines = fd.readlines()
+			fd.close()
+			for l in lines:
+				rdepends.append(l.rstrip())
+		bb.data.setVar('RDEPENDS_' + pkg, " " + " ".join(rdepends), d)
+}
+
+python read_subpackage_metadata () {
+	import re
+
+	def decode(str):
+		import codecs
+		c = codecs.getdecoder("string_escape")
+		return c(str)[0]
+
+	data_file = bb.data.expand("${WORKDIR}/install/${PN}.package", d)
+	if os.access(data_file, os.R_OK):
+		f = file(data_file, 'r')
+		lines = f.readlines()
+		f.close()
+		r = re.compile("([^:]+):\s*(.*)")
+		for l in lines:
+			m = r.match(l)
+			if m:
+				bb.data.setVar(m.group(1), decode(m.group(2)), d)
+}
+
+python __anonymous () {
+	import exceptions
+	need_host = bb.data.getVar('COMPATIBLE_HOST', d, 1)
+	if need_host:
+		import re
+		this_host = bb.data.getVar('HOST_SYS', d, 1)
+		if not re.match(need_host, this_host):
+			raise bb.parse.SkipPackage("incompatible with host %s" % this_host)
+	
+	pn = bb.data.getVar('PN', d, 1)
+	cvsdate = bb.data.getVar('CVSDATE_%s' % pn, d, 1)
+	if cvsdate != None:
+		bb.data.setVar('CVSDATE', cvsdate, d)
+
+	try:
+		bb.build.exec_func('read_manifest', d)
+		bb.build.exec_func('parse_manifest', d)
+		bb.build.exec_func('read_shlibdeps', d)
+		bb.build.exec_func('read_subpackage_metadata', d)
+	except exceptions.KeyboardInterrupt:
+		raise
+	except Exception, e:
+		bb.error("anonymous function: %s" % e)
+		pass
+}
+
+python () {
+	import bb, os
+	mach_arch = bb.data.getVar('MACHINE_ARCH', d, 1)
+	old_arch = bb.data.getVar('PACKAGE_ARCH', d, 1)
+	if (old_arch == mach_arch):
+		# Nothing to do
+		return
+	paths = []
+	for p in [ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ]:
+		paths.append(bb.data.expand(os.path.join(p, mach_arch), d))
+	for s in bb.data.getVar('SRC_URI', d, 1).split():
+		local = bb.data.expand(bb.fetch.localpath(s, d), d)
+		for mp in paths:
+			if local.startswith(mp):
+#				bb.note("overriding PACKAGE_ARCH from %s to %s" % (old_arch, mach_arch))
+				bb.data.setVar('PACKAGE_ARCH', mach_arch, d)
+				return
+}
+
+
+addtask emit_manifest
+python do_emit_manifest () {
+#	FIXME: emit a manifest here
+#	1) adjust PATH to hit the wrapper scripts
+	wrappers = bb.which(bb.data.getVar("OEPATH", d, 1), 'build/install', 0)
+	path = (bb.data.getVar('PATH', d, 1) or '').split(':')
+	path.insert(0, os.path.dirname(wrappers))
+	bb.data.setVar('PATH', ':'.join(path), d)
+#	2) exec_func("do_install", d)
+	bb.build.exec_func('do_install', d)
+#	3) read in data collected by the wrappers
+	bb.build.exec_func('read_manifest', d)
+#	4) mangle the manifest we just generated, get paths back into
+#	   our variable form
+#	5) write it back out
+#	6) re-parse it to ensure the generated functions are proper
+	bb.build.exec_func('parse_manifest', d)
+}
+
+EXPORT_FUNCTIONS do_clean do_mrproper do_fetch do_unpack do_configure do_compile do_install do_package do_patch do_populate_pkgs do_stage
+
+MIRRORS[func] = "0"
+MIRRORS () {
+${DEBIAN_MIRROR}/main	http://snapshot.debian.net/archive/pool
+${DEBIAN_MIRROR}	ftp://ftp.de.debian.org/debian/pool
+${DEBIAN_MIRROR}	ftp://ftp.au.debian.org/debian/pool
+${DEBIAN_MIRROR}	ftp://ftp.cl.debian.org/debian/pool
+${DEBIAN_MIRROR}	ftp://ftp.hr.debian.org/debian/pool
+${DEBIAN_MIRROR}	ftp://ftp.fi.debian.org/debian/pool
+${DEBIAN_MIRROR}	ftp://ftp.hk.debian.org/debian/pool
+${DEBIAN_MIRROR}	ftp://ftp.hu.debian.org/debian/pool
+${DEBIAN_MIRROR}	ftp://ftp.ie.debian.org/debian/pool
+${DEBIAN_MIRROR}	ftp://ftp.it.debian.org/debian/pool
+${DEBIAN_MIRROR}	ftp://ftp.jp.debian.org/debian/pool
+${DEBIAN_MIRROR}	ftp://ftp.no.debian.org/debian/pool
+${DEBIAN_MIRROR}	ftp://ftp.pl.debian.org/debian/pool
+${DEBIAN_MIRROR}	ftp://ftp.ro.debian.org/debian/pool
+${DEBIAN_MIRROR}	ftp://ftp.si.debian.org/debian/pool
+${DEBIAN_MIRROR}	ftp://ftp.es.debian.org/debian/pool
+${DEBIAN_MIRROR}	ftp://ftp.se.debian.org/debian/pool
+${DEBIAN_MIRROR}	ftp://ftp.tr.debian.org/debian/pool
+${GNU_MIRROR}	ftp://mirrors.kernel.org/gnu
+${GNU_MIRROR}	ftp://ftp.matrix.com.br/pub/gnu
+${GNU_MIRROR}	ftp://ftp.cs.ubc.ca/mirror2/gnu
+${GNU_MIRROR}	ftp://sunsite.ust.hk/pub/gnu
+${GNU_MIRROR}	ftp://ftp.ayamura.org/pub/gnu
+ftp://ftp.kernel.org/pub	http://www.kernel.org/pub
+ftp://ftp.kernel.org/pub	ftp://ftp.us.kernel.org/pub
+ftp://ftp.kernel.org/pub	ftp://ftp.uk.kernel.org/pub
+ftp://ftp.kernel.org/pub	ftp://ftp.hk.kernel.org/pub
+ftp://ftp.kernel.org/pub	ftp://ftp.au.kernel.org/pub
+ftp://ftp.kernel.org/pub	ftp://ftp.jp.kernel.org/pub
+ftp://.*/.*/	http://treke.net/oe/source/
+http://.*/.*/	http://treke.net/oe/source/
+}
+
-- 
cgit v1.2.3


From 00f6a165aeeab027ba0361f2d9601cb359d73726 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Thu, 9 Dec 2004 01:08:40 +0000
Subject: More rename updates.

BKrev: 41b7a598bGnuzf3sKWuCwtAE9oItIw
---
 classes/base.bbclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'classes/base.bbclass')

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 09710b0a8b..9ab1fdc7b0 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -465,13 +465,14 @@ python base_eventhandler() {
 
 addtask configure after do_unpack do_patch
 do_configure[dirs] = "${S} ${B}"
-
+do_configure[bbdepcmd] = "do_populate_staging"
 base_do_configure() {
 	:
 }
 
 addtask compile after do_configure
 do_compile[dirs] = "${S} ${B}"
+do_compile[bbdepcmd] = "do_populate_staging"
 base_do_compile() {
 	if [ -e Makefile -o -e makefile ]; then
 		oe_runmake || die "make failed"
@@ -682,7 +683,7 @@ addtask emit_manifest
 python do_emit_manifest () {
 #	FIXME: emit a manifest here
 #	1) adjust PATH to hit the wrapper scripts
-	wrappers = bb.which(bb.data.getVar("OEPATH", d, 1), 'build/install', 0)
+	wrappers = bb.which(bb.data.getVar("BBPATH", d, 1), 'build/install', 0)
 	path = (bb.data.getVar('PATH', d, 1) or '').split(':')
 	path.insert(0, os.path.dirname(wrappers))
 	bb.data.setVar('PATH', ':'.join(path), d)
-- 
cgit v1.2.3


From 2d37aa3b3e7d0b8be9ec8beb374627660f97bce9 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Sat, 11 Dec 2004 21:13:44 +0000
Subject: Merge oe-devel@oe-devel.bkbits.net:openembedded into
 hyperion.kergoth.com:/home/kergoth/code/openembedded

2004/12/11 15:12:44-06:00 kergoth.com!kergoth
s/oemake failed/oe_runmake failed/ in base.bbclass.

BKrev: 41bb6308SAoyJ3DywlNNWNLMItSNww
---
 classes/base.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes/base.bbclass')

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 9ab1fdc7b0..e94e331fb4 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -79,7 +79,7 @@ oedebug() {
 oe_runmake() {
 	if [ x"$MAKE" = x ]; then MAKE=make; fi
 	oenote ${MAKE} ${EXTRA_OEMAKE} "$@"
-	${MAKE} ${EXTRA_OEMAKE} "$@" || die "oemake failed"
+	${MAKE} ${EXTRA_OEMAKE} "$@" || die "oe_runmake failed"
 }
 
 oe_soinstall() {
-- 
cgit v1.2.3


From 182573fdba68b6fe20942ac93ded46909663e37b Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 14 Jan 2005 14:06:37 +0000
Subject: Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded into
 home.(none):/home/slug/openembedded

2005/01/14 06:05:21-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/13 15:05:24-06:00 ti.com!kergoth
Import '[PATCH] more trailing spaces and missing quotes' from Marc Singer.

2005/01/13 15:02:51-06:00 ti.com!kergoth
Add a /etc/network/interfaces file for coLinux.

2005/01/13 13:24:50-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded

2005/01/13 13:24:42-06:00 ti.com!kergoth
Fix btxml and devmem2 to stop working around the do_unpack bug I just fixed.

2005/01/13 18:33:04+00:00 cambridgebroadband.com!rjt
Merge oe-devel@oe-devel.bkbits.net:openembedded
into flotta.cambridgebroadband.com:/development/openembedded/openembedded

2005/01/13 13:14:19-06:00 ti.com!kergoth
Add lemon, an LALR(1) parser generator.

2005/01/13 13:09:04-06:00 ti.com!kergoth
BUGFIX in do_unpack: only create a relative directory structure in WORKDIR when unpacking using cp if the type is file:// (FILESPATH handling).

2005/01/13 12:30:36-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded

2005/01/13 18:29:26+00:00 cambridgebroadband.com!rjt
update PR on openzaurus-pxa

2005/01/13 12:27:56-06:00 ti.com!kergoth
Update klibc to 0.190, the latest stable version.

2005/01/13 18:11:50+00:00 cambridgebroadband.com!rjt
make select work on the apm device for tosa,corgi,poodle and related archictectures

2005/01/13 09:10:02+01:00 hrw.one.pl!hrw
justreader: fix Settings file location (fix #204)

2005/01/13 00:32:44+00:00 rpsys.net!RP
Fix after merge

2005/01/13 00:26:37+00:00 rpsys.net!RP
Merge

2005/01/13 00:23:32+00:00 rpsys.net!RP
openzaurus-2.6: Switch to 2.6.11-rc1. Remove patches now merged upstream (8 of them). Add patches to fix upstream bug (reported). Improve MMC driver.

2005/01/12 23:02:21+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/12 23:02:08+00:00 nexus.co.uk!pb
fix some postinst/postrm issues in module-init-tools

2005/01/12 23:52:41+01:00 uni-frankfurt.de!mickeyl
make the check and the WARNING also work for kernel 2.6.x

2005/01/12 20:32:37+01:00 uni-frankfurt.de!mickeyl
improve readme for prism3-firmware

2005/01/12 20:03:32+01:00 uni-frankfurt.de!mickeyl
fix qte crashing right after calibration (again). patch courtesy qte-uberhacker Holger 'Zecke' Freyther

2005/01/12 18:42:20+01:00 (none)!br1
added package yamonenv (inside nylon/): read any write yamon environment

2005/01/12 16:40:38+01:00 uni-frankfurt.de!mickeyl
add wireless tools v27

2005/01/12 16:05:25+01:00 uni-frankfurt.de!mickeyl
upgrade bison to 2.0

2005/01/12 16:04:20+01:00 uni-frankfurt.de!mickeyl
use pregenerated yacc files in kgrog. still nonworky though

2005/01/12 12:35:05+01:00 uni-frankfurt.de!mickeyl
pcmcia-cs: don't ship config.opts on arm machines

2005/01/12 11:51:05+01:00 uni-frankfurt.de!mickeyl
CONFIG_FEATURE_IFUPDOWN_MAPPING=y in busybox defconfig. This adds just 3K but is very useful

2005/01/12 10:27:23+01:00 hrw.one.pl!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into home.hrw.one.pl:/home/hrw/zaurus/bb/openembedded

2005/01/12 10:26:59+01:00 hrw.one.pl!hrw
changed tremor SRC_URI to fetch from svn via http

2005/01/12 08:26:26+00:00 rpsys.net!RP
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/tmp6/openembedded

2005/01/12 08:26:12+00:00 rpsys.net!RP
openzaurus-2.6: Update corgi after pushing code upstream

2005/01/12 00:12:52+01:00 hrw.one.pl!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into home.hrw.one.pl:/home/hrw/zaurus/bb/openembedded

2005/01/12 00:12:18+01:00 hrw.one.pl!hrw
updated kdepimpi to 1.9.16 (also added their fork of gammu)

2005/01/11 23:46:19+01:00 uni-frankfurt.de!mickeyl
ipkg-utils has been fixed upstream

2005/01/11 23:39:28+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/01/11 17:09:51-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded

2005/01/11 17:09:37-06:00 ti.com!kergoth
Add OpenNTPD, a free NTP implementation from the OpenBSD guys.

2005/01/11 23:39:20+01:00 uni-frankfurt.de!mickeyl
opie: use Transformed:Rot0 instead of LinuxFb for kernel 2.6

2005/01/11 21:36:12+01:00 uni-frankfurt.de!mickeyl
ship libopie2 examples in libopie2_cvs

2005/01/11 21:30:53+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/01/11 21:30:43+01:00 uni-frankfurt.de!mickeyl
machine.confs: catchup with changes in orinoco package granularity

2005/01/11 20:24:29+00:00 nexus.co.uk!pb
remove spurious DEPENDS

2005/01/11 20:58:09+01:00 uni-frankfurt.de!mickeyl
orinoco-modules: use KERNEL_OBJECT_SUFFIX and increase package granularity

2005/01/11 20:37:02+01:00 uni-frankfurt.de!mickeyl
hostap-modules: use KERNEL_OBJECT_SUFFIX to make it work w/ old and new kernels

2005/01/11 20:21:51+01:00 uni-frankfurt.de!mickeyl
set KERNEL_OBJECT_SUFFIX to .ko on 2.6 kernels and .o for earlier kernels

2005/01/11 16:57:01+00:00 rpsys.net!RP
openzaurus-2.6: update patch order. Add MMC and SD support

2005/01/11 16:59:54+01:00 (none)!br1
/bin/sh update-alternative calls have to be done in prerm not postrm

2005/01/11 10:22:15-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded

2005/01/11 10:22:07-06:00 ti.com!kergoth
Add fnmatch test result to some arm*linux* site files.

2005/01/11 12:05:37+01:00 (none)!br1
added "dash" shell

2005/01/10 20:20:01-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded

2005/01/10 20:19:53-06:00 ti.com!kergoth
Add OpenCVS from cvs.

2005/01/10 23:26:51+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into merlin.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/01/10 16:34:16-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded

2005/01/10 16:34:07-06:00 ti.com!kergoth
Fix unionfs 1.0.6 make.patch.

2005/01/10 23:26:28+01:00 uni-frankfurt.de!mickeyl
it's irk-targus and irk-belkin, not irk-0.11.0 and irk-0.11.1 :(

2005/01/10 20:54:21+01:00 hrw.one.pl!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into home.hrw.one.pl:/home/hrw/zaurus/bb/openembedded

2005/01/10 14:40:45-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded

2005/01/10 14:40:33-06:00 ti.com!kergoth
Add didiwiki 0.5.

2005/01/10 20:54:06+01:00 hrw.one.pl!hrw
added KGrok into nonworking (I dont know how to fix it's usage of yacc)

2005/01/10 18:52:01+01:00 (none)!koen
add matchbox-desktop_svn

2005/01/10 18:42:31+01:00 (none)!koen
add matchbox_panel_svn

2005/01/10 18:28:27+01:00 (none)!koen
add matchbox-wm_svn

2005/01/10 18:09:30+01:00 (none)!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into lieve.(none):/data/build/oe/clean-tree/openembedded

2005/01/10 18:09:12+01:00 (none)!koen
add libmatchbox_svn

2005/01/10 17:38:04+01:00 uni-frankfurt.de!mickeyl
add some extra depends for openzaurus-pxa-2.6

2005/01/10 17:30:19+01:00 (none)!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into lieve.(none):/data/build/oe/clean-tree/openembedded

2005/01/10 17:29:57+01:00 (none)!koen
delete unneeded patches for faad2

2005/01/10 17:27:22+01:00 (none)!koen
libgpevtype 0.6 in familiar-0.8.0.conf

2005/01/10 14:08:45+01:00 mn-solutions.de!schurig
removed cruft

2005/01/10 13:09:37+01:00 (none)!koen
don't set PREFERRED_VERSION for gtk+ and bluetooth/dbus in familiar-0.8.1.conf

2005/01/09 20:24:58+00:00 nexus.co.uk!pb
add dependency on xpm

2005/01/09 20:22:42+00:00 nexus.co.uk!pb
add gnocky


2005/01/09 20:21:04+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/09 20:20:54+00:00 nexus.co.uk!pb
add staging to gnokii

2005/01/09 20:19:35+00:00 rpsys.net!RP
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/tmp6/openembedded

2005/01/09 20:18:32+00:00 rpsys.net!RP
openzaurus-2.6: Update and use changes to SSP made in 2.6 bk tree (imported by ssp.patch)

2005/01/09 21:12:14+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/01/09 21:11:58+01:00 uni-frankfurt.de!mickeyl
remove bogus stuff in opie-keytabs

2005/01/09 19:59:57+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/09 19:59:40+00:00 nexus.co.uk!pb
add gnokii


2005/01/09 18:45:34+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into merlin.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/01/09 18:45:18+01:00 uni-frankfurt.de!mickeyl
openzaurus 3.5.3.conf: use opie-cvs for now

2005/01/09 17:27:13+00:00 nexus.co.uk!pb
add missing file


2005/01/09 17:21:59+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/09 17:21:42+00:00 nexus.co.uk!pb
demote pciutils and usbutils from Recommends to Suggests in hotplug

2005/01/09 18:11:18+01:00 handhelds.org!CoreDump
Remove ressource.patch from libqpe-opie_1.1.8 as it has been applied upstream

2005/01/09 17:01:46+00:00 rpsys.net!RP
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/tmp6/openembedded

2005/01/09 17:01:32+00:00 rpsys.net!RP
openzaurus-2.6: changes to help push patches upstream. Break poodle for now...

2005/01/09 17:00:18+00:00 rpsys.net!RP
openzaurus-2.6: changes to patches to assist with pushing upstream. Break poodle for now :-/

2005/01/09 16:07:24+01:00 dyndns.org!reenoo
rosetta: it's pkg_postinst, not do_postinst

2005/01/09 14:24:35+00:00 nexus.co.uk!pb
update libgpevtype to 0.6


2005/01/09 14:03:18+00:00 nexus.co.uk!pb
update gtk+ to 2.6.1


2005/01/09 14:02:36+00:00 nexus.co.uk!pb
update glib-2.0 to 2.6.1


2005/01/09 14:01:31+00:00 nexus.co.uk!pb
remove some extraneous gtk+ patches


2005/01/09 14:00:43+00:00 nexus.co.uk!pb
second attempt at fixing gpe-bluetooth dbus naming problems

2005/01/09 14:57:37+01:00 dyndns.org!reenoo
sysvinit: use update-alternatives.bbclass. put PACKAGES/FILES related things in a single place.

2005/01/09 00:47:25+00:00 nexus.co.uk!pb
apply patch from Marc Singer to remove spurious trailing space from backslash-continued line

2005/01/09 00:46:13+00:00 nexus.co.uk!pb
apply patch from Marc Singer to remove spurious trailing space from backslash-continued line

2005/01/09 00:42:35+00:00 nexus.co.uk!pb
apply patch from Paul Eggleton to add usbf and bnep0 entries to interfaces file
use CONFFILES for netbase under all DISTROs, not just nylon

2005/01/09 00:38:50+00:00 nexus.co.uk!pb
apply patch from Paul Eggleton to fix usbnet hotplug on iPAQ


2005/01/09 00:29:52+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/09 00:29:41+00:00 nexus.co.uk!pb
apply patch from Marc Singer to correct typo in gpe-package

2005/01/08 15:16:29-08:00 (none)!emte
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into t.(none):/home/OE/speedracer/packages

2005/01/08 15:14:54-08:00 (none)!emte
removed kbdd-patched

2005/01/08 16:49:42-05:00 handhelds.org!kergoth
Add unionfs 1.0.6.

2005/01/08 20:14:46+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/08 20:14:26+00:00 nexus.co.uk!pb
remove figment from gpe base set due to libxml2 dependency

2005/01/08 18:46:11+00:00 rpsys.net!RP
openzaurus-2.6: corgi updates: make MAGIC_SYSRQ work + fix reboot bug. w100fb updates for mainline acceptance.

2005/01/08 18:01:30+00:00 nexus.co.uk!pb
apply patch from Bob Davies to remove kismet from meta-sectest-gpe

2005/01/08 18:37:36+01:00 hrw.one.pl!hrw
added description to librsvg

2005/01/08 18:37:12+01:00 hrw.one.pl!hrw
added description to libart-lgpl

2005/01/08 18:36:26+01:00 hrw.one.pl!hrw
added description to esound

2005/01/08 18:13:19+01:00 hrw.one.pl!hrw
fixed description for Busybox

2005/01/08 18:04:49+01:00 hrw.one.pl!hrw
added description to atd

BKrev: 41e7d1ednFJIdPS8nrzP9S2cq5B_1A
---
 classes/base.bbclass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'classes/base.bbclass')

diff --git a/classes/base.bbclass b/classes/base.bbclass
index e94e331fb4..c5b7ede8d0 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -361,7 +361,12 @@ def oe_unpack_file(file, data, url = None):
 	else:
 		(type, host, path, user, pswd, parm) = bb.decodeurl(url)
 		if not 'patch' in parm:
-			destdir = bb.decodeurl(url)[1] or "."
+			# The "destdir" handling was specifically done for FILESPATH
+			# items.  So, only do so for file:// entries.
+			if type == "file":
+				destdir = bb.decodeurl(url)[1] or "."
+			else:
+				destdir = "."
 			bb.mkdirhier("%s/%s" % (os.getcwd(), destdir))
 			cmd = 'cp %s %s/%s/' % (file, os.getcwd(), destdir)
 	if not cmd:
-- 
cgit v1.2.3


From 442b1e01c075ef23f9db223f8199c0d351661029 Mon Sep 17 00:00:00 2001
From: "nslu2-linux.adm@bkbits.net" <nslu2-linux.adm@bkbits.net>
Date: Sun, 16 Jan 2005 23:40:14 +0000
Subject: Merge bk://oe-devel.bkbits.net/openembedded into
 bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/16 23:14:38+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/16 23:14:08+00:00 nexus.co.uk!pb
call read_subpackage_metadata at the start of package_ipk, not from base.bbclass anonymous function

BKrev: 41eafb5emDtcv2ti43OMi-pcTItdsA
---
 classes/base.bbclass | 1 -
 1 file changed, 1 deletion(-)

(limited to 'classes/base.bbclass')

diff --git a/classes/base.bbclass b/classes/base.bbclass
index c5b7ede8d0..501eefb50b 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -656,7 +656,6 @@ python __anonymous () {
 		bb.build.exec_func('read_manifest', d)
 		bb.build.exec_func('parse_manifest', d)
 		bb.build.exec_func('read_shlibdeps', d)
-		bb.build.exec_func('read_subpackage_metadata', d)
 	except exceptions.KeyboardInterrupt:
 		raise
 	except Exception, e:
-- 
cgit v1.2.3


From 8bc61c54fdac2884d23ae3802afe7f5f81c7aff2 Mon Sep 17 00:00:00 2001
From: "nslu2-linux.adm@bkbits.net" <nslu2-linux.adm@bkbits.net>
Date: Mon, 17 Jan 2005 21:40:24 +0000
Subject: Merge bk://oe-devel.bkbits.net/openembedded into
 bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/17 22:09:22+01:00 handhelds.org!zecke
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/ich/programming/oe/openembedded

2005/01/17 22:08:56+01:00 handhelds.org!zecke
UICMOC use Qt2.3.9:
	-Use recent Qt2.3.9 for building uicmoc
	-Update patches to work with Qt2.3.9 version

2005/01/17 22:07:14+01:00 handhelds.org!zecke
Qt 2.3.9:
	-Update to 14.01.2005 snapshot
	-TSlib patch is included but castrated, uncastrate it
	-The latest mouse release patch was fixed independently by Trolltech as well
	-Update other patches

2005/01/17 16:00:45-05:00 handhelds.org!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into handhelds.org:/home/kergoth/code/openembedded

2005/01/17 15:56:11-05:00 handhelds.org!kergoth
Update the default event handler to clean things up a bit, and to mention the package version in the Pkg events, which people have requested in the past.

2005/01/17 20:49:43+00:00 rpsys.net!RP
Add facility to pass parallel build option to make. Disable parallel build option for known broken packages.

BKrev: 41ec30c8I5e1Ks5lsaghKSnrJo6cVg
---
 classes/base.bbclass | 42 ++++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 16 deletions(-)

(limited to 'classes/base.bbclass')

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 501eefb50b..608114cb22 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -448,23 +448,33 @@ python base_eventhandler() {
 	from bb.event import Handled, NotHandled, getName
 	import os
 
+	messages = {}
+	messages["Succeeded"] = "completed"
+	messages["Started"] = "started"
+	messages["Failed"] = "failed"
+
 	name = getName(e)
-	if name in ["PkgSucceeded"]:
-		note("package %s: build completed" % e.pkg)
-	if name in ["PkgStarted"]:
-		note("package %s: build %s" % (e.pkg, name[3:].lower()))
-	elif name in ["PkgFailed"]:
-		error("package %s: build %s" % (e.pkg, name[3:].lower()))
-	elif name in ["TaskStarted"]:
-		note("package %s: task %s %s" % (data.expand(data.getVar("PF", e.data), e.data), e.task, name[4:].lower()))
-	elif name in ["TaskSucceeded"]:
-		note("package %s: task %s completed" % (data.expand(data.getVar("PF", e.data), e.data), e.task))
-	elif name in ["TaskFailed"]:
-		error("package %s: task %s %s" % (data.expand(data.getVar("PF", e.data), e.data), e.task, name[4:].lower()))
-	elif name in ["UnsatisfiedDep"]:
-		note("package %s: dependency %s %s" % (e.pkg, e.dep, name[:-3].lower()))
-	elif name in ["BuildStarted", "BuildCompleted"]:
-		note("build %s %s" % (e.name, name[5:].lower()))
+	msg = ""
+	if name.startswith("Pkg"):
+		msg += "package %s: " % data.getVar("P", e.data, 1)
+		msg += messages.get(name[3:]) or name[3:]
+	elif name.startswith("Task"):
+		msg += "package %s: task %s: " % (data.getVar("PF", e.data, 1), e.task)
+		msg += messages.get(name[4:]) or name[4:]
+	elif name.startswith("Build"):
+		msg += "build %s: " % e.name
+		msg += messages.get(name[5:]) or name[5:]
+	elif name == "UnsatisfiedDep":
+		msg += "package %s: dependency %s %s" % (e.pkg, e.dep, name[:-3].lower())
+	note(msg)
+	if not data in e.__dict__:
+		return NotHandled
+
+	log = data.getVar("EVENTLOG", e.data, 1)
+	if log:
+		logfile = file(log, "a")
+		logfile.write("%s\n" % msg)
+		logfile.close()
 	return NotHandled
 }
 
-- 
cgit v1.2.3


From 6e012296c2dc513ae301654b3d4d3eb826068c81 Mon Sep 17 00:00:00 2001
From: "nslu2-linux.adm@bkbits.net" <nslu2-linux.adm@bkbits.net>
Date: Tue, 18 Jan 2005 00:08:01 +0000
Subject: Merge bk://oe-devel.bkbits.net/openembedded into
 bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/17 18:08:00-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded

2005/01/17 18:07:46-06:00 ti.com!kergoth
base_do_patch: Obey a 'PATCHCMD' variable for the actual patcher command.  Execute it using bb.build.exec_func so that the patcher command execution is logged.

2005/01/15 20:07:00-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded

2005/01/15 20:06:41-06:00 ti.com!kergoth
Adjust the dyn-ldconfig patch for uclibc cvs to apply against current cvs, and make it a uclibc configure option so it can be pushed upstream.  Also update the i386 and i686 defconfigs for uclibc-cvs.

BKrev: 41ec5361nnjCZWEmpkrD0oZ0-dBk8g
---
 classes/base.bbclass | 54 ++++++++++++++++++++++++++++------------------------
 1 file changed, 29 insertions(+), 25 deletions(-)

(limited to 'classes/base.bbclass')

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 608114cb22..47720464f9 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -405,40 +405,44 @@ addtask patch after do_unpack
 do_patch[dirs] = "${WORKDIR}"
 python base_do_patch() {
 	import re
+	import bb.fetch
+
+	src_uri = (bb.data.getVar('SRC_URI', d, 1) or '').split()
+	workdir = bb.data.getVar('WORKDIR', d, 1)
+	for url in src_uri:
 
-	src_uri = bb.data.getVar('SRC_URI', d)
-	if not src_uri:
-		return
-	src_uri = bb.data.expand(src_uri, d)
-	for url in src_uri.split():
-#		bb.note('url is %s' % url)
 		(type, host, path, user, pswd, parm) = bb.decodeurl(url)
 		if not "patch" in parm:
 			continue
-		from bb.fetch import init, localpath
-		init([url])
+
+		bb.fetch.init([url])
 		url = bb.encodeurl((type, host, path, user, pswd, []))
-		local = '/' + localpath(url, d)
-		# patch!
+		local = os.path.join('/', bb.fetch.localpath(url, d))
+
+		# did it need to be unpacked?
 		dots = local.split(".")
 		if dots[-1] in ['gz', 'bz2', 'Z']:
-			efile = os.path.join(bb.data.getVar('WORKDIR', d),os.path.basename('.'.join(dots[0:-1])))
+			unpacked = os.path.join(bb.data.getVar('WORKDIR', d),os.path.basename('.'.join(dots[0:-1])))
 		else:
-			efile = local
-		efile = bb.data.expand(efile, d)
-		patches_dir = bb.data.expand(bb.data.getVar('PATCHES_DIR', d), d)
-		bb.mkdirhier(patches_dir + "/.patches")
-		os.chdir(patches_dir)
-		cmd = "PATH=\"%s\" patcher" % bb.data.getVar("PATH", d, 1)
+			unpacked = local
+		unpacked = bb.data.expand(unpacked, d)
+
 		if "pnum" in parm:
-			cmd += " -p %s" % parm["pnum"]
-		# Getting rid of // at the front helps the Cygwin-Users of OE
-		if efile.startswith('//'):
-			efile = efile[1:]
-		cmd += " -R -n \"%s\" -i %s" % (os.path.basename(efile), efile)
-		ret = os.system(cmd)
-		if ret != 0:
-			raise bb.build.FuncFailed("'patcher' execution failed")
+			pnum = parm["pnum"]
+		else:
+			pnum = "1"
+
+		dots = os.path.basename(unpacked).split(".")
+		if len(dots) > 1:
+			pname = ".".join(dots[:-1])
+		else:
+			pname = unpacked
+
+		os.chdir(workdir)
+		bb.note("Applying patch '%s'" % pname)
+		bb.data.setVar("do_patchcmd", bb.data.getVar("PATCHCMD", d, 1) % (pnum, pname, unpacked), d)
+		bb.data.setVarFlag("do_patchcmd", "func", 1, d)
+		bb.build.exec_func("do_patchcmd", d)
 }
 
 
-- 
cgit v1.2.3


From 2650645237555cc24c532a4c9ccd81d8c01bcaf7 Mon Sep 17 00:00:00 2001
From: "nslu2-linux.adm@bkbits.net" <nslu2-linux.adm@bkbits.net>
Date: Tue, 18 Jan 2005 01:01:16 +0000
Subject: Merge bk://oe-devel.bkbits.net/openembedded into
 bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/17 19:01:15-06:00 ti.com!kergoth
Move 'patcher-native' into a PATCH_DEPENDS variable.

2005/01/17 18:35:01-06:00 ti.com!kergoth
Teach base_do_patch to unapply all the patches before it starts applying things.  This ensures that a patch being 'already applied' isn't a problem.

BKrev: 41ec5fdcZyPXKe57f5FM3PpA19zcww
---
 classes/base.bbclass | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'classes/base.bbclass')

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 47720464f9..886f25664b 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -8,8 +8,15 @@ def base_dep_prepend(d):
 	# that case though.
 	#
 	deps = ""
+
+	# INHIBIT_DEFAULT_DEPS doesn't apply to the patch command.  Whether or  not
+	# we need that built is the responsibility of the patch function / class, not
+	# the application.
+	patchdeps = bb.data.getVar("PATCH_DEPENDS", d, 1)
+	if patchdeps and not patchdeps in bb.data.getVar("PROVIDES", d, 1):
+		deps = patchdeps
+
 	if not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d):
-		deps += "patcher-native"
 		if (bb.data.getVar('HOST_SYS', d, 1) !=
 	     	    bb.data.getVar('BUILD_SYS', d, 1)):
 			deps += " virtual/${TARGET_PREFIX}gcc virtual/libc "
@@ -408,6 +415,15 @@ python base_do_patch() {
 	import bb.fetch
 
 	src_uri = (bb.data.getVar('SRC_URI', d, 1) or '').split()
+	if not src_uri:
+		return
+
+	patchcleancmd = bb.data.getVar('PATCHCLEANCMD', d, 1)
+	if patchcleancmd:
+		bb.data.setVar("do_patchcleancmd", patchcleancmd, d)
+		bb.data.setVarFlag("do_patchcleancmd", "func", 1, d)
+		bb.build.exec_func("do_patchcleancmd", d)
+
 	workdir = bb.data.getVar('WORKDIR', d, 1)
 	for url in src_uri:
 
-- 
cgit v1.2.3


From fbb14d6d3f6b35b66f39efed78d7836ea7110b28 Mon Sep 17 00:00:00 2001
From: "nslu2-linux.adm@bkbits.net" <nslu2-linux.adm@bkbits.net>
Date: Tue, 18 Jan 2005 05:40:09 +0000
Subject: Merge bk://oe-devel.bkbits.net/openembedded into
 bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/18 00:19:55-05:00 handhelds.org!kergoth
Disable use of parallel make for uclibc.

2005/01/17 23:57:02-05:00 handhelds.org!kergoth
Fix a major bug in the new base_do_patch.. it wasn't chdir()ing into the correct dir before calling the PATCHCMD.

2005/01/17 23:48:20-05:00 handhelds.org!kergoth
Remove python-native from the ipkg-utils-native deps, because having it there is just silly.

BKrev: 41eca139NmEzWeP48TMCg6TqCdQpAg
---
 classes/base.bbclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'classes/base.bbclass')

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 886f25664b..f4ee9d90d7 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -454,7 +454,9 @@ python base_do_patch() {
 		else:
 			pname = unpacked
 
-		os.chdir(workdir)
+		patchdir = bb.data.getVar('S', d, 1)
+		os.chdir(patchdir)
+
 		bb.note("Applying patch '%s'" % pname)
 		bb.data.setVar("do_patchcmd", bb.data.getVar("PATCHCMD", d, 1) % (pnum, pname, unpacked), d)
 		bb.data.setVarFlag("do_patchcmd", "func", 1, d)
-- 
cgit v1.2.3


From 7d6574bc264fbca8bc317551c09a7588bd0b49a0 Mon Sep 17 00:00:00 2001
From: "nslu2-linux.adm@bkbits.net" <nslu2-linux.adm@bkbits.net>
Date: Tue, 18 Jan 2005 06:44:18 +0000
Subject: Merge bk://oe-devel.bkbits.net/openembedded into
 bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/18 01:44:17-05:00 handhelds.org!kergoth
qte: Correct a bug in a sed script in the do_configure, and disable PARALLEL_MAKE.

2005/01/18 01:09:16-05:00 handhelds.org!kergoth
Properly mangle the messages for the BuildCompleted event.

2005/01/18 00:47:58-05:00 handhelds.org!kergoth
Fix the new base_do_patch application dir problem, again, hopefully for the last time.

BKrev: 41ecb042ECy_RNQJN4-AJGD_c8kZcQ
---
 classes/base.bbclass | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'classes/base.bbclass')

diff --git a/classes/base.bbclass b/classes/base.bbclass
index f4ee9d90d7..f09968e612 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -454,12 +454,10 @@ python base_do_patch() {
 		else:
 			pname = unpacked
 
-		patchdir = bb.data.getVar('S', d, 1)
-		os.chdir(patchdir)
-
 		bb.note("Applying patch '%s'" % pname)
 		bb.data.setVar("do_patchcmd", bb.data.getVar("PATCHCMD", d, 1) % (pnum, pname, unpacked), d)
 		bb.data.setVarFlag("do_patchcmd", "func", 1, d)
+		bb.data.setVarFlag("do_patchcmd", "dirs", "${WORKDIR} ${S}", d)
 		bb.build.exec_func("do_patchcmd", d)
 }
 
@@ -471,6 +469,7 @@ python base_eventhandler() {
 	import os
 
 	messages = {}
+	messages["Completed"] = "completed"
 	messages["Succeeded"] = "completed"
 	messages["Started"] = "started"
 	messages["Failed"] = "failed"
-- 
cgit v1.2.3


From 4cc600f1bed1c629bf77ebf1178258ca860bca9b Mon Sep 17 00:00:00 2001
From: "nslu2-linux.adm@bkbits.net" <nslu2-linux.adm@bkbits.net>
Date: Thu, 20 Jan 2005 05:14:20 +0000
Subject: Merge bk://oe-devel.bkbits.net/openembedded into
 bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/20 00:02:54-05:00 handhelds.org!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into handhelds.org:/home/kergoth/code/openembedded

2005/01/20 00:01:05-05:00 handhelds.org!kergoth
Fix a critical bug resulting from the recent changes in bitbake (facilitating
make -j).  The behavior is that of the root filesystem not having a ton of
required shared libraries, like libc.  Our packaging classes relied on the
tasks being able to modify the global metadata, which is no longer allowed.
Rework how we do packaging to account for this.

BKrev: 41ef3e2c_WACPUP9Waae3Humbe58ng
---
 classes/base.bbclass | 1 -
 1 file changed, 1 deletion(-)

(limited to 'classes/base.bbclass')

diff --git a/classes/base.bbclass b/classes/base.bbclass
index f09968e612..d80ce3010b 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -686,7 +686,6 @@ python __anonymous () {
 	try:
 		bb.build.exec_func('read_manifest', d)
 		bb.build.exec_func('parse_manifest', d)
-		bb.build.exec_func('read_shlibdeps', d)
 	except exceptions.KeyboardInterrupt:
 		raise
 	except Exception, e:
-- 
cgit v1.2.3


From cc0c35e6a20dbb85033efa44f56a2789ecf34ee4 Mon Sep 17 00:00:00 2001
From: "nslu2-linux.adm@bkbits.net" <nslu2-linux.adm@bkbits.net>
Date: Thu, 20 Jan 2005 06:40:08 +0000
Subject: Merge bk://oe-devel.bkbits.net/openembedded into
 bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/20 01:02:45-05:00 handhelds.org!kergoth
uclibc_cvs: include librt in the uclibc package.

2005/01/20 00:13:06-05:00 handhelds.org!kergoth
Now that packaging is one coherent whole, there's no reason to keep the
'build' task flagged as nostamp.  Removing that will make bitbake skip
packages that you've already built quite a bit faster than it does today.

BKrev: 41ef5248d9nHZI7DoQf5eHhkD3XiOQ
---
 classes/base.bbclass | 1 -
 1 file changed, 1 deletion(-)

(limited to 'classes/base.bbclass')

diff --git a/classes/base.bbclass b/classes/base.bbclass
index d80ce3010b..33d2d7c171 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -570,7 +570,6 @@ base_do_package() {
 
 addtask build after do_populate_staging
 do_build = ""
-do_build[nostamp] = "1"
 do_build[func] = "1"
 
 # Functions that update metadata based on files outputted
-- 
cgit v1.2.3


From e5df6027fdcab8ef927a28cef04f8209458abf66 Mon Sep 17 00:00:00 2001
From: "nslu2-linux.adm@bkbits.net" <nslu2-linux.adm@bkbits.net>
Date: Thu, 20 Jan 2005 07:40:09 +0000
Subject: Merge bk://oe-devel.bkbits.net/openembedded into
 bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/20 02:26:21-05:00 handhelds.org!kergoth
Fix base_do_patch when applying patches with no extension in the filename.

BKrev: 41ef605976xbq6OfMXpNpf0rLQcAhA
---
 classes/base.bbclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'classes/base.bbclass')

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 33d2d7c171..1b26b4d9ba 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -436,9 +436,9 @@ python base_do_patch() {
 		local = os.path.join('/', bb.fetch.localpath(url, d))
 
 		# did it need to be unpacked?
-		dots = local.split(".")
+		dots = os.path.basename(local).split(".")
 		if dots[-1] in ['gz', 'bz2', 'Z']:
-			unpacked = os.path.join(bb.data.getVar('WORKDIR', d),os.path.basename('.'.join(dots[0:-1])))
+			unpacked = os.path.join(bb.data.getVar('WORKDIR', d),'.'.join(dots[0:-1]))
 		else:
 			unpacked = local
 		unpacked = bb.data.expand(unpacked, d)
@@ -452,7 +452,7 @@ python base_do_patch() {
 		if len(dots) > 1:
 			pname = ".".join(dots[:-1])
 		else:
-			pname = unpacked
+			pname = os.path.basename(unpacked)
 
 		bb.note("Applying patch '%s'" % pname)
 		bb.data.setVar("do_patchcmd", bb.data.getVar("PATCHCMD", d, 1) % (pnum, pname, unpacked), d)
-- 
cgit v1.2.3


From 3fff43da673534e60500beeb61ff7875f72cdff4 Mon Sep 17 00:00:00 2001
From: "nslu2-linux.adm@bkbits.net" <nslu2-linux.adm@bkbits.net>
Date: Thu, 20 Jan 2005 12:40:23 +0000
Subject: Merge bk://oe-devel.bkbits.net/openembedded into
 bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/20 12:47:46+01:00 mn-solutions.de!schurig
Allow patches to have names, otherwise you couldn't install patch-2.6.11-rc1 and
patch-2.6.11-rc1-bk7, because the auto-name-feature would set 'patch-2.6' as name
for both.

BKrev: 41efa6b7InwrkprDOdRS1P2ji_O2gw
---
 classes/base.bbclass | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'classes/base.bbclass')

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 1b26b4d9ba..8c92ed6f76 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -448,11 +448,14 @@ python base_do_patch() {
 		else:
 			pnum = "1"
 
-		dots = os.path.basename(unpacked).split(".")
-		if len(dots) > 1:
-			pname = ".".join(dots[:-1])
+		if "pname" in parm:
+			pname = parm["pname"]
 		else:
-			pname = os.path.basename(unpacked)
+			dots = os.path.basename(unpacked).split(".")
+			if len(dots) > 1:
+				pname = ".".join(dots[:-1])
+			else:
+				pname = os.path.basename(unpacked)
 
 		bb.note("Applying patch '%s'" % pname)
 		bb.data.setVar("do_patchcmd", bb.data.getVar("PATCHCMD", d, 1) % (pnum, pname, unpacked), d)
-- 
cgit v1.2.3


From a5669c1f9c38182f5a76cbde93dfc433a739009c Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@gnu.org>
Date: Thu, 27 Jan 2005 19:13:15 +0000
Subject: turn off SRC_URI-based PACKAGE_ARCH mangling if requested

BKrev: 41f93d4bA7UVxRqWKvjaoryoPbopfQ
---
 classes/base.bbclass | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'classes/base.bbclass')

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 8c92ed6f76..6686d2eab0 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -702,6 +702,8 @@ python () {
 	if (old_arch == mach_arch):
 		# Nothing to do
 		return
+	if (bb.data.getVar('SRC_URI_OVERRIDES_PACKAGE_ARCH', d, 1) == '0'):
+		return
 	paths = []
 	for p in [ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ]:
 		paths.append(bb.data.expand(os.path.join(p, mach_arch), d))
-- 
cgit v1.2.3


From c37371fecffccaf855cb73c679319750640e30db Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Thu, 27 Jan 2005 22:07:28 +0000
Subject: Add handling of USE_NLS_packagename, done the same way as CVSDATE.

BKrev: 41f96620LvvAATva0D1dW9Br_EB-mg
---
 classes/base.bbclass | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'classes/base.bbclass')

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 6686d2eab0..a2ed7a76be 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -681,10 +681,15 @@ python __anonymous () {
 			raise bb.parse.SkipPackage("incompatible with host %s" % this_host)
 	
 	pn = bb.data.getVar('PN', d, 1)
+
 	cvsdate = bb.data.getVar('CVSDATE_%s' % pn, d, 1)
 	if cvsdate != None:
 		bb.data.setVar('CVSDATE', cvsdate, d)
 
+	use_nls = bb.data.getVar('USE_NLS_%s' % pn, d, 1)
+	if use_nls != None:
+		bb.data.setVar('USE_NLS', use_nls, d)
+
 	try:
 		bb.build.exec_func('read_manifest', d)
 		bb.build.exec_func('parse_manifest', d)
-- 
cgit v1.2.3


From c25445d4276ddbc7c1dee0b64de0b04bd402cf26 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Wed, 9 Feb 2005 23:41:53 +0000
Subject: Merge oe-devel@oe-devel.bkbits.net:openembedded into
 odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded

2005/02/09 17:41:25-06:00 ti.com!kergoth
- At the beginning of a build, display an 'OE Build Configuration',
  showing some important variables and their values, to make it easy
  to spot an incorrect setup.
- Change the default TARGET_ARCH and TARGET_OS to no longer be the BUILD
  versions.  It used to make sense, given the primary configuration file
  resided in the core.  Now that its in our metadata, we can change that,
  and also make the build abort with an obvious error if either are not set.

BKrev: 420a9fc1QNq7YE9IOvWAuHnCbfBZuw
---
 classes/base.bbclass | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'classes/base.bbclass')

diff --git a/classes/base.bbclass b/classes/base.bbclass
index a2ed7a76be..e6f8e43fd6 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -491,6 +491,23 @@ python base_eventhandler() {
 	elif name == "UnsatisfiedDep":
 		msg += "package %s: dependency %s %s" % (e.pkg, e.dep, name[:-3].lower())
 	note(msg)
+
+	if name.startswith("BuildStarted"):
+		statusvars = ['TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO',
+			      'TARGET_FPU']
+		statuslines = ["%-13s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars]
+		statusmsg = "\nOE Build Configuration:\n%s\n" % '\n'.join(statuslines)
+		print statusmsg
+
+		needed_vars = [ "TARGET_ARCH", "TARGET_OS" ]
+		pesteruser = []
+		for v in needed_vars:
+			val = bb.data.getVar(v, e.data, 1)
+			if not val or val == 'INVALID':
+				pesteruser.append(v)
+		if pesteruser:
+			bb.fatal('The following variable(s) were not set: %s\nPlease set them directly, or choose a MACHINE or DISTRO that sets them.' % ', '.join(pesteruser))
+
 	if not data in e.__dict__:
 		return NotHandled
 
@@ -499,6 +516,7 @@ python base_eventhandler() {
 		logfile = file(log, "a")
 		logfile.write("%s\n" % msg)
 		logfile.close()
+
 	return NotHandled
 }
 
-- 
cgit v1.2.3


From 602c25bfe0b5fb933eb4e3e5ae9da8aa18c0ad66 Mon Sep 17 00:00:00 2001
From: "g2@giantshoulder.com" <g2@giantshoulder.com>
Date: Sat, 26 Mar 2005 17:04:38 +0000
Subject: Merge nslu2-linux@nslu2-linux.bkbits.net:openembedded into
 giantshoulder.com:/home/tom/dev/openslug/openembedded
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2005/03/26 17:01:49+01:00 nslu2-linux.org!perlguru
openslug-packages.bb:
  Added CVS

2005/03/26 06:41:32-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/26 15:07:57+01:00 vanille.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into allanon.vanille.de:/home/mickey/openembedded

2005/03/26 15:05:31+01:00 vanille.de!mickeyl
This ChangeSet introduces .inc files for everything Opie related
Fixed and floating versions only differ in PV and SRC_URI, so that's
what gets overridden in the actual .bbfiles. Please watch out for breakage
and catch up if I missed files.
Unfortunately, for now I had to yank the few individually versioned Opie
programs. We will bring individual versions for many (if not all) programs
back eventually.

2005/03/26 14:14:13+01:00 mauricekoster.com!maurice
openslug-packages.bb:
  Added rsync

2005/03/26 04:41:37-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/26 13:06:25+01:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/03/26 13:06:05+01:00 utwente.nl!koen
libgphoto2_2.1.5.bb:
  fix deps

2005/03/26 03:41:28-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/26 12:07:48+01:00 uni-frankfurt.de!mickeyl
opie-1.2.0 uses qcop 1.0.1

2005/03/26 12:06:49+01:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/03/26 12:03:13+01:00 utwente.nl!koen
libgphoto2_2.1.5.bb, gphoto2_2.1.5.bb: add latest and greatest gphoto2, features improved ptp2 support

2005/03/26 12:02:29+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/03/26 12:00:56+01:00 uni-frankfurt.de!mickeyl
opie-taskbar-1.2.0: catch up with cvs version

2005/03/26 11:51:00+01:00 uni-frankfurt.de!mickeyl
use opie 1.2.0 in familiar 0.8.2

2005/03/26 11:44:24+01:00 uni-frankfurt.de!mickeyl
libqpe-opie-1.2.0: catch up with cvs version

2005/03/25 20:41:33-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/25 23:09:00-05:00 handhelds.org!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into handhelds.org:/home/kergoth/code/openembedded

2005/03/25 23:08:40-05:00 handhelds.org!kergoth
Add linux-libc-headers 2.6.11.1.

2005/03/25 16:44:54-08:00 kalmiopsis!jbowler
ssh does not allow login as a user unless that user has a password.
Unmodified NSLU2 boxes running OpenSlug only allow login via dropbear
(ssh), therefore a password is required for root (the only user in
the initial setup.)  This changed version of the root-home.patch
adds a password, the password is documented in the README file.

2005/03/25 15:41:35-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bk