rpms/hercules/EL-5 README-rpm, NONE, 1.1 generic.prm, NONE, 1.1 hercules-3.05-make.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 hercules.spec, 1.14, 1.15 sources, 1.5, 1.6 README.fedora, 1.2, NONE
Dan Horák
sharkcz at fedoraproject.org
Thu Oct 9 18:14:31 UTC 2008
Author: sharkcz
Update of /cvs/pkgs/rpms/hercules/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16490
Modified Files:
.cvsignore hercules.spec sources
Added Files:
README-rpm generic.prm hercules-3.05-make.patch
Removed Files:
README.fedora
Log Message:
* Thu Oct 09 2008 Dan Horak <dan[at]danny.cz> 3.05-7.20081009cvs
- update to CVS snapshot 20081009 (#461044)
- install utils only as docs
- little cleanup
--- NEW FILE README-rpm ---
These are quick instructions on how to get Red Hat Enterprise Linux running
with Hercules.
Red Hat Enterprise Linux 4 and 5 steps :
======================================
Prepare hercules :
================
- Install : yum install hercules
- Edit /etc/hercules/hercules.cnf and change ARCHMODE if needed :
- ESA/390 for s390
- ESAME for s390x
- Create HD image : dasdinit -z /var/lib/hercules/linux.120 3390-3 lin000
(substitute -lpf or -0 for -z if you wish to use a non-compressed image)
- Mount the first installation CD
- Run : hercules-run
- Start installation : ipl /media/cdrom/generic.ins
Note that when running Hercules, all commands sent to the OS must be prefixed
by a dot. When not prefixed, commands are sent to Hercules itself (like "ipl").
OS installation example steps :
=============================
Which kind of network device do you intend to use:
.ctc
Enter the bus ID and the device number of your CCW devices:
.0.0.0600,0.0.0601
Enter the FQDN of your new Linux guest:
.s390.localdomain
Enter the IP address of your new Linux guest:
.192.168.200.3
Enter the network address of the new Linux guest:
.255.255.255.252
Enter the IP of your CTC / ESCON / IUCV point-to-point partner:
.192.168.200.4
Select which protocol should be used for the CTC interface:
.0
Enter your DNS server(s), separated by colons (:):
.192.168.1.1:192.168.1.2
Enter your DNS search domain(s) (if any), separated by colons (:):
.localdomain
Enter DASD range (e.g. 200-203 or 200,201,202,203):
.000-200
--
Alternatively, you can copy initrd.img and kernel.img from your installation
media into /etc/hercules and start the installation via 'ipl 00c', which uses
the virtual punch card defined in hercules.cnf and auto-fills in most of the
networking options for you, based on the contents of /etc/hercules/generic.prm.
--
Use "telnet 192.168.200.3" and log in as "root" with no password (press enter).
The installation will start automatically.
Appendix :
Red Hat Linux 7.2 steps :
=======================
- Mount the installation CD and run "ipl /mnt/cdrom/redhat.ins"
or
- Copy all files from the os/images/ directory to /etc/hercules/
- Replace in hercules.cnf the line :
000C 3505 kernel.img generic.prm initrd.img autopad
with :
000C 3505 kernel.img redhat.prm initrd.img autopad
And :
0580 3420 /etc/hercules/tape.tdf
with :
0580 3420 /etc/hercules/redhat.tdf
- Commands :
ipl 000C
.s390.localdomain
.ctc0
.ctc0,0x600,0x601
.192.168.200.3
.192.168.200.4
.192.168.1.1
.localdomain
.120
--- NEW FILE generic.prm ---
root=/dev/ram0 ro ip=off ramdisk_size=40000
DASD=0120
NETTYPE=ctc
SUBCHANNELS=0.0.0600,0.0.0601
IPADDR=192.168.200.3
NETWORK=192.168.200.0
GATEWAY=192.168.200.4
#DNS=ip.of.dns.1:ip.of.dns.2
#SEARCHDNS=example.com:sample.com
#HOSTNAME=s390.localdomain
#vnc
hercules-3.05-make.patch:
--- NEW FILE hercules-3.05-make.patch ---
Index: Makefile.am
===================================================================
RCS file: /usr/cvs/hercules/hercules/Makefile.am,v
retrieving revision 1.183
diff -u -r1.183 Makefile.am
--- Makefile.am 22 May 2008 19:25:58 -0000 1.183
+++ Makefile.am 9 Oct 2008 13:27:50 -0000
@@ -65,7 +65,7 @@
lns=@LN_S@
-SUBDIRS = decNumber m4 po util html man . crypto
+SUBDIRS = decNumber m4 po html man . crypto
LDADD = @LTLIBICONV@ @LTLIBINTL@ @LIBS@
Index: configure.ac
===================================================================
RCS file: /usr/cvs/hercules/hercules/configure.ac,v
retrieving revision 1.197
diff -u -r1.197 configure.ac
--- configure.ac 25 Mar 2008 11:41:31 -0000 1.197
+++ configure.ac 9 Oct 2008 13:27:50 -0000
@@ -2077,7 +2077,7 @@
AC_CACHE_SAVE()
-AC_OUTPUT( [ Makefile util/Makefile html/Makefile crypto/Makefile po/Makefile.in po/Makefile man/Makefile m4/Makefile decNumber/Makefile] )
+AC_OUTPUT( [ Makefile html/Makefile crypto/Makefile po/Makefile.in po/Makefile man/Makefile m4/Makefile decNumber/Makefile] )
###############################################################################
# (end-of-file)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 3 Jul 2006 10:33:50 -0000 1.5
+++ .cvsignore 9 Oct 2008 18:14:00 -0000 1.6
@@ -1 +1 @@
-hercules-3.04.1.tar.gz
+hercules-3.05-20081009.tar.gz
Index: hercules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/EL-5/hercules.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- hercules.spec 28 Aug 2006 10:03:06 -0000 1.14
+++ hercules.spec 9 Oct 2008 18:14:00 -0000 1.15
@@ -1,16 +1,25 @@
+%define cvsdate 20081009
+
Summary: Hercules S/370, ESA/390, and z/Architecture emulator
Name: hercules
-Version: 3.04.1
-Release: 4%{?dist}
+Version: 3.05
+Release: 7.%{cvsdate}cvs%{?dist}
License: QPL
Group: Applications/Emulators
-URL: http://www.conmicro.cx/hercules/
-Source0: http://www.conmicro.cx/hercules/hercules-%{version}.tar.gz
+URL: http://www.hercules-390.org/
+#Source0: http://www.hercules-390.org/hercules-%{version}.tar.gz
+# CVS snapshot; use commands below to reproduce
+# cvs -d :pserver:anonymous at cvs.hercules-390.org:/usr/cvs/hercules co -D %{cvsdate} hercules
+# cd hercules; sh ./autogen.sh && ./configure && make dist
+Source0: hercules-%{version}-%{cvsdate}.tar.gz
Source1: hercules.cnf
Source2: hercules-run
-Source3: README.fedora
+Source3: README-rpm
+Source4: generic.prm
+Patch0: %{name}-3.05-make.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: bison, zlib-devel, bzip2-devel
+BuildRequires: libtool
Obsoletes: hercules-docs <= 3.01
%description
@@ -23,17 +32,30 @@
%prep
-%setup
+%setup -q
+%patch0 -p0
+
+# refresh for recent libtool
+rm autoconf/libtool.m4
+libtoolize --copy --force
+aclocal -I m4 -I autoconf
+autoheader
+automake
+autoconf
-%build
# Get the modules in the right place (lib64 on 64bit archs)
-%{__perl} -pi -e 's|\${DESTPREFIX}/lib/|${libdir}/|g' configure*
-# Required in 3.04 to find libs on x86_64
-export LDFLAGS="-L%{_libdir}"
+sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}/|g' configure*
+# Scripts to be looked at, not executed from the docs
+%{__chmod} -x util/*
+# remove Makefile
+%{__rm} util/Makefile*
+
+
+%build
%configure \
--enable-dependency-tracking \
- --disable-rpath \
--enable-optimization="%{optflags}"
+
%{__make} %{?_smp_mflags}
@@ -45,11 +67,13 @@
%{__mkdir_p} %{buildroot}%{_sysconfdir}/hercules
%{__cat} %{SOURCE1} | %{__sed} 's|@LIBDIR@|%{_libdir}|g' > \
%{buildroot}%{_sysconfdir}/hercules/hercules.cnf
+# Install generic.prm with parameters matching hercules.cnf
+%{__install} -p -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/hercules/
# Install our wrapper script (takes care of tunnel networking)
%{__install} -D -p -m 0755 %{SOURCE2} \
%{buildroot}%{_sbindir}/hercules-run
# Copy our README to be included as doc
-%{__install} -p -m 0644 %{SOURCE3} README.fedora
+%{__install} -p -m 0644 %{SOURCE3} README-rpm
# Create empty directory where to store system images
%{__mkdir_p} %{buildroot}%{_var}/lib/hercules
@@ -59,10 +83,11 @@
%files -f %{name}.lang
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
%doc CHANGES README* RELEASE* hercules.cnf html/ util/
%dir %{_sysconfdir}/hercules/
%attr(0644, root, root) %config(noreplace) %{_sysconfdir}/hercules/hercules.cnf
+%attr(0644, root, root) %config(noreplace) %{_sysconfdir}/hercules/generic.prm
%{_bindir}/*
%{_sbindir}/*
%{_datadir}/hercules/
@@ -75,6 +100,32 @@
%changelog
+* Thu Oct 09 2008 Dan Horak <dan[at]danny.cz> 3.05-7.20081009cvs
+- update to CVS snapshot 20081009 (#461044)
+- install utils only as docs
+- little cleanup
+
+* Thu Apr 10 2008 Jarod Wilson <jwilson at redhat.com> 3.05-5
+- Point to new project URL
+- Add a template generic.prm matching provided hercules.cnf
+
+* Sun Feb 3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 3.05-4
+- Fix loading of plugins (bz 430805)
+
+* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 3.05-3
+- Rebuild for new BuildID feature.
+
+* Sun Aug 12 2007 Matthias Saou <http://freshrpms.net/> 3.05-2
+- Include open patch.
+
+* Sun Aug 5 2007 Matthias Saou <http://freshrpms.net/> 3.05-1
+- Update to 3.05.
+
+* Tue Jun 19 2007 Matthias Saou <http://freshrpms.net/> 3.04.1-5
+- Update included README-rpm (was README.fedora) to remove Fedora instructions
+ since after the Core+Extras merge, Fedora isn't built for x390 (#234803).
+- Remove rpath at last (using sed on the libtool script method).
+
* Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 3.04.1-4
- FC6 rebuild.
@@ -87,7 +138,7 @@
- Move out all the inlined configuration files, keep only the .cnf file.
- Update .cnf file so that it works (load modules required for the default).
- Include README.fedora to give quick instructions on how to get started.
-- Include empty %{_var}/lib/hercules/ directory.
+- Include empty %%{_var}/lib/hercules/ directory.
- Rename hercules.init to hercules-run in PATH and clean it up somewhat.
* Mon Jul 3 2006 Matthias Saou <http://freshrpms.net/> 3.04.1-1
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 3 Jul 2006 10:33:50 -0000 1.5
+++ sources 9 Oct 2008 18:14:00 -0000 1.6
@@ -1 +1 @@
-7ca609490a5d135c91c3f69986e0a162 hercules-3.04.1.tar.gz
+9c3719547c6e40160ff4cfb9a664fd05 hercules-3.05-20081009.tar.gz
--- README.fedora DELETED ---
More information about the scm-commits
mailing list