From a780643c4b6aa11e1a36965a69df7116477c7b4c Mon Sep 17 00:00:00 2001 From: Chris Larson 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/binconfig.bbclass | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 classes/binconfig.bbclass (limited to 'classes/binconfig.bbclass') diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass new file mode 100644 index 0000000000..e69de29bb2 -- cgit v1.2.3 From 65f3fc9521119f91bf570481074e2cc4c296ece7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 6 Feb 2005 22:30:30 +0000 Subject: classes/binconfig.bbclass: Fix namespace clash if you compile in /usr or friends BKrev: 42069a8624BK350E1xrDCQmGxx2tWA --- classes/binconfig.bbclass | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'classes/binconfig.bbclass') diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass index e69de29bb2..7011004026 100644 --- a/classes/binconfig.bbclass +++ b/classes/binconfig.bbclass @@ -0,0 +1,31 @@ +inherit base + +# The namespaces can clash here hence the two step replace +def get_binconfig_mangle(d): + import bb.data + s = "-e ''" + if not bb.data.inherits_class('native', d): + s += " -e 's:${libdir}:OELIBDIR:;'" + s += " -e 's:${includedir}:OEINCDIR:;'" + s += " -e 's:${datadir}:OEDATADIR:'" + s += " -e 's:${prefix}:OEPREFIX:'" + s += " -e 's:${exec_prefix}:OEEXECPREFIX:'" + s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'" + s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'" + s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'" + s += " -e 's:OEPREFIX:${STAGING_LIBDIR}/..:'" + s += " -e 's:OEEXECPREFIX:${STAGING_LIBDIR}/..:'" + return s + +def is_native(d): + import bb.data + return ["","-native"][bb.data.inherits_class('native', d)] + +do_stage_append() { + for config in `find ${S} -name '*-config'`; do + configname=`basename $config`${@is_native(d)} + install -d ${STAGING_BINDIR} + cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR}/$configname + chmod u+x ${STAGING_BINDIR}/$configname + done +} -- cgit v1.2.3 From a2b1be8430c236be3708ac8f9c5e3a1ff48ead33 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 2 Mar 2005 14:04:55 +0000 Subject: binconfig.bbclass/pkgconfig.bbclass: Make pattern matching more restrictive so oe works within /usr BKrev: 4225c807EQAZ6gSzTcAR8RuS2aIW1Q --- classes/binconfig.bbclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'classes/binconfig.bbclass') diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass index 7011004026..b2545deddd 100644 --- a/classes/binconfig.bbclass +++ b/classes/binconfig.bbclass @@ -5,11 +5,11 @@ def get_binconfig_mangle(d): import bb.data s = "-e ''" if not bb.data.inherits_class('native', d): - s += " -e 's:${libdir}:OELIBDIR:;'" - s += " -e 's:${includedir}:OEINCDIR:;'" - s += " -e 's:${datadir}:OEDATADIR:'" - s += " -e 's:${prefix}:OEPREFIX:'" - s += " -e 's:${exec_prefix}:OEEXECPREFIX:'" + s += " -e 's:=${libdir}:=OELIBDIR:;'" + s += " -e 's:=${includedir}:=OEINCDIR:;'" + s += " -e 's:=${datadir}:=OEDATADIR:'" + s += " -e 's:=${prefix}:=OEPREFIX:'" + s += " -e 's:=${exec_prefix}:=OEEXECPREFIX:'" s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'" s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'" s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'" -- cgit v1.2.3 From 75829d795e816ec2d8a0efb71a82503b41840e9f Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Sat, 5 Mar 2005 20:40:27 +0000 Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2005/03/05 20:40:10+00:00 nexus.co.uk!pb put foo-config files in STAGING_BINDIR/HOST_SYS, since -native versions differ from the regular ones. BKrev: 422a193bs6ZoJh9hr-69NzCS-5DN4g --- classes/binconfig.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'classes/binconfig.bbclass') diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass index b2545deddd..866d689896 100644 --- a/classes/binconfig.bbclass +++ b/classes/binconfig.bbclass @@ -24,8 +24,8 @@ def is_native(d): do_stage_append() { for config in `find ${S} -name '*-config'`; do configname=`basename $config`${@is_native(d)} - install -d ${STAGING_BINDIR} - cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR}/$configname - chmod u+x ${STAGING_BINDIR}/$configname + install -d ${STAGING_BINDIR}/${HOST_SYS} + cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR}/${HOST_SYS}/$configname + chmod u+x ${STAGING_BINDIR}/${HOST_SYS}/$configname done } -- cgit v1.2.3 From eccdf92b20e5fcc8784a1061613d7ea2014ef8fa Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Wed, 9 Mar 2005 17:36:40 +0000 Subject: apply patch from Graeme Gregory to remove spurious "-native" in binconfig filenames BKrev: 422f3428NXWAO6eGMfNOYUsLoCGRlg --- classes/binconfig.bbclass | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'classes/binconfig.bbclass') diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass index 866d689896..cfc444cf26 100644 --- a/classes/binconfig.bbclass +++ b/classes/binconfig.bbclass @@ -17,13 +17,9 @@ def get_binconfig_mangle(d): s += " -e 's:OEEXECPREFIX:${STAGING_LIBDIR}/..:'" return s -def is_native(d): - import bb.data - return ["","-native"][bb.data.inherits_class('native', d)] - do_stage_append() { for config in `find ${S} -name '*-config'`; do - configname=`basename $config`${@is_native(d)} + configname=`basename $config` install -d ${STAGING_BINDIR}/${HOST_SYS} cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR}/${HOST_SYS}/$configname chmod u+x ${STAGING_BINDIR}/${HOST_SYS}/$configname -- cgit v1.2.3 From f8776728ceefc5f860490610869ead22d93ed26b Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Fri, 1 Apr 2005 01:32:46 +0000 Subject: Add a couple new sed statements to binconfig.bbclass. The current ones weren't fixing up a lot of binconfig scripts, including edb and audiofile. BKrev: 424ca4be7dxiZnat3ONkffto3f3K9g --- classes/binconfig.bbclass | 2 ++ 1 file changed, 2 insertions(+) (limited to 'classes/binconfig.bbclass') diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass index cfc444cf26..c660fd9cae 100644 --- a/classes/binconfig.bbclass +++ b/classes/binconfig.bbclass @@ -10,6 +10,8 @@ def get_binconfig_mangle(d): s += " -e 's:=${datadir}:=OEDATADIR:'" s += " -e 's:=${prefix}:=OEPREFIX:'" s += " -e 's:=${exec_prefix}:=OEEXECPREFIX:'" + s += " -e 's:-L${libdir}:-LOELIBDIR:;'" + s += " -e 's:-I${includedir}:-IOEINCDIR:;'" s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'" s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'" s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'" -- cgit v1.2.3 From 86404033c9bb58e7870007571073d5394efaed7e Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 8 Aug 2005 12:10:08 +0000 Subject: binconfig.bbclass: install foo-config as foo-config-native for native packages, this way the config packages don't step over each other's toes --- classes/binconfig.bbclass | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'classes/binconfig.bbclass') diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass index c660fd9cae..35f859b2c8 100644 --- a/classes/binconfig.bbclass +++ b/classes/binconfig.bbclass @@ -19,11 +19,25 @@ def get_binconfig_mangle(d): s += " -e 's:OEEXECPREFIX:${STAGING_LIBDIR}/..:'" return s +# Native package configurations go in ${BINDIR}/-config-native to prevent a collision with cross packages +def is_native_pkg(d): + import bb.data, os + if not bb.data.inherits_class('native', d): + return "no" + else: + return "yes" + do_stage_append() { for config in `find ${S} -name '*-config'`; do - configname=`basename $config` - install -d ${STAGING_BINDIR}/${HOST_SYS} - cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR}/${HOST_SYS}/$configname - chmod u+x ${STAGING_BINDIR}/${HOST_SYS}/$configname + origname=`basename $config` + if [ "${@is_native_pkg(d)}" == "yes" ] + then + configname=$origname-native + else + configname=$origname + fi + install -d ${STAGING_BINDIR} + cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR}/$configname + chmod u+x ${STAGING_BINDIR}/$configname done } -- cgit v1.2.3 From 0395f0f5e840805c6ac53cec294a732de4c03b44 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 9 Aug 2005 02:16:06 +0000 Subject: binconfig.bbclass: reinstantiate patch that solved appending -native slightly more elegant http://openembedded.bkbits.net:8080/openembedded/diffs/classes/binconfig.bbclass@1.7?nav=index.html|src/.|src/classes|hist/classes/binconfig.bbclass --- classes/binconfig.bbclass | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'classes/binconfig.bbclass') diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass index 35f859b2c8..a599dec3f2 100644 --- a/classes/binconfig.bbclass +++ b/classes/binconfig.bbclass @@ -20,22 +20,13 @@ def get_binconfig_mangle(d): return s # Native package configurations go in ${BINDIR}/-config-native to prevent a collision with cross packages -def is_native_pkg(d): - import bb.data, os - if not bb.data.inherits_class('native', d): - return "no" - else: - return "yes" +def is_native(d): + import bb.data + return ["","-native"][bb.data.inherits_class('native', d)] do_stage_append() { for config in `find ${S} -name '*-config'`; do - origname=`basename $config` - if [ "${@is_native_pkg(d)}" == "yes" ] - then - configname=$origname-native - else - configname=$origname - fi + configname=`basename $config`${@is_native(d)} install -d ${STAGING_BINDIR} cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR}/$configname chmod u+x ${STAGING_BINDIR}/$configname -- cgit v1.2.3 From 303731ed22883cdfbc69f7d4cd974a10bfcc0185 Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Wed, 5 Oct 2005 13:15:20 +0000 Subject: binconfig.bbclass: add new BINCONFIG_GLOB variable to allow passing a different glob to find --- classes/binconfig.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'classes/binconfig.bbclass') diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass index a599dec3f2..bf15ebcdf9 100644 --- a/classes/binconfig.bbclass +++ b/classes/binconfig.bbclass @@ -24,8 +24,10 @@ def is_native(d): import bb.data return ["","-native"][bb.data.inherits_class('native', d)] +BINCONFIG_GLOB ?= "*-config" + do_stage_append() { - for config in `find ${S} -name '*-config'`; do + for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do configname=`basename $config`${@is_native(d)} install -d ${STAGING_BINDIR} cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR}/$configname -- cgit v1.2.3