[PATCH 0/4] Integration of latest swabber

[PATCH 0/4] Integration of latest swabber

[Alex deVries]

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 <alex.devries@windriver.com>
---


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.

[Alex deVries]

---
 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

diff --git a/meta/classes/image-swab.bbclass b/meta/classes/image-swab.bbclass
index 93918bf..c9b321c 100644
--- a/meta/classes/image-swab.bbclass
+++ b/meta/classes/image-swab.bbclass
@@ -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} ${OEROOT} /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
diff --git a/meta/conf/swabber/Ubuntu-10.04.1-64/blacklist b/meta/conf/swabber/Ubuntu-10.04.1-64/blacklist
new file mode 100644
index 0000000..5fdb8f2
--- /dev/null
+++ b/meta/conf/swabber/Ubuntu-10.04.1-64/blacklist
@@ -0,0 +1,6 @@
+libneon27-gnutls
+openjdk-6-jre-headless
+openjdk-6-jre-lib
+openjdk-6-jre
+libdbus-1-3
+libneon27-gnutls
diff --git a/meta/conf/swabber/Ubuntu-10.04.1-64/filters b/meta/conf/swabber/Ubuntu-10.04.1-64/filters
new file mode 100644
index 0000000..a447f70
--- /dev/null
+++ b/meta/conf/swabber/Ubuntu-10.04.1-64/filters
@@ -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
diff --git a/meta/conf/swabber/Ubuntu-10.04.1-64/whitelist b/meta/conf/swabber/Ubuntu-10.04.1-64/whitelist
new file mode 100644
index 0000000..f0fe963
--- /dev/null
+++ b/meta/conf/swabber/Ubuntu-10.04.1-64/whitelist
@@ -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
diff --git a/meta/conf/swabber/generic/blacklist b/meta/conf/swabber/generic/blacklist
new file mode 100644
index 0000000..396bcb4
--- /dev/null
+++ b/meta/conf/swabber/generic/blacklist
@@ -0,0 +1,2 @@
+udev
+dkpg
diff --git a/meta/conf/swabber/generic/filters b/meta/conf/swabber/generic/filters
new file mode 100644
index 0000000..3b10fcb
--- /dev/null
+++ b/meta/conf/swabber/generic/filters
@@ -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
diff --git a/meta/conf/swabber/generic/whitelist b/meta/conf/swabber/generic/whitelist
new file mode 100644
index 0000000..48ec2af
--- /dev/null
+++ b/meta/conf/swabber/generic/whitelist
@@ -0,0 +1,15 @@
+bash
+bzip2
+ccache
+coreutils
+cpp
+file
+findutils
+gawk
+grep
+hostname
+make
+sed
+tar
+util-linux
+zlib1g
-- 
1.7.0.4

[PATCH 2/4] Swabber's update_distro automatically updates the blob now.

[Alex deVries]

---
 meta/classes/image-swab.bbclass |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/meta/classes/image-swab.bbclass b/meta/classes/image-swab.bbclass
index c9b321c..7cb1c1e 100644
--- a/meta/classes/image-swab.bbclass
+++ b/meta/classes/image-swab.bbclass
@@ -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}
-- 
1.7.0.4

[PATCH 3/4] Calculate CCACHE_DIR by calling host's ccache config.

[Alex deVries]

---
 meta/classes/image-swab.bbclass |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/meta/classes/image-swab.bbclass b/meta/classes/image-swab.bbclass
index 7cb1c1e..d0fb009 100644
--- a/meta/classes/image-swab.bbclass
+++ b/meta/classes/image-swab.bbclass
@@ -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}
-- 
1.7.0.4

[PATCH 4/4] Update to the latest swabber.

[Alex deVries]

---
 .../conf/distro/include/poky-default-revisions.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index c5a0c7f..4f42a18 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -150,7 +150,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-table ??= "4b267533ce16656cba4104fc39dc12709c1bdddf"
 SRCREV_pn-tasks ??= "ea52d46d691c5fce4473ea4e24a35411381f3a65"
 SRCREV_pn-trace-cmd ??= "0d252224626bd6926324f023a65f20c165232891"
-- 
1.7.0.4