Update to latest swabber
cover Update to latest swabber
I'm resending this as I forgot to sign off the changes.
Merge of latest swabber and interface code. Highlights are:
- include distro filter files
- calculate ccache directory properly
- use latest version of swabber.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: adevries/swabber
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=adevries/swabber
Thanks,
Alex deVries <[email protected]>
---
Alex deVries (4):
Stop using hardcoded paths, use new Ubuntu and generic filters. Swabber's update_distro automatically updates the blob now. Calculate CCACHE_DIR by calling host's ccache config. Update to the latest swabber.
meta/classes/image-swab.bbclass | 12 +++++----- .../conf/distro/include/poky-default-revisions.inc | 2 +- meta/conf/swabber/Ubuntu-10.04.1-64/blacklist | 6 +++++ meta/conf/swabber/Ubuntu-10.04.1-64/filters | 7 ++++++ meta/conf/swabber/Ubuntu-10.04.1-64/whitelist | 23 ++++++++++++++++++++ meta/conf/swabber/generic/blacklist | 2 + meta/conf/swabber/generic/filters | 10 ++++++++ meta/conf/swabber/generic/whitelist | 15 +++++++++++++ 8 files changed, 70 insertions(+), 7 deletions(-) create mode 100644 meta/conf/swabber/Ubuntu-10.04.1-64/blacklist create mode 100644 meta/conf/swabber/Ubuntu-10.04.1-64/filters create mode 100644 meta/conf/swabber/Ubuntu-10.04.1-64/whitelist create mode 100644 meta/conf/swabber/generic/blacklist create mode 100644 meta/conf/swabber/generic/filters create mode 100644 meta/conf/swabber/generic/whitelist
PATCH 1/4 Stop using hardcoded paths, use new Ubuntu and generic filters.
--- meta/classes/image-swab.bbclass | 2 +- meta/conf/swabber/Ubuntu-10.04.1-64/blacklist | 6 ++++++ meta/conf/swabber/Ubuntu-10.04.1-64/filters | 7 +++++++ meta/conf/swabber/Ubuntu-10.04.1-64/whitelist | 23 +++++++++++++++++++++++ meta/conf/swabber/generic/blacklist | 2 ++ meta/conf/swabber/generic/filters | 10 ++++++++++ meta/conf/swabber/generic/whitelist | 15 +++++++++++++++ 7 files changed, 64 insertions(+), 1 deletions(-) create mode 100644 meta/conf/swabber/Ubuntu-10.04.1-64/blacklist create mode 100644 meta/conf/swabber/Ubuntu-10.04.1-64/filters create mode 100644 meta/conf/swabber/Ubuntu-10.04.1-64/whitelist create mode 100644 meta/conf/swabber/generic/blacklist create mode 100644 meta/conf/swabber/generic/filters create mode 100644 meta/conf/swabber/generic/whitelist
meta/classes/image-swab.bbclass +1 -1
@@ -74,7 +74,7 @@ do_generate_swabber_report () { if [ "$(ls -A ${HOST_DATA})" ]; then echo "Generating swabber report" - swabber -d ${HOST_DATA} -l ${SWABBER_LOGS} -o ${SWABBER_REPORT}/report-${REPORTSTAMP}.txt -r ${SWABBER_REPORT}/extra_report-${REPORTSTAMP}.txt -c all -p ${TOPDIR} ${POKYBASE} /tmp /dev /proc /usr/lib/python2.6 /usr/local/lib/python2.6 /usr/lib/pymodules /etc/ld.so.cache + swabber -d ${HOST_DATA} -l ${SWABBER_LOGS} -o ${SWABBER_REPORT}/report-${REPORTSTAMP}.txt -r ${SWABBER_REPORT}/extra_report-${REPORTSTAMP}.txt -c all -p ${TOPDIR} -f ${OEROOT}/meta/conf/swabber ${TOPDIR} ${OEROOT} ${CCACHE_DIR} else echo "No host data, cannot generate swabber report." fi
meta/conf/swabber/Ubuntu-10.04.1-64/blacklist new file +6 -0
@@ -0,0 +1,6 @@ +libneon27-gnutls +openjdk-6-jre-headless +openjdk-6-jre-lib +openjdk-6-jre +libdbus-1-3 +libneon27-gnutls
meta/conf/swabber/Ubuntu-10.04.1-64/filters new file +7 -0
@@ -0,0 +1,7 @@ +/usr/local/lib/python2.6 +/usr/lib/python2.6 +/usr/lib/pymodules/python2.6 +/usr/lib/perl/5.10 +# which is part of the debianutils packages, but we don't want to put the entire +# debianutils package in the whitelist. +/usr/bin/which
meta/conf/swabber/Ubuntu-10.04.1-64/whitelist new file +23 -0
@@ -0,0 +1,23 @@ +base-files +dash +libacl1 +libattr1 +libbz2-1.0 +libc6 +libc-bin +libglib2.0-0 +libncurses5 +libselinux1 +libsqlite3-0 +libssl0.9.8 +mime-support +perl-base +python2.6 +python2.6-minimal +python-apport +python-gst0.10 +python-imaging +python-minimal +python-support +python-zope.interface +zlib1g
meta/conf/swabber/generic/blacklist new file +2 -0
@@ -0,0 +1,2 @@ +udev +dkpg
meta/conf/swabber/generic/filters new file +10 -0
@@ -0,0 +1,10 @@ +/tmp +/etc/localtime +/etc/ld.so.cache +/etc/ld.so.conf +/etc/passwd +/etc/group +/etc/nsswitch.conf +/proc +/dev/null +/dev/tty
meta/conf/swabber/generic/whitelist new file +15 -0
@@ -0,0 +1,15 @@ +bash +bzip2 +ccache +coreutils +cpp +file +findutils +gawk +grep +hostname +make +sed +tar +util-linux +zlib1g
Signature · 1 line
1.7.0.4
PATCH 2/4 Swabber's update_distro automatically updates the blob now.
In reply to Alex deVries--- meta/classes/image-swab.bbclass | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-)
meta/classes/image-swab.bbclass +1 -5
@@ -60,12 +60,8 @@ python() { } do_generate_swabber_report () { - echo "Updating host data" - # Ensure we have the very latest host information - if [ "${NOSWABBERUPDATE}" != "1" ]; then - update_distro ${HOST_DATA} - fi + update_distro ${HOST_DATA} # Swabber can't create the directory for us mkdir -p ${SWABBER_REPORT}
Signature · 1 line
1.7.0.4
PATCH 3/4 Calculate CCACHE_DIR by calling host's ccache config.
In reply to Alex deVries--- meta/classes/image-swab.bbclass | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
meta/classes/image-swab.bbclass +4 -0
@@ -68,6 +68,10 @@ do_generate_swabber_report () { REPORTSTAMP=${SWAB_ORIG_TASK}-`date +%2m%2d%2H%2M%Y` + if [ `which ccache` ] ; then + CCACHE_DIR=`( ccache -s | grep "cache directory" | grep -o '[^ ]*$' 2> /dev/null )` + fi + if [ "$(ls -A ${HOST_DATA})" ]; then echo "Generating swabber report" swabber -d ${HOST_DATA} -l ${SWABBER_LOGS} -o ${SWABBER_REPORT}/report-${REPORTSTAMP}.txt -r ${SWABBER_REPORT}/extra_report-${REPORTSTAMP}.txt -c all -p ${TOPDIR} -f ${OEROOT}/meta/conf/swabber ${TOPDIR} ${OEROOT} ${CCACHE_DIR}
Signature · 1 line
1.7.0.4
PATCH 4/4 Update to the latest swabber.
In reply to Alex deVries--- .../conf/distro/include/poky-default-revisions.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
meta/conf/distro/include/poky-default-revisions.inc +1 -1
@@ -164,7 +164,7 @@ SRCREV_pn-qemugl-nativesdk ??= "d888bbc723c00d197d34a39b5b7448660ec1b1c0" SRCREV_pn-sat-solver = "aa799f7bae0ec055e0e527203635001bb7346dbc" SRCREV_pn-screenshot ??= "292" SRCREV_pn-settings-daemon ??= "2059" -SRCREV_pn-swabber-native ??= "1ffb646ffd4266afae181286e45d1b6f7965c47e" +SRCREV_pn-swabber-native ??= "a0792390c5d6d5a5bade7ab155c80eef3f30fa52" SRCREV_pn-sysprof ??= "38a6af1f0a45e528fd2842983da71e0f23c70d6a" SRCREV_pn-table ??= "4b267533ce16656cba4104fc39dc12709c1bdddf" SRCREV_pn-tasks ??= "ea52d46d691c5fce4473ea4e24a35411381f3a65"
Signature · 1 line
1.7.0.4