OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 18-Sep-2006 08:04:36
Branch: HEAD Handle: 2006091807043600
Modified files:
openpkg-src/dynamips dynamips.patch dynamips.spec
Log:
use the Wiki page as the homepage; shorten the Vendor header; class
can be EVAL as the packaging is ok; adjust style of library
dependencies; add missing GNU make dependency; be more descriptive in
%description; use 0-prefix/non-version-hardcoded patch; fix building
under NOJIT; enable JIT on X86/AMD64 only; install manual pages, too
Summary:
Revision Changes Path
1.2 +15 -2 openpkg-src/dynamips/dynamips.patch
1.2 +27 -15 openpkg-src/dynamips/dynamips.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dynamips/dynamips.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 dynamips.patch
--- openpkg-src/dynamips/dynamips.patch 17 Sep 2006 20:21:41 -0000
1.1
+++ openpkg-src/dynamips/dynamips.patch 18 Sep 2006 06:04:36 -0000
1.2
@@ -1,5 +1,6 @@
---- dynamips-0.2.5-RC5/Makefile.orig 2006-09-04 23:34:03 +0200
-+++ dynamips-0.2.5-RC5/Makefile 2006-09-08 11:09:51 +0200
+Index: Makefile
+--- Makefile.orig 2006-09-14 12:59:13 +0200
++++ Makefile 2006-09-18 07:56:47 +0200
@@ -32,26 +32,18 @@
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \
-DHAS_RFC2553=$(HAS_RFC2553)
@@ -33,3 +34,15 @@
endif
endif
+Index: nojit_trans.h
+--- nojit_trans.h.orig 2006-09-14 12:59:13 +0200
++++ nojit_trans.h 2006-09-18 07:57:58 +0200
+@@ -38,7 +38,7 @@
+ void mips64_emit_breakpoint(insn_block_t *b);
+
+ /* Emit unhandled instruction code */
+-int mips64_emit_invalid_delay_slot(insn_block_t *b);
++void mips64_emit_invalid_delay_slot(insn_block_t *b);
+
+ /*
+ * Increment count register and trigger the timer IRQ if value in compare
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dynamips/dynamips.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 dynamips.spec
--- openpkg-src/dynamips/dynamips.spec 17 Sep 2006 20:21:41 -0000
1.1
+++ openpkg-src/dynamips/dynamips.spec 18 Sep 2006 06:04:36 -0000
1.2
@@ -25,15 +25,15 @@
# package information
Name: dynamips
Summary: Cisco 7200 Simulator
-URL: http://www.ipflow.utc.fr/dynamips/
-Vendor: Fabien Devaux, Christophe Fillot, MtvE
+URL: http://www.ipflow.utc.fr/index.php/Cisco_7200_Simulator
+Vendor: F. Devaux, C. Fillot, MtvE
Packager: OpenPKG
Distribution: OpenPKG
-Class: JUNK
+Class: EVAL
Group: Network
License: GPL
Version: 0.2.5
-Release: 20060917
+Release: 20060918
# list of sources
Source0: http://www.ipflow.utc.fr/dynamips/dynamips-%{version}.tar.gz
@@ -42,13 +42,18 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, libelf, libpcap
-PreReq: OpenPKG, openpkg >= 20040130, libelf, libpcap
+BuildPreReq: OpenPKG, openpkg >= 20040130, make
+PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: libelf, libpcap
+PreReq: libelf, libpcap
AutoReq: no
AutoReqProv: no
%description
- dynamips is Cisco 7200 simulator.
+ DynaMIPS is a Cisco 7200 (and 3600) series hardware simulator. It
+ works by emulating the MIPS64 CPU sufficiently enough to run the
+ Cisco IOS. It requires a licensed Cisco IOS image and is intended
+ for training purposes only.
%track
prog dynamips = {
@@ -59,21 +64,28 @@
%prep
%setup -q
- %patch -p1
+ %patch -p0
%build
- CFLAGS="%{l_cppflags}" \
- PCAP_LIB="%{l_ldflags} %{l_prefix}/lib/libpcap.a" \
+ export CC="%{l_cc}"
+ export CFLAGS="%{l_cppflags}"
+ export PCAP_LIB="%{l_ldflags} -lpcap -lelf"
+ export DYNAMIPS_ARCH=nojit
+ case "%{l_platform -p}" in
+ ix86-* ) DYNAMIPS_ARCH=x86 ;;
+ amd64-* ) DYNAMIPS_ARCH=x86_64 ;;
+ esac
%{l_make} %{l_mflags -O}
%install
rm -rf $RPM_BUILD_ROOT
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/bin
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/bin \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man1
%{l_shtool} install -c -s -m 755 \
- dynamips $RPM_BUILD_ROOT%{l_prefix}/bin/
- %{l_shtool} install -c -s -m 755 \
- nvram_export $RPM_BUILD_ROOT%{l_prefix}/bin/
- strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+ dynamips nvram_export $RPM_BUILD_ROOT%{l_prefix}/bin/
+ %{l_shtool} install -c -m 644 \
+ dynamips.1 nvram_export.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
