Re: [OE-core] [PATCH 1/2] package_rpm.bbclass: add srpm function in spec file
On 2012年01月10日 00:17, Mark Hatle wrote:
On 1/8/12 1:11 AM, Xiaofeng Yan wrote:
From: Xiaofeng Yanxiaofeng@windriver.com
For packaging source codes to source rpm package, adding Sources,\
Patches and prep stage in spec file.
Sources include source codes (type of tar.gz) and \
log files including log.do_patch and log.do_configure (type of tar.gz)
Patches include all patches called in bb file.
prep is for user viewing the result in the stage of doing patch and
configuration
for example:
User can use the following command to run the stage of prep.
$rpmbuild -bp package.spec
show the result of log.do_patch and log.configure
[YOCTO #1655]
Signed-off-by: Xiaofeng Yanxiaofeng@windriver.com
---
meta/classes/package_rpm.bbclass | 65
--
1 files changed, 55 insertions(+), 10 deletions(-)
diff --git a/meta/classes/package_rpm.bbclass
b/meta/classes/package_rpm.bbclass
index d03dc3f..3e0ca15 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -6,6 +6,7 @@ RPM=rpm
RPMBUILD=rpmbuild
PKGWRITEDIRRPM = ${WORKDIR}/deploy-rpms
+PKGWRITEDIRSRPM = ${WORKDIR}/deploy-srpm
python package_rpm_fn () {
d.setVar('PKGFN', d.getVar('PKG'))
@@ -422,6 +423,19 @@ python write_specfile () {
import textwrap
import oe.packagedata
+ def add_prep(spec_files_bottom):
+ bb.build.exec_func('not_srpm', d)
+ if not d.getVar('NOTSRPM', True) and d.getVar('ARCHIVE_TYPE', True)
== 'SRPM':
+ spec_files_bottom.append('%%prep -n %s' % d.getVar('PN', True) )
+ spec_files_bottom.append('%s' % set +x)
+ spec_files_bottom.append('%s' % cd $RPM_SOURCE_BUILD)
+ spec_files_bottom.append('%s' % tar zxvf $RPM_SOURCE_DIR/log.tar.gz)
+ spec_files_bottom.append('%s' % echo \ do patch
==\)
+ spec_files_bottom.append('%s' % cat log.do_patch*)
+ spec_files_bottom.append('%s' % echo \ do configure
==\)
+ spec_files_bottom.append('%s' % cat log.do_configure*)
+ spec_files_bottom.append('')
The above will simply print the output of the do_patch and
do_configure steps. It would probably be better to simply include the
steps themselves... but with the python based steps I'm not sure that
is possible.
The stage of prep can work with command rpmbuild -bp xxx.spec on
target platform. I have also a query. if I plus %prep between
%package and %file, then prep can't work but if plussing %prep
after %file, then %prep can work. I don't know why about that.
So returning the log entries is likely the next best thing.
I should modify codes like the following.
def add_prep(spec_files_bottom):
bb.build.exec_func('not_srpm', d)
if not d.getVar('NOTSRPM', True) and d.getVar('ARCHIVE_TYPE', True) ==
'SRPM':
spec_files_bottom.append('%%prep -n %s' % d.getVar('PN', True) )
spec_files_bottom.append('%s' % set +x)
spec_files_bottom.append('%s' % echo \include log.do_unpack and
log.do_patch, Please check them in log.tar.gz from SOURCES\)
spec_files_bottom.append('')
only tell user to find log files in detailed place. right?
Note, you don't need the wild cards in this, you should simply cat out
the version log.do_patch instead of log.do_patch* -- bitbake ensures
that the last log file is always the one with the symbolic link.
--Mark
+
# We need a simple way to remove the MLPREFIX from the package name,
# and dependency information...
def strip_multilib(name, d):
@@ -533,6 +547,13 @@ python write_specfile () {
srcmaintainer = d.getVar('MAINTAINER', True)
srchomepage = d.getVar('HOMEPAGE', True)
srcdescription = d.getVar('DESCRIPTION', True) or .
+
+ bb.build.exec_func('not_srpm', d)
+ if not d.getVar('NOTSRPM', True) and d.getVar('ARCHIVE_TYPE', True)
== 'SRPM':
+ tpkg_name = d.getVar('PF',True)
+ srctargz = tpkg_name + .tar.gz
+ logtargz = log.tar.gz
+
srcdepends = strip_multilib(d.getVar('DEPENDS', True), d)
srcrdepends = []
@@ -557,6 +578,11 @@ python write_specfile () {
spec_files_top = []
spec_files_bottom = []
+ if not d.getVar('NOTSRPM', True) and d.getVar('ARCHIVE_TYPE', True)
== 'SRPM':
+ srcpatches = []
+ bb.build.exec_func('get_patches', d)
+ srcpatches = d.getVar('PLIST',True)
+
for pkg in packages.split():
localdata = bb.data.createCopy(d)
@@ -637,7 +663,7 @@ python write_specfile () {
else:
bb.note(Creating EMPTY RPM Package for %s % splitname)
spec_files_top.append('')
-
+
bb.utils.unlockfile(lf)
continue
@@ -714,7 +740,7 @@ python write_specfile () {
spec_scriptlets_bottom.append('# %s - %s' % (splitname, script))
spec_scriptlets_bottom.append(scriptvar)
spec_scriptlets_bottom.append('')
-
+
# Now process files
file_list = []
walk_files(root, file_list, conffiles)
@@ -732,7 +758,8 @@ python write_specfile () {
del localdata
bb.utils.unlockfile(lf)
-
+
+ add_prep(spec_files_bottom)
spec_preamble_top.append('Summary: %s' % srcsummary)
spec_preamble_top.append('Name: %s' % srcname)
spec_preamble_top.append('Version: %s' % srcversion)
@@ -743,6 +770,11 @@ python write_specfile () {
Re: [OE-core] [PATCH 1/1] distro_tracking: update manual check info
Dear Dongxiao, Am Dienstag, den 10.01.2012, 15:52 +0800 schrieb Dongxiao Xu: updated kexec-tools manual check information this is mostly the same as the commit summary. So just merge it. distro_tracking_fields: kexec-tools: Add manual check info Signed-off-by: Dongxiao Xu dongxiao...@intel.com --- .../conf/distro/include/distro_tracking_fields.inc |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc index cc87d5c..6a8463f 100644 --- a/meta/conf/distro/include/distro_tracking_fields.inc +++ b/meta/conf/distro/include/distro_tracking_fields.inc @@ -2384,6 +2384,7 @@ RECIPE_NO_OF_PATCHES_pn-kexec-tools=1 RECIPE_LATEST_RELEASE_DATE_pn-kexec-tools=Jul 29, 2010 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-kexec-tools=1 year RECIPE_LAST_UPDATE_pn-kexec-tools = Nov 16, 2010 +RECIPE_MANUAL_CHECK_DATE_pn-kexec-tools = Jan 10, 2012 RECIPE_MAINTAINER_pn-kexec-tools = Dongxiao Xu dongxiao...@intel.com RECIPE_STATUS_pn-hostap-conf = red Otherwise very trivial. So Acked-by: Paul Menzel paulepan...@users.sourceforge.net Thanks, Paul signature.asc Description: This is a digitally signed message part ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] Preventing RRECOMMENDS from installing
Is there a simple way, in a bbappend-file to prevent packages in an
RRECOMMENDS from being installed? E.g. if package foo has:
RRECOMMENDS_${PN} += bar
I'd reluctant to rewrite RRECOMMENDS_${PN} completely, as foo sets
RRECOMMENDS using += (or =+), thus I'd like not to remove other packages
from RRECOMMENDS.
If possible, I'd like to avoid patching the foo.bb-file, and just have a
foo.bbappend in my own layer.
I've unsuccesfully tried different variants using oe_filter_out, but
they don't seems to prevent bar from being installed.
Thanks in advance for any hints!
Cheers,
Anders
--
Anders Darander
ChargeStorm AB / eStorm AB
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Preventing RRECOMMENDS from installing
On Tue, 2012-01-10 at 11:03 +0100, Anders Darander wrote:
Is there a simple way, in a bbappend-file to prevent packages in an
RRECOMMENDS from being installed? E.g. if package foo has:
RRECOMMENDS_${PN} += bar
If you mean you just want to stop them getting installed during rootfs
construction, you can achieve that by declaring them to be
BAD_RECOMMENDATIONS.
If you want to remove the actual Recommends: header then you probably
need to write an anonymous python function to bash RRECOMMENDS around
after parsing completes.
p.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Preventing RRECOMMENDS from installing
On Tue, Jan 10, 2012 at 11:03:06AM +0100, Anders Darander wrote:
Is there a simple way, in a bbappend-file to prevent packages in an
RRECOMMENDS from being installed? E.g. if package foo has:
RRECOMMENDS_${PN} += bar
I'd reluctant to rewrite RRECOMMENDS_${PN} completely, as foo sets
RRECOMMENDS using += (or =+), thus I'd like not to remove other packages
from RRECOMMENDS.
If possible, I'd like to avoid patching the foo.bb-file, and just have a
foo.bbappend in my own layer.
I've unsuccesfully tried different variants using oe_filter_out, but
they don't seems to prevent bar from being installed.
Thanks in advance for any hints!
Cannot you use
BAD_RECOMMENDATIONS += bar
for your image/distro?
It was broken for some time, but iirc should be fixed now.
Cheers,
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Preventing RRECOMMENDS from installing
On Tuesday 10 January 2012 10:08:24 Phil Blundell wrote:
On Tue, 2012-01-10 at 11:03 +0100, Anders Darander wrote:
Is there a simple way, in a bbappend-file to prevent packages in an
RRECOMMENDS from being installed? E.g. if package foo has:
RRECOMMENDS_${PN} += bar
If you mean you just want to stop them getting installed during rootfs
construction, you can achieve that by declaring them to be
BAD_RECOMMENDATIONS.
FWIW, it should be noted that this currently works for ipk packaging only.
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] hdparm: upgrade to 9.37
This patch is to upgrade hdparm to 9.37 and bring its new dependency stat. Please review. The following changes since commit 468998cddbe1a803096c9b357e1b5daa3b7e8c2e: command.py: add parseConfigurationFiles API (2012-01-06 16:01:44 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib shane/upgrade3 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=shane/upgrade3 Shane Wang (1): hdparm: upgrade to 9.37 .../recipes-extended/hdparm/hdparm-6.3/bswap.patch | 37 .../hdparm/hdparm-6.3/uclibc.patch | 34 -- meta/recipes-extended/hdparm/hdparm_6.3.bb | 18 - meta/recipes-extended/hdparm/hdparm_9.37.bb| 36 +++ meta/recipes-extended/stat/stat_3.3.bb | 27 ++ 5 files changed, 63 insertions(+), 89 deletions(-) delete mode 100644 meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch delete mode 100644 meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch delete mode 100644 meta/recipes-extended/hdparm/hdparm_6.3.bb create mode 100644 meta/recipes-extended/hdparm/hdparm_9.37.bb create mode 100644 meta/recipes-extended/stat/stat_3.3.bb -- 1.7.6 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2 ] V3 Incremental rpm image generation
Changes of V3:
* Change the name from INC_RPM_IMAGE_GEN to INC_RPM_IMAGE_GEN as Richard
suggested, and it will only work for rpm based rootfs, the deb and ipk
will be done in M3.
* Update rootfs_rpm.bbclass since other developer has modified it since
V2.
Changes of V2:
* Move the config sample from meta-yocto/conf/local.conf.sample to
meta-yocto/conf/local.conf.sample.extended as Saul suggested.
Testing:
1) Add INC_RPM_IMAGE_GEN = 1 to conf/local.conf
2) $ bitbake core-image-sato
* Test when remove some pkgs
a) Save the modify time of file which is in
tmp/work/qemux86_64-poky-linux/core-image-sato-1.0-r0/rootfs/dev/.
b) Edit meta/recipes-sato/images/core-image-sato.bb, remove
${SATO_IMAGE_FEATURES} from IMAGE_FEATURES.
c) bitbake core-image-sato
Result: The project built well, check the modify time of the file
which is in
tmp/work/qemux86_64-poky-linux/core-image-sato-1.0-r0/rootfs/dev/,
They should be the same to step a)'s, which means that these files
were note newly created.
* Testh when add some pkgs
a) Save the modify time of file which is in
tmp/work/qemux86_64-poky-linux/core-image-sato-1.0-r0/rootfs/dev/.
b) Edit meta/recipes-sato/images/core-image-sato.bb, add the
${SATO_IMAGE_FEATURES} back to IMAGE_FEATURES.
c) bitbake core-image-sato
Result: The project built well, check the modify time of the file
which is in
tmp/work/qemux86_64-poky-linux/core-image-sato-1.0-r0/rootfs/dev/,
They should be the same to step a)'s, which means that these files
were note newly created.
* Test when edit a pkg
a) bitbake bzip2 -cclean
b) rm -f rm -f sstate-cache/sstate-bzip2-*
c) Edit meta/recipes-extended/bzip2/bzip2_1.0.6.bb
d) bitbake core-image-sato
Result: The project built well, and check:
tmp/work/qemux86-poky-linux/core-image-sato-1.0-r0/temp/log.do_rootfs
Only the bzip2 has been re-installed
The following changes since commit 468998cddbe1a803096c9b357e1b5daa3b7e8c2e:
command.py: add parseConfigurationFiles API (2012-01-06 16:01:44 +)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib robert/inc_image_gen
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/inc_image_gen
Robert Yang (2):
Incremental rpm image generation
Incremental rpm image generation(Add config sample)
meta-yocto/conf/local.conf.sample.extended |7 +++
meta/classes/image.bbclass | 11 -
meta/classes/package_rpm.bbclass | 73
meta/classes/rootfs_rpm.bbclass|6 ++-
4 files changed, 84 insertions(+), 13 deletions(-)
--
1.7.4.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2 ] V3 Incremental rpm image generation(Add config sample)
Add the config sample for incremental image generation to meta-yocto/conf/local.conf.sample.extended [YOCTO #1651] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta-yocto/conf/local.conf.sample.extended |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/meta-yocto/conf/local.conf.sample.extended b/meta-yocto/conf/local.conf.sample.extended index 7c26572..b901c5b 100644 --- a/meta-yocto/conf/local.conf.sample.extended +++ b/meta-yocto/conf/local.conf.sample.extended @@ -123,3 +123,10 @@ # The following is a list of classes to import to use in the generation of images # currently an example class is image_types_uboot # IMAGE_CLASSES = image_types_uboot + +# Incremental rpm image generation, the rootfs would be totally removed +# and re-created in the second generation by default, but with +# INC_RPM_IMAGE_GEN = 1, the rpm based rootfs would be kept, and will +# do update(remove/add some pkgs) on it. NOTE: This is not suggested +# when you want to create a productive rootfs +#INC_RPM_IMAGE_GEN = 1 -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2 ] V3 Incremental rpm image generation
Incremental rpm image generation, the rootfs would be totally removed and
re-created in the second generation by default, but with
INC_RPM_IMAGE_GEN = 1, the rpm based rootfs would be kept, and will do
update(remove/add some pkgs) on it.
NOTE: This is not suggested when you want to create a productive rootfs
For example:
1) Add the follow config option to a conf file:
INC_RPM_IMAGE_GEN = 1
2) bitbake core-image-sato
modify a package
bitbake core-image-sato
The rootfs would not be totally removed and re-created in the second
generation, it would be simply updated based on the package.
Implatation:
1) Figure out the pkg which need to be removed or re-installed, then use
'rpm -e to remove the old one. Use the rpm's BUILDTIME to determine
which pkg has been rebuilt.
2) Figure out the pkg which is newly added, and use 'rpm -U' to install
it.
This only for the rpm based rootfs, the deb and ipk based rootfs would
be done later.
[YOCTO #1651]
Signed-off-by: Robert Yang liezhi.y...@windriver.com
---
meta/classes/image.bbclass | 11 +-
meta/classes/package_rpm.bbclass | 73 -
meta/classes/rootfs_rpm.bbclass |6 +++-
3 files changed, 77 insertions(+), 13 deletions(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 295b653..3034725 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -134,15 +134,22 @@ do_rootfs[umask] = 022
fakeroot do_rootfs () {
#set -x
- rm -rf ${IMAGE_ROOTFS}
+# When use the rpm incremental image generation, don't remove the rootfs
+if [ ${INC_RPM_IMAGE_GEN} != 1 -o ${IMAGE_PKGTYPE} != rpm ]; then
+rm -rf ${IMAGE_ROOTFS}
+fi
rm -rf ${MULTILIB_TEMP_ROOTFS}
mkdir -p ${IMAGE_ROOTFS}
mkdir -p ${DEPLOY_DIR_IMAGE}
cp ${COREBASE}/meta/files/deploydir_readme.txt
${DEPLOY_DIR_IMAGE}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt
- if [ ${USE_DEVFS} != 1 ]; then
+# If ${IMAGE_ROOTFS}/dev exists, then the device had been made by
+# the previous build
+ if [ ${USE_DEVFS} != 1 -a ! -r ${IMAGE_ROOTFS}/dev ]; then
for devtable in ${@get_devtable_list(d)}; do
+# Always return ture since there maybe already one when use the
+# incremental image generation
makedevs -r ${IMAGE_ROOTFS} -D $devtable
done
fi
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index d03dc3f..2d92efe 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -147,6 +147,67 @@ resolve_package_rpm () {
echo $pkg_name
}
+# rpm common command and options
+rpm_common_comand () {
+
+local target_rootfs=${INSTALL_ROOTFS_RPM}
+local extra_args=$@
+
+${RPM} --root ${target_rootfs} \
+--predefine _rpmds_sysinfo_path ${target_rootfs}/etc/rpm/sysinfo \
+--predefine _rpmrc_platform_path ${target_rootfs}/etc/rpm/platform \
+-D _var ${localstatedir} \
+-D _dbpath ${rpmlibdir} \
+--noparentdirs --nolinktos \
+-D __dbi_txn create nofsync private \
+-D _cross_scriptlet_wrapper ${WORKDIR}/scriptlet_wrapper $extra_args
+}
+
+# install or remove the pkg
+rpm_update_pkg () {
+
+local target_rootfs=${INSTALL_ROOTFS_RPM}
+
+# Save the rpm's build time for incremental image generation, and the file
+# would be moved to ${T}
+rm -f ${target_rootfs}/install/total_solution_bt.manifest
+for i in `cat ${target_rootfs}/install/total_solution.manifest`; do
+# Use rpm rather than ${RPM} here, since we don't need the
+# '--dbpath' option
+echo $i `rpm -qp --qf '%{BUILDTIME}\n' $i` \
+${target_rootfs}/install/total_solution_bt.manifest
+done
+
+# Only install the different pkgs if incremental image generation is set
+if [ ${INC_RPM_IMAGE_GEN} = 1 -a -f ${T}/total_solution_bt.manifest -a
\
+${IMAGE_PKGTYPE} = rpm ]; then
+cur_list=${target_rootfs}/install/total_solution_bt.manifest
+pre_list=${T}/total_solution_bt.manifest
+sort -u $cur_list -o $cur_list
+sort -u $pre_list -o $pre_list
+comm -1 -3 $cur_list $pre_list | sed 's#.*/\(.*\)\.rpm .*#\1#' \
+${target_rootfs}/install/remove.manifest
+comm -2 -3 $cur_list $pre_list | awk '{print $1}' \
+${target_rootfs}/install/incremental.manifest
+
+# Attempt to remove unwanted pkgs, the scripts(pre, post, etc.) has not
+# been run by now, so don't have to run them(preun, postun, etc.) when
+# erase the pkg
+if [ -s ${target_rootfs}/install/remove.manifest ]; then
+rpm_common_comand --noscripts --nodeps \
+-e `cat ${target_rootfs}/install/remove.manifest`
+fi
+
+# Attempt to install the incremental pkgs
+rpm_common_comand --nodeps --replacefiles
Re: [OE-core] [PATCH 1/2] V2 Incremental image generation(rpm based rootfs)
Hi Richard, Please see my comments inline ... On 01/06/2012 11:22 PM, Richard Purdie wrote: On Sat, 2011-12-31 at 16:10 +0800, Robert Yang wrote: Incremental image generation, the rootfs would be totally removed and re-created in the second generation by default, but with INC_IMAGE_GEN = 1, the rootfs would be kept, and will do update(remove/add some pkgs) on it. it. This only for the rpm based rootfs, I don't know whether we also need this for ipk or deb based rootfs. As Koen points out, this should be called INC_RPM_IMAGE_GEN since it only works for rpm at present. It would be good to make this work on the other package backends. If we keep the generic variable name, the other package backends could error out saying they don't support it. I did a rough investigation on deb these days, it seems not easy to do in M2, so I'd like to make it work for both deb and ipk in M3. I will change the name to INC_RPM_IMAGE_GEN at present, and send a V3 sooner. [YOCTO #1651] Signed-off-by: Robert Yangliezhi.y...@windriver.com --- + +# Attempt to remove unwanted pkgs, the scripts(pre, post, etc.) has not +# been run by now, so don't have to run them(preun, postun, etc.) when +# erase the pkg Really? I'd have thought it possible the scripts have run during the previous do_rootfs? Yes, I think so, I think these post scripts are put in /etc/rpm-postinsts/, and will be run when the system starts at the first time. The best solution is that remove the script when rpm -e, but it is hard to know which pkg owns which script, so I just prevent running the preun and postun when rpm -e, I think this is acceptable since the INC_RPM_IMAGE_GEN is not suggested in the productive rootfs. // Robert Otherwise the patch looks reasonable to me. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] hdparm: upgrade to 9.37
Because hdparm depends on stat, stat is brought into Yocto, and it is a new
dependency.
Part of this patch comes from oe
http://git.openembedded.org/openembedded/tree/recipes/hdparm, and
http://git.openembedded.org/openembedded/tree/recipes/stat.
But, changes include:
- upgrade to the latest version 9.37 from 9.35.
- added license checksum for both recipes.
- for hdparm, the license for wiper which is in hdparm is GPLv2.
Signed-off-by: Shane Wang shane.w...@intel.com
---
.../recipes-extended/hdparm/hdparm-6.3/bswap.patch | 37
.../hdparm/hdparm-6.3/uclibc.patch | 34 --
meta/recipes-extended/hdparm/hdparm_6.3.bb | 18 -
meta/recipes-extended/hdparm/hdparm_9.37.bb| 36 +++
meta/recipes-extended/stat/stat_3.3.bb | 27 ++
5 files changed, 63 insertions(+), 89 deletions(-)
delete mode 100644 meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch
delete mode 100644 meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch
delete mode 100644 meta/recipes-extended/hdparm/hdparm_6.3.bb
create mode 100644 meta/recipes-extended/hdparm/hdparm_9.37.bb
create mode 100644 meta/recipes-extended/stat/stat_3.3.bb
diff --git a/meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch
b/meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch
deleted file mode 100644
index 715886a..000
--- a/meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Upstream-Status: Backport
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
hdparm-5.8/hdparm.c~bswap
-+++ hdparm-5.8/hdparm.c
-@@ -20,7 +20,9 @@
- #include linux/types.h
- #include linux/hdreg.h
- #include linux/major.h
--#include asm/byteorder.h
-+#include byteswap.h
-+
-+#define le16_to_cpus(x) bswap_16(htons(x))
-
- #include hdparm.h
-
-@@ -1160,7 +1162,7 @@
- }
- } else {
- for(i = 0; i 0x100; ++i) {
-- __le16_to_cpus(id[i]);
-+ le16_to_cpus(id[i]);
- }
- identify((void *)id, NULL);
- }
-@@ -1380,7 +1382,7 @@
- }
- for (i = 0; count = 4; ++i) {
- sbuf[i] = (fromhex(b[0]) 12) | (fromhex(b[1]) 8) |
(fromhex(b[2]) 4) | fromhex(b[3]);
-- __le16_to_cpus((__u16 *)(sbuf[i]));
-+ le16_to_cpus((__u16 *)(sbuf[i]));
- b += 5;
- count -= 5;
- }
diff --git a/meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch
b/meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch
deleted file mode 100644
index d5f9298..000
--- a/meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
hdparm-5.8/hdparm.c.ark2005-05-22 19:48:34.0 +
-+++ hdparm-5.8/hdparm.c2005-05-22 19:52:18.0 +
-@@ -17,7 +17,9 @@
- #include sys/times.h
- #include sys/types.h
- #include sys/mount.h
-+#ifndef __UCLIBC__
- #include linux/types.h
-+#endif
- #include linux/hdreg.h
- #include linux/major.h
- #include byteswap.h
hdparm-5.8/hdparm.h.ark2005-05-22 19:51:49.0 +
-+++ hdparm-5.8/hdparm.h2005-05-22 19:54:54.0 +
-@@ -1,6 +1,6 @@
- /* Some prototypes for extern functions. */
-
--#include linux/types.h /* for __u16 */
-+#include stdint.h
-
- #if !defined(__GNUC__) !defined(__attribute__)
- #define __attribute__(x) /* if not using GCC, turn off the __attribute__
-@@ -11,7 +11,7 @@
-others, though, were declared in hdparm.c with global scope; since other
-functions in that file have static (file) scope, I assume the difference is
-intentional. */
--extern void identify (__u16 *id_supplied, const char *devname);
-+extern void identify (uint16_t *id_supplied, const char *devname);
-
- extern void usage_error(int out)__attribute__((noreturn));
- extern int main(int argc, char **argv) __attribute__((noreturn));
-
diff --git a/meta/recipes-extended/hdparm/hdparm_6.3.bb
b/meta/recipes-extended/hdparm/hdparm_6.3.bb
deleted file mode 100644
index 62ae4c0..000
--- a/meta/recipes-extended/hdparm/hdparm_6.3.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = Utility for displaying and setting hard disk parameters
-DESCRIPTION = hdparm is a system utility for viewing \
-and manipulating various IDE drive and driver parameters.
-SECTION = console/utils
-LICENSE = BSD
-LIC_FILES_CHKSUM = file://LICENSE.TXT;md5=910a8a42c962d238619c75fdb78bdb24
-
-SRC_URI = ${SOURCEFORGE_MIRROR}/hdparm/hdparm-${PV}.tar.gz \
- file://bswap.patch \
- file://uclibc.patch
-
-SRC_URI[md5sum] = 0c12672f3a09c14ad0b0882f15fc9389
-SRC_URI[sha256sum] =
08688a6a46ba495494bf838f8f26103e797584c1888eca94e43a171e1b37246d
-
-do_install () {
- install -d ${D}/${sbindir} ${D}/${mandir}/man8
- oe_runmake 'DESTDIR=${D}'
Re: [OE-core] Preventing RRECOMMENDS from installing
* Paul Eggleton paul.eggle...@linux.intel.com [120110 11:26]:
On Tuesday 10 January 2012 10:08:24 Phil Blundell wrote:
On Tue, 2012-01-10 at 11:03 +0100, Anders Darander wrote:
Is there a simple way, in a bbappend-file to prevent packages in an
RRECOMMENDS from being installed? E.g. if package foo has:
RRECOMMENDS_${PN} += bar
If you mean you just want to stop them getting installed during rootfs
construction, you can achieve that by declaring them to be
BAD_RECOMMENDATIONS.
FWIW, it should be noted that this currently works for ipk packaging only.
Ah, good to know...
I was just about to start a new round of tests, but as we're currently
using rpm packaging, there probably is no need...
For the beginning, I'll have to stay with the local patch approach then,
and later on, investigate what it would take to implement this for rpm
packaging.
Cheers,
Anders
--
Anders Darander
ChargeStorm AB / eStorm AB
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 14/22] default-distrovars: Define DISTRO_FEATURES_LIBC for uclibc
On Mon, 2012-01-09 at 21:54 -0800, Saul Wold wrote: diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index e1594f3..0b515e5 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc @@ -10,6 +10,8 @@ LIMIT_BUILT_LOCALES ?= POSIX en_US en_GB ENABLE_BINARY_LOCALE_GENERATION ?= 1 LOCALE_UTF8_ONLY ?= 0 +DISTRO_FEATURES_LIBC_libc-uclibc ?= ipv4 ipv6 largefile libc-posix-clang-wchar + DISTRO_FEATURES_LIBC ?= ipv4 ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \ libc-crypt-ufc libc-db-aliases libc-envz libc-fcvt libc-fmtmsg libc-fstab libc-ftraverse \ libc-getlogin libc-idn libc-inet-anl libc-libm libc-libm-big libc-locales libc-locale-code \ This looks like a bad idea to me. I think that override will cause potentially surprising behaviour for folks who are trying to set DISTRO_FEATURES_LIBC by hand. And, as far as I can tell, this patch won't make any functional difference since uclibc will just ignore the features it doesn't understand. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] license.bbclass base.bbclass: support for 'or' operand in LICENSE and for SPDX license names
From: Andrei Gherzan andrei.gher...@windriver.com
A new function was defined in license.bbclass in order to correctly exclude
packages where OE-Style licence naming
is used. In this way licenses as GPL-3, GPLv3, GPLv3.0 etc will be excluded
from a non-GPLv3 build. This function
takes into consideration if 'or' operand is used.
The function defined in license.bbclass is called in base.bbclass where
packages are excluded based on
INCOMPATIBLE_LICENSE variable.
[YOCTO #1884]
[YOCTO #1844]
Signed-off-by: Andrei Gherzan andrei at gherzan.ro
---
meta/classes/base.bbclass|3 +-
meta/classes/license.bbclass | 45 ++
2 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index e65a722..f0c358e 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -398,9 +398,8 @@ python () {
dont_want_whitelist = (d.getVar('WHITELIST_%s' %
dont_want_license, 1) or ).split()
if pn not in hosttools_whitelist and pn not in lgplv2_whitelist
and pn not in dont_want_whitelist:
-import re
this_license = d.getVar('LICENSE', 1)
-if this_license and re.search(dont_want_license, this_license):
+if incompatible_license(d,dont_want_license):
bb.note(SKIPPING %s because it's %s % (pn, this_license))
raise bb.parse.SkipPackage(incompatible with license %s
% this_license)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index d351b5a..4b98e29 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -237,6 +237,51 @@ python do_populate_lic() {
}
+def incompatible_license(d,dont_want_license):
+
+This function checks if a package has only incompatible licenses. It also
take into consideration 'or'
+operand.
+
+import re
+import oe.license
+from fnmatch import fnmatchcase as fnmatch
+
+dont_want_licenses = []
+dont_want_licenses.append(d.getVar('INCOMPATIBLE_LICENSE', 1))
+if d.getVarFlag('SPDXLICENSEMAP', dont_want_license):
+ dont_want_licenses.append(d.getVarFlag('SPDXLICENSEMAP',
dont_want_license))
+
+def include_license(license):
+ if any(fnmatch(license, pattern) for pattern in dont_want_licenses):
+ return False
+ else:
+ spdx_license = d.getVarFlag('SPDXLICENSEMAP', license)
+ if spdx_license and any(fnmatch(spdx_license, pattern) for pattern
in dont_want_licenses):
+ return False
+ else:
+ return True
+
+def choose_licenses(a, b):
+if all(include_license(lic) for lic in a):
+ return a
+else:
+ return b
+
+
+If you want to exlude license named generically 'X', we surely want to
exlude 'X+' as well.
+In consequence, we will exclude the '+' character from LICENSE in case
INCOMPATIBLE_LICENSE
+is not a 'X+' license.
+
+if not re.search(r'[+]',dont_want_license):
+ licenses=oe.license.flattened_licenses(re.sub(r'[+]', '',
d.getVar('LICENSE', True)), choose_licenses)
+else:
+ licenses=oe.license.flattened_licenses(d.getVar('LICENSE', True),
choose_licenses)
+
+for onelicense in licenses:
+ if not include_license(onelicense):
+ return True
+return False
+
SSTATETASKS += do_populate_lic
do_populate_lic[sstate-name] = populate-lic
do_populate_lic[sstate-inputdirs] = ${LICSSTATEDIR}
--
1.7.5.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] license.bbclass base.bbclass: support for 'or' operand in LICENSE and for SPDX license names
On 01/10/2012 05:34 PM, Chris Larson wrote: On Tue, Jan 10, 2012 at 8:17 AM, Andrei Gherzanand...@gherzan.ro wrote: From: Andrei Gherzanandrei.gher...@windriver.com A new function was defined in license.bbclass in order to correctly exclude packages where OE-Style licence naming is used. In this way licenses as GPL-3, GPLv3, GPLv3.0 etc will be excluded from a non-GPLv3 build. This function takes into consideration if 'or' operand is used. The function defined in license.bbclass is called in base.bbclass where packages are excluded based on INCOMPATIBLE_LICENSE variable. [YOCTO #1884] [YOCTO #1844] Signed-off-by: Andrei Gherzanandrei at gherzan.ro Out of curiosity, why are we using regex for this when we already have license parsing in the oe.license module which can handle the OR case? I'm using regex only for excluding '+' characters from LICENSE. The rest of the work is done in oe.license. If X is defined as INCOMPATIBLE_LICENSE, X+ should be exluded as well. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] license.bbclass base.bbclass: support for 'or' operand in LICENSE and for SPDX license names
On Tue, Jan 10, 2012 at 9:07 AM, Andrei Gherzan and...@gherzan.ro wrote: On 01/10/2012 05:34 PM, Chris Larson wrote: On Tue, Jan 10, 2012 at 8:17 AM, Andrei Gherzanand...@gherzan.ro wrote: From: Andrei Gherzanandrei.gher...@windriver.com A new function was defined in license.bbclass in order to correctly exclude packages where OE-Style licence naming is used. In this way licenses as GPL-3, GPLv3, GPLv3.0 etc will be excluded from a non-GPLv3 build. This function takes into consideration if 'or' operand is used. The function defined in license.bbclass is called in base.bbclass where packages are excluded based on INCOMPATIBLE_LICENSE variable. [YOCTO #1884] [YOCTO #1844] Signed-off-by: Andrei Gherzanandrei at gherzan.ro Out of curiosity, why are we using regex for this when we already have license parsing in the oe.license module which can handle the OR case? I'm using regex only for excluding '+' characters from LICENSE. The rest of the work is done in oe.license. If X is defined as INCOMPATIBLE_LICENSE, X+ should be exluded as well. Ah, right, apparently I'm blind :) We should really think about a generic mechanism for handling + somehow. Hmm. -- Christopher Larson ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] license.bbclass base.bbclass: support for 'or' operand in LICENSE and for SPDX license names
On 01/10/2012 06:10 PM, Chris Larson wrote: On Tue, Jan 10, 2012 at 9:07 AM, Andrei Gherzanand...@gherzan.ro wrote: On 01/10/2012 05:34 PM, Chris Larson wrote: On Tue, Jan 10, 2012 at 8:17 AM, Andrei Gherzanand...@gherzan.rowrote: From: Andrei Gherzanandrei.gher...@windriver.com A new function was defined in license.bbclass in order to correctly exclude packages where OE-Style licence naming is used. In this way licenses as GPL-3, GPLv3, GPLv3.0 etc will be excluded from a non-GPLv3 build. This function takes into consideration if 'or' operand is used. The function defined in license.bbclass is called in base.bbclass where packages are excluded based on INCOMPATIBLE_LICENSE variable. [YOCTO #1884] [YOCTO #1844] Signed-off-by: Andrei Gherzanandrei at gherzan.ro Out of curiosity, why are we using regex for this when we already have license parsing in the oe.license module which can handle the OR case? I'm using regex only for excluding '+' characters from LICENSE. The rest of the work is done in oe.license. If X is defined as INCOMPATIBLE_LICENSE, X+ should be exluded as well. Ah, right, apparently I'm blind :) We should really think about a generic mechanism for handling + somehow. Hmm. No worries. Anyway, you are right about the + mechanism but right now this is a fast and complete solution. ag ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/4] copyleft/license bits
From: Christopher Larson chris_lar...@mentor.com The following changes since commit fff18970706913e7fd7f4a119d798dddb44b388a: base-files: filesystems: fix mount order (2012-01-06 14:41:19 +) are available in the git repository at: https://github.com/kergoth/oe-core license-bits Christopher Larson (4): copyleft_compliance: add control of recipe types to include copyleft_compliance: add debug message with the reason for exclusion oe.license: add is_included convenience function oe.license: avoid the need to catch SyntaxError meta/classes/copyleft_compliance.bbclass | 56 meta/lib/oe/license.py | 59 -- meta/lib/test.py |3 ++ 3 files changed, 90 insertions(+), 28 deletions(-) create mode 100644 meta/lib/test.py Christopher Larson (4): copyleft_compliance: add control of recipe types to include copyleft_compliance: add debug message with the reason for exclusion oe.license: add is_included convenience function oe.license: avoid the need to catch SyntaxError meta/classes/copyleft_compliance.bbclass | 56 meta/lib/oe/license.py | 59 -- meta/lib/test.py |3 ++ 3 files changed, 90 insertions(+), 28 deletions(-) create mode 100644 meta/lib/test.py -- 1.7.8.rc4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] copyleft_compliance: add debug message with the reason for exclusion
From: Christopher Larson chris_lar...@mentor.com
Signed-off-by: Christopher Larson chris_lar...@mentor.com
---
meta/classes/copyleft_compliance.bbclass | 24 +---
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/meta/classes/copyleft_compliance.bbclass
b/meta/classes/copyleft_compliance.bbclass
index 37ed09e..fd04638 100644
--- a/meta/classes/copyleft_compliance.bbclass
+++ b/meta/classes/copyleft_compliance.bbclass
@@ -39,8 +39,9 @@ def copyleft_should_include(d):
import oe.license
from fnmatch import fnmatchcase as fnmatch
-if d.getVar('COPYLEFT_RECIPE_TYPE', True) not in
oe.data.typed_value('COPYLEFT_RECIPE_TYPES', d):
-return False
+recipe_type = d.getVar('COPYLEFT_RECIPE_TYPE', True)
+if recipe_type not in oe.data.typed_value('COPYLEFT_RECIPE_TYPES', d):
+return False, 'recipe type %s is excluded' % recipe_type
include = oe.data.typed_value('COPYLEFT_LICENSE_INCLUDE', d)
exclude = oe.data.typed_value('COPYLEFT_LICENSE_EXCLUDE', d)
@@ -63,18 +64,27 @@ def copyleft_should_include(d):
licenses = oe.license.flattened_licenses(d.getVar('LICENSE', True),
choose_licenses)
except oe.license.InvalidLicense as exc:
bb.fatal('%s: %s' % (d.getVar('PF', True), exc))
-except SyntaxError:
-bb.warn(%s: Failed to parse it's LICENSE field. % (d.getVar('PF',
True)))
-
-return all(include_license(lic) for lic in licenses)
+except SyntaxError as exc:
+bb.warn('%s: error when parsing the LICENSE variable: %s' %
(d.getVar('P', True), exc))
+else:
+excluded = filter(lambda lic: not include_license(lic), licenses)
+if excluded:
+return False, 'recipe has excluded licenses: %s' % ',
'.join(excluded)
+else:
+return True, None
python do_prepare_copyleft_sources () {
Populate a tree of the recipe sources and emit patch series files
import os.path
import shutil
-if not copyleft_should_include(d):
+p = d.getVar('P', True)
+included, reason = copyleft_should_include(d)
+if not included:
+bb.debug(1, 'copyleft: %s is excluded: %s' % (p, reason))
return
+else:
+bb.debug(1, 'copyleft: %s is included' % p)
sources_dir = d.getVar('COPYLEFT_SOURCES_DIR', 1)
src_uri = d.getVar('SRC_URI', 1).split()
--
1.7.8.rc4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] oe.license: add is_included convenience function
From: Christopher Larson chris_lar...@mentor.com
Given a license string and whitelist and blacklist, determine if the
license string matches the whitelist and does not match the blacklist.
When encountering an OR, it prefers the side with the highest weight (more
included licenses). It then checks the inclusion of the flattened list of
licenses from there.
Returns a tuple holding the boolean state and a list of the applicable
licenses which were excluded (or None, if the state is True)
Examples:
is_included, excluded = oe.license.is_included(licensestr, ['GPL*',
'LGPL*'])
is_included, excluded = oe.license.is_included(licensestr,
blacklist=['Proprietary', 'CLOSED'])
Signed-off-by: Christopher Larson chris_lar...@mentor.com
---
meta/classes/copyleft_compliance.bbclass | 23 +++---
meta/lib/oe/license.py | 36 ++
meta/lib/test.py |3 ++
3 files changed, 43 insertions(+), 19 deletions(-)
create mode 100644 meta/lib/test.py
diff --git a/meta/classes/copyleft_compliance.bbclass
b/meta/classes/copyleft_compliance.bbclass
index fd04638..6f058e0 100644
--- a/meta/classes/copyleft_compliance.bbclass
+++ b/meta/classes/copyleft_compliance.bbclass
@@ -46,32 +46,17 @@ def copyleft_should_include(d):
include = oe.data.typed_value('COPYLEFT_LICENSE_INCLUDE', d)
exclude = oe.data.typed_value('COPYLEFT_LICENSE_EXCLUDE', d)
-def include_license(license):
-if any(fnmatch(license, pattern) for pattern in exclude):
-return False
-if any(fnmatch(license, pattern) for pattern in include):
-return True
-return False
-
-def choose_licenses(a, b):
-Select the left option in an OR if all its licenses are to be
included
-if all(include_license(lic) for lic in a):
-return a
-else:
-return b
-
try:
-licenses = oe.license.flattened_licenses(d.getVar('LICENSE', True),
choose_licenses)
+is_included, excluded = oe.license.is_included(d.getVar('LICENSE',
True), include, exclude)
except oe.license.InvalidLicense as exc:
bb.fatal('%s: %s' % (d.getVar('PF', True), exc))
except SyntaxError as exc:
bb.warn('%s: error when parsing the LICENSE variable: %s' %
(d.getVar('P', True), exc))
else:
-excluded = filter(lambda lic: not include_license(lic), licenses)
-if excluded:
-return False, 'recipe has excluded licenses: %s' % ',
'.join(excluded)
-else:
+if is_included:
return True, None
+else:
+return False, 'recipe has excluded licenses: %s' % ',
'.join(excluded)
python do_prepare_copyleft_sources () {
Populate a tree of the recipe sources and emit patch series files
diff --git a/meta/lib/oe/license.py b/meta/lib/oe/license.py
index 7ab66e7..3543cfe 100644
--- a/meta/lib/oe/license.py
+++ b/meta/lib/oe/license.py
@@ -3,6 +3,7 @@
import ast
import re
+from fnmatch import fnmatchcase as fnmatch
class InvalidLicense(StandardError):
def __init__(self, license):
@@ -60,3 +61,38 @@ def flattened_licenses(licensestr, choose_licenses):
flatten = FlattenVisitor(choose_licenses)
flatten.visit_string(licensestr)
return flatten.licenses
+
+def is_included(licensestr, whitelist=None, blacklist=None):
+Given a license string and whitelist and blacklist, determine if the
+license string matches the whitelist and does not match the blacklist.
+
+Returns a tuple holding the boolean state and a list of the applicable
+licenses which were excluded (or None, if the state is True)
+
+
+def include_license(license):
+return (any(fnmatch(license, pattern) for pattern in whitelist) and not
+any(fnmatch(license, pattern) for pattern in blacklist))
+
+def choose_licenses(alpha, beta):
+Select the option in an OR which is the 'best' (has the most
+included licenses).
+alpha_weight = len(filter(include_license, alpha))
+beta_weight = len(filter(include_license, beta))
+if alpha_weight beta_weight:
+return alpha
+else:
+return beta
+
+if not whitelist:
+whitelist = ['*']
+
+if not blacklist:
+blacklist = []
+
+licenses = flattened_licenses(licensestr, choose_licenses)
+excluded = filter(lambda lic: not include_license(lic), licenses)
+if excluded:
+return False, excluded
+else:
+return True, None
diff --git a/meta/lib/test.py b/meta/lib/test.py
new file mode 100644
index 000..12f4d83
--- /dev/null
+++ b/meta/lib/test.py
@@ -0,0 +1,3 @@
+import oe.license
+
+print(oe.license.is_included('LGPLv2.1 | GPLv3', ['*'], []))
--
1.7.8.rc4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
Re: [OE-core] [PATCH] license.bbclass base.bbclass: support for 'or' operand in LICENSE and for SPDX license names
On Tue, Jan 10, 2012 at 9:12 AM, Andrei Gherzan and...@gherzan.ro wrote: No worries. Anyway, you are right about the + mechanism but right now this is a fast and complete solution. Indeed, nice work on this. -- Christopher Larson ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] license.bbclass base.bbclass: support for 'or' operand in LICENSE and for SPDX license names
On Tue, Jan 10, 2012 at 8:34 AM, Chris Larson clar...@kergoth.com wrote: On Tue, Jan 10, 2012 at 9:12 AM, Andrei Gherzan and...@gherzan.ro wrote: No worries. Anyway, you are right about the + mechanism but right now this is a fast and complete solution. Indeed, nice work on this. Agreed! One note about +. There is still a discussion about or greater licensing within the SPDX community about how or greater should be dealt with. http://www.spdx.org/wiki/proposal-2010-11-16-1-or-later-version-licensing https://bugs.linuxfoundation.org/show_bug.cgi?id=591 I'm partial to, as a stop gap, re-including L/GPL-x.0+ license files into common-licenses until they hash it out and treating + as just part of the license name. It's not a perfect solution but it should solve most or greater use cases. -b -- Christopher Larson ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- Elizabeth Flanagan Yocto Project Build and Release ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] license.bbclass base.bbclass: support for 'or' operand in LICENSE and for SPDX license names
On Tue, Jan 10, 2012 at 9:55 AM, Flanagan, Elizabeth elizabeth.flana...@intel.com wrote: Agreed! One note about +. There is still a discussion about or greater licensing within the SPDX community about how or greater should be dealt with. http://www.spdx.org/wiki/proposal-2010-11-16-1-or-later-version-licensing https://bugs.linuxfoundation.org/show_bug.cgi?id=591 Interesting. I'm partial to, as a stop gap, re-including L/GPL-x.0+ license files into common-licenses until they hash it out and treating + as just part of the license name. It's not a perfect solution but it should solve most or greater use cases. I've been thinking about something like this. LICENSE_EXPANSIONS += GPL-2.0+:GPL-2.0,GPL-3.0 Then process the license, turning GPL-2.0+ into an OR operation. Replace with (GPL-2.0 | GPL-3.0). Perhaps coupled with something like https://gist.github.com/1590028 to express distributor preferences, we then get a sanitized, SDPX, flat string with the licenses we're going to be using for this. Then we run this against each binary package's LICENSE (if different than recipe) and ensure our emitted binary packages match up with our license choices. -- Christopher Larson ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] RFC: Joint, monthly, and online forum for developer discussion
I propose having a monthly, online developer forum that promotes discussion on longer term technical issues that impact both Yocto and OpenEmbedded. This would supplement the already existing mailing list and irc communication channels. In order to facilitate this, I'd like to propose a telephone/web conference, which my employer has agreed to host. This forum would help provide an additional way for the community to discuss technical issues and share information about planned work and works in progress. Initial Topics for Discussion might include: 1. layering definitions - discussion on what exists today and how to make it better 2. discussions on techniques to make working with oe/yocto better 3. oe/yocto disconnects (opportunities for better alignment) 4. common new user issues 5. documentation (standards, lacks, etc) 6. ? Regards, Sean Sean Hudson | Embedded Linux Architect for Mentor Embedded Linux Mentor Graphics - Embedded Software Division(tm) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] Add alsa-state from OE Classic v2
The small series following introduces the alsa-state recipe from oe-classic. The reason for doing so is to remove the requirement for recipes like the beagleboard-audio recipe in meta-yocto, which ensures the beagleboards sound device has the volume turned up. Long term I'd like to implement something more generic for handling device quirks, but alsa-state is a simple fix for an immediate need that should standardise how alsa configuration is handled in layers. Since v1 I've added an extra commit which: a) defaults to /var/lib/alsa/ for state files, as this is the directory alsactl writes to by default. b) sed's the path to the state files into the init script, rather than hard codes them. The following changes since commit fff18970706913e7fd7f4a119d798dddb44b388a: base-files: filesystems: fix mount order (2012-01-06 14:41:19 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib josh/devices http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/devices Joshua Lock (3): alsa-state: add alsa-state from oe classic alsa-state: move state files to localstatedir task-base: add alsa-state to task-base-alsa meta/recipes-bsp/alsa-state/alsa-state.bb | 59 meta/recipes-bsp/alsa-state/alsa-state/alsa-state | 29 ++ meta/recipes-bsp/alsa-state/alsa-state/asound.conf | 12 .../recipes-bsp/alsa-state/alsa-state/asound.state |1 + meta/recipes-core/tasks/task-base.bb |5 +- 5 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-bsp/alsa-state/alsa-state.bb create mode 100755 meta/recipes-bsp/alsa-state/alsa-state/alsa-state create mode 100644 meta/recipes-bsp/alsa-state/alsa-state/asound.conf create mode 100644 meta/recipes-bsp/alsa-state/alsa-state/asound.state -- 1.7.7.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] alsa-state: move state files to localstatedir
alsactl creates the state files in /var/lib/alsa by default so switch
alsa-state to use files in that location.
Further, update the alsa-state init script to have the location of the
state files sed'ed into the script at do_install time (so as to remove
hard coding of directory paths).
Signed-off-by: Joshua Lock j...@linux.intel.com
---
meta/recipes-bsp/alsa-state/alsa-state.bb |8 +---
meta/recipes-bsp/alsa-state/alsa-state/alsa-state |6 +++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-bsp/alsa-state/alsa-state.bb
b/meta/recipes-bsp/alsa-state/alsa-state.bb
index ecfa975..bc17b25 100644
--- a/meta/recipes-bsp/alsa-state/alsa-state.bb
+++ b/meta/recipes-bsp/alsa-state/alsa-state.bb
@@ -26,11 +26,13 @@ INITSCRIPT_NAME = alsa-state
INITSCRIPT_PARAMS = start 39 S . stop 31 0 6 .
do_install() {
+sed -i -e s:#STATEDIR#:${localstatedir}/lib/alsa:g ${WORKDIR}/alsa-state
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d
+install -d ${D}/${localstatedir}/lib/alsa
install -m 0644 ${WORKDIR}/asound.conf ${D}${sysconfdir}
-install -m 0644 ${WORKDIR}/*.state ${D}${sysconfdir}
+install -m 0644 ${WORKDIR}/*.state ${D}${localstatedir}/lib/alsa
}
PACKAGES += alsa-states
@@ -40,14 +42,14 @@ RRECOMMENDS_alsa-state = alsa-states
FILES_${PN} = ${sysconfdir}/init.d ${sysconfdir}/asound.conf
CONFFILES_${PN} = ${sysconfdir}/asound.conf
-FILES_alsa-states = ${sysconfdir}/*.state
+FILES_alsa-states = ${localstatedir}/lib/alsa/*.state
pkg_postinst_${PN}() {
if test -z $D
then
if test -x /usr/sbin/alsactl
then
- /usr/sbin/alsactl -f ${sysconfdir}/asound.state restore
+ /usr/sbin/alsactl -f
${localstatedir}/lib/alsa/asound.state restore
fi
# INITSCRIPT_PARAMS changed, so remove the old and
# install the new setting.
diff --git a/meta/recipes-bsp/alsa-state/alsa-state/alsa-state
b/meta/recipes-bsp/alsa-state/alsa-state/alsa-state
index 84cdf03..9850791 100755
--- a/meta/recipes-bsp/alsa-state/alsa-state/alsa-state
+++ b/meta/recipes-bsp/alsa-state/alsa-state/alsa-state
@@ -9,9 +9,9 @@
asound_restore(){
echo ALSA: Restoring mixer settings...
- if test -x /usr/sbin/alsactl -a -e /etc/asound.state
+ if test -x /usr/sbin/alsactl -a -e #STATEDIR#/asound.state
then
- /usr/sbin/alsactl -f /etc/asound.state restore
+ /usr/sbin/alsactl -f #STATEDIR#/asound.state restore
fi
}
@@ -19,7 +19,7 @@ asound_store(){
echo ALSA: Storing mixer settings...
if test -x /usr/sbin/alsactl
then
- /usr/sbin/alsactl -f /etc/asound.state store
+ /usr/sbin/alsactl -f #STATEDIR#/asound.state store
fi
}
--
1.7.7.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/22] Patches and Updates for M2
On Mon, 2012-01-09 at 21:53 -0800, Saul Wold wrote: This change set has been run through the AB, I pull out the DTB patch which is what I think caused the failure for MPC. Please due further review and commit as appropriate. Thanks Sau! The following changes since commit fff18970706913e7fd7f4a119d798dddb44b388a: base-files: filesystems: fix mount order (2012-01-06 14:41:19 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib sgw/stage http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgw/stage Andrea Adami (2): kexec-tools: split packaging of kexec and kdump task-core-tools: adapt to kexec-tools package split Andreas Müller (2): libusb1: keep *.la in base_libdir libusb-compat: keep *.la in base_libdir Colin Walters (1): util-linux: .pc files should go in the -dev packages for subpackages Dexuan Cui (1): distro_tracking_fields.inc: upgrade tcf-agent Jessica Zhang (1): add sysroot support for meta-ide-support which is the toolchain within build env case Khem Raj (8): site/common-uclibc: Cache gl_cv_func_wcwidth_works libiconv_1.14.bb: Fix build failure eglibc: Upgrade recipes 2.14 - 2.15 autotools.bbclass: Introduce CACHED_CONFIGUREVARS default-distrovars: Define DISTRO_FEATURES_LIBC for uclibc uclibc: Configure UCLIBC_HAS_WCHAR based on libc-posix-clang-wchar distro feature findutils: Use CACHED_CONFIGUREVARS to specify cached configure vars util-linux: Enable fallocate and use CACHED_CONFIGUREVARS Matthew McClintock (1): libxml2: add shared library version info to libxml shared libraries Nitin A Kamble (1): libxxf86dga: fix compilation with x32 toolchain Saul Wold (1): distro_tracking: Update Manual Checks Steve Sakoman (4): Remove last remnants of kernel26 MACHINE_FEATURES dbus: change permissions of dbus-daemon-launch-helper to 4755 gtk-icon-cache.bbclass: add -f option to gtk-update-icon-cache in postinst update-modules: don't run modutils.sh if systemd is installed I merged these apart from: default-distrovars: Define DISTRO_FEATURES_LIBC for uclibc Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 14/22] default-distrovars: Define DISTRO_FEATURES_LIBC for uclibc
On Tue, 2012-01-10 at 11:01 +, Phil Blundell wrote:
On Mon, 2012-01-09 at 21:54 -0800, Saul Wold wrote:
diff --git a/meta/conf/distro/include/default-distrovars.inc
b/meta/conf/distro/include/default-distrovars.inc
index e1594f3..0b515e5 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -10,6 +10,8 @@ LIMIT_BUILT_LOCALES ?= POSIX en_US en_GB
ENABLE_BINARY_LOCALE_GENERATION ?= 1
LOCALE_UTF8_ONLY ?= 0
+DISTRO_FEATURES_LIBC_libc-uclibc ?= ipv4 ipv6 largefile
libc-posix-clang-wchar
+
DISTRO_FEATURES_LIBC ?= ipv4 ipv6 libc-backtrace libc-big-macros libc-bsd
libc-cxx-tests libc-catgets libc-charsets libc-crypt \
libc-crypt-ufc libc-db-aliases
libc-envz libc-fcvt libc-fmtmsg libc-fstab libc-ftraverse \
libc-getlogin libc-idn libc-inet-anl
libc-libm libc-libm-big libc-locales libc-locale-code \
This looks like a bad idea to me. I think that override will cause
potentially surprising behaviour for folks who are trying to set
DISTRO_FEATURES_LIBC by hand. And, as far as I can tell, this patch
won't make any functional difference since uclibc will just ignore the
features it doesn't understand.
Agreed. If this really is an issue we could do something like:
DEFAULTLIBFEATURES = xxx
DEFAULTLIBFEATURES_libc-uclibc = yyy
DISTRO_FEATURES_LIBC ?= ${DEFAULTLIBCFEATURES}
Cheers,
Richard
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] license.bbclass base.bbclass: support for 'or' operand in LICENSE and for SPDX license names
On Tue, Jan 10, 2012 at 18:34, Chris Larson clar...@kergoth.com wrote: On Tue, Jan 10, 2012 at 9:12 AM, Andrei Gherzan and...@gherzan.ro wrote: No worries. Anyway, you are right about the + mechanism but right now this is a fast and complete solution. Indeed, nice work on this. -- Christopher Larson ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core On Tue, Jan 10, 2012 at 19:05, Chris Larson clar...@kergoth.com wrote: On Tue, Jan 10, 2012 at 9:55 AM, Flanagan, Elizabeth elizabeth.flana...@intel.com wrote: Agreed! Thank you. On Tue, Jan 10, 2012 at 19:05, Chris Larson clar...@kergoth.com wrote: On Tue, Jan 10, 2012 at 9:55 AM, Flanagan, Elizabeth elizabeth.flana...@intel.com wrote: Agreed! One note about +. There is still a discussion about or greater licensing within the SPDX community about how or greater should be dealt with. http://www.spdx.org/wiki/proposal-2010-11-16-1-or-later-version-licensing https://bugs.linuxfoundation.org/show_bug.cgi?id=591 Interesting. I'm partial to, as a stop gap, re-including L/GPL-x.0+ license files into common-licenses until they hash it out and treating + as just part of the license name. It's not a perfect solution but it should solve most or greater use cases. I've been thinking about something like this. LICENSE_EXPANSIONS += GPL-2.0+:GPL-2.0,GPL-3.0 Then process the license, turning GPL-2.0+ into an OR operation. Replace with (GPL-2.0 | GPL-3.0). Perhaps coupled with something like https://gist.github.com/1590028 to express distributor preferences, we then get a sanitized, SDPX, flat string with the licenses we're going to be using for this. Then we run this against each binary package's LICENSE (if different than recipe) and ensure our emitted binary packages match up with our license choices. -- Christopher Larson ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core Christopher's solution crossed my mind as well. Actually i tried something like this but i didn't want to modify more from this patch and i didn't really know how to define those expansions. Another problem here that i faced and dropped the idea for, was the the scenario where a developer wants to exclude only GPLv3+. This case needed a another couple of ifs and so on. So my solution seemed to deal most of the situations even if it looks a little... childish. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 03/22] site/common-uclibc: Cache gl_cv_func_wcwidth_works
please drop this patch. Its superseded by my pull request.
On Mon, Jan 9, 2012 at 9:53 PM, Saul Wold s...@linux.intel.com wrote:
From: Khem Raj raj.k...@gmail.com
Its not computed properly during configure and
we configure uclibc with widechar support anyway
so its fine to cache it. It fixes the errors like
| In file included from ./stdio.h:31:0,
| from fpurge.h:20,
| from fpurge.c:20:
|
/home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemux86/usr/include/stdio.h:662:40:
error: expected declaration specifiers or '...' before '(' token
| make[4]: *** [fpurge.o] Error 1
Signed-off-by: Khem Raj raj.k...@gmail.com
---
meta/site/common-uclibc | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/site/common-uclibc b/meta/site/common-uclibc
index 331c2a2..c2ad42d 100644
--- a/meta/site/common-uclibc
+++ b/meta/site/common-uclibc
@@ -21,6 +21,7 @@ ac_cv_func_vsnprintf_c99=${ac_cv_func_vsnprintf_c99=yes}
glib_cv_compliant_posix_memalign=${glib_cv_compliant_posix_memalign=1}
glib_cv_long_long_format=${glib_cv_long_long_format=ll}
glib_cv_have_qsort_r=${glib_cv_have_qsort_r=no}
+gl_cv_func_wcwidth_works=${gl_cv_func_wcwidth_works=yes}
#dbus-glib
ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes}
--
1.7.6.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/22] Patches and Updates for M2
On Tue, 2012-01-10 at 17:57 +, Richard Purdie wrote: Khem Raj (8): site/common-uclibc: Cache gl_cv_func_wcwidth_works I merged these apart from: default-distrovars: Define DISTRO_FEATURES_LIBC for uclibc I think the consensus on that common-uclibc patch (see previous discussion on this list) was that it oughtn't to be merged. Certainly not if: uclibc: Configure UCLIBC_HAS_WCHAR based on libc-posix-clang-wchar distro feature is in, since the latter will make the value in the site file wrong. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 03/22] site/common-uclibc: Cache gl_cv_func_wcwidth_works
On 01/10/2012 10:13 AM, Khem Raj wrote:
please drop this patch. Its superseded by my pull request.
Looks like this got pulled, will there be a problem?
Sau!
On Mon, Jan 9, 2012 at 9:53 PM, Saul Wolds...@linux.intel.com wrote:
From: Khem Rajraj.k...@gmail.com
Its not computed properly during configure and
we configure uclibc with widechar support anyway
so its fine to cache it. It fixes the errors like
| In file included from ./stdio.h:31:0,
| from fpurge.h:20,
| from fpurge.c:20:
|
/home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemux86/usr/include/stdio.h:662:40:
error: expected declaration specifiers or '...' before '(' token
| make[4]: *** [fpurge.o] Error 1
Signed-off-by: Khem Rajraj.k...@gmail.com
---
meta/site/common-uclibc |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/site/common-uclibc b/meta/site/common-uclibc
index 331c2a2..c2ad42d 100644
--- a/meta/site/common-uclibc
+++ b/meta/site/common-uclibc
@@ -21,6 +21,7 @@ ac_cv_func_vsnprintf_c99=${ac_cv_func_vsnprintf_c99=yes}
glib_cv_compliant_posix_memalign=${glib_cv_compliant_posix_memalign=1}
glib_cv_long_long_format=${glib_cv_long_long_format=ll}
glib_cv_have_qsort_r=${glib_cv_have_qsort_r=no}
+gl_cv_func_wcwidth_works=${gl_cv_func_wcwidth_works=yes}
#dbus-glib
ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes}
--
1.7.6.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 03/22] site/common-uclibc: Cache gl_cv_func_wcwidth_works
On Tue, Jan 10, 2012 at 10:18 AM, Saul Wold s...@linux.intel.com wrote:
On 01/10/2012 10:13 AM, Khem Raj wrote:
please drop this patch. Its superseded by my pull request.
Looks like this got pulled, will there be a problem?
I think there could be a problem when wchar feature is unset. Although
since it sets.
gl_cv_func_wcwidth_works=${gl_cv_func_wcwidth_works=yes}
It might honor the setting coming from recipe through CONFIGUREVARS
but not sure.
its probably best to revert it.
Sau!
On Mon, Jan 9, 2012 at 9:53 PM, Saul Wolds...@linux.intel.com wrote:
From: Khem Rajraj.k...@gmail.com
Its not computed properly during configure and
we configure uclibc with widechar support anyway
so its fine to cache it. It fixes the errors like
| In file included from ./stdio.h:31:0,
| from fpurge.h:20,
| from fpurge.c:20:
|
/home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemux86/usr/include/stdio.h:662:40:
error: expected declaration specifiers or '...' before '(' token
| make[4]: *** [fpurge.o] Error 1
Signed-off-by: Khem Rajraj.k...@gmail.com
---
meta/site/common-uclibc | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/site/common-uclibc b/meta/site/common-uclibc
index 331c2a2..c2ad42d 100644
--- a/meta/site/common-uclibc
+++ b/meta/site/common-uclibc
@@ -21,6 +21,7 @@
ac_cv_func_vsnprintf_c99=${ac_cv_func_vsnprintf_c99=yes}
glib_cv_compliant_posix_memalign=${glib_cv_compliant_posix_memalign=1}
glib_cv_long_long_format=${glib_cv_long_long_format=ll}
glib_cv_have_qsort_r=${glib_cv_have_qsort_r=no}
+gl_cv_func_wcwidth_works=${gl_cv_func_wcwidth_works=yes}
#dbus-glib
ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes}
--
1.7.6.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC PATCH 1/1] self-hosted-image: generate the .hdddirect and .vmdk image files
Signed-off-by: Dexuan Cui dexuan@intel.com
---
meta/classes/boot-directdisk.bbclass | 10 +-
meta/recipes-core/images/self-hosted-image.bb | 11 +--
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/meta/classes/boot-directdisk.bbclass
b/meta/classes/boot-directdisk.bbclass
index 8879ba8..83ec929 100644
--- a/meta/classes/boot-directdisk.bbclass
+++ b/meta/classes/boot-directdisk.bbclass
@@ -24,6 +24,7 @@ do_bootdirectdisk[depends] +=
dosfstools-native:do_populate_sysroot \
syslinux-native:do_populate_sysroot \
parted-native:do_populate_sysroot \
mtools-native:do_populate_sysroot
+do_bootdirectdisk[depends] += qemu-native:do_populate_sysroot
PACKAGES =
EXCLUDE_FROM_WORLD = 1
@@ -38,7 +39,7 @@ BOOTDD_EXTRA_SPACE ?= 16384
AUTO_SYSLINUXCFG = 1
LABELS = boot
-APPEND = root=/dev/sda2
+APPEND = root=/dev/hda2
TIMEOUT = 10
SYSLINUXCFG = ${HDDDIR}/syslinux.cfg
SYSLINUXMENU = ${HDDDIR}/menu
@@ -50,6 +51,7 @@ build_boot_dd() {
install -d ${HDDDIR}
install -m 0644 ${STAGING_DIR_HOST}/kernel/bzImage ${HDDDIR}/vmlinuz
+ install -m 0644 ${S}/syslinux.cfg ${HDDDIR}/syslinux.cfg
install -m 444 ${STAGING_LIBDIR}/syslinux/ldlinux.sys
${HDDDIR}/ldlinux.sys
BLOCKS=`du -bks ${HDDDIR} | cut -f 1`
@@ -83,6 +85,12 @@ build_boot_dd() {
cd ${DEPLOY_DIR_IMAGE}
rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdddirect
ln -s ${IMAGE_NAME}.hdddirect
${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdddirect
+
+ if [ ${NOVMDK} != 1 ] ; then
+ ${STAGING_BINDIR_NATIVE}/qemu-img convert -O vmdk \
+ ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdddirect \
+ ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.vmdk
+ fi
}
python do_bootdirectdisk() {
diff --git a/meta/recipes-core/images/self-hosted-image.bb
b/meta/recipes-core/images/self-hosted-image.bb
index 111c057..df6c81f 100644
--- a/meta/recipes-core/images/self-hosted-image.bb
+++ b/meta/recipes-core/images/self-hosted-image.bb
@@ -6,6 +6,13 @@ POKY_EXTRA_INSTALL = \
IMAGE_FEATURES += x11-mini
-inherit core-image
+# Needed by boot-directdisk
+ROOTFS ?= ${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3
-PR = r2
+inherit core-image boot-directdisk
+
+do_bootimg[depends] += ${INITRD_IMAGE}:do_rootfs
+do_bootimg[depends] += ${IMAGE_BASENAME}:do_rootfs
+do_bootdirectdisk[depends] += ${PN}:do_rootfs
+
+PR = r3
--
1.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC PATCH 0/1] [RFC] enhance boot-directdisk.bbclass to generate .vmdk image
[RFC][PATCH] enhance boot-directdisk.bbclass to generate .vmdk image The self-hosted-image work needs a live-bootable and r/w-able image format. The existing .iso isn't ok since it's readonly. The existing .hddimg is not a good choice, since it has a two-option(boot,install) syslinux function that we don't need: we don't hope a user be potentially able to install, and I think it may be not suitble to hack build_hddimg to hide the install? Moreever, .hddimg is not that compatibible with some devices and we hope to have the most compatibility. So I think the .hdddirect format is a good choice and I made this patch to adopt it and also enhanced boot-directdisk.bbclass to generate .vmdk image so we can run it on vmware, too. BTW, currently self-hosted-image is the only user of boot-directdisk.bbclass; with the adoption of .hdddirect and .vmdk formats, a user can still use IMAGE_FSTYPES += 'live' to generate the .iso and .hddimg format. Please give comment. Thanks! Please review the following changes for suitability for inclusion. If you have any objections or suggestions for improvement, please respond to the patches. If you agree with the changes, please provide your Acked-by. The following changes since commit 468998cddbe1a803096c9b357e1b5daa3b7e8c2e: command.py: add parseConfigurationFiles API (2012-01-06 16:01:44 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib dcui/self-hosted-v7 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/self-hosted-v7 Dexuan Cui (1): self-hosted-image: generate the .hdddirect and .vmdk image files meta/classes/boot-directdisk.bbclass | 10 +- meta/recipes-core/images/self-hosted-image.bb | 11 +-- 2 files changed, 18 insertions(+), 3 deletions(-) -- 1.7.6 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] alsa-state: add alsa-state from oe classic
On Tue, Jan 10, 2012 at 15:39, Joshua Lock j...@linux.intel.com wrote: ... +++ b/meta/recipes-bsp/alsa-state/alsa-state/asound.state @@ -0,0 +1 @@ +# Dummy file, do not delete \ No newline at end of file ^ please fix it. -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/3] Add alsa-state from OE Classic v2
On Tue, Jan 10, 2012 at 15:39, Joshua Lock j...@linux.intel.com wrote: The small series following introduces the alsa-state recipe from oe-classic. The reason for doing so is to remove the requirement for recipes like the beagleboard-audio recipe in meta-yocto, which ensures the beagleboards sound device has the volume turned up. If you're on the mood please also prepare a patch for meta-oe to add support to systemd. It ought to be quite trivial to add and allow for easy use for people using systemd based images. -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] alsa-state: add alsa-state from oe classic
On 10/01/12 11:30, Otavio Salvador wrote: On Tue, Jan 10, 2012 at 15:39, Joshua Lock j...@linux.intel.com mailto:j...@linux.intel.com wrote: ... +++ b/meta/recipes-bsp/alsa-state/alsa-state/asound.state @@ -0,0 +1 @@ +# Dummy file, do not delete \ No newline at end of file ^ please fix it. Pushed to the branch. Joshua -- Joshua Lock Yocto Project Johannes factotum Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/3] Add alsa-state from OE Classic v2
On 10/01/12 11:34, Otavio Salvador wrote: On Tue, Jan 10, 2012 at 15:39, Joshua Lock j...@linux.intel.com mailto:j...@linux.intel.com wrote: The small series following introduces the alsa-state recipe from oe-classic. The reason for doing so is to remove the requirement for recipes like the beagleboard-audio recipe in meta-yocto, which ensures the beagleboards sound device has the volume turned up. If you're on the mood please also prepare a patch for meta-oe to add support to systemd. It ought to be quite trivial to add and allow for easy use for people using systemd based images. I haven't done *anything* with systemd yet but I'd like to check it out so I'll add this to my list. Expect it to take a few days. Joshua -- Joshua Lock Yocto Project Johannes factotum Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/3] Add alsa-state from OE Classic v2
On Tue, Jan 10, 2012 at 17:45, Joshua Lock j...@linux.intel.com wrote: On 10/01/12 11:34, Otavio Salvador wrote: If you're on the mood please also prepare a patch for meta-oe to add support to systemd. It ought to be quite trivial to add and allow for easy use for people using systemd based images. I haven't done *anything* with systemd yet but I'd like to check it out so I'll add this to my list. Expect it to take a few days. If you need some help, ping me. -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] ncurses-native: install to libdir, not base_libdir
From: Christopher Larson chris_lar...@mentor.com
For target, both base_libdir and libdir in sysroot can be used, as we pass
--sysroot to the toolchain. For native, we don't do this, and we also only add
-Lsysroot/${libdir}, not -Lsysroot/${base_libdir}, resulting in other
native recipes (like readline-native) failing to find the ncurses libraries.
readline-native only built successfully on hosts where it could fall back to
their ncurses/termcap rather than the one in the sysroot.
Signed-off-by: Christopher Larson chris_lar...@mentor.com
---
meta/recipes-core/ncurses/ncurses.inc |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/ncurses/ncurses.inc
b/meta/recipes-core/ncurses/ncurses.inc
index 8321d7b..43303b7 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM =
file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc
SECTION = libs
DEPENDS = ncurses-native
DEPENDS_virtclass-native =
-INC_PR = r3
+INC_PR = r4
inherit autotools binconfig multilib_header
@@ -26,8 +26,8 @@ ENABLE_WIDEC ?= true
# builds.
BUILD_CPPFLAGS += -D_GNU_SOURCE
-# tic from the -native build cannot run without setting this explicitly
-BUILD_LDFLAGS_virtclass-native += -Wl,-rpath,${base_libdir}
+# natives don't generally look in base_libdir
+base_libdir_virtclass-native = ${libdir}
# Helper function for do_configure to allow multiple configurations
# $1 the directory to run configure in
--
1.7.8.rc4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] Add grep to RDEPENDS to avoid command failures.
Fixes [YOCTO #1887]
Signed-off-by: Marc Ferland ferla...@sonatest.com
---
meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb |5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb
b/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb
index a4ac230..5e09f7b 100644
--- a/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb
+++ b/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb
@@ -1,12 +1,13 @@
SECTION = base
SUMMARY = Utilities and scripts for power management
-DESCRIPTION = Simple shell command line toos to suspect and hibernate.
+DESCRIPTION = Simple shell command line tools to suspend and hibernate.
HOMEPAGE = http://pm-utils.freedesktop.org/wiki/;
LICENSE=GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://src/pm-pmu.c;beginline=1;endline=22;md5=3c1ddbc54e735fb4a0386e14c78a3147
-PR = r0
+PR = r1
+RDEPENDS = grep
SRC_URI = http://pm-utils.freedesktop.org/releases/pm-utils-${PV}.tar.gz;
--
1.7.5.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Add grep to RDEPENDS to avoid command failures.
On Tue, 2012-01-10 at 15:22 -0500, Marc Ferland wrote:
-PR = r0
+PR = r1
+RDEPENDS = grep
Do you not get a QA warning for that? Usually it would be RDEPENDS_${PN}.
p.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Add grep to RDEPENDS to avoid command failures.
Phil Blundell ph...@gnu.org writes:
On Tue, 2012-01-10 at 15:22 -0500, Marc Ferland wrote:
-PR = r0
+PR = r1
+RDEPENDS = grep
Do you not get a QA warning for that? Usually it would be RDEPENDS_${PN}.
Nope. Everything looks fine. Whant me to resubmit the patch with
RDEPENDS_${PN}?
BTW I'm using yocto, if that makes a difference.
Marc
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] lttng-ust: Integrate into yocto linux
This patch intended to integrate the LTTng UST 2.0 package, which
contains the userspace tracer library to trace userspace codes.
Signed-off-by: Zumeng Chen zumeng.c...@windriver.com
---
meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb | 25 ++
1 files changed, 25 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb
b/meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb
new file mode 100644
index 000..846019e
--- /dev/null
+++ b/meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb
@@ -0,0 +1,25 @@
+SUMMARY = Linux Trace Toolkit Userspace Tracer 2.0
+DESCRIPTION = The LTTng UST 2.0 package contains the userspace tracer library
to trace userspace codes.
+HOMEPAGE = http://lttng.org/lttng2.0;
+BUGTRACKER = n/a
+
+LICENSE = LGPLv2.1+ BSD
+LIC_FILES_CHKSUM = file://COPYING;md5=e647752e045a8c45b6f583771bd561ef \
+
file://snprintf/snprintf.c;endline=32;md5=d3d544959d8a3782b2e07451be0a903c \
+
file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44
+
+inherit autotools
+
+DEPENDS = liburcu util-linux
+
+SRC_URI = http://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.gz;
+
+SRC_URI[md5sum] = 0f09bb954c99cb99ab6997cd492953c1
+SRC_URI[sha256sum] =
e9ec3c55c2251b3f3b512bfa1015b0f67e35d55793850ccea5134f7b24ee3ba1
+
+S = ${WORKDIR}/lttng-ust-${PV}
+
+# Due to liburcu not building on MIPS currently this recipe needs to
+# be limited also.
+# So here let us first suppport x86/arm/powerpc platforms now.
+COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux'
--
1.7.5.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] lttng-tools: Integrated from git repo.
This patch intended to integrate the Linux trace toolkit, which
is a suite of tools designed to extract program execution details
from the Linux operating system and interpret them.
lttng-tools 2.0 is currently in pre-release(-pre16), so we have to
update it when official released.
Signed-off-by: Zumeng Chen zumeng.c...@windriver.com
---
...tools-fix-compiling-error-for-powerpc-arm.patch | 28 +++
.../lttng-2.0/lttng-tools_2.0-pre16.bb | 29
2 files changed, 57 insertions(+), 0 deletions(-)
create mode 100644
meta/recipes-kernel/lttng-2.0/lttng-tools-fix-compiling-error-for-powerpc-arm.patch
create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-tools_2.0-pre16.bb
diff --git
a/meta/recipes-kernel/lttng-2.0/lttng-tools-fix-compiling-error-for-powerpc-arm.patch
b/meta/recipes-kernel/lttng-2.0/lttng-tools-fix-compiling-error-for-powerpc-arm.patch
new file mode 100644
index 000..f8e144f
--- /dev/null
+++
b/meta/recipes-kernel/lttng-2.0/lttng-tools-fix-compiling-error-for-powerpc-arm.patch
@@ -0,0 +1,28 @@
+From 5d8d75ab0c7f9e0009d90a2e5ad6475034a5c859 Mon Sep 17 00:00:00 2001
+From: Zumeng Chen zumeng.c...@windriver.com
+Date: Tue, 10 Jan 2012 12:41:45 +0800
+Subject: [PATCH 1/1] Fix compiling error on powerpc and arm
+
+For powerpc and arm, some MAP_ are defined asm/mman.h,
+so including it in header.
+
+Signed-off-by: Zumeng Chen zumeng.c...@windriver.com
+---
+ common/runas.c |1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/common/runas.c b/common/runas.c
+index f612ccc..62a2791 100644
+--- a/common/runas.c
b/common/runas.c
+@@ -29,6 +29,7 @@
+ #include fcntl.h
+ #include sched.h
+ #include sys/mman.h
++#include asm/mman.h
+
+ #include lttngerr.h
+
+--
+1.7.5.4
+
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-tools_2.0-pre16.bb
b/meta/recipes-kernel/lttng-2.0/lttng-tools_2.0-pre16.bb
new file mode 100644
index 000..d771ed9
--- /dev/null
+++ b/meta/recipes-kernel/lttng-2.0/lttng-tools_2.0-pre16.bb
@@ -0,0 +1,29 @@
+SECTION = devel
+SUMMARY = Linux Trace Toolkit Control
+DESCRIPTION = The Linux trace toolkit is a suite of tools designed \
+to extract program execution details from the Linux operating system \
+and interpret them.
+
+LICENSE = GPLv2.1
+LIC_FILES_CHKSUM = file://COPYING;md5=ab682a4729389c3f11913d758affe98e \
+file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca
+
+DEPENDS = liburcu popt lttng-ust
+
+SRCREV = f2ca2e251d8f49b0dbbcca529dd61b3562c1147f
+PV = v2.0.pre16+git${SRCREV}
+PR = r0
+
+SRC_URI = git://git.lttng.org/lttng-tools.git;protocol=git\
+ file://lttng-tools-fix-compiling-error-for-powerpc-arm.patch
+
+S = ${WORKDIR}/git
+
+inherit autotools
+
+export KERNELDIR=${STAGING_KERNEL_DIR}
+
+# Currenly lttng-tools doesn't supprt MIPS officially.
+# So here let us keep as-is.
+COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux'
--
1.7.5.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] babeltrace: Integrated from version 0.8
It provides trace read and write libraries, as well as a trace converter.
Signed-off-by: Zumeng Chen zumeng.c...@windriver.com
---
meta/recipes-kernel/lttng-2.0/babeltrace_0.8.bb | 28 +++
1 files changed, 28 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-kernel/lttng-2.0/babeltrace_0.8.bb
diff --git a/meta/recipes-kernel/lttng-2.0/babeltrace_0.8.bb
b/meta/recipes-kernel/lttng-2.0/babeltrace_0.8.bb
new file mode 100644
index 000..dfa4790
--- /dev/null
+++ b/meta/recipes-kernel/lttng-2.0/babeltrace_0.8.bb
@@ -0,0 +1,28 @@
+SUMMARY = Babeltrace - Trace Format Babel Tower
+DESCRIPTION = Babeltrace provides trace read and write libraries in host
side, as well as a trace converter, which used to convert LTTng 2.0 traces into
human-readable log.
+HOMEPAGE = http://www.efficios.com/babeltrace/;
+BUGTRACKER = n/a
+
+LICENSE = MIT GPLV2
+LIC_FILES_CHKSUM = file://LICENSE;md5=8d1a03b3c17bdd158b3cbb34813b1423
+
+inherit autotools
+
+DEPENDS = gtk+ util-linux
+
+SRCREV = 31e670293588d7882a232bc14b93d5e956fa43f4
+PV = 0.8+git${SRCPV}
+PR = r0
+
+SRC_URI = git://git.efficios.com/babeltrace.git;protocol=git
+
+S = ${WORKDIR}/git
+
+do_configure_prepend () {
+ ${S}/bootstrap
+}
+
+# Due to liburcu not building on MIPS currently this recipe needs to
+# be limited also.
+# So here let us first suppport x86/arm/powerpc platforms now.
+COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux'
--
1.7.5.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] lttng-modules: from lttng-modules 2.0 git repo.
This patch intended to integrate the lttng-modules 2.0 package
containing the kernel tracer modules.
LTTng-modules 2.0 is currently in pre-release (-pre11), so we
have to update it when official released.
lttng-2.0 supports lttng-modules extra builds, which don't need
any patches on Linux kernel vs the previous version of lttng.
As described in README of lttng-modules-2.0, so far, it has been
tested in the latest kernel on x86 32/64-bit, and powerpc 32-bit,
, build tested on ARM. So does yocto kernel, the related tests
on qemux86 and qemuppc has been validated and a build test on
qemuarm passed too with this patcheset.
Signed-off-by: Zumeng Chen zumeng.c...@windriver.com
---
...modules-replace-KERNELDIR-with-KERNEL_SRC.patch | 41
.../lttng-2.0/lttng-modules_2.0.pre11.bb | 27 +
2 files changed, 68 insertions(+), 0 deletions(-)
create mode 100644
meta/recipes-kernel/lttng-2.0/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb
diff --git
a/meta/recipes-kernel/lttng-2.0/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
b/meta/recipes-kernel/lttng-2.0/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
new file mode 100644
index 000..aa24171
--- /dev/null
+++
b/meta/recipes-kernel/lttng-2.0/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
@@ -0,0 +1,41 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+lttng-modules: replace KERNELDIR with KERNEL_SRC
+
+Since lttng-modules uses the default way of module.bbclass to
+build and install lttng-modules, we do this replacement for
+it as-is.
+
+Signed-off-by: Zumeng Chen zumeng.c...@windriver.com
+---
+ Makefile |7 +++
+ 1 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 5ac13d7..25caad5 100644
+--- a/Makefile
b/Makefile
+@@ -38,17 +38,16 @@ obj-m += lib/
+ endif
+
+ else
+- KERNELDIR ?= /lib/modules/$(shell uname -r)/build
+ PWD := $(shell pwd)
+ CFLAGS = $(EXTCFLAGS)
+
+ default:
+- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
++ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules
+
+ modules_install:
+- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
++ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules_install
+
+ clean:
+- $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
++ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean
+
+ endif
+--
+1.7.5.4
+
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb
b/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb
new file mode 100644
index 000..4bf636e
--- /dev/null
+++ b/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb
@@ -0,0 +1,27 @@
+SECTION = devel
+SUMMARY = Linux Trace Toolkit KERNEL MODULE
+DESCRIPTION = The lttng-modules 2.0 package contains the kernel tracer
modules
+LICENSE = LGPLv2.1 GPLv2
+LIC_FILES_CHKSUM = file://LICENSE;md5=1eb086682a7c65a45acd9bcdf6877b3e \
+file://gpl-2.0.txt;md5=751419260aa954499f7abaabaa882bbe \
+file://lgpl-2.1.txt;md5=243b725d71bb5df4a1e5920b344b86ad
+
+DEPENDS = virtual/kernel
+
+inherit module
+
+SRCREV = 4d3e89e379fc66480d729abe8daa5c86eb585400
+PV = 2.0.pre11+git${SRCREV}
+PR = r0
+
+SRC_URI = git://git.lttng.org/lttng-modules.git;protocol=git \
+ file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
+
+export INSTALL_MOD_DIR=kernel/lttng-modules
+
+S = ${WORKDIR}/git
+
+# Currenly lttng-tools doesn't supprt MIPS officially.
+# So here let us keep as-is.
+
+COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux'
--
1.7.5.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Add grep to RDEPENDS to avoid command failures.
On Tue, Jan 10, 2012 at 18:22, Marc Ferland ferla...@sonatest.com wrote: ... +PR = r1 +RDEPENDS = grep Busybox ought to provide it; what is missing? -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Add grep to RDEPENDS to avoid command failures.
Otavio Salvador ota...@ossystems.com.br writes: [1:multipart/alternative Hide] [1/1:text/plain Hide] On Tue, Jan 10, 2012 at 18:22, Marc Ferland ferla...@sonatest.com wrote: ... +PR = r1 +RDEPENDS = grep Busybox ought to provide it; what is missing? I was having trouble running the pm-suspend command. See: http://bugzilla.pokylinux.org/show_bug.cgi?id=1887 Basically the '-x' option is missing from busybox's grep. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Add grep to RDEPENDS to avoid command failures.
On Tue, Jan 10, 2012 at 19:14, Marc Ferland ferla...@sonatest.com wrote: I was having trouble running the pm-suspend command. See: http://bugzilla.pokylinux.org/show_bug.cgi?id=1887 Basically the '-x' option is missing from busybox's grep. Can't pm-suspend be patched to avoid using the -x option? Maybe making the regexp more strict, for example? -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] image_types: Ensure /init exists for cpio rootfs archives
On Fri, Jan 6, 2012 at 11:58 PM, Andrea Adami andrea.ad...@gmail.com wrote:
On Fri, Jan 6, 2012 at 11:57 AM, Richard Purdie
richard.pur...@linuxfoundation.org wrote:
On Fri, 2012-01-06 at 02:00 +0100, Andrea Adami wrote:
On Fri, Jan 6, 2012 at 12:36 AM, Darren Hart dvh...@linux.intel.com wrote:
On 01/05/2012 04:30 AM, Richard Purdie wrote:
On Thu, 2012-01-05 at 01:05 +0100, Andrea Adami wrote:
I'd say we have to test for the in-existence of the file instead of
blindly touching it.
Smthg like
if [! -e ${IMAGE_ROOTFS}/init]; then
touch ${IMAGE_ROOTFS}/init
fi
Why? Touch creates it if it doesn't exist and updates the modtime if it
does. It doesn't modify the content of the file if it exists. What is
the motivation for testing for it's existence?
touch fails with Permission denied because one package in my rootfs
already created the symlink
Now, repeating that block for all 4 cpio images is a bit ugly... better
ideas?
Make it a shell function we call? I'd also check for
${base_sbindir}/init first too?
Why check for that? So we can link to it instead of creating an empty
file?
Nonsense, kernel looks for /init
(
http://www.kernel.org/doc/Documentation/filesystems/ramfs-rootfs-initramfs.txt
)
Yes, please ignore my comment about /sbin/init, I'm misremembering
something. We should deal with the symlink case though.
Cheers,
Richard
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
ok, I think the issue is the behavior of touch when trying to change
the timestamp of a symlink.
http://fossplanet.com/f13/bug-7122-touch-gnu-coreutils-7-4-no-way-touch-symlink-57418/
Using 'touch -h' seems solving the issue and the image is built.
However, the timestamp of the /init symlink now differs from the
timestamp of the binary.
Regards
Andrea
Ok, now I think I understand the issue:
the /init symlink in rootfs is absolute, being its path is pointing to
/usr/bin/kexecboot in our case.
Now, until this becomes the real rootfs, the symlink appears broken
and that's why adding the -h (do not dereference) fixes the case of
existent symlink.
Unfortunately it appears touch -h fails if /init is a file and not a
symlink (tested now).
Afterall, I think it would be easier to add a guard around touch as
initially proposed.
Just my 2 cents
Andrea
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Add grep to RDEPENDS to avoid command failures.
Otavio Salvador ota...@ossystems.com.br writes: [1:multipart/alternative Hide] [1/1:text/plain Hide] On Tue, Jan 10, 2012 at 19:14, Marc Ferland ferla...@sonatest.com wrote: I was having trouble running the pm-suspend command. See: http://bugzilla.pokylinux.org/show_bug.cgi?id=1887 Basically the '-x' option is missing from busybox's grep. Can't pm-suspend be patched to avoid using the -x option? Maybe making the regexp more strict, for example? Looks like it uses grep to ignore some parameters that are specified in a separate file. A combination of 'sort' and 'uniq' would probably work, but we would loose the order of the parameters. Any idea? Marc ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] image_types: Ensure /init exists for cpio rootfs archives
On Wed, Jan 11, 2012 at 12:07 AM, Andrea Adami andrea.ad...@gmail.com wrote:
On Fri, Jan 6, 2012 at 11:58 PM, Andrea Adami andrea.ad...@gmail.com wrote:
On Fri, Jan 6, 2012 at 11:57 AM, Richard Purdie
richard.pur...@linuxfoundation.org wrote:
On Fri, 2012-01-06 at 02:00 +0100, Andrea Adami wrote:
On Fri, Jan 6, 2012 at 12:36 AM, Darren Hart dvh...@linux.intel.com
wrote:
On 01/05/2012 04:30 AM, Richard Purdie wrote:
On Thu, 2012-01-05 at 01:05 +0100, Andrea Adami wrote:
I'd say we have to test for the in-existence of the file instead of
blindly touching it.
Smthg like
if [! -e ${IMAGE_ROOTFS}/init]; then
touch ${IMAGE_ROOTFS}/init
fi
Why? Touch creates it if it doesn't exist and updates the modtime if it
does. It doesn't modify the content of the file if it exists. What is
the motivation for testing for it's existence?
touch fails with Permission denied because one package in my rootfs
already created the symlink
Now, repeating that block for all 4 cpio images is a bit ugly...
better ideas?
Make it a shell function we call? I'd also check for
${base_sbindir}/init first too?
Why check for that? So we can link to it instead of creating an empty
file?
Nonsense, kernel looks for /init
(
http://www.kernel.org/doc/Documentation/filesystems/ramfs-rootfs-initramfs.txt
)
Yes, please ignore my comment about /sbin/init, I'm misremembering
something. We should deal with the symlink case though.
Cheers,
Richard
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
ok, I think the issue is the behavior of touch when trying to change
the timestamp of a symlink.
http://fossplanet.com/f13/bug-7122-touch-gnu-coreutils-7-4-no-way-touch-symlink-57418/
Using 'touch -h' seems solving the issue and the image is built.
However, the timestamp of the /init symlink now differs from the
timestamp of the binary.
Regards
Andrea
Ok, now I think I understand the issue:
the /init symlink in rootfs is absolute, being its path is pointing to
/usr/bin/kexecboot in our case.
Now, until this becomes the real rootfs, the symlink appears broken
and that's why adding the -h (do not dereference) fixes the case of
existent symlink.
Unfortunately it appears touch -h fails if /init is a file and not a
symlink (tested now).
This must have been an error on my side mixing previous builds.
No errors using touch -h on files.
Sorry for the confusion
Afterall, I think it would be easier to add a guard around touch as
initially proposed.
Just my 2 cents
Andrea
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/4] lttng-ust: Integrate into yocto linux
于 2012年01月11日 00:58, Darren Hart 写道:
On 01/10/2012 08:11 AM, Zumeng Chen wrote:
This patch intended to integrate the LTTng UST 2.0 package, which
contains the userspace tracer library to trace userspace codes.
Signed-off-by: Zumeng Chenzumeng.c...@windriver.com
---
meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb | 25 ++
1 files changed, 25 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb
b/meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb
new file mode 100644
index 000..846019e
--- /dev/null
+++ b/meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb
@@ -0,0 +1,25 @@
+SUMMARY = Linux Trace Toolkit Userspace Tracer 2.0
+DESCRIPTION = The LTTng UST 2.0 package contains the userspace tracer library to
trace userspace codes.
+HOMEPAGE = http://lttng.org/lttng2.0;
+BUGTRACKER = n/a
+
+LICENSE = LGPLv2.1+ BSD
+LIC_FILES_CHKSUM = file://COPYING;md5=e647752e045a8c45b6f583771bd561ef \
+
file://snprintf/snprintf.c;endline=32;md5=d3d544959d8a3782b2e07451be0a903c \
+
file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44
+
+inherit autotools
+
+DEPENDS = liburcu util-linux
+
+SRC_URI = http://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.gz;
+
+SRC_URI[md5sum] = 0f09bb954c99cb99ab6997cd492953c1
+SRC_URI[sha256sum] =
e9ec3c55c2251b3f3b512bfa1015b0f67e35d55793850ccea5134f7b24ee3ba1
+
+S = ${WORKDIR}/lttng-ust-${PV}
+
+# Due to liburcu not building on MIPS currently this recipe needs to
+# be limited also.
+# So here let us first suppport x86/arm/powerpc platforms now.
+COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux'
We had discussed using a different comment that more clearly stated why
this is necessary and use the same comment across all the patches
implementing this.
This applies to all 4 patches. The suggestion was in my response to
Patch 1/4 V1:
Oops, sorry Darren, all fixed and really soon for V4 on OE :-)
Regards,
Zumeng
Looking through documentation.conf and existing poky sources, I believe
this test is correct. HOST/TARGET are the same in this case. The comment
is a bit confusing however. I believe the comment should read:
# liburcu doesn't build for MIPS
COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux'
The key difference being for instead of on. The rest of the comment
is redundant with the assignment itself. This applies to all 4 patches.
Otherwise, things look good.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [V4]lttng-2.0 new recipe
Changes of V4: Fixed all comments from Darrent; To: OE-core. The following changes since commit 4a8a3c503fd896593b787c26edbe46a7324e494e: Revert site/common-uclibc: Cache gl_cv_func_wcwidth_works (2012-01-10 18:33:25 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib zumeng/lttng-2.0 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zumeng/lttng-2.0 Zumeng Chen (4): lttng-ust: Integrate into yocto linux lttng-tools: Integrated from git repo. lttng-modules: from lttng-modules 2.0 git repo. babeltrace: Integrated from version 0.8 meta/recipes-kernel/lttng-2.0/babeltrace_0.8.bb| 28 + ...modules-replace-KERNELDIR-with-KERNEL_SRC.patch | 41 .../lttng-2.0/lttng-modules_2.0.pre11.bb | 27 + ...tools-fix-compiling-error-for-powerpc-arm.patch | 28 + .../lttng-2.0/lttng-tools_2.0-pre16.bb | 30 ++ meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb | 25 6 files changed, 179 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-kernel/lttng-2.0/babeltrace_0.8.bb create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-tools-fix-compiling-error-for-powerpc-arm.patch create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-tools_2.0-pre16.bb create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] lttng-ust: Integrate into yocto linux
This patch intended to integrate the LTTng UST 2.0 package, which
contains the userspace tracer library to trace userspace codes.
Signed-off-by: Zumeng Chen zumeng.c...@windriver.com
---
meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb | 25 ++
1 files changed, 25 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb
b/meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb
new file mode 100644
index 000..32ec25b
--- /dev/null
+++ b/meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb
@@ -0,0 +1,25 @@
+SUMMARY = Linux Trace Toolkit Userspace Tracer 2.0
+DESCRIPTION = The LTTng UST 2.0 package contains the userspace tracer library
to trace userspace codes.
+HOMEPAGE = http://lttng.org/lttng2.0;
+BUGTRACKER = n/a
+
+LICENSE = LGPLv2.1+ BSD
+LIC_FILES_CHKSUM = file://COPYING;md5=e647752e045a8c45b6f583771bd561ef \
+
file://snprintf/snprintf.c;endline=32;md5=d3d544959d8a3782b2e07451be0a903c \
+
file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44
+
+inherit autotools
+
+DEPENDS = liburcu util-linux
+
+SRC_URI = http://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.gz;
+
+SRC_URI[md5sum] = 0f09bb954c99cb99ab6997cd492953c1
+SRC_URI[sha256sum] =
e9ec3c55c2251b3f3b512bfa1015b0f67e35d55793850ccea5134f7b24ee3ba1
+
+S = ${WORKDIR}/lttng-ust-${PV}
+
+# Due to liburcu not building for MIPS currently this recipe needs to
+# be limited also.
+# So here let us first suppport x86/arm/powerpc platforms now.
+COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux'
--
1.7.5.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] lttng-modules: from lttng-modules 2.0 git repo.
This patch intended to integrate the lttng-modules 2.0 package
containing the kernel tracer modules.
LTTng-modules 2.0 is currently in pre-release (-pre11), so we
have to update it when official released.
lttng-2.0 supports lttng-modules extra builds, which don't need
any patches on Linux kernel vs the previous version of lttng.
As described in README of lttng-modules-2.0, so far, it has been
tested in the latest kernel on x86 32/64-bit, and powerpc 32-bit,
, build tested on ARM. So does yocto kernel, the related tests
on qemux86 and qemuppc has been validated and a build test on
qemuarm passed too with this patcheset.
Signed-off-by: Zumeng Chen zumeng.c...@windriver.com
---
...modules-replace-KERNELDIR-with-KERNEL_SRC.patch | 41
.../lttng-2.0/lttng-modules_2.0.pre11.bb | 27 +
2 files changed, 68 insertions(+), 0 deletions(-)
create mode 100644
meta/recipes-kernel/lttng-2.0/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb
diff --git
a/meta/recipes-kernel/lttng-2.0/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
b/meta/recipes-kernel/lttng-2.0/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
new file mode 100644
index 000..aa24171
--- /dev/null
+++
b/meta/recipes-kernel/lttng-2.0/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
@@ -0,0 +1,41 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+lttng-modules: replace KERNELDIR with KERNEL_SRC
+
+Since lttng-modules uses the default way of module.bbclass to
+build and install lttng-modules, we do this replacement for
+it as-is.
+
+Signed-off-by: Zumeng Chen zumeng.c...@windriver.com
+---
+ Makefile |7 +++
+ 1 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 5ac13d7..25caad5 100644
+--- a/Makefile
b/Makefile
+@@ -38,17 +38,16 @@ obj-m += lib/
+ endif
+
+ else
+- KERNELDIR ?= /lib/modules/$(shell uname -r)/build
+ PWD := $(shell pwd)
+ CFLAGS = $(EXTCFLAGS)
+
+ default:
+- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
++ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules
+
+ modules_install:
+- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
++ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules_install
+
+ clean:
+- $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
++ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean
+
+ endif
+--
+1.7.5.4
+
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb
b/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb
new file mode 100644
index 000..5d34c41
--- /dev/null
+++ b/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb
@@ -0,0 +1,27 @@
+SECTION = devel
+SUMMARY = Linux Trace Toolkit KERNEL MODULE
+DESCRIPTION = The lttng-modules 2.0 package contains the kernel tracer
modules
+LICENSE = LGPLv2.1 GPLv2
+LIC_FILES_CHKSUM = file://LICENSE;md5=1eb086682a7c65a45acd9bcdf6877b3e \
+file://gpl-2.0.txt;md5=751419260aa954499f7abaabaa882bbe \
+file://lgpl-2.1.txt;md5=243b725d71bb5df4a1e5920b344b86ad
+
+DEPENDS = virtual/kernel
+
+inherit module
+
+SRCREV = 4d3e89e379fc66480d729abe8daa5c86eb585400
+PV = 2.0.pre11+git${SRCREV}
+PR = r0
+
+SRC_URI = git://git.lttng.org/lttng-modules.git;protocol=git \
+ file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
+
+export INSTALL_MOD_DIR=kernel/lttng-modules
+
+S = ${WORKDIR}/git
+
+# Due to liburcu not building for MIPS currently this recipe needs to
+# be limited also.
+# So here let us first suppport x86/arm/powerpc platforms now.
+COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux'
--
1.7.5.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/6] Misc recipe fixes upgrades
From: Nitin A Kamble nitin.a.kam...@intel.com
Thanks,
Nitin
The following changes since commit 4a8a3c503fd896593b787c26edbe46a7324e494e:
Revert site/common-uclibc: Cache gl_cv_func_wcwidth_works (2012-01-10
18:33:25 +)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib nitin/misc
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/misc
Nitin A Kamble (6):
locale: fix package's provides tag
diffstat: upgrade from 1.54 to 1.55
insane.bbclass: fix elf.arch not matching error for x32 kernel
libpcre: upgrade from 8.20 to 8.21
btrfs-tools: upgrade to newer git commit
distro_tracking: update manual_check_date fields
meta/classes/insane.bbclass|3 +-
meta/classes/libc-package.bbclass |3 --
.../conf/distro/include/distro_tracking_fields.inc | 36 +++-
meta/recipes-core/eglibc/eglibc-locale.inc |2 +-
.../btrfs-tools/btrfs-tools_git.bb |4 +-
.../{diffstat_1.54.bb = diffstat_1.55.bb} |6 ++--
.../libpcre/{libpcre_8.20.bb = libpcre_8.21.bb} |5 ++-
7 files changed, 31 insertions(+), 28 deletions(-)
rename meta/recipes-devtools/diffstat/{diffstat_1.54.bb = diffstat_1.55.bb}
(82%)
rename meta/recipes-support/libpcre/{libpcre_8.20.bb = libpcre_8.21.bb} (93%)
--
1.7.6.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/6] distro_tracking: update manual_check_date fields
From: Nitin A Kamble nitin.a.kam...@intel.com Signed-off-by: Nitin A Kamble nitin.a.kam...@intel.com --- .../conf/distro/include/distro_tracking_fields.inc | 36 +++- 1 files changed, 20 insertions(+), 16 deletions(-) diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc index 14eff32..dbcfd2b 100644 --- a/meta/conf/distro/include/distro_tracking_fields.inc +++ b/meta/conf/distro/include/distro_tracking_fields.inc @@ -31,9 +31,9 @@ RECIPE_MAINTAINER_pn-gtk-theme-torturer = Zhai Edwin edwin.z...@intel.com DISTRO_PN_ALIAS_pn-gtk-theme-torturer = OSPDT upstream=http://wiki.laptop.org/go/GTK_for_OLPC; RECIPE_STATUS_pn-libpcre = green -RECIPE_LATEST_VERSION_pn-libpcre = 8.20 -RECIPE_LAST_UPDATE_pn-libpcre = Nov 15, 2011 -RECIPE_MANUAL_CHECK_DATE_pn-libpcre = Nov 15, 2011 +RECIPE_LATEST_VERSION_pn-libpcre = 8.21 +RECIPE_LAST_UPDATE_pn-libpcre = Jan 10, 2012 +RECIPE_MANUAL_CHECK_DATE_pn-libpcre = Jan 10, 2012 RECIPE_MAINTAINER_pn-libpcre = Nitin A Kamble nitin.a.kam...@intel.com DISTRO_PN_ALIAS_pn-libpcre = Mandriva=libpcre0 Fedora=pcre @@ -2979,13 +2979,20 @@ RECIPE_STATUS_pn-ldconfig-native = red RECIPE_LAST_UPDATE_pn-ldconfig-native = Nov 23, 2007 DISTRO_PN_ALIAS_pn-ldconfig-native = Ubuntu=libc-bin Fedora=glibc -RECIPE_STATUS_pn-gcc=red -RECIPE_LATEST_VERSION_pn-gcc=4.6.1 +RECIPE_LATEST_VERSION_pn-gcc=4.6.2+git RECIPE_LAST_UPDATE_pn-gcc = May 1, 2011 -RECIPE_MANUAL_CHECK_DATE_pn-gcc = Jul 06, 2011 +RECIPE_MANUAL_CHECK_DATE_pn-gcc = Jan 10, 2012 RECIPE_MAINTAINER_pn-gcc = Nitin A Kamble nitin.a.kam...@intel.com DISTRO_PN_ALIAS_pn-gcc-runtime = Ubuntu=gcc Fedora=gcc +RECIPE_LATEST_VERSION_pn-libgcc = 4.6.2+git +RECIPE_LAST_UPDATE_pn-libgcc = May 1, 2011 +RECIPE_MANUAL_CHECK_DATE_pn-libgcc = Jan 10, 2012 +DISTRO_PN_ALIAS_pn-libgcc = Debian=libgcc4 Ubuntu=libgcc1 OpenSuSE=libgcc46 + +RECIPE_LATEST_VERSION_pn-gcc-runtime = 4.6.2+git +RECIPE_LAST_UPDATE_pn-gcc-runtime = May 1, 2011 +RECIPE_MANUAL_CHECK_DATE_pn-gcc-runtime = Jan 10, 2012 RECIPE_STATUS_pn-autoconf=red RECIPE_LATEST_VERSION_pn-autoconf=2.68 @@ -3018,7 +3025,7 @@ DISTRO_PN_ALIAS_pn-distcc = Debian=distcc Fedora=distcc RECIPE_STATUS_pn-flex=green RECIPE_LATEST_VERSION_pn-flex=2.5.35 RECIPE_LAST_UPDATE_pn-flex = Jun 20, 2010 -RECIPE_MANUAL_CHECK_DATE_pn-flex = Nov 16, 2011 +RECIPE_MANUAL_CHECK_DATE_pn-flex = Jan 10, 2012 RECIPE_MAINTAINER_pn-flex = Nitin A Kamble nitin.a.kam...@intel.com RECIPE_STATUS_pn-fstests=green @@ -3075,14 +3082,14 @@ RECIPE_MAINTAINER_pn-postinsts = Nitin A Kamble nitin.a.kam...@intel.com RECIPE_STATUS_pn-nasm=green RECIPE_LATEST_VERSION_pn-nasm=2.07 -RECIPE_MANUAL_CHECK_DATE_pn-nasm = Nov 16, 2011 RECIPE_LAST_UPDATE_pn-nasm = Jun 23, 2010 +RECIPE_MANUAL_CHECK_DATE_pn-nasm = Jan 10, 2012 RECIPE_MAINTAINER_pn-nasm = Nitin A Kamble nitin.a.kam...@intel.com RECIPE_STATUS_pn-btrfs-tools=green RECIPE_LATEST_VERSION_pn-btrfs-tools=git -RECIPE_MANUAL_CHECK_DATE_pn-btrfs-tools = Oct 18, 2011 -RECIPE_LAST_UPDATE_pn-btrfs-tools = Jun 09, 2011 +RECIPE_MANUAL_CHECK_DATE_pn-btrfs-tools = Jan 10, 2012 +RECIPE_LAST_UPDATE_pn-btrfs-tools = Jan 10, 2012 RECIPE_MAINTAINER_pn-btrfs-tools = Nitin A Kamble nitin.a.kam...@intel.com DISTRO_PN_ALIAS_pn-btrfs-tools = Debian=btrfs-tools Fedora=btrfs-progs @@ -3143,6 +3150,7 @@ DISTRO_PN_ALIAS_pn-python-pyrex = Mandriva=python-pyrex Ubuntu=python-pyrex RECIPE_STATUS_pn-python-scons=green RECIPE_LATEST_VERSION_pn-python-scons=2.1.0 RECIPE_LAST_UPDATE_pn-python-scons = Oct 18, 2011 +RECIPE_MANUAL_CHECK_DATE_pn-python-scons = Jan 10, 2012 DISTRO_PN_ALIAS_pn-python-scons = Fedora=scons OpenSuSE=scons Ubuntu=scons Mandriva=scons Debian=scons RECIPE_MANUAL_CHECK_DATE_pn-python-scons = Nov 16, 2011 RECIPE_MAINTAINER_pn-python-scons = Nitin A Kamble nitin.a.kam...@intel.com @@ -3160,7 +3168,7 @@ RECIPE_MAINTAINER_pn-quilt = Nitin A Kamble nitin.a.kam...@intel.com RECIPE_STATUS_pn-tcl=green RECIPE_LATEST_VERSION_pn-tcl=8.5.11 RECIPE_LAST_UPDATE_pn-tcl = Nov 16, 2011 -RECIPE_MANUAL_CHECK_DATE_pn-tcl = Nov 16, 2011 +RECIPE_MANUAL_CHECK_DATE_pn-tcl = Jan 10, 2012 RECIPE_MAINTAINER_pn-tcl = Nitin A Kamble nitin.a.kam...@intel.com RECIPE_STATUS_pn-unifdef=green # poky local source files @@ -3176,7 +3184,7 @@ RECIPE_MAINTAINER_pn-gnu-config = Nitin A Kamble nitin.a.kam...@intel.com RECIPE_STATUS_pn-mpfr=green RECIPE_LATEST_VERSION_pn-mpfr=3.1.0 -RECIPE_MANUAL_CHECK_DATE_pn-mpfr = Nov 15, 2011 +RECIPE_MANUAL_CHECK_DATE_pn-mpfr = Jan 10, 2012 RECIPE_LAST_UPDATE_pn-mpfr = Nov 15, 2011 RECIPE_MAINTAINER_pn-mpfr = Nitin A Kamble nitin.a.kam...@intel.com @@ -5992,10 +6000,6 @@ RECIPE_LAST_UPDATE_pn-mailx = Jul 1, 2011 RECIPE_MANUAL_CHECK_DATE_pn-mailx = Jul 28, 2011 RECIPE_MAINTAINER_pn-mailx = Kai Kang kai.k...@windriver.com -RECIPE_LATEST_VERSION_pn-libgcc = 4.5.1 -DISTRO_PN_ALIAS_pn-libgcc = Debian=libgcc4 Ubuntu=libgcc1 OpenSuSE=libgcc45
[OE-core] [PATCH 1/6] locale: fix package's provides tag
From: Nitin A Kamble nitin.a.kam...@intel.com
Fixes this bug: [YOCTO #1874]
Fixes an issue where a locale package depends on one package while it
also provides the same, as seen bellow.
Package: locale-base-de-de
Version: 2.12-r19
Depends: eglibc-binary-localedata-de-de
Provides: virtual-locale-de-de, virtual-locale-de,
eglibc-binary-localedata-de-de
Actually the eglibc-binary-localedata-de-de is ia separate package,
and it should not be part of provides of the locale-base-de-de.
Signed-off-by: Nitin A Kamble nitin.a.kam...@intel.com
---
meta/classes/libc-package.bbclass |3 ---
meta/recipes-core/eglibc/eglibc-locale.inc |2 +-
2 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/meta/classes/libc-package.bbclass
b/meta/classes/libc-package.bbclass
index 1796d3d..8cd5fec 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -248,9 +248,6 @@ python package_do_split_gconvs () {
libc_name = name
d.setVar('RDEPENDS_%s' % pkgname,
legitimize_package_name('%s-binary-localedata-%s' \
% (bpn, libc_name)))
- rprovides = (d.getVar('RPROVIDES_%s' % pkgname, True) or
).split()
-
rprovides.append(legitimize_package_name('%s-binary-localedata-%s' % (bpn,
libc_name)))
- d.setVar('RPROVIDES_%s' % pkgname, .join(rprovides))
commands = {}
diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc
b/meta/recipes-core/eglibc/eglibc-locale.inc
index d9720e4..b4646fa 100644
--- a/meta/recipes-core/eglibc/eglibc-locale.inc
+++ b/meta/recipes-core/eglibc/eglibc-locale.inc
@@ -26,7 +26,7 @@ BINARY_LOCALE_ARCHES ?= arm.* i[3-6]86 x86_64 powerpc mips
# set 0 for qemu emulation of native localedef for locale generation
LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = 1
-PR = r18
+PR = r19
PKGSUFFIX =
PKGSUFFIX_virtclass-nativesdk = -nativesdk
--
1.7.6.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/6] libpcre: upgrade from 8.20 to 8.21
From: Nitin A Kamble nitin.a.kam...@intel.com
Signed-off-by: Nitin A Kamble nitin.a.kam...@intel.com
---
.../libpcre/{libpcre_8.20.bb = libpcre_8.21.bb} |5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
rename meta/recipes-support/libpcre/{libpcre_8.20.bb = libpcre_8.21.bb} (93%)
diff --git a/meta/recipes-support/libpcre/libpcre_8.20.bb
b/meta/recipes-support/libpcre/libpcre_8.21.bb
similarity index 93%
rename from meta/recipes-support/libpcre/libpcre_8.20.bb
rename to meta/recipes-support/libpcre/libpcre_8.21.bb
index 58c6ecf..4eb65d7 100644
--- a/meta/recipes-support/libpcre/libpcre_8.20.bb
+++ b/meta/recipes-support/libpcre/libpcre_8.21.bb
@@ -12,8 +12,9 @@ SRC_URI = ${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \
file://pcre-cross.patch \
file://fix-pcre-name-collision.patch
-SRC_URI[md5sum] = a1931c70e1273e3450d5036fe273d25c
-SRC_URI[sha256sum] =
e06b0943ce4b0f15324a20020d6086760a75b72f5ad7c23b9b2bfe690ed49acd
+SRC_URI[md5sum] = 0a7b592bea64b7aa7f4011fc7171a730
+SRC_URI[sha256sum] =
a4b8509d11fc2764fb4e1415b764ad2c214459edc011ce48aeeb6bbe1ac599e3
+
S = ${WORKDIR}/pcre-${PV}
PROVIDES = pcre
--
1.7.6.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/6] diffstat: upgrade from 1.54 to 1.55
From: Nitin A Kamble nitin.a.kam...@intel.com
Signed-off-by: Nitin A Kamble nitin.a.kam...@intel.com
---
.../{diffstat_1.54.bb = diffstat_1.55.bb} |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/diffstat/{diffstat_1.54.bb = diffstat_1.55.bb}
(82%)
diff --git a/meta/recipes-devtools/diffstat/diffstat_1.54.bb
b/meta/recipes-devtools/diffstat/diffstat_1.55.bb
similarity index 82%
rename from meta/recipes-devtools/diffstat/diffstat_1.54.bb
rename to meta/recipes-devtools/diffstat/diffstat_1.55.bb
index ab89f62..fdc2967 100644
--- a/meta/recipes-devtools/diffstat/diffstat_1.54.bb
+++ b/meta/recipes-devtools/diffstat/diffstat_1.55.bb
@@ -6,13 +6,13 @@ HOMEPAGE = http://invisible-island.net/diffstat/;
SECTION = devel
LICENSE = MIT
LIC_FILES_CHKSUM =
file://install-sh;endline=42;md5=b3549726c1022bee09c174c72a0ca4a5
-PR = r1
+PR = r0
SRC_URI = ftp://invisible-island.net/diffstat/diffstat-${PV}.tgz \
file://dirfix.patch
-SRC_URI[md5sum] = af08bef2eb37050ceb0c4fddedb2ee36
-SRC_URI[sha256sum] =
d8e67660ec85be597f8548ecdd088926639dac34ec7184aaf9d09c1e6ecb83e5
+SRC_URI[md5sum] = 630d5278f1cd874dc3cc68cff3fddecf
+SRC_URI[sha256sum] =
59a46c75a99f2c373a81880051adc43a17b71c55478691e702c61c13c6d61b55
S = ${WORKDIR}/diffstat-${PV}
--
1.7.6.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/5] packageinfo.bbclass: add a new bbclass to pass package information
packageinfo.bbclass is to pass the accurate package information to
clients (e.g. Hob), including PN, PV, RDEPENDS, PKGSIZE, etc.
Signed-off-by: Dongxiao Xu dongxiao...@intel.com
---
meta/classes/packageinfo.bbclass | 30 ++
1 files changed, 30 insertions(+), 0 deletions(-)
create mode 100644 meta/classes/packageinfo.bbclass
diff --git a/meta/classes/packageinfo.bbclass b/meta/classes/packageinfo.bbclass
new file mode 100644
index 000..4a99b51
--- /dev/null
+++ b/meta/classes/packageinfo.bbclass
@@ -0,0 +1,30 @@
+python packageinfo_handler () {
+if isinstance(e, bb.event.TargetsTreeGenerated) or isinstance(e,
bb.event.BuildCompleted):
+import oe.packagedata
+pkginfolist = []
+tmpdir = e.data.getVar('TMPDIR', True)
+target_vendor = e.data.getVar('TARGET_VENDOR', True)
+target_os = e.data.getVar('TARGET_OS', True)
+package_archs = e.data.getVar('PACKAGE_ARCHS', True)
+packaging = e.data.getVar('PACKAGE_CLASSES',
True).split()[0].split('_')[1]
+deploy_dir = e.data.getVar('DEPLOY_DIR', True) + '/' + packaging
+for arch in package_archs.split():
+pkgdata_dir = tmpdir + '/pkgdata/' + arch + target_vendor + '-' +
target_os + '/runtime/'
+if os.path.exists(pkgdata_dir):
+for root, dirs, files in os.walk(pkgdata_dir):
+for pkgname in files:
+if pkgname.endswith('.packaged'):
+continue
+sdata = oe.packagedata.read_pkgdatafile(root + pkgname)
+sdata['PKG'] = pkgname
+pkgrename = sdata['PKG_%s' % pkgname]
+pkgv = sdata['PKGV']
+pkgr = sdata['PKGR']
+pkgname_path = deploy_dir + '/' + arch + '/' + pkgname
+ '-' + pkgv + '-' + pkgr + '.' + arch + '.' + packaging
+pkgrename_path = deploy_dir + '/' + arch + '/' +
pkgrename + '-' + pkgv + '-' + pkgr + '.' + arch + '.' + packaging
+if os.path.exists(pkgname_path) or
os.path.exists(pkgrename_path):
+pkginfolist.append(sdata)
+bb.event.fire(bb.event.PackageInfo(pkginfolist), e.data)
+}
+
+addhandler packageinfo_handler
--
1.7.0.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/5] package.bbclass: set package size into pkgdata for hob2's use
From: Shane Wang shane.w...@intel.com
Write the size of a package into its pkgdata for hob2 to get the size
and show on the UI for image making.
Signed-off-by: Shane Wang shane.w...@intel.com
Signed-off-by: Dongxiao Xu dongxiao...@intel.com
---
meta/classes/package.bbclass |8
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 9040eb4..8bde0b3 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1042,6 +1042,13 @@ python emit_pkgdata() {
f.write('%s: %s\n' % (var, encode(val)))
return
+ def get_directory_size(dir):
+ if os.listdir(dir):
+ size = int(os.popen('du -sk %s' %
dir).readlines()[0].split('\t')[0])
+ else:
+ size = 0
+ return size
+
packages = d.getVar('PACKAGES', True)
pkgdest = d.getVar('PKGDEST', 1)
pkgdatadir = d.getVar('PKGDESTWORK', True)
@@ -1090,6 +1097,7 @@ python emit_pkgdata() {
for dfile in (d.getVar('FILERDEPENDSFLIST_' + pkg, True) or
).split():
write_if_exists(sf, pkg, 'FILERDEPENDS_' + dfile)
+ sf.write('%s_%s: %s\n' % ('PKGSIZE', pkg,
get_directory_size(pkgdest + /%s % pkg)))
sf.close()
--
1.7.0.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/5 v2][PULL] Hob: oe-core related changes
Hi Richard, This is the second pull request for Hob oe-core related changes. Please help to review and pull. Note that this pull request has dependency on branch dxu4/hob-bitbake-changes-v2. Changes from v1: 1. Change the way to pass package information to GUI. In v1 we defined a do_packageinfo task to pass the package information of built recipes. Here we use a new approach to pass all the available package information to the client GUI. 2. Change the name for hob.bb and hob-toolchain.bb to dummy-image.bb and dummy-toolchain.bb. Thanks, Dongxiao The following changes since commit 9b944ae2f0e4dbac5a8f1f235f60730e56b26516: Richard Purdie (1): Revert site/common-uclibc: Cache gl_cv_func_wcwidth_works are available in the git repository at: git://git.pokylinux.org/poky-contrib dxu4/hob-oecore-changes-v2 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/hob-oecore-changes-v2 Dongxiao Xu (4): packageinfo.bbclass: add a new bbclass to pass package information dummy-image.bb: add an empty image template dummy-toolchain: add a new recipe dummy-toolchain layers: add a new folder to put user added layers Shane Wang (1): package.bbclass: set package size into pkgdata for hob2's use layers/README |1 + meta/classes/package.bbclass |8 +++ meta/classes/packageinfo.bbclass | 30 + meta/recipes-core/images/dummy-image.bb |1 + meta/recipes-core/meta/dummy-toolchain.bb | 10 + 5 files changed, 50 insertions(+), 0 deletions(-) create mode 100644 layers/README create mode 100644 meta/classes/packageinfo.bbclass create mode 100644 meta/recipes-core/images/dummy-image.bb create mode 100644 meta/recipes-core/meta/dummy-toolchain.bb ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/5] dummy-image.bb: add an empty image template
This recipe serves as the target when using Hob to generate image. Signed-off-by: Dongxiao Xu dongxiao...@intel.com --- meta/recipes-core/images/dummy-image.bb |1 + 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-core/images/dummy-image.bb diff --git a/meta/recipes-core/images/dummy-image.bb b/meta/recipes-core/images/dummy-image.bb new file mode 100644 index 000..c8d6f49 --- /dev/null +++ b/meta/recipes-core/images/dummy-image.bb @@ -0,0 +1 @@ +inherit image -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] dummy-toolchain: add a new recipe dummy-toolchain
This is a dummy recipe to build toolchain in Hob
Signed-off-by: Dongxiao Xu dongxiao...@intel.com
---
meta/recipes-core/meta/dummy-toolchain.bb | 10 ++
1 files changed, 10 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-core/meta/dummy-toolchain.bb
diff --git a/meta/recipes-core/meta/dummy-toolchain.bb
b/meta/recipes-core/meta/dummy-toolchain.bb
new file mode 100644
index 000..6535253
--- /dev/null
+++ b/meta/recipes-core/meta/dummy-toolchain.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = dummy toolchain
+LICENSE = MIT
+
+PR = r0
+
+LIC_FILES_CHKSUM =
file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420
+
+IMAGETEST ?= dummy
+inherit populate_sdk imagetest-${IMAGETEST}
--
1.7.0.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] layers: add a new folder to put user added layers
This is helpful for remote users to find the available layers in the bitbake server machine. Signed-off-by: Dongxiao Xu dongxiao...@intel.com --- layers/README |1 + 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 layers/README diff --git a/layers/README b/layers/README new file mode 100644 index 000..88747f4 --- /dev/null +++ b/layers/README @@ -0,0 +1 @@ +Please put extra layers (besides meta and meta-yocto) in this folder. -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] Distro-tracking: Update info for manual check recipes
From: Zhai Edwin edwin.z...@intel.com Saul, This is update for long time no check recipes. Pls. pull. Thanks, Edwin The following changes since commit 4a8a3c503fd896593b787c26edbe46a7324e494e: Revert site/common-uclibc: Cache gl_cv_func_wcwidth_works (2012-01-10 18:33:25 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib gzhai/master2 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/master2 Zhai Edwin (1): distro-tracking: Update info for webkit-gtk, web-webkit .../conf/distro/include/distro_tracking_fields.inc |7 --- 1 files changed, 4 insertions(+), 3 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 3/5] Incremental rpm image generation(Add config sample)
From: Robert Yang liezhi.y...@windriver.com Add the config sample for incremental image generation to meta-yocto/conf/local.conf.sample.extended [YOCTO #1651] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/conf/local.conf.sample.extended |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/meta/conf/local.conf.sample.extended b/meta/conf/local.conf.sample.extended index 7c26572..b901c5b 100644 --- a/meta/conf/local.conf.sample.extended +++ b/meta/conf/local.conf.sample.extended @@ -123,3 +123,10 @@ # The following is a list of classes to import to use in the generation of images # currently an example class is image_types_uboot # IMAGE_CLASSES = image_types_uboot + +# Incremental rpm image generation, the rootfs would be totally removed +# and re-created in the second generation by default, but with +# INC_RPM_IMAGE_GEN = 1, the rpm based rootfs would be kept, and will +# do update(remove/add some pkgs) on it. NOTE: This is not suggested +# when you want to create a productive rootfs +#INC_RPM_IMAGE_GEN = 1 -- 1.7.6.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 0/5] final items for M2 RC1
Richard, Here are the final items we discussed yesterday, a succesful build finished, and we seem to be in good shape, please pull these early in your day and fire up AB Master is you can. Thanks Sau! The following changes since commit 9b944ae2f0e4dbac5a8f1f235f60730e56b26516: Revert site/common-uclibc: Cache gl_cv_func_wcwidth_works (2012-01-10 18:32:16 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib sgw/stage http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage Lianhao Lu (2): meta/PRService: Added export/import fuctions. package.bbclass: per recipe PRSERV_HOST support Robert Yang (2): Incremental rpm image generation Incremental rpm image generation(Add config sample) Shane Wang (1): hdparm: upgrade to 9.37 meta/classes/image.bbclass | 11 ++- meta/classes/package.bbclass | 21 +++- meta/classes/package_rpm.bbclass | 73 +++-- meta/classes/prexport.bbclass | 45 meta/classes/primport.bbclass | 17 +++ meta/classes/prserv.bbclass| 36 +++ meta/classes/rootfs_rpm.bbclass|6 +- meta/conf/bitbake.conf |4 +- meta/conf/local.conf.sample.extended |7 ++ meta/conf/prexport.conf|1 + meta/conf/primport.conf|1 + meta/lib/oe/prservice.py | 113 .../recipes-extended/hdparm/hdparm-6.3/bswap.patch | 37 --- .../hdparm/hdparm-6.3/uclibc.patch | 34 -- meta/recipes-extended/hdparm/hdparm_6.3.bb | 18 --- meta/recipes-extended/hdparm/hdparm_9.37.bb| 36 ++ meta/recipes-extended/stat/stat_3.3.bb | 27 + scripts/bitbake-prserv-tool| 57 ++ 18 files changed, 415 insertions(+), 129 deletions(-) create mode 100644 meta/classes/prexport.bbclass create mode 100644 meta/classes/primport.bbclass create mode 100644 meta/conf/prexport.conf create mode 100644 meta/conf/primport.conf create mode 100644 meta/lib/oe/prservice.py delete mode 100644 meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch delete mode 100644 meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch delete mode 100644 meta/recipes-extended/hdparm/hdparm_6.3.bb create mode 100644 meta/recipes-extended/hdparm/hdparm_9.37.bb create mode 100644 meta/recipes-extended/stat/stat_3.3.bb create mode 100755 scripts/bitbake-prserv-tool -- 1.7.6.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 2/5] Incremental rpm image generation
From: Robert Yang liezhi.y...@windriver.com
Incremental rpm image generation, the rootfs would be totally removed and
re-created in the second generation by default, but with
INC_RPM_IMAGE_GEN = 1, the rpm based rootfs would be kept, and will do
update(remove/add some pkgs) on it.
NOTE: This is not suggested when you want to create a productive rootfs
For example:
1) Add the follow config option to a conf file:
INC_RPM_IMAGE_GEN = 1
2) bitbake core-image-sato
modify a package
bitbake core-image-sato
The rootfs would not be totally removed and re-created in the second
generation, it would be simply updated based on the package.
Implatation:
1) Figure out the pkg which need to be removed or re-installed, then use
'rpm -e to remove the old one. Use the rpm's BUILDTIME to determine
which pkg has been rebuilt.
2) Figure out the pkg which is newly added, and use 'rpm -U' to install
it.
This only for the rpm based rootfs, the deb and ipk based rootfs would
be done later.
[YOCTO #1651]
Signed-off-by: Robert Yang liezhi.y...@windriver.com
---
meta/classes/image.bbclass | 11 +-
meta/classes/package_rpm.bbclass | 73 -
meta/classes/rootfs_rpm.bbclass |6 +++-
3 files changed, 77 insertions(+), 13 deletions(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 295b653..3034725 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -134,15 +134,22 @@ do_rootfs[umask] = 022
fakeroot do_rootfs () {
#set -x
- rm -rf ${IMAGE_ROOTFS}
+# When use the rpm incremental image generation, don't remove the rootfs
+if [ ${INC_RPM_IMAGE_GEN} != 1 -o ${IMAGE_PKGTYPE} != rpm ]; then
+rm -rf ${IMAGE_ROOTFS}
+fi
rm -rf ${MULTILIB_TEMP_ROOTFS}
mkdir -p ${IMAGE_ROOTFS}
mkdir -p ${DEPLOY_DIR_IMAGE}
cp ${COREBASE}/meta/files/deploydir_readme.txt
${DEPLOY_DIR_IMAGE}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt
- if [ ${USE_DEVFS} != 1 ]; then
+# If ${IMAGE_ROOTFS}/dev exists, then the device had been made by
+# the previous build
+ if [ ${USE_DEVFS} != 1 -a ! -r ${IMAGE_ROOTFS}/dev ]; then
for devtable in ${@get_devtable_list(d)}; do
+# Always return ture since there maybe already one when use the
+# incremental image generation
makedevs -r ${IMAGE_ROOTFS} -D $devtable
done
fi
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index d03dc3f..2d92efe 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -147,6 +147,67 @@ resolve_package_rpm () {
echo $pkg_name
}
+# rpm common command and options
+rpm_common_comand () {
+
+local target_rootfs=${INSTALL_ROOTFS_RPM}
+local extra_args=$@
+
+${RPM} --root ${target_rootfs} \
+--predefine _rpmds_sysinfo_path ${target_rootfs}/etc/rpm/sysinfo \
+--predefine _rpmrc_platform_path ${target_rootfs}/etc/rpm/platform \
+-D _var ${localstatedir} \
+-D _dbpath ${rpmlibdir} \
+--noparentdirs --nolinktos \
+-D __dbi_txn create nofsync private \
+-D _cross_scriptlet_wrapper ${WORKDIR}/scriptlet_wrapper $extra_args
+}
+
+# install or remove the pkg
+rpm_update_pkg () {
+
+local target_rootfs=${INSTALL_ROOTFS_RPM}
+
+# Save the rpm's build time for incremental image generation, and the file
+# would be moved to ${T}
+rm -f ${target_rootfs}/install/total_solution_bt.manifest
+for i in `cat ${target_rootfs}/install/total_solution.manifest`; do
+# Use rpm rather than ${RPM} here, since we don't need the
+# '--dbpath' option
+echo $i `rpm -qp --qf '%{BUILDTIME}\n' $i` \
+${target_rootfs}/install/total_solution_bt.manifest
+done
+
+# Only install the different pkgs if incremental image generation is set
+if [ ${INC_RPM_IMAGE_GEN} = 1 -a -f ${T}/total_solution_bt.manifest -a
\
+${IMAGE_PKGTYPE} = rpm ]; then
+cur_list=${target_rootfs}/install/total_solution_bt.manifest
+pre_list=${T}/total_solution_bt.manifest
+sort -u $cur_list -o $cur_list
+sort -u $pre_list -o $pre_list
+comm -1 -3 $cur_list $pre_list | sed 's#.*/\(.*\)\.rpm .*#\1#' \
+${target_rootfs}/install/remove.manifest
+comm -2 -3 $cur_list $pre_list | awk '{print $1}' \
+${target_rootfs}/install/incremental.manifest
+
+# Attempt to remove unwanted pkgs, the scripts(pre, post, etc.) has not
+# been run by now, so don't have to run them(preun, postun, etc.) when
+# erase the pkg
+if [ -s ${target_rootfs}/install/remove.manifest ]; then
+rpm_common_comand --noscripts --nodeps \
+-e `cat ${target_rootfs}/install/remove.manifest`
+fi
+
+# Attempt to install the incremental pkgs
+
[OE-core] [CONSOLIDATED PULL 1/5] hdparm: upgrade to 9.37
From: Shane Wang shane.w...@intel.com
Because hdparm depends on stat, stat is brought into Yocto, and it is a new
dependency.
Part of this patch comes from oe
http://git.openembedded.org/openembedded/tree/recipes/hdparm, and
http://git.openembedded.org/openembedded/tree/recipes/stat.
But, changes include:
- upgrade to the latest version 9.37 from 9.35.
- added license checksum for both recipes.
- for hdparm, the license for wiper which is in hdparm is GPLv2.
Signed-off-by: Shane Wang shane.w...@intel.com
---
.../recipes-extended/hdparm/hdparm-6.3/bswap.patch | 37
.../hdparm/hdparm-6.3/uclibc.patch | 34 --
meta/recipes-extended/hdparm/hdparm_6.3.bb | 18 -
meta/recipes-extended/hdparm/hdparm_9.37.bb| 36 +++
meta/recipes-extended/stat/stat_3.3.bb | 27 ++
5 files changed, 63 insertions(+), 89 deletions(-)
delete mode 100644 meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch
delete mode 100644 meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch
delete mode 100644 meta/recipes-extended/hdparm/hdparm_6.3.bb
create mode 100644 meta/recipes-extended/hdparm/hdparm_9.37.bb
create mode 100644 meta/recipes-extended/stat/stat_3.3.bb
diff --git a/meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch
b/meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch
deleted file mode 100644
index 715886a..000
--- a/meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Upstream-Status: Backport
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
hdparm-5.8/hdparm.c~bswap
-+++ hdparm-5.8/hdparm.c
-@@ -20,7 +20,9 @@
- #include linux/types.h
- #include linux/hdreg.h
- #include linux/major.h
--#include asm/byteorder.h
-+#include byteswap.h
-+
-+#define le16_to_cpus(x) bswap_16(htons(x))
-
- #include hdparm.h
-
-@@ -1160,7 +1162,7 @@
- }
- } else {
- for(i = 0; i 0x100; ++i) {
-- __le16_to_cpus(id[i]);
-+ le16_to_cpus(id[i]);
- }
- identify((void *)id, NULL);
- }
-@@ -1380,7 +1382,7 @@
- }
- for (i = 0; count = 4; ++i) {
- sbuf[i] = (fromhex(b[0]) 12) | (fromhex(b[1]) 8) |
(fromhex(b[2]) 4) | fromhex(b[3]);
-- __le16_to_cpus((__u16 *)(sbuf[i]));
-+ le16_to_cpus((__u16 *)(sbuf[i]));
- b += 5;
- count -= 5;
- }
diff --git a/meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch
b/meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch
deleted file mode 100644
index d5f9298..000
--- a/meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
hdparm-5.8/hdparm.c.ark2005-05-22 19:48:34.0 +
-+++ hdparm-5.8/hdparm.c2005-05-22 19:52:18.0 +
-@@ -17,7 +17,9 @@
- #include sys/times.h
- #include sys/types.h
- #include sys/mount.h
-+#ifndef __UCLIBC__
- #include linux/types.h
-+#endif
- #include linux/hdreg.h
- #include linux/major.h
- #include byteswap.h
hdparm-5.8/hdparm.h.ark2005-05-22 19:51:49.0 +
-+++ hdparm-5.8/hdparm.h2005-05-22 19:54:54.0 +
-@@ -1,6 +1,6 @@
- /* Some prototypes for extern functions. */
-
--#include linux/types.h /* for __u16 */
-+#include stdint.h
-
- #if !defined(__GNUC__) !defined(__attribute__)
- #define __attribute__(x) /* if not using GCC, turn off the __attribute__
-@@ -11,7 +11,7 @@
-others, though, were declared in hdparm.c with global scope; since other
-functions in that file have static (file) scope, I assume the difference is
-intentional. */
--extern void identify (__u16 *id_supplied, const char *devname);
-+extern void identify (uint16_t *id_supplied, const char *devname);
-
- extern void usage_error(int out)__attribute__((noreturn));
- extern int main(int argc, char **argv) __attribute__((noreturn));
-
diff --git a/meta/recipes-extended/hdparm/hdparm_6.3.bb
b/meta/recipes-extended/hdparm/hdparm_6.3.bb
deleted file mode 100644
index 62ae4c0..000
--- a/meta/recipes-extended/hdparm/hdparm_6.3.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = Utility for displaying and setting hard disk parameters
-DESCRIPTION = hdparm is a system utility for viewing \
-and manipulating various IDE drive and driver parameters.
-SECTION = console/utils
-LICENSE = BSD
-LIC_FILES_CHKSUM = file://LICENSE.TXT;md5=910a8a42c962d238619c75fdb78bdb24
-
-SRC_URI = ${SOURCEFORGE_MIRROR}/hdparm/hdparm-${PV}.tar.gz \
- file://bswap.patch \
- file://uclibc.patch
-
-SRC_URI[md5sum] = 0c12672f3a09c14ad0b0882f15fc9389
-SRC_URI[sha256sum] =
08688a6a46ba495494bf838f8f26103e797584c1888eca94e43a171e1b37246d
-
-do_install () {
- install -d ${D}/${sbindir} ${D}/${mandir}/man8
[OE-core] [CONSOLIDATED PULL 4/5] meta/PRService: Added export/import fuctions.
From: Lianhao Lu lianhao...@intel.com
[YOCTO #1556]
- Modified meta/class/package.bbclass and prserv.bbclass according to
the change in PR service by adding PACKAGE_ARCH into the query tuple.
- Added prexport.bbclass, primport.bbclass to export/import AUTOPR
values from/to PRService.
- Move PR service related common code to lib/oe/prservice.py.
- Supported reading the AUTOPR values from the exported .inc file
instead of reading it from remote PR service.
- Created a new script bitbake-prserv-tool to export/import the AUTOPR
values from/to the PR service.
Typical usage scenario of the export/import is:
1. bitbake-prserv-tool export file to export the AUTOPR values from
the current PR service into an exported .inc file.
2. Others may use that exported .inc file(to be included in the
local.conf) to lockdown and reproduce the same AUTOPR when generating
package feeds.
3. Others may bitbake-prserv-tool import file to import the AUTOPR
values into their own PR service and the AUTOPR values will be
incremented from there.
Signed-off-by: Lianhao Lu lianhao...@intel.com
---
meta/classes/package.bbclass | 13 -
meta/classes/prexport.bbclass | 45
meta/classes/primport.bbclass | 17 ++
meta/classes/prserv.bbclass | 36 +
meta/conf/bitbake.conf|4 +-
meta/conf/prexport.conf |1 +
meta/conf/primport.conf |1 +
meta/lib/oe/prservice.py | 113 +
scripts/bitbake-prserv-tool | 57 +
9 files changed, 260 insertions(+), 27 deletions(-)
create mode 100644 meta/classes/prexport.bbclass
create mode 100644 meta/classes/primport.bbclass
create mode 100644 meta/conf/prexport.conf
create mode 100644 meta/conf/primport.conf
create mode 100644 meta/lib/oe/prservice.py
create mode 100755 scripts/bitbake-prserv-tool
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 9040eb4..65e6571 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -351,10 +351,17 @@ def runtime_mapping_rename (varname, d):
python package_get_auto_pr() {
if d.getVar('USE_PR_SERV', True) != 0:
- auto_pr=prserv_get_pr_auto(d)
- if auto_pr is None:
- bb.fatal(Can NOT get auto PR revision from remote PR
service)
+ try:
+ auto_pr=prserv_get_pr_auto(d)
+ except Exception as e:
+ bb.fatal(Can NOT get PRAUTO, exception %s % str(e))
return
+ if auto_pr is None:
+ if d.getVar('PRSERV_LOCKDOWN', True):
+ bb.fatal(Can NOT get PRAUTO from lockdown
exported file)
+ else:
+ bb.fatal(Can NOT get PRAUTO from remote PR
service)
+ return
d.setVar('PRAUTO',str(auto_pr))
}
diff --git a/meta/classes/prexport.bbclass b/meta/classes/prexport.bbclass
new file mode 100644
index 000..5b5b707
--- /dev/null
+++ b/meta/classes/prexport.bbclass
@@ -0,0 +1,45 @@
+PRSERV_DUMPOPT_VERSION = ${PRAUTOINX}
+PRSERV_DUMPOPT_PKGARCH =
+PRSERV_DUMPOPT_CHECKSUM =
+PRSERV_DUMPOPT_COL = 0
+
+PRSERV_DUMPDIR ??= ${LOG_DIR}/db
+PRSERV_DUMPFILE ??= ${PRSERV_DUMPDIR}/prserv.inc
+
+python prexport_handler () {
+import bb.event
+if not e.data:
+return
+
+if isinstance(e, bb.event.RecipeParsed):
+import oe.prservice
+#get all PR values for the current PRAUTOINX
+ver = e.data.getVar('PRSERV_DUMPOPT_VERSION', True)
+ver = ver.replace('%','-')
+retval = oe.prservice.prserv_dump_db(e.data)
+if not retval:
+bb.fatal(prexport_handler: export failed!)
+(metainfo, datainfo) = retval
+if not datainfo:
+bb.error(prexport_handler: No AUROPR values found for %s % ver)
+return
+oe.prservice.prserv_export_tofile(e.data, None, datainfo, False)
+elif isinstance(e, bb.event.ParseStarted):
+import bb.utils
+#remove dumpfile
+bb.utils.remove(e.data.getVar('PRSERV_DUMPFILE', True))
+elif isinstance(e, bb.event.ParseCompleted):
+import oe.prservice
+#dump meta info of tables
+d = e.data.createCopy()
+d.setVar('PRSERV_DUMPOPT_COL', 1)
+retval = oe.prservice.prserv_dump_db(d)
+if not retval:
+bb.error(prexport_handler: export failed!)
+return
+(metainfo, datainfo) = retval
+oe.prservice.prserv_export_tofile(d, metainfo, None, True)
+
+}
+
+addhandler prexport_handler
diff --git a/meta/classes/primport.bbclass b/meta/classes/primport.bbclass
new file mode 100644
index 000..08e5a8f
--- /dev/null
+++ b/meta/classes/primport.bbclass
@@ -0,0 +1,17 @@
+python primport_handler () {
+import bb.event
+if not e.data:
+return
+
+if
[OE-core] [CONSOLIDATED PULL 5/5] package.bbclass: per recipe PRSERV_HOST support
From: Lianhao Lu lianhao...@intel.com
[YOCTO #1126]
Added per recipe PRSERV_HOST PRSERV_PORT support.
Signed-off-by: Lianhao Lu lianhao...@intel.com
---
meta/classes/package.bbclass |8
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 65e6571..f8f0a12 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -350,6 +350,14 @@ def runtime_mapping_rename (varname, d):
#
python package_get_auto_pr() {
+ # per recipe PRSERV_HOST PRSERV_PORT
+ pn = d.getVar('PN', True)
+ host = d.getVar(PRSERV_HOST_ + pn, True)
+ port = d.getVar(PRSERV_PORT_ + pn, True)
+ if not (host is None):
+ d.setVar(PRSERV_HOST, host)
+ if not (port is None):
+ d.setVar(PRSERV_PORT, port)
if d.getVar('USE_PR_SERV', True) != 0:
try:
auto_pr=prserv_get_pr_auto(d)
--
1.7.6.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/1] archive.bbclass: archive work directory
From: Wenzong Fan wenzong@windriver.com
Some legal departments believe a complete archive of the work directory
is required for certain license compliance issues. We could therefore
do with a class which archives up the work directories in each build and
provide them so those legal departments can be happy.
Implementations:
Add a new class named 'archive.bbclass' to provide task 'do_archive',
and get it called after 'do_patch' before 'do_configure'.
Following cases should be considered to the sources dirs:
1) The sources dir is under $WORKDIR:
Just archive sources and temp/run.* up.
2) The sources dir is outside of $WORKDIR, such as gcc:
Copy its sources and temp/run.* to a temporary dir and then archive
them up.
3) The sources dir is equal to $WORKDIR:
Just archive whole work dir up.
[YOCTO #1590]
Signed-off-by: Wenzong Fan wenzong@windriver.com
---
meta/classes/archive.bbclass | 49 ++
1 files changed, 49 insertions(+), 0 deletions(-)
create mode 100644 meta/classes/archive.bbclass
diff --git a/meta/classes/archive.bbclass b/meta/classes/archive.bbclass
new file mode 100644
index 000..e529793
--- /dev/null
+++ b/meta/classes/archive.bbclass
@@ -0,0 +1,49 @@
+# Archive the patched sources and build scripts to assist in license
+# compliance by the end user or legal departments.
+
+ARCHIVE_DIR = ${TMPDIR}/archives/${MULTIMACH_TARGET_SYS}/
+do_archive[dirs] = ${ARCHIVE_DIR}
+
+archive_do_archive() {
+# In mostly scenarios the $S is under $WORKDIR and has a separate
+# dir for storing the sources; but sometimes we also put the same
+# sources 'tmp/work-shared/' for sharing between different build.
+if [ -d ${S} -a ${S} != ${WORKDIR} ]; then
+sources_shared=0
+
+if echo ${S} | grep ${TMPDIR}/work-shared /dev/null; then
+sources_shared=1
+fi
+
+if [ x$sources_shared == x1 ]; then
+# Create temporary sources directory
+mkdir -p ${PF}/temp
+cp -r ${S} ${PF}
+cp -r ${S}/../temp/* ${PF}/temp
+cp -r ${WORKDIR}/temp/* ${PF}/temp
+tarbase=`pwd`
+sourcedir=`basename ${S}`
+else
+tarbase=`dirname ${WORKDIR}`
+sourcedir=`echo ${S}|sed -e s#${WORKDIR}/*##g`
+fi
+
+tar -C $tarbase -cjf ${PF}.tar.bz2 ${PF}/$sourcedir \
+${PF}/temp --exclude log.do_*
+
+# Remove the temporary sources directory
+if [ x$sources_shared == x1 -a -d ${PF} ]; then
+rm -rf ${PF}
+fi
+fi
+
+# Just archive whole build directory up when $S is equal to $WORKDIR
+if [ -d ${S} -a ${S} == ${WORKDIR} ]; then
+tarbase=`dirname ${WORKDIR}`
+tar -C $tarbase -cjf ${PF}.tar.bz2 ${PF} --exclude log.do_*
+fi
+}
+
+addtask do_archive after do_patch before do_configure
+
+EXPORT_FUNCTIONS do_archive
--
1.7.0.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
