forked from osmocom/wireshark
Remove the SVR4 packaging assets.
Remove the svr4-package and solaris-package targets along with their associated files and directories. We used to use this to build Solaris packages but we haven't shipped those in years. Given that the last substantive change to packaging/svr4 was in 2008 it's likely that this has been unused for a while. Change-Id: Ib9153c99f503200ea8c48d3ef81ad688ee55c09f Reviewed-on: https://code.wireshark.org/review/23808 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>pespin/amr
Gerald Combs
Anders Broman
parent
5c2a5dbdcd
commit
4d563d8f10
|
|
@ -265,6 +265,4 @@ packaging/nsis/qt-dll-manifest.nsh
|
|||
packaging/portableapps/Files/
|
||||
packaging/portableapps/appinfo.ini
|
||||
packaging/rpm/SPECS/wireshark.spec
|
||||
packaging/svr4/checkinstall
|
||||
packaging/svr4/pkginfo
|
||||
vgcore.*
|
||||
|
|
|
|||
2
INSTALL
2
INSTALL
|
|
@ -219,8 +219,6 @@ README.windows for those instructions.
|
|||
run one of
|
||||
|
||||
make rpm-package # Builds a binary package using rpm
|
||||
make svr4-package # Builds a binary package using pkgmk
|
||||
make solaris-package # Same as "make svr4-package"
|
||||
make osx-package # Builds a binary package for OSX
|
||||
|
||||
to make an installable package for your system.
|
||||
|
|
|
|||
19
Makefile.am
19
Makefile.am
|
|
@ -1061,7 +1061,7 @@ update-databases-and-caches-install: update-databases-and-caches-common
|
|||
|
||||
update-databases-and-caches-uninstall: update-databases-and-caches-common
|
||||
|
||||
# Used by svr4-package and osx-package
|
||||
# Used by osx-package
|
||||
# We load top_stagedir with an absolute path so that libtool doesn't freak.
|
||||
top_stagedir=$(abs_top_builddir)/packaging/staging
|
||||
stagedir=$(top_stagedir)/$(PACKAGE).inst
|
||||
|
|
@ -1069,23 +1069,6 @@ stagedir=$(top_stagedir)/$(PACKAGE).inst
|
|||
host_cpu=@host_cpu@
|
||||
host_os=@host_os@
|
||||
|
||||
solaris-package: svr4-package
|
||||
|
||||
svr4-package: $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA)
|
||||
@if test x$(HAVE_SVR4_PACKAGING) = xyes ; then \
|
||||
rm -rf $(stagedir) ; \
|
||||
$(MAKE) DESTDIR=$(stagedir) install; \
|
||||
$(srcdir)/packaging/svr4/mkpkg \
|
||||
$(PACKAGE) \
|
||||
$(PACKAGE)-$(VERSION)-$(host_os)-$(host_cpu)-local \
|
||||
$(prefix) \
|
||||
$(top_stagedir) ; \
|
||||
else \
|
||||
echo "Error: SVR4 packaging tools not found." ; \
|
||||
echo "Package build abandoned." ; \
|
||||
fi
|
||||
|
||||
|
||||
rpm_topdir=`cd $(top_builddir) && pwd`/packaging/rpm
|
||||
if HAVE_RPM
|
||||
rpm-package: dist
|
||||
|
|
|
|||
16
configure.ac
16
configure.ac
|
|
@ -464,19 +464,6 @@ AC_SUBST(A2X_LYNX)
|
|||
#
|
||||
AC_PATH_PROG(DESKTOP_FILE_INSTALL, desktop-file-install)
|
||||
|
||||
# SVR4/Solaris
|
||||
AC_CHECK_PROG(HAVE_PKGPROTO, pkgproto, "yes", "no")
|
||||
AC_CHECK_PROG(HAVE_PKGMK, pkgmk, "yes", "no")
|
||||
AC_CHECK_PROG(HAVE_PKGTRANS, pkgtrans, "yes", "no")
|
||||
|
||||
if test x$HAVE_PKGPROTO = xyes -a x$HAVE_PKGMK = xyes \
|
||||
-a x$HAVE_PKGTRANS = xyes ; then
|
||||
HAVE_SVR4_PACKAGING=yes
|
||||
else
|
||||
HAVE_SVR4_PACKAGING=no
|
||||
fi
|
||||
AC_SUBST(HAVE_SVR4_PACKAGING)
|
||||
|
||||
# RPM
|
||||
#
|
||||
# Looks for the rpmbuild program, and checks to see if we can redefine "_topdir".
|
||||
|
|
@ -3021,9 +3008,6 @@ AC_CONFIG_FILES(
|
|||
packaging/rpm/Makefile
|
||||
packaging/rpm/SPECS/Makefile
|
||||
packaging/rpm/SPECS/wireshark.spec
|
||||
packaging/svr4/Makefile
|
||||
packaging/svr4/checkinstall
|
||||
packaging/svr4/pkginfo
|
||||
packaging/wix/Makefile
|
||||
plugins/Makefile
|
||||
plugins/docsis/Makefile
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
SUBDIRS = macosx rpm svr4 nsis wix
|
||||
SUBDIRS = macosx rpm nsis wix
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
Makefile.in
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
#
|
||||
DISTCLEANFILES = \
|
||||
Prototype
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
Makefile.in
|
||||
|
||||
EXTRA_DIST = checkinstall.in mkpkg pkginfo.in
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
#!/bin/sh
|
||||
# @configure_input@
|
||||
#
|
||||
# Checkinstall - perform preinstallation install checks.
|
||||
#
|
||||
# This is a modified version of a script written by mark@metalab.unc.edu .
|
||||
# The original is at http://metalab.unc.edu/pub/packages/solaris/sparc/html/creating.solaris.packages.html .
|
||||
#
|
||||
|
||||
PKG_CONFIG=@PKG_CONFIG@
|
||||
|
||||
gtk_version_needed="2.0"
|
||||
expected_platform="@host_cpu@"
|
||||
|
||||
platform=`uname -p`
|
||||
|
||||
if [ ${platform} != ${expected_platform} ]
|
||||
then
|
||||
echo "\n\n\n\tThis package must be installed on a ${expected_platform} architecture\n"
|
||||
echo "\tAborting installation.\n\n\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ ! -x "$PKG_CONFIG" ]
|
||||
then
|
||||
# We couldn't find GTK in the location that was used to build
|
||||
# Wireshark.
|
||||
# Punt!
|
||||
# If gtk-config is in the $PATH then wireshark should install fine.
|
||||
# Some modifications to $LD_LIBRARY_PATH (or non Solaris equivalent)
|
||||
# may be required by the user. Should there be a warning here?
|
||||
PKG_CONFIG=pkg-config
|
||||
fi
|
||||
|
||||
$PKG_CONFIG gtk+-2.0 --atleast-version=$gtk_version_needed
|
||||
if [ $? != 0 ]
|
||||
then
|
||||
echo "\n\n\n\tThis package requires gtk+-2 version >= $gtk_version_needed installed in `dirname @PKG_CONFIG@`."
|
||||
echo "\tAborting installation.\n\n\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
exit 0
|
||||
|
|
@ -1,90 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# mkpkg - Builds a pkgadd-installable package from a listing of the contents in
|
||||
# a staging directory.
|
||||
#
|
||||
# This is a modified version of a script written by mark@metalab.unc.edu .
|
||||
# The original is at http://metalab.unc.edu/pub/packages/solaris/sparc/html/creating.solaris.packages.html .
|
||||
#
|
||||
if [ "$1" != "" ] ; then
|
||||
pkg=$1
|
||||
else
|
||||
echo "Usage: " `basename $0` " <package name> [output file]"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "$2" != "" ] ; then
|
||||
pkgfile=$2
|
||||
else
|
||||
pkgfile=$pkg
|
||||
fi
|
||||
|
||||
if [ "$3" != "" ] ; then
|
||||
prefix=$3
|
||||
else
|
||||
prefix=/usr/local
|
||||
fi
|
||||
|
||||
if [ "$4" != "" ] ; then
|
||||
srcdir=$4
|
||||
else
|
||||
srcdir=`basename $0`/../..
|
||||
fi
|
||||
|
||||
# Initialize our variables
|
||||
prepdir=`dirname $0`
|
||||
prototype="$prepdir/Prototype"
|
||||
stagedir=$srcdir/${pkg}.inst
|
||||
|
||||
# Create the Prototype file
|
||||
cat > $prototype <<Fin
|
||||
i pkginfo
|
||||
i checkinstall
|
||||
Fin
|
||||
if [ ! -d $stagedir ] ; then
|
||||
echo "Whoops! Staging directory $stagedir doesn't exist. Bailing."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
find $stagedir/$prefix/* -print | \
|
||||
pkgproto $stagedir/$prefix=$prefix | \
|
||||
# Mimic file permissions under /usr
|
||||
awk ' \
|
||||
/bin/ { print $1, $2, $3, $4, "root bin"; next }; \
|
||||
/lib/ { print $1, $2, $3, $4, "root bin"; next }; \
|
||||
/man/ { print $1, $2, $3, $4, "root bin"; next }; \
|
||||
{ print $1, $2, $3, $4, "root sys" } \
|
||||
' \
|
||||
>> $prototype
|
||||
|
||||
# Make the package installation directory
|
||||
pkgmk -o -r / -d /$srcdir -f $prototype
|
||||
echo "Setting file permissions in $stagedir tree to 644."
|
||||
find $stagedir -type f -print | xargs chmod a+r
|
||||
find $stagedir -type f -print | xargs chmod u+w
|
||||
echo "Setting directory permissions in $stagedir tree to 755."
|
||||
find $stagedir -type d -print | xargs chmod 755
|
||||
if [ -f $stagedir/install/preinstall ]; then
|
||||
chmod 755 $stagedir/install/preinstall
|
||||
fi
|
||||
if [ -f $stagedir/install/postinstall ]; then
|
||||
chmod 755 $stagedir/install/postinstall
|
||||
fi
|
||||
if [ -f $stagedir/install/preremove ]; then
|
||||
chmod 755 $stagedir/install/preremove
|
||||
fi
|
||||
if [ -f $stagedir/install/postremove ]; then
|
||||
chmod 755 $stagedir/install/postremove
|
||||
fi
|
||||
if [ -f $stagedir/install/request ]; then
|
||||
chmod 755 $stagedir/install/request
|
||||
fi
|
||||
if [ -f $stagedir/install/checkinstall ]; then
|
||||
chmod 755 $stagedir/install/checkinstall
|
||||
fi
|
||||
|
||||
# Spool the install directory into its own self-contained file.
|
||||
pkgtrans -s $srcdir $pkgfile $pkg
|
||||
|
||||
# echo "Compressing package file"
|
||||
# gzip -9 $srcdir/$pkgfile
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
# @configure_input@
|
||||
PKG="@PACKAGE@"
|
||||
NAME="@PACKAGE@ @VERSION@"
|
||||
VERSION="@VERSION@"
|
||||
ARCH="@host_cpu@"
|
||||
CLASSES="none"
|
||||
CATEGORY="application,network"
|
||||
DESC="A GUI network protocol analyzer"
|
||||
VENDOR="Wireshark Development Team"
|
||||
EMAIL="gerald@wireshark.org"
|
||||
ISTATES="S s 1 2 3"
|
||||
RSTATES="S s 1 2 3"
|
||||
BASEDIR=""
|
||||
Loading…
Reference in New Issue