- drop the original cmsfs subpackage
This commit is contained in:
Dan Horák
parent
b0eb99190c
commit
a8e0a7dfa6
|
|
@ -1,12 +0,0 @@
|
|||
diff -urN cmsfs-1.1.8/cmsfssed.sh cmsfs-1.1.8_/cmsfssed.sh
|
||||
--- cmsfs-1.1.8/cmsfssed.sh 2003-02-28 17:52:59.000000000 -0500
|
||||
+++ cmsfs-1.1.8_/cmsfssed.sh 2004-05-28 16:36:22.000000000 -0400
|
||||
@@ -85,7 +85,7 @@
|
||||
DRIVER_SOURCE="cmsfs22x.c"
|
||||
MODULES_DIRECTORY="/lib/modules/`uname -r`/fs"
|
||||
;;
|
||||
- 2.4*|2.5*)
|
||||
+ 2.4*|2.5*|2.6*|3.*|4.*)
|
||||
LINUX_RELEASE="2.4"
|
||||
# ln -s cmsfs24x.c cmsfsvfs.c
|
||||
INCLUDES="-I/lib/modules/`uname -r`/build/include"
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
From 25442f958a12b428b7d063b927ac48965dcd8164 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
|
||||
Date: Fri, 28 Jan 2011 16:11:19 +0100
|
||||
Subject: [PATCH] use detected filesystem block size on FBA devices
|
||||
|
||||
If a FBA device is not properly formated, then the CMS file system can
|
||||
have a different block size. The cmsfs tools were able to detect the file
|
||||
system block size, but in fact they still used default 512 instead. And
|
||||
using the default was causing crashes. Now the detected value is used.
|
||||
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=651012
|
||||
---
|
||||
cmsfsany.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/cmsfsany.c b/cmsfsany.c
|
||||
index 55bcfdc..18efffb 100644
|
||||
--- a/cmsfsany.c
|
||||
+++ b/cmsfsany.c
|
||||
@@ -102,7 +102,7 @@ int cmsfs_find_label(struct CMSSUPER *vol,struct CMSFSADT *adt)
|
||||
cmsfs_error(cmsfs_ermsg);
|
||||
}
|
||||
vol->flags = CMSFSFBA;
|
||||
- vol->blksz = 512;
|
||||
+ vol->blksz = blksz;
|
||||
return vol->blksz;
|
||||
} }
|
||||
|
||||
--
|
||||
1.7.3.5
|
||||
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- cmsfs-1.1.8/cmsfsvol.c.warnings 2003-07-18 01:38:57.000000000 +0200
|
||||
+++ cmsfs-1.1.8/cmsfsvol.c 2005-09-06 16:57:15.000000000 +0200
|
||||
@@ -52,7 +52,7 @@
|
||||
|
||||
/* print a header; looks like CMS */
|
||||
(void) printf("LABEL VDEV M STAT CYL TYPE \
|
||||
-BLKSZ FILES BLKS USED-(%) BLKS LEFT BLK TOTAL\n");
|
||||
+BLKSZ FILES BLKS USED-(%%) BLKS LEFT BLK TOTAL\n");
|
||||
|
||||
for ( ; i < argc ; i++)
|
||||
{
|
||||
|
|
@ -1,18 +1,16 @@
|
|||
%define cmsfsver 1.1.8c
|
||||
%define vipaver 2.1.0
|
||||
|
||||
Name: s390utils
|
||||
Summary: Utilities and daemons for IBM z Systems
|
||||
Group: System Environment/Base
|
||||
Version: 2.7.0
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Epoch: 2
|
||||
License: MIT
|
||||
ExclusiveArch: s390 s390x
|
||||
#URL: http://www.ibm.com/developerworks/linux/linux390/s390-tools.html
|
||||
URL: https://github.com/ibm-s390-tools/s390-tools
|
||||
Source0: https://github.com/ibm-s390-tools/s390-tools/archive/v%{version}.tar.gz#/s390-tools-%{version}.tar.gz
|
||||
Source4: http://www.linuxvm.org/Patches/S390/cmsfs-%{cmsfsver}.tar.gz
|
||||
Source5: zfcpconf.sh
|
||||
# http://www.ibm.com/developerworks/linux/linux390/src_vipa-%%{vipaver}.html
|
||||
Source6: http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/src_vipa-%{vipaver}.tar.gz
|
||||
|
|
@ -35,10 +33,6 @@ Patch3: 0007-blscfg-sort-like-rpm-nvr-not-like-a-single-version.patch
|
|||
# https://github.com/ibm-s390-tools/s390-tools/pull/47
|
||||
Patch5: s390-tools-zipl-title-section-name.patch
|
||||
|
||||
Patch1000: cmsfs-1.1.8-warnings.patch
|
||||
Patch1001: cmsfs-1.1.8-kernel26.patch
|
||||
Patch1002: cmsfs-1.1.8-use-detected-filesystem-block-size-on-FBA-devices.patch
|
||||
|
||||
Requires: s390utils-base = %{epoch}:%{version}-%{release}
|
||||
Requires: s390utils-osasnmpd = %{epoch}:%{version}-%{release}
|
||||
Requires: s390utils-cpuplugd = %{epoch}:%{version}-%{release}
|
||||
|
|
@ -48,7 +42,6 @@ Requires: s390utils-ziomon = %{epoch}:%{version}-%{release}
|
|||
Requires: s390utils-cmsfs = %{epoch}:%{version}-%{release}
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: rpm-devel
|
||||
|
||||
%description
|
||||
This is a meta package for installing the default s390-tools sub packages.
|
||||
|
|
@ -59,41 +52,17 @@ The s390utils packages contain a set of user space utilities that should to
|
|||
be used together with the zSeries (s390) Linux kernel and device drivers.
|
||||
|
||||
%prep
|
||||
%setup -q -n s390-tools-%{version} -a 4 -a 6
|
||||
%setup -q -n s390-tools-%{version} -a 6
|
||||
|
||||
# Fedora/RHEL changes
|
||||
%patch0 -p1 -b .zipl-invert-script-options
|
||||
%patch3 -p1 -b .blscfg-rpm-nvr-sort
|
||||
%patch5 -p1 -b .zipl-title-section-name.patch
|
||||
|
||||
#
|
||||
# cmsfs
|
||||
#
|
||||
pushd cmsfs-%{cmsfsver}
|
||||
# Patch to fix a couple of code bugs
|
||||
%patch1000 -p1 -b .warnings
|
||||
|
||||
# build on kernel-2.6, too
|
||||
%patch1001 -p1 -b .cmsfs26
|
||||
|
||||
# use detected filesystem block size (#651012)
|
||||
%patch1002 -p1 -b .use-detected-block-size
|
||||
popd
|
||||
|
||||
|
||||
# remove --strip from install
|
||||
find . -name Makefile | xargs sed -i 's/$(INSTALL) -s/$(INSTALL)/g'
|
||||
|
||||
pushd cmsfs-%{cmsfsver}
|
||||
# cmdfs: fix encoding
|
||||
iconv -f ISO8859-1 -t UTF-8 -o README.new README
|
||||
touch -r README README.new
|
||||
mv README.new README
|
||||
# prepare docs
|
||||
mv README README.cmsfs
|
||||
mv CREDITS CREDITS.cmsfs
|
||||
popd
|
||||
|
||||
|
||||
%build
|
||||
make \
|
||||
|
|
@ -102,11 +71,6 @@ make \
|
|||
DISTRELEASE=%{release} \
|
||||
V=1
|
||||
|
||||
pushd cmsfs-%{cmsfsver}
|
||||
./configure
|
||||
make CC="gcc %{build_cflags} -fno-strict-aliasing %{build_ldflags}"
|
||||
popd
|
||||
|
||||
pushd src_vipa-%{vipaver}
|
||||
make CC_FLAGS="%{build_cflags} -fPIC" LD_FLAGS="%{build_ldflags} -shared" LIBDIR=%{_libdir}
|
||||
popd
|
||||
|
|
@ -142,12 +106,6 @@ install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE24}
|
|||
install -d -m 0755 %{buildroot}%{_sysconfdir}/kernel/install.d/
|
||||
install -m 0644 /dev/null %{buildroot}%{_sysconfdir}/kernel/install.d/20-grubby.install
|
||||
|
||||
# cmsfs tools must be available in /sbin
|
||||
for f in cat lst vol cp ck; do
|
||||
install -p -m 755 cmsfs-%{cmsfsver}/cmsfs${f} $RPM_BUILD_ROOT%{_sbindir}
|
||||
install -p -m 644 cmsfs-%{cmsfsver}/cmsfs${f}.8 $RPM_BUILD_ROOT%{_mandir}/man8
|
||||
done
|
||||
|
||||
# src_vipa
|
||||
pushd src_vipa-%{vipaver}
|
||||
make install LIBDIR=%{_libdir} SBINDIR=%{_bindir} INSTROOT=$RPM_BUILD_ROOT LDCONFIG=/bin/true
|
||||
|
|
@ -197,6 +155,7 @@ BuildRequires: libpfm-devel
|
|||
BuildRequires: glibc-static
|
||||
BuildRequires: cryptsetup-devel >= 2.0.3
|
||||
BuildRequires: json-c-devel
|
||||
BuildRequires: rpm-devel
|
||||
|
||||
|
||||
%description base
|
||||
|
|
@ -690,30 +649,6 @@ fi
|
|||
%{_unitdir}/iucvtty-login@.service
|
||||
%{_unitdir}/ttyrun-getty@.service
|
||||
|
||||
#
|
||||
# *********************** cmsfs package ***********************
|
||||
#
|
||||
%package cmsfs
|
||||
License: GPLv2
|
||||
Summary: CMS file system tools
|
||||
Group: System Environment/Base
|
||||
URL: http://www.casita.net/pub/cmsfs/cmsfs.html
|
||||
# Requires:
|
||||
|
||||
%description cmsfs
|
||||
This package contains the CMS file system tools.
|
||||
|
||||
%files cmsfs
|
||||
%{_sbindir}/cmsfscat
|
||||
%{_sbindir}/cmsfsck
|
||||
%{_sbindir}/cmsfscp
|
||||
%{_sbindir}/cmsfslst
|
||||
%{_sbindir}/cmsfsvol
|
||||
%{_mandir}/man8/cmsfscat.8*
|
||||
%{_mandir}/man8/cmsfsck.8*
|
||||
%{_mandir}/man8/cmsfscp.8*
|
||||
%{_mandir}/man8/cmsfslst.8*
|
||||
%{_mandir}/man8/cmsfsvol.8*
|
||||
|
||||
#
|
||||
# *********************** cmsfs-fuse package ***********************
|
||||
|
|
@ -723,6 +658,7 @@ Summary: CMS file system based on FUSE
|
|||
Group: System Environment/Base
|
||||
BuildRequires: fuse-devel
|
||||
Requires: fuse
|
||||
Obsoletes: %{name}-cmsfs < 2:2.7.0-3
|
||||
|
||||
%description cmsfs-fuse
|
||||
This package contains the CMS file system based on FUSE.
|
||||
|
|
@ -814,6 +750,9 @@ User-space development files for the s390/s390x architecture.
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Nov 19 2018 Dan Horák <dan[at]danny.cz> - 2:2.7.0-3
|
||||
- drop the original cmsfs subpackage
|
||||
|
||||
* Tue Nov 06 2018 Javier Martinez Canillas <javierm@redhat.com> - 2:2.7.0-2
|
||||
- Make zipl to use the BLS title field as the IPL section name
|
||||
|
||||
|
|
|
|||
1
sources
1
sources
|
|
@ -1,3 +1,2 @@
|
|||
SHA512 (cmsfs-1.1.8c.tar.gz) = 2ba5687d378fdd9871283728e81f1399047e74f9bba3936726eda11a978fe6ced1a300f15acb871d5daa26e61069d89767c753cf584f2731f5e99985db96aef0
|
||||
SHA512 (src_vipa-2.1.0.tar.gz) = 8f6048e82b4bcc479dfb09d62da64b9519f66efc31889ff795ee6ca107e262167df57628c305f1b899c41bb3f035e6309552d8548c890855d319e8e60d6a6cf7
|
||||
SHA512 (s390-tools-2.7.0.tar.gz) = f1c41f251d77ab7776def1569c2e8c424571b1fda9b3d6921fcf65bbfaa7c9dfc585a89e839ba00813ce4ee462ff525e3cf36d6dd02bf64b62ae81f2d4b7ca7d
|
||||
|
|
|
|||
Loading…
Reference in New Issue