summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-08-14 14:09:28 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-15 09:44:33 +0100
commit6c5d4f989d377fea2c95bd04e7a04776753bf434 (patch)
treef1b3b77e5026b6fa9419ded37ee8f5caa726de2a
parentaa5987c943cf1e452698eba95dcdab4d0e369248 (diff)
downloadpoky-6c5d4f989d377fea2c95bd04e7a04776753bf434.tar.gz
pcmciautils: remove from oe-core
PCMCIA is pretty rare these days, so now that the recipe is in meta-oe we can remove it from oe-core. (From OE-Core rev: 0f8dcb9c717201c4b1edf4fa55880b432bfb7723) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/maintainers.inc1
-rw-r--r--meta/recipes-bsp/pcmciautils/pcmciautils-018/lex_sys_types.patch21
-rw-r--r--meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_fix.patch101
-rw-r--r--meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_race.patch29
-rw-r--r--meta/recipes-bsp/pcmciautils/pcmciautils.inc34
-rw-r--r--meta/recipes-bsp/pcmciautils/pcmciautils_018.bb11
6 files changed, 0 insertions, 197 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 08f8c46ff4..0d1c72a85f 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -519,7 +519,6 @@ RECIPE_MAINTAINER_pn-patchelf = "Richard Purdie <richard.purdie@linuxfoundation.
519RECIPE_MAINTAINER_pn-pbzip2 = "Denys Dmytriyenko <denys@ti.com>" 519RECIPE_MAINTAINER_pn-pbzip2 = "Denys Dmytriyenko <denys@ti.com>"
520RECIPE_MAINTAINER_pn-pciutils = "Chen Qi <Qi.Chen@windriver.com>" 520RECIPE_MAINTAINER_pn-pciutils = "Chen Qi <Qi.Chen@windriver.com>"
521RECIPE_MAINTAINER_pn-pcmanfm = "Alexander Kanavin <alex.kanavin@gmail.com>" 521RECIPE_MAINTAINER_pn-pcmanfm = "Alexander Kanavin <alex.kanavin@gmail.com>"
522RECIPE_MAINTAINER_pn-pcmciautils = "Robert Yang <liezhi.yang@windriver.com>"
523RECIPE_MAINTAINER_pn-perf = "Bruce Ashfield <bruce.ashfield@windriver.com>" 522RECIPE_MAINTAINER_pn-perf = "Bruce Ashfield <bruce.ashfield@windriver.com>"
524RECIPE_MAINTAINER_pn-perl = "Maxin B. John <maxin.john@intel.com>" 523RECIPE_MAINTAINER_pn-perl = "Maxin B. John <maxin.john@intel.com>"
525RECIPE_MAINTAINER_pn-perl-native = "Maxin B. John <maxin.john@intel.com>" 524RECIPE_MAINTAINER_pn-perl-native = "Maxin B. John <maxin.john@intel.com>"
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils-018/lex_sys_types.patch b/meta/recipes-bsp/pcmciautils/pcmciautils-018/lex_sys_types.patch
deleted file mode 100644
index d4c2bed15c..0000000000
--- a/meta/recipes-bsp/pcmciautils/pcmciautils-018/lex_sys_types.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1Include sys/types.h for u_long definition
2
3Fix errors like
4In file included from src/lex_config.l:34:0:
5src/yacc_config.y:45:5: error: unknown type name 'u_long'
6 u_long num;
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9Upstream-Status: Pending
10Index: pcmciautils-018/src/lex_config.l
11===================================================================
12--- pcmciautils-018.orig/src/lex_config.l
13+++ pcmciautils-018/src/lex_config.l
14@@ -22,6 +22,7 @@
15 #include <unistd.h>
16 #include <string.h>
17 #include <syslog.h>
18+#include <sys/types.h>
19
20 #ifdef HAS_WORDEXP
21 #include <wordexp.h>
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_fix.patch b/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_fix.patch
deleted file mode 100644
index 7b0ce21194..0000000000
--- a/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_fix.patch
+++ /dev/null
@@ -1,101 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Hardcoded paths are bad...
4This lets us use the install from OE's native sysroot
5rebase the patch to 018, removing hardcoded path for true
6as well. Removing of -D in install invocation is a little
7questionable, is it some GNU extention?
8
9-Khem Raj <raj.khem@gmail.com>
10
11Index: 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-018/makefile_race.patch b/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_race.patch
deleted file mode 100644
index 4c5eba7951..0000000000
--- a/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_race.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1"make src/lex_config.o"
2
3results in:
4
5src/lex_config.l:35:25: fatal error: yacc_config.h: No such file or directory
6
7so add missing dependency through a missing rule. Also remove a rule which
8doesn't appear to do anything.
9
10RP
112016/1/31
12
13Upstream-Status: Pending
14
15Index: pcmciautils-018/Makefile
16===================================================================
17--- pcmciautils-018.orig/Makefile
18+++ pcmciautils-018/Makefile
19@@ -246,8 +246,8 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/st
20 $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) src/startup.o src/yacc_config.o src/lex_config.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
21 $(QUIET) $(STRIPCMD) $@
22
23-yacc_config.o lex_config.o: %.o: %.c
24- $(CC) -c -MD -O -pipe $(CPPFLAGS) $<
25+src/lex_config.o : src/lex_config.c src/yacc_config.h ccdv
26+ $(QUIET) $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
27
28 debugtools: ccdv $(CBDUMP) $(CISDUMP)
29
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils.inc b/meta/recipes-bsp/pcmciautils/pcmciautils.inc
deleted file mode 100644
index 26c6d75d4b..0000000000
--- a/meta/recipes-bsp/pcmciautils/pcmciautils.inc
+++ /dev/null
@@ -1,34 +0,0 @@
1SUMMARY = "Linux kernel userland utilities for the PCMCIA subsystem"
2HOMEPAGE = "https://www.kernel.org/pub/linux/utils/kernel/pcmcia/"
3SECTION = "kernel/userland"
4
5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
7
8DEPENDS = "udev sysfsutils flex-native bison-native"
9RDEPENDS_${PN} = "udev module-init-tools"
10
11SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/pcmcia/${BP}.tar.xz"
12
13S = "${WORKDIR}/pcmciautils-${PV}"
14
15inherit pkgconfig
16
17export HOSTCC = "${BUILD_CC}"
18export etcdir = "${sysconfdir}"
19export sbindir = "${base_sbindir}"
20export pcmciaconfdir = "${sysconfdir}/pcmcia"
21export udevdir = "`pkg-config --variable=udevdir udev`"
22export udevrulesdir = "`pkg-config --variable=udevdir udev`/rules.d"
23export UDEV = "1"
24LD = "${CC}"
25CFLAGS =+ "-I${S}/src"
26CFLAGS =+ "-DPCMCIAUTILS_VERSION=\\"${PV}\\""
27
28EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs' 'LEX=flex'"
29
30do_install () {
31 oe_runmake 'DESTDIR=${D}' install
32}
33
34CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts"
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
deleted file mode 100644
index bf0f58a7cc..0000000000
--- a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1require pcmciautils.inc
2
3SRC_URI += "file://makefile_fix.patch \
4 file://makefile_race.patch \
5 file://lex_sys_types.patch \
6"
7
8SRC_URI[md5sum] = "885431c3cefb76ffdad8cb985134e996"
9SRC_URI[sha256sum] = "57c27be8f04ef4d535bcfa988567316cc57659fe69068327486dab53791e6558"
10
11PR = "r1"