diff options
| -rw-r--r-- | meta/classes/image-swab.bbclass | 2 | ||||
| -rw-r--r-- | meta/conf/swabber/Ubuntu-10.04.1-64/blacklist | 6 | ||||
| -rw-r--r-- | meta/conf/swabber/Ubuntu-10.04.1-64/filters | 7 | ||||
| -rw-r--r-- | meta/conf/swabber/Ubuntu-10.04.1-64/whitelist | 23 | ||||
| -rw-r--r-- | meta/conf/swabber/generic/blacklist | 2 | ||||
| -rw-r--r-- | meta/conf/swabber/generic/filters | 10 | ||||
| -rw-r--r-- | meta/conf/swabber/generic/whitelist | 15 |
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 () { 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 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 @@ +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 0000000000..a447f70e96 --- /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 0000000000..f0fe9633dc --- /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 0000000000..396bcb4bf2 --- /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 0000000000..3b10fcb377 --- /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 0000000000..48ec2af2c8 --- /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 |