avatar
Rosa has added 2831eb3b3e
initial: add from SRPM
... ... --- /dev/null
... ... +++ b/.abf.yml
... ... @@ -0,0 +1,2 @@
1
sources:
2
  "pcmciautils-015.tar.bz2": 6ecc69e0088c8b29111ca08749cf283582c70ed3
view file @ 2831eb3b3e
... ... --- /dev/null
... ... +++ b/pcmciautils-015-libudevdir.patch
... ... @@ -0,0 +1,55 @@
1
From 390ae29ff467ec351c2f69aec599111589b599f0 Mon Sep 17 00:00:00 2001
2
From: Olivier Blin <blino@mandriva.com>
3
Date: Mon, 1 Sep 2008 11:55:11 +0200
4
Subject: [PATCH] fix installation of udev helpers
5
6
udev helpers were wrongly installed in /sbin while udev rules
7
explicitely called them from /lib/udev
8
9
Signed-off-by: Olivier Blin <blino@mandriva.com>
10
---
11
 Makefile |   12 +++++++-----
12
 1 files changed, 7 insertions(+), 5 deletions(-)
13
14
diff --git a/Makefile b/Makefile
15
index e1d7c85..6f7d9f4 100644
16
--- a/Makefile
17
+++ b/Makefile
18
@@ -80,6 +80,8 @@ hotplugdir =	${etcdir}/hotplug
19
 
20
 # place to put our udev rules to
21
 udevrulesdir = 	${etcdir}/udev/rules.d
22
+# place to put our udev helpers to
23
+udevlibdir =	/lib/udev
24
 
25
 # place where PCMICIA config is put to
26
 pcmciaconfdir =	${etcdir}/pcmcia
27
@@ -273,20 +275,20 @@ install-socket-hotplug:
28
 uninstall-socket-hotplug:
29
 	- rm -f $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc
30
 install-socket-tools:
31
-	$(INSTALL_PROGRAM) -D $(PCMCIA_SOCKET_STARTUP) $(DESTDIR)$(sbindir)/$(PCMCIA_SOCKET_STARTUP)
32
+	$(INSTALL_PROGRAM) -D $(PCMCIA_SOCKET_STARTUP) $(DESTDIR)$(udevlibdir)/$(PCMCIA_SOCKET_STARTUP)
33
 
34
 uninstall-socket-tools:
35
-	- rm -f $(DESTDIR)$(sbindir)/$(PCMCIA_SOCKET_STARTUP)
36
+	- rm -f $(DESTDIR)$(udevlibdir)/$(PCMCIA_SOCKET_STARTUP)
37
 
38
 install-tools:
39
-	$(INSTALL) -d $(DESTDIR)$(sbindir)
40
+	$(INSTALL) -d $(DESTDIR)$(sbindir) $(DESTDIR)$(udevlibdir)
41
 	$(INSTALL_PROGRAM) -D $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(PCCARDCTL)
42
-	$(INSTALL_PROGRAM) -D $(PCMCIA_CHECK_BROKEN_CIS) $(DESTDIR)$(sbindir)/$(PCMCIA_CHECK_BROKEN_CIS)
43
+	$(INSTALL_PROGRAM) -D $(PCMCIA_CHECK_BROKEN_CIS) $(DESTDIR)$(udevlibdir)/$(PCMCIA_CHECK_BROKEN_CIS)
44
 	$(SYMLINK) $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(LSPCMCIA)
45
 
46
 uninstall-tools:
47
 	- rm -f $(DESTDIR)$(sbindir)/$(PCCARDCTL)
48
-	- rm -f $(DESTDIR)$(sbindir)/$(PCMCIA_CHECK_BROKEN_CIS)
49
+	- rm -f $(DESTDIR)$(udevlibdir)/$(PCMCIA_CHECK_BROKEN_CIS)
50
 	- rm -f $(DESTDIR)$(sbindir)/$(LSPCMCIA)
51
 
52
 install-config:
53
-- 
54
1.6.0.1
55
view file @ 2831eb3b3e
... ... --- /dev/null
... ... +++ b/pcmciautils-015-parallel.patch
... ... @@ -0,0 +1,19 @@
1
diff -p -up pcmciautils-015/Makefile.parallel pcmciautils-015/Makefile
2
--- pcmciautils-015/Makefile.parallel	2008-07-14 10:59:17.000000000 +0200
3
+++ pcmciautils-015/Makefile	2008-08-12 10:40:18.000000000 +0200
4
@@ -208,11 +208,13 @@ UDEV_RULES += udev/rules-end
5
 
6
 all: ccdv $(PCCARDCTL) $(PCMCIA_CHECK_BROKEN_CIS) $(PCMCIA_SOCKET_STARTUP_BUILD) udevrules
7
 
8
-ccdv:
9
+ccdv: build/ccdv
10
+build/ccdv: build/ccdv.c
11
 	@echo "Building ccdv"
12
 	@$(HOSTCC) -O1 build/ccdv.c -o build/ccdv
13
 
14
-.c.o:
15
+%.o : %.c ccdv
16
+	echo "building $@"
17
 	$(QUIET) $(CC) $(CFLAGS) -c -o $@ $<
18
 
19
 %.c %.h : %.y
view file @ 2831eb3b3e
... ... --- /dev/null
... ... +++ b/pcmciautils.spec
... ... @@ -0,0 +1,174 @@
1
Summary: Tools for the hotpluggable PCMCIA subsystem
2
Name: pcmciautils
3
Version: 015
4
Release: %mkrel 7
5
Source0: %{name}-%{version}.tar.bz2
6
Patch0:	 pcmciautils-015-parallel.patch
7
Patch1:	 pcmciautils-015-libudevdir.patch
8
License: GPL
9
Group: System/Kernel and hardware
10
Url: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/
11
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
12
BuildRequires: byacc
13
BuildRequires: libsysfs-devel
14
BuildRequires: flex
15
Provides:     pcmcia-cs
16
Obsoletes:     pcmcia-cs
17
Conflicts:	drakxtools-backend < 10.4.33-1mdv2007.0
18
19
%description
20
PCMCIAutils contains hotplug scripts and initialization tools
21
necessary to allow the PCMCIA subsystem to behave (almost) as every
22
other hotpluggable bus system (e.g. USB, IEEE1394).
23
24
Please note that the kernel support for this new feature is only
25
present since 2.6.13-rc1.
26
27
%prep
28
%setup -q
29
%patch0 -p1 -b .parallel
30
%patch1 -p1 -b .libudevdir
31
32
%build
33
%make
34
35
%install
36
rm -rf %{buildroot}
37
%makeinstall_std
38
39
%clean
40
rm -rf %{buildroot}
41
42
# write /etc/modprobe.preload.d/pcmcia file on migration from old pcmcia-cs
43
%triggerpostun -p /usr/bin/perl -- pcmcia-cs, %{name} < 014-3mdv2007.0
44
use lib qw(/usr/lib/libDrakX);
45
use harddrake::autoconf;
46
use detect_devices;
47
my $controller = detect_devices::pcmcia_controller_probe();
48
harddrake::autoconf::pcmcia($controller && $controller->{driver});
49
50
%files
51
%defattr(-,root,root)
52
%config(noreplace) %{_sysconfdir}/pcmcia/config.opts
53
%{_sysconfdir}/udev/rules.d/60-pcmcia.rules
54
/sbin/lspcmcia
55
/sbin/pccardctl
56
/lib/udev/pcmcia-check-broken-cis
57
/lib/udev/pcmcia-socket-startup
58
%{_mandir}/man*/*
59
60
61
%changelog
62
* Wed May 04 2011 Oden Eriksson <oeriksson@mandriva.com> 015-7mdv2011.0
63
+ Revision: 667002
64
- mass rebuild
65
66
* Fri Dec 03 2010 Oden Eriksson <oeriksson@mandriva.com> 015-6mdv2011.0
67
+ Revision: 607084
68
- rebuild
69
70
* Wed Mar 17 2010 Oden Eriksson <oeriksson@mandriva.com> 015-5mdv2010.1
71
+ Revision: 523608
72
- rebuilt for 2010.1
73
74
* Thu Sep 03 2009 Christophe Fergeau <cfergeau@mandriva.com> 015-4mdv2010.0
75
+ Revision: 426384
76
- rebuild
77
78
* Sat Mar 07 2009 Antoine Ginies <aginies@mandriva.com> 015-3mdv2009.1
79
+ Revision: 351668
80
- rebuild
81
82
* Mon Sep 01 2008 Olivier Blin <oblin@mandriva.com> 015-2mdv2009.0
83
+ Revision: 278173
84
- install udev helpers to /lib/udev as expected (#43024)
85
86
* Tue Aug 12 2008 Olivier Blin <oblin@mandriva.com> 015-1mdv2009.0
87
+ Revision: 271053
88
- fix parallel build with ccdv
89
- remove modalias patch, fixed upstream
90
- 015
91
92
* Tue Jun 17 2008 Thierry Vignaud <tv@mandriva.org> 014-5mdv2009.0
93
+ Revision: 223471
94
- rebuild
95
96
* Tue Mar 04 2008 Oden Eriksson <oeriksson@mandriva.com> 014-4mdv2008.1
97
+ Revision: 179155
98
- rebuild
99
100
  + Olivier Blin <oblin@mandriva.com>
101
    - restore BuildRoot
102
103
  + Thierry Vignaud <tv@mandriva.org>
104
    - kill re-definition of %%buildroot on Pixel's request
105
106
107
* Thu Jun 15 2006 Olivier Blin <oblin@mandriva.com> 014-3mdv2007.0
108
- adapt to new detect_devices::pcmcia_controller_probe()
109
110
* Wed Jun 07 2006 Olivier Blin <oblin@mandriva.com> 014-2mdv2007.0
111
- fix PCMCIA autoconf
112
113
* Wed Jun 07 2006 Olivier Blin <oblin@mandriva.com> 014-1mdv2007.0
114
- 014
115
- drop Patch0 and Patch1 (merged upstream)
116
- write /etc/modprobe.preload.d/pcmcia file on migration from old pcmcia-cs (#22831)
117
118
* Tue May 23 2006 Olivier Blin <oblin@mandriva.com> 013-3mdk
119
- Patch2: fix udev modalias rules
120
- don't do coldplug for PCMCIA controller with a broken rule
121
  (that triggered general PCI hotplugging /o\)
122
  this should be done in some /etc/modprobe.preload.d/ file
123
124
* Mon Mar 27 2006 Olivier Blin <oblin@mandriva.com> 013-2mdk
125
- Patch1: fix lspcmcia symlink (from Colin Watson, Debian)
126
127
* Mon Mar 27 2006 Olivier Blin <oblin@mandriva.com> 013-1mdk
128
- New release 013
129
- Patch0: use correct path for ln
130
- package lspcmcia
131
132
* Tue Mar 14 2006 Olivier Blin <oblin@mandriva.com> 012-2mdk
133
- Obsoletes/Provides pcmcia-cs
134
- remove udev build hacks (enabled by default now)
135
136
* Tue Dec 20 2005 Olivier Blin <oblin@mandriva.com> 012-1mdk
137
- New release 012
138
- remove Patch0, merged upstream
139
140
* Tue Dec 13 2005 Thierry Vignaud <tvignaud@mandriva.com> 011-2mdk
141
- link with new libsysfs2
142
- patch 0: fix compiling with libsysfs2
143
144
* Tue Dec 06 2005 Olivier Blin <oblin@mandriva.com> 011-1mdk
145
- New release 011
146
147
* Wed Oct 12 2005 Olivier Blin <oblin@mandriva.com> 010-2mdk
148
- Source1: coldplug support for yenta_socket (#19097)
149
150
* Thu Sep 22 2005 Olivier Blin <oblin@mandriva.com> 010-1mdk
151
- 010
152
- build with udev support
153
154
* Sat Aug 27 2005 Olivier Blin <oblin@mandriva.com> 007-4mdk
155
- don't package hotplug files, this has to be moved to udev
156
157
* Thu Aug 04 2005 Nicolas Lcureuil <neoclust@mandriva.org> 007-3mdk
158
- Fix BuildRequires
159
160
* Sat Jul 30 2005 Nicolas Lcureuil <neoclust@mandriva.org> 007-2mdk
161
- Fix BuildRequires
162
163
* Mon Jul 25 2005 Olivier Blin <oblin@mandriva.com> 007-1mdk
164
- 007
165
166
* Mon Jul 18 2005 Olivier Blin <oblin@mandriva.com> 006-1mdk
167
- 006
168
169
* Mon Jul 04 2005 Olivier Blin <oblin@mandriva.com> 005-2mdk
170
- conflicts with pcmcia-cs, which will be deprecated soon
171
172
* Mon Jul 04 2005 Olivier Blin <oblin@mandriva.com> 005-1mdk
173
- initial Mandriva Linux release
174

Comments