cozybit/distro11s — pull request #12 by jasonabele (2013-08-01 23:19:06+00:00)
Title: [PATCH] distro11s: use/track newer tshark from debian sid

```
From 61d75999a44dce28fbc109713e81732004d706cd Mon Sep 17 00:00:00 2001
From: Jason Abele
Date: Thu, 1 Aug 2013 15:19:56 -0700
Subject: [PATCH] distro11s: use/track newer tshark from debian sid

debian/sid already has tshark 1.10 ... no reason to build it ourselves

Signed-off-by: Jason Abele
---
board/board.conf | 2 +-
board/qemu/pkglist | 1 -
board/zotac/pkglist | 1 -
packages/tshark/tshark_1.9.0_amd64.deb | Bin 145340 -> 0 bytes
packages/tshark/wireshark-common_1.9.0_amd64.deb | Bin 15472298 -> 0 bytes
packages/tshark/wireshark-dev_1.9.0_amd64.deb | Bin 1006858 -> 0 bytes
packages/tshark/wireshark_1.9.0_amd64.deb | Bin 906982 -> 0 bytes
scripts/debian-rootfs.sh | 4 ++++
scripts/tshark.sh | 23 ----------------------
9 files changed, 5 insertions(+), 26 deletions(-)
delete mode 100644 packages/tshark/tshark_1.9.0_amd64.deb
delete mode 100644 packages/tshark/wireshark-common_1.9.0_amd64.deb
delete mode 100644 packages/tshark/wireshark-dev_1.9.0_amd64.deb
delete mode 100644 packages/tshark/wireshark_1.9.0_amd64.deb
delete mode 100755 scripts/tshark.sh

diff --git a/board/board.conf b/board/board.conf
index 31616da..daee27c 100644
--- a/board/board.conf
+++ b/board/board.conf
@@ -1,5 +1,5 @@
# This file contains common board build-system configuration

-BOARD11S_COMMON_PACKAGES="autoconf automake bison flex libtool make libssl-dev cmake python-dev vde2 bc libglib2.0-dev libevent-dev vim tcpdump openssh-server rsync psmisc libconfig-dev iperf bridge-utils less gdb crda bzip2 build-essential screen"
+BOARD11S_COMMON_PACKAGES="autoconf automake bison flex libtool make libssl-dev cmake python-dev vde2 bc libglib2.0-dev libevent-dev vim tcpdump openssh-server rsync psmisc libconfig-dev iperf bridge-utils less gdb crda bzip2 build-essential screen tshark"

BOARD11S_COMMON_BUILDDEP_PACKAGES="libnl"
diff --git a/board/qemu/pkglist b/board/qemu/pkglist
index e13006f..3effd14 100644
--- a/board/qemu/pkglist
+++ b/board/qemu/pkglist
@@ -7,7 +7,6 @@ trace-cmd;git;git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.gi
wmediumd;git;git://github.com/cozybit/wmediumd.git;master;
wpa_sup_mesh;git;git@github.com:cozybit/wpa_supplicant.git;master;
linux-firmware;git;git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git;master;
-tshark;;;;
mccatool;;;;
qemu-cleanups;;;;
overlay;;;;
diff --git a/board/zotac/pkglist b/board/zotac/pkglist
index 3b8cb76..9743d8c 100644
--- a/board/zotac/pkglist
+++ b/board/zotac/pkglist
@@ -10,7 +10,6 @@ hostap;git;git://w1.fi/srv/git/hostap.git;master;
mccatool;;;;
hostapd;;;;
rootpassword;;;;
-tshark;;;;
meshkit;;;;
overlay;;;;
zotac-cleanups;;;;
diff --git a/packages/tshark/tshark_1.9.0_amd64.deb b/packages/tshark/tshark_1.9.0_amd64.deb
deleted file mode 100644
index 88ab512608105e5ca78d65d69887ff9e7be79590..0000000000000000000000000000000000000000
GIT binary patch
[ removed ]

diff --git a/packages/tshark/wireshark-common_1.9.0_amd64.deb b/packages/tshark/wireshark-common_1.9.0_amd64.deb
deleted file mode 100644
index c5f843f1aff777936ac510165434088e50eeb9ac..0000000000000000000000000000000000000000
GIT binary patch
[ removed ]

diff --git a/packages/tshark/wireshark-dev_1.9.0_amd64.deb b/packages/tshark/wireshark-dev_1.9.0_amd64.deb
deleted file mode 100644
index e0ad59b1b6b8e5c103809251be3aa65c40454d01..0000000000000000000000000000000000000000
GIT binary patch
[ removed ]

diff --git a/packages/tshark/wireshark_1.9.0_amd64.deb b/packages/tshark/wireshark_1.9.0_amd64.deb
deleted file mode 100644
index 52a253cbda316ba6309107e5337f1ea117f6dc4a..0000000000000000000000000000000000000000
GIT binary patch
[ removed ]

diff --git a/scripts/debian-rootfs.sh b/scripts/debian-rootfs.sh
index 699b7ca..f0331f4 100755
--- a/scripts/debian-rootfs.sh
+++ b/scripts/debian-rootfs.sh
@@ -17,6 +17,10 @@ fi

echo "Updating package cache"
sudo chroot ${STAGING} apt-get update
+echo "Fixing old installation issues"
+# Fix for the old force-installed tshark 1.9.0
+sudo chroot ${STAGING} apt-get -y remove tshark wireshark-common libwireshark3
+sudo chroot ${STAGING} apt-get -y -f install
echo "Install locales support"
sudo chroot ${STAGING} apt-get -y install locales
sudo chroot ${STAGING} sed -i -e "s/^#\s*\(.*$LANG\)/\1/" /etc/locale.gen
diff --git a/scripts/tshark.sh b/scripts/tshark.sh
deleted file mode 100755
index 1814827..0000000
--- a/scripts/tshark.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-source `dirname $0`/common.sh
-
-if [ ! -d $PWD/packages/tshark ]; then
-	echo "No tshark package."
-	exit 1
-fi
-
-if [ ! -e ${STAMPS}/tshark.stamp -o ${FORCE_BUILD} -eq 1 ]; then
-	Q pushd $PWD/packages/tshark
-	cp *.deb ${STAGING}/tmp/
-	# install wireshark_common and have it fail...
-	ARCH="i386"
-	[ "`uname -m`" == "x86_64" ] && ARCH="amd64"
-
-	sudo chroot ${STAGING} apt-get -y --force-yes update
-	sudo chroot ${STAGING} dpkg -i --force overwrite /tmp/wireshark-common_1.9.0_${ARCH}.deb
-	# now tell apt-get to install the missing dependencies
-	sudo chroot ${STAGING} apt-get -y -f install
-	sudo chroot ${STAGING} dpkg -i --force overwrite /tmp/tshark_1.9.0_${ARCH}.deb && touch ${STAMPS}/tshark.stamp
-	sudo rm ${STAGING}/tmp/*.deb
-fi
--
1.7.9.5

```