summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlex deVries <alex.devries@windriver.com>2010-11-15 16:12:08 -0500
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-17 10:47:02 +0000
commitb544d01c23d9b9692feacc75531214d06e6b7e56 (patch)
tree9588e7824ea48f9798deacc06f5800c39fd7ef74 /meta
parent8021200c3e6fb05b6211a6f38a68afb08486bdc2 (diff)
downloadpoky-b544d01c23d9b9692feacc75531214d06e6b7e56.tar.gz
Stop using hardcoded paths, use new Ubuntu and generic filters.
Signed-off-by: Alex deVries <alex.devries@windriver.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/image-swab.bbclass2
-rw-r--r--meta/conf/swabber/Ubuntu-10.04.1-64/blacklist6
-rw-r--r--meta/conf/swabber/Ubuntu-10.04.1-64/filters7
-rw-r--r--meta/conf/swabber/Ubuntu-10.04.1-64/whitelist23
-rw-r--r--meta/conf/swabber/generic/blacklist2
-rw-r--r--meta/conf/swabber/generic/filters10
-rw-r--r--meta/conf/swabber/generic/whitelist15
7 files changed, 64 insertions, 1 deletions
diff --git a/meta/classes/image-swab.bbclass b/meta/classes/image-swab.bbclass
index fc1eccb7f4..9ddd1c986c 100644
--- a/meta/classes/image-swab.bbclass
+++ b/meta/classes/image-swab.bbclass
@@ -74,7 +74,7 @@ do_generate_swabber_report () {
74 74
75 if [ "$(ls -A ${HOST_DATA})" ]; then 75 if [ "$(ls -A ${HOST_DATA})" ]; then
76 echo "Generating swabber report" 76 echo "Generating swabber report"
77 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 77 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}
78 else 78 else
79 echo "No host data, cannot generate swabber report." 79 echo "No host data, cannot generate swabber report."
80 fi 80 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 0000000000..5fdb8f2b9a
--- /dev/null
+++ b/meta/conf/swabber/Ubuntu-10.04.1-64/blacklist
@@ -0,0 +1,6 @@
1libneon27-gnutls
2openjdk-6-jre-headless
3openjdk-6-jre-lib
4openjdk-6-jre
5libdbus-1-3
6libneon27-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 0000000000..a447f70e96
--- /dev/null
+++ b/meta/conf/swabber/Ubuntu-10.04.1-64/filters
@@ -0,0 +1,7 @@
1/usr/local/lib/python2.6
2/usr/lib/python2.6
3/usr/lib/pymodules/python2.6
4/usr/lib/perl/5.10
5# which is part of the debianutils packages, but we don't want to put the entire
6# debianutils package in the whitelist.
7/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 0000000000..f0fe9633dc
--- /dev/null
+++ b/meta/conf/swabber/Ubuntu-10.04.1-64/whitelist
@@ -0,0 +1,23 @@
1base-files
2dash
3libacl1
4libattr1
5libbz2-1.0
6libc6
7libc-bin
8libglib2.0-0
9libncurses5
10libselinux1
11libsqlite3-0
12libssl0.9.8
13mime-support
14perl-base
15python2.6
16python2.6-minimal
17python-apport
18python-gst0.10
19python-imaging
20python-minimal
21python-support
22python-zope.interface
23zlib1g
diff --git a/meta/conf/swabber/generic/blacklist b/meta/conf/swabber/generic/blacklist
new file mode 100644
index 0000000000..396bcb4bf2
--- /dev/null
+++ b/meta/conf/swabber/generic/blacklist
@@ -0,0 +1,2 @@
1udev
2dkpg
diff --git a/meta/conf/swabber/generic/filters b/meta/conf/swabber/generic/filters
new file mode 100644
index 0000000000..3b10fcb377
--- /dev/null
+++ b/meta/conf/swabber/generic/filters
@@ -0,0 +1,10 @@
1/tmp
2/etc/localtime
3/etc/ld.so.cache
4/etc/ld.so.conf
5/etc/passwd
6/etc/group
7/etc/nsswitch.conf
8/proc
9/dev/null
10/dev/tty
diff --git a/meta/conf/swabber/generic/whitelist b/meta/conf/swabber/generic/whitelist
new file mode 100644
index 0000000000..48ec2af2c8
--- /dev/null
+++ b/meta/conf/swabber/generic/whitelist
@@ -0,0 +1,15 @@
1bash
2bzip2
3ccache
4coreutils
5cpp
6file
7findutils
8gawk
9grep
10hostname
11make
12sed
13tar
14util-linux
15zlib1g