Author: matkor Date: Tue Nov 7 09:19:08 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- Moved made by blues buildable kernel-misc-tifm.spec to tifm.spec which seems
to be better as for PLD standards.
---- Files affected:
SPECS:
tifm.spec (1.2 -> 1.3) , kernel-misc-tifm.spec (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SPECS/tifm.spec
diff -u SPECS/tifm.spec:1.2 SPECS/tifm.spec:1.3
--- SPECS/tifm.spec:1.2 Mon Oct 16 05:28:38 2006
+++ SPECS/tifm.spec Tue Nov 7 10:19:03 2006
@@ -1,66 +1,43 @@
# $Revision$, $Date$
#
-# Replace MODULE_NAME with real module name and MODULE_DIR
-# with required directory name.
-#
# Conditional build:
%bcond_without dist_kernel # allow non-distribution kernel
-%bcond_without kernel # don't build kernel modules
%bcond_without smp # don't build SMP module
-%bcond_without userspace # don't build userspace programs
%bcond_with verbose # verbose build (V=1)
-%if %{without kernel}
-%undefine with_dist_kernel
-%endif
-
-#
-# main package.
-#
-%define _rel 0.1
-###### Unknown group!
-Summary: Free source linux driver for TI FlashMedia family of devices.
-Summary(pl): Otwarty linuxowy sterownik dla urzadzen TI Flashmedia
-Name: tifm
+%define _rel 0.3
+%define _module tifm
+Summary: Linux driver for TI FlashMedia xx12/xx21 storage controllers
+Name: %{_module}
Version: 0.6b
-Release: %{_rel}
-Epoch: 0
-License: GPL
-Group: kernel
-#
-# Source0: %{name}-%{version}.tar.gz
+Release: [EMAIL PROTECTED]
+License: GPL v2
+Group: Base/Kernel
Source0: http://download.berlios.de/tifmxx/%{name}-%{version}.tar.bz2
# Source0-md5: e48d47260cda579362f14a9a81bd75dc
-#Source1: -
-# Source1-md5: -
-#Patch0: %{name}-what.patch
-URL:
http://openfacts.berlios.de/index-en.phtml?title=TI_FlashMedia_xx12/xx21_driver
-%if %{with kernel}
-%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >=
3:2.6.14}
+Patch0: kernel-misc-%{name}-7420_7620.patch
+URL: http://developer.berlios.de/projects/tifmxx
+%{?with_dist_kernel:BuildRequires: kernel-module-build >= 3:2.6.7}
BuildRequires: rpmbuild(macros) >= 1.308
-%endif
-#BuildRequires: -
-#Requires(postun): -
-#Requires(pre,post): -
-#Requires(preun): -
-#Requires: -
-#Provides: -
-#Obsoletes: -
-#Conflicts: -
+ExclusiveArch: %{ix86}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-Free source linux driver for TI FlashMedia xx12/xx21 family of
-devices.
-
-%description -l pl
-Otwarty linuxowy sterownik dla urzadzen TI Flasmedia xx12/xx21
+This project is devoted to the development of the acceptable and free
+source linux driver for TI FlashMedia family of devices. These devices
+are found in a vast majority of the modern laptops. Unfortunately, TI
+refused to publish a complete datasheet for any of the FlashMedia
+devices rendering them useless anywhere except M$ Windows (not unlike
+many other hardware vendors).
+
+Windows drivers to the mentioned devices are available from nearly all
+major computer vendors both for Win32 and Win64 platforms. They
+support all the expected functionality: SM/xD cards, MMC, SD and SDIO,
+MemoryStick and MSpro including security/DRM features.
# kernel subpackages.
-
-%package -n kernel%{_alt_kernel}-misc-tifm
-Summary: Linux driver for TI FlashMedia xx12/xx21 family of devices.
-Summary(pl): Sterownik dla Linuksa do urzadzen TI FlashMedia xx12/xx21
+%package -n kernel-misc-%{_module}
+Summary: Linux SMP driver for TI FlashMedia xx12/xx21 storage controllers
Release: [EMAIL PROTECTED]
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
@@ -69,15 +46,17 @@
Requires(postun): %releq_kernel_up
%endif
-%description -n kernel%{_alt_kernel}-misc-tifm
-Driver for TI FlashMedia xx12/xx21 devices for Linux.
+%description -n kernel-misc-%{_module}
+Free source linux driver for TI FlashMedia xx12/xx21 family of
+devices.
-%description -n kernel%{_alt_kernel}-misc-tifm -l pl
+%description -n kernel-misc-%{_module} -l pl
Sterownik dla Linuksa do TI FlashMedia z rodziny xx12/xx21.
-%package -n kernel%{_alt_kernel}-smp-misc-tifm
-Summary: Linux SMP driver for TI FlashMedia xx12/xx21
-Summary(pl): Sterownik dla Linuksa SMP do TI FlashMedia xx12/xx21
+
+
+%package -n kernel-smp-misc-%{_module}
+Summary: Linux SMP driver for TI FlashMedia xx12/xx21 storage controllers
Release: [EMAIL PROTECTED]
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
@@ -86,21 +65,19 @@
Requires(postun): %releq_kernel_smp
%endif
-%description -n kernel%{_alt_kernel}-smp-misc-tifm
-This is driver for TI FlashMedia xx12/xx21 for Linux SMP.
-
-%description -n kernel%{_alt_kernel}-smp-misc-tifm -l pl
-Sterownik dla Linuksa SMP do urzadzen TI FlashMedia z serii xx12/xx21.
+%description -n kernel-smp-misc-%{_module}
+Free source linux driver for TI FlashMedia xx12/xx21 family of devices
+for SMP kernels.
+
+%description -n kernel-misc-%{_module} -l pl
+Sterownik dla Linuksa do TI FlashMedia z rodziny xx12/xx21 dla jąder
+SMP.
%prep
+%setup -q -c
+%patch0 -p1
%build
-%if %{with userspace}
-
-
-%endif
-
-%if %{with kernel}
# kernel module(s)
for cfg in %{?with_dist_kernel:%{?with_smp:smp}
up}%{!?with_dist_kernel:nondist}; do
if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
@@ -117,77 +94,61 @@
touch o/include/config/MARKER
ln -sf %{_kernelsrcdir}/scripts o/scripts
%endif
-#
-# patching/creating makefile(s) (optional)
-#
%{__make} -C %{_kernelsrcdir} clean \
RCS_FIND_IGNORE="-name '*.ko' -o" \
- SYSSRC=%{_kernelsrcdir} \
- SYSOUT=$PWD/o \
- M=$PWD O=$PWD/o \
+ M=$PWD O=$PWD/o KSRC=$PWD/o\
%{?with_verbose:V=1}
%{__make} -C %{_kernelsrcdir} modules \
- CC="%{__cc}" CPP="%{__cpp}" \
- SYSSRC=%{_kernelsrcdir} \
- SYSOUT=$PWD/o \
- M=$PWD O=$PWD/o \
+ M=$PWD O=$PWD/o KSRC=$PWD/o\
%{?with_verbose:V=1}
-
- mv tifm{,-$cfg}.ko
+ for mod in tifm_7xx1 tifm_core tifm_sd; do
+ mv $mod{,-$cfg}.ko
+ done
done
-%endif
%install
rm -rf $RPM_BUILD_ROOT
-
-%if %{with userspace}
-
-
-%endif
-
-%if %{with kernel}
install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
-install tifm-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/tifm.ko
+
+install
%{_module}_7xx1-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
+ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/%{_module}_7xx1.ko
+install
%{_module}_core-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
+ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/%{_module}_core.ko
+install %{_module}_sd-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
+ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/%{_module}_sd.ko
%if %{with smp} && %{with dist_kernel}
-install tifm-smp.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/tifm.ko
-%endif
+install %{_module}_7xx1-smp.ko \
+ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/%{_module}_7xx1.ko
+install %{_module}_core-smp.ko \
+ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/%{_module}_core.ko
+install %{_module}_sd-smp.ko \
+ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/%{_module}_sd.ko
%endif
%clean
rm -rf $RPM_BUILD_ROOT
-%post -n kernel%{_alt_kernel}-misc-tifm
+%post
%depmod %{_kernel_ver}
-%postun -n kernel%{_alt_kernel}-misc-tifm
+%postun
%depmod %{_kernel_ver}
-%post -n kernel%{_alt_kernel}-smp-misc-tifm
+%post -n kernel-smp-misc-%{_module}
%depmod %{_kernel_ver}smp
-%postun -n kernel%{_alt_kernel}-smp-misc-tifm
+%postun -n kernel-smp-misc-%{_module}
%depmod %{_kernel_ver}smp
-%if %{with kernel}
-%files -n kernel%{_alt_kernel}-misc-tifm
+%files -n kernel-misc-%{_module}
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}/misc/*.ko*
%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-misc-tifm
+%files -n kernel-smp-misc-%{_module}
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}smp/misc/*.ko*
%endif
-%endif
-
-%if %{with userspace}
-%files
-%defattr(644,root,root,755)
-
-%endif
-
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -195,6 +156,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.2 2006/10/16 03:28:38 matkor
-- Adapterised.
+Revision 1.3 2006/11/07 09:19:03 matkor
+- Moved made by blues buildable kernel-misc-tifm.spec to tifm.spec which seems
to be better as for PLD standards.
+
+Revision 1.2 2006/11/06 20:52:41 blues
+- some adapter, added 7420/7620 patch, not tested yet
+
+Revision 1.1 2006/11/06 20:34:03 blues
+- initial
================================================================
Index: SPECS/kernel-misc-tifm.spec
diff -u SPECS/kernel-misc-tifm.spec:1.2 SPECS/kernel-misc-tifm.spec:1.3
--- SPECS/kernel-misc-tifm.spec:1.2 Mon Nov 6 21:52:41 2006
+++ SPECS/kernel-misc-tifm.spec Tue Nov 7 10:19:03 2006
@@ -1,5 +1,7 @@
# $Revision$, $Date$
#
+# USE tifm.spec insted this spec !
+#
# Conditional build:
%bcond_without dist_kernel # allow non-distribution kernel
%bcond_without smp # don't build SMP module
@@ -64,6 +66,11 @@
MemoryStick and MSpro including security/DRM features.
%prep
+echo "*********************************************************************"
+echo "PLEASE USE tifm.spec instead of this file"
+echo "*********************************************************************"
+
+return 1
%setup -q -c
%patch0 -p1
@@ -146,6 +153,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.3 2006/11/07 09:19:03 matkor
+- Moved made by blues buildable kernel-misc-tifm.spec to tifm.spec which seems
to be better as for PLD standards.
+
Revision 1.2 2006/11/06 20:52:41 blues
- some adapter, added 7420/7620 patch, not tested yet
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/tifm.spec?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SPECS/kernel-misc-tifm.spec?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
