diff options
Diffstat (limited to 'meta/recipes-bsp/pcmciautils')
-rw-r--r-- | meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_fix.patch | 101 | ||||
-rw-r--r-- | meta/recipes-bsp/pcmciautils/pcmciautils.inc | 33 | ||||
-rw-r--r-- | meta/recipes-bsp/pcmciautils/pcmciautils_018.bb | 11 |
3 files changed, 145 insertions, 0 deletions
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_fix.patch b/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_fix.patch new file mode 100644 index 0000000000..7b0ce21194 --- /dev/null +++ b/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_fix.patch | |||
@@ -0,0 +1,101 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Hardcoded paths are bad... | ||
4 | This lets us use the install from OE's native sysroot | ||
5 | rebase the patch to 018, removing hardcoded path for true | ||
6 | as well. Removing of -D in install invocation is a little | ||
7 | questionable, is it some GNU extention? | ||
8 | |||
9 | -Khem Raj <raj.khem@gmail.com> | ||
10 | |||
11 | Index: pcmciautils-018/Makefile | ||
12 | =================================================================== | ||
13 | --- pcmciautils-018.orig/Makefile | ||
14 | +++ pcmciautils-018/Makefile | ||
15 | @@ -76,7 +76,7 @@ sbindir = ${exec_prefix}/sbin | ||
16 | mandir = ${prefix}/usr/share/man | ||
17 | udevdir = ${prefix}/lib/udev | ||
18 | |||
19 | -INSTALL = /usr/bin/install -c | ||
20 | +INSTALL = install -c | ||
21 | INSTALL_PROGRAM = ${INSTALL} | ||
22 | INSTALL_DATA = ${INSTALL} -m 644 | ||
23 | INSTALL_SCRIPT = ${INSTALL_PROGRAM} | ||
24 | @@ -180,7 +180,7 @@ endif | ||
25 | # if DEBUG is enabled, then we do not strip or optimize | ||
26 | ifeq ($(strip $(DEBUG)),true) | ||
27 | CFLAGS += -O1 -g -DDEBUG -D_GNU_SOURCE | ||
28 | - STRIPCMD = /bin/true -Since_we_are_debugging | ||
29 | + STRIPCMD = true -Since_we_are_debugging | ||
30 | else | ||
31 | CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE | ||
32 | STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment | ||
33 | @@ -273,30 +273,32 @@ clean: | ||
34 | |||
35 | install-hotplug: | ||
36 | $(INSTALL) -d $(DESTDIR)$(hotplugdir) | ||
37 | - $(INSTALL_PROGRAM) -D hotplug/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.agent | ||
38 | - $(INSTALL_PROGRAM) -D hotplug/pcmcia.rc $(DESTDIR)$(hotplugdir)/pcmcia.rc | ||
39 | + $(INSTALL_PROGRAM) hotplug/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.agent | ||
40 | + $(INSTALL_PROGRAM) hotplug/pcmcia.rc $(DESTDIR)$(hotplugdir)/pcmcia.rc | ||
41 | |||
42 | uninstall-hotplug: | ||
43 | - rm -f $(DESTDIR)$(hotplugdir)/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.rc | ||
44 | |||
45 | install-socket-hotplug: | ||
46 | - $(INSTALL_PROGRAM) -D hotplug/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent | ||
47 | - $(INSTALL_PROGRAM) -D hotplug/pcmcia_socket.rc $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc | ||
48 | + $(INSTALL_PROGRAM) hotplug/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent | ||
49 | + $(INSTALL_PROGRAM) hotplug/pcmcia_socket.rc $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc | ||
50 | |||
51 | uninstall-socket-hotplug: | ||
52 | - rm -f $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc | ||
53 | |||
54 | install-socket-tools: | ||
55 | - $(INSTALL_PROGRAM) -D $(PCMCIA_SOCKET_STARTUP) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_SOCKET_STARTUP) | ||
56 | + $(INSTALL) -d $(DESTDIR)$(udevhelperdir) | ||
57 | + $(INSTALL_PROGRAM) $(PCMCIA_SOCKET_STARTUP) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_SOCKET_STARTUP) | ||
58 | |||
59 | uninstall-socket-tools: | ||
60 | - rm -f $(DESTDIR)$(udevhelperdir)/$(PCMCIA_SOCKET_STARTUP) | ||
61 | |||
62 | install-tools: | ||
63 | $(INSTALL) -d $(DESTDIR)$(sbindir) | ||
64 | - $(INSTALL_PROGRAM) -D $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(PCCARDCTL) | ||
65 | + $(INSTALL) -d $(DESTDIR)$(udevhelperdir) | ||
66 | + $(INSTALL_PROGRAM) $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(PCCARDCTL) | ||
67 | $(SYMLINK) $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(LSPCMCIA) | ||
68 | - $(INSTALL_PROGRAM) -D $(PCMCIA_CHECK_BROKEN_CIS) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_CHECK_BROKEN_CIS) | ||
69 | + $(INSTALL_PROGRAM) $(PCMCIA_CHECK_BROKEN_CIS) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_CHECK_BROKEN_CIS) | ||
70 | |||
71 | uninstall-tools: | ||
72 | - rm -f $(DESTDIR)$(sbindir)/$(PCCARDCTL) | ||
73 | @@ -305,22 +307,24 @@ uninstall-tools: | ||
74 | |||
75 | install-config: | ||
76 | $(INSTALL) -d $(DESTDIR)$(pcmciaconfdir) | ||
77 | - $(INSTALL_DATA) -D config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts | ||
78 | + $(INSTALL_DATA) config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts | ||
79 | if [ -f config/config.opts.$(ARCH) ]; then \ | ||
80 | - $(INSTALL_DATA) -D config/config.opts.$(ARCH) $(DESTDIR)$(pcmciaconfdir)/config.opts; \ | ||
81 | + $(INSTALL_DATA) config/config.opts.$(ARCH) $(DESTDIR)$(pcmciaconfdir)/config.opts; \ | ||
82 | fi | ||
83 | |||
84 | uninstall-config: | ||
85 | # - rm -f $(DESTDIR)$(pcmciaconfdir)/config.opts | ||
86 | |||
87 | install-udev: | ||
88 | - $(INSTALL_DATA) -D $(UDEV_RULES_FILE) $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules | ||
89 | + $(INSTALL) -d $(DESTDIR)$(udevrulesdir) | ||
90 | + $(INSTALL_DATA) $(UDEV_RULES_FILE) $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules | ||
91 | |||
92 | uninstall-udev: | ||
93 | - rm -f $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules | ||
94 | |||
95 | install-man: | ||
96 | - $(INSTALL_DATA) -D man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8 | ||
97 | + $(INSTALL) -d $(DESTDIR)$(mandir)/man8 | ||
98 | + $(INSTALL_DATA) man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8 | ||
99 | $(SYMLINK) pccardctl.8 $(DESTDIR)$(mandir)/man8/lspcmcia.8 | ||
100 | |||
101 | uninstall-man: | ||
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils.inc b/meta/recipes-bsp/pcmciautils/pcmciautils.inc new file mode 100644 index 0000000000..eafe82045c --- /dev/null +++ b/meta/recipes-bsp/pcmciautils/pcmciautils.inc | |||
@@ -0,0 +1,33 @@ | |||
1 | SUMMARY = "Linux kernel userland utilities for the PCMCIA subsystem" | ||
2 | HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" | ||
3 | SECTION = "kernel/userland" | ||
4 | |||
5 | LICENSE = "GPLv2" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
7 | |||
8 | DEPENDS = "udev sysfsutils flex-native" | ||
9 | RDEPENDS_${PN} = "udev module-init-tools" | ||
10 | |||
11 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2" | ||
12 | |||
13 | S = "${WORKDIR}/pcmciautils-${PV}" | ||
14 | |||
15 | export HOSTCC = "${BUILD_CC}" | ||
16 | export etcdir = "${sysconfdir}" | ||
17 | export sbindir = "${base_sbindir}" | ||
18 | export pcmciaconfdir = "${sysconfdir}/pcmcia" | ||
19 | export udevdir = "`pkg-config --variable=udevdir udev`" | ||
20 | export udevrulesdir = "`pkg-config --variable=udevdir udev`/rules.d" | ||
21 | export UDEV = "1" | ||
22 | LD = "${CC}" | ||
23 | CFLAGS =+ "-I${S}/src" | ||
24 | CFLAGS =+ "-DPCMCIAUTILS_VERSION=\\"${PV}\\"" | ||
25 | |||
26 | PARALLEL_MAKE = "" | ||
27 | EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs' 'LEX=flex'" | ||
28 | |||
29 | do_install () { | ||
30 | oe_runmake 'DESTDIR=${D}' install | ||
31 | } | ||
32 | |||
33 | CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts" | ||
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb new file mode 100644 index 0000000000..50629b4b14 --- /dev/null +++ b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb | |||
@@ -0,0 +1,11 @@ | |||
1 | require pcmciautils.inc | ||
2 | |||
3 | SRC_URI += "file://makefile_fix.patch" | ||
4 | |||
5 | SRC_URI[md5sum] = "5d85669b3440baa4532363da6caaf1b4" | ||
6 | SRC_URI[sha256sum] = "79e6ae441278e178c07501d492394ed2c0326fdb66894f6d040ec811b0dc8ed5" | ||
7 | |||
8 | PR = "r1" | ||
9 | |||
10 | FILES_${PN}-dbg += "*/udev/.debug" | ||
11 | FILES_${PN} += "*/udev" | ||