added my Recipes
This commit is contained in:
@@ -0,0 +1,21 @@
|
||||
Include sys/types.h for u_long definition
|
||||
|
||||
Fix errors like
|
||||
In file included from src/lex_config.l:34:0:
|
||||
src/yacc_config.y:45:5: error: unknown type name 'u_long'
|
||||
u_long num;
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Upstream-Status: Pending
|
||||
Index: pcmciautils-018/src/lex_config.l
|
||||
===================================================================
|
||||
--- pcmciautils-018.orig/src/lex_config.l
|
||||
+++ pcmciautils-018/src/lex_config.l
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <syslog.h>
|
||||
+#include <sys/types.h>
|
||||
|
||||
#ifdef HAS_WORDEXP
|
||||
#include <wordexp.h>
|
||||
@@ -0,0 +1,101 @@
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Hardcoded paths are bad...
|
||||
This lets us use the install from OE's native sysroot
|
||||
rebase the patch to 018, removing hardcoded path for true
|
||||
as well. Removing of -D in install invocation is a little
|
||||
questionable, is it some GNU extention?
|
||||
|
||||
-Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
Index: pcmciautils-018/Makefile
|
||||
===================================================================
|
||||
--- pcmciautils-018.orig/Makefile
|
||||
+++ pcmciautils-018/Makefile
|
||||
@@ -76,7 +76,7 @@ sbindir = ${exec_prefix}/sbin
|
||||
mandir = ${prefix}/usr/share/man
|
||||
udevdir = ${prefix}/lib/udev
|
||||
|
||||
-INSTALL = /usr/bin/install -c
|
||||
+INSTALL = install -c
|
||||
INSTALL_PROGRAM = ${INSTALL}
|
||||
INSTALL_DATA = ${INSTALL} -m 644
|
||||
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
|
||||
@@ -180,7 +180,7 @@ endif
|
||||
# if DEBUG is enabled, then we do not strip or optimize
|
||||
ifeq ($(strip $(DEBUG)),true)
|
||||
CFLAGS += -O1 -g -DDEBUG -D_GNU_SOURCE
|
||||
- STRIPCMD = /bin/true -Since_we_are_debugging
|
||||
+ STRIPCMD = true -Since_we_are_debugging
|
||||
else
|
||||
CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE
|
||||
STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
|
||||
@@ -273,30 +273,32 @@ clean:
|
||||
|
||||
install-hotplug:
|
||||
$(INSTALL) -d $(DESTDIR)$(hotplugdir)
|
||||
- $(INSTALL_PROGRAM) -D hotplug/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.agent
|
||||
- $(INSTALL_PROGRAM) -D hotplug/pcmcia.rc $(DESTDIR)$(hotplugdir)/pcmcia.rc
|
||||
+ $(INSTALL_PROGRAM) hotplug/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.agent
|
||||
+ $(INSTALL_PROGRAM) hotplug/pcmcia.rc $(DESTDIR)$(hotplugdir)/pcmcia.rc
|
||||
|
||||
uninstall-hotplug:
|
||||
- rm -f $(DESTDIR)$(hotplugdir)/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.rc
|
||||
|
||||
install-socket-hotplug:
|
||||
- $(INSTALL_PROGRAM) -D hotplug/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent
|
||||
- $(INSTALL_PROGRAM) -D hotplug/pcmcia_socket.rc $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc
|
||||
+ $(INSTALL_PROGRAM) hotplug/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent
|
||||
+ $(INSTALL_PROGRAM) hotplug/pcmcia_socket.rc $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc
|
||||
|
||||
uninstall-socket-hotplug:
|
||||
- rm -f $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc
|
||||
|
||||
install-socket-tools:
|
||||
- $(INSTALL_PROGRAM) -D $(PCMCIA_SOCKET_STARTUP) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_SOCKET_STARTUP)
|
||||
+ $(INSTALL) -d $(DESTDIR)$(udevhelperdir)
|
||||
+ $(INSTALL_PROGRAM) $(PCMCIA_SOCKET_STARTUP) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_SOCKET_STARTUP)
|
||||
|
||||
uninstall-socket-tools:
|
||||
- rm -f $(DESTDIR)$(udevhelperdir)/$(PCMCIA_SOCKET_STARTUP)
|
||||
|
||||
install-tools:
|
||||
$(INSTALL) -d $(DESTDIR)$(sbindir)
|
||||
- $(INSTALL_PROGRAM) -D $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(PCCARDCTL)
|
||||
+ $(INSTALL) -d $(DESTDIR)$(udevhelperdir)
|
||||
+ $(INSTALL_PROGRAM) $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(PCCARDCTL)
|
||||
$(SYMLINK) $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(LSPCMCIA)
|
||||
- $(INSTALL_PROGRAM) -D $(PCMCIA_CHECK_BROKEN_CIS) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_CHECK_BROKEN_CIS)
|
||||
+ $(INSTALL_PROGRAM) $(PCMCIA_CHECK_BROKEN_CIS) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_CHECK_BROKEN_CIS)
|
||||
|
||||
uninstall-tools:
|
||||
- rm -f $(DESTDIR)$(sbindir)/$(PCCARDCTL)
|
||||
@@ -305,22 +307,24 @@ uninstall-tools:
|
||||
|
||||
install-config:
|
||||
$(INSTALL) -d $(DESTDIR)$(pcmciaconfdir)
|
||||
- $(INSTALL_DATA) -D config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts
|
||||
+ $(INSTALL_DATA) config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts
|
||||
if [ -f config/config.opts.$(ARCH) ]; then \
|
||||
- $(INSTALL_DATA) -D config/config.opts.$(ARCH) $(DESTDIR)$(pcmciaconfdir)/config.opts; \
|
||||
+ $(INSTALL_DATA) config/config.opts.$(ARCH) $(DESTDIR)$(pcmciaconfdir)/config.opts; \
|
||||
fi
|
||||
|
||||
uninstall-config:
|
||||
# - rm -f $(DESTDIR)$(pcmciaconfdir)/config.opts
|
||||
|
||||
install-udev:
|
||||
- $(INSTALL_DATA) -D $(UDEV_RULES_FILE) $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules
|
||||
+ $(INSTALL) -d $(DESTDIR)$(udevrulesdir)
|
||||
+ $(INSTALL_DATA) $(UDEV_RULES_FILE) $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules
|
||||
|
||||
uninstall-udev:
|
||||
- rm -f $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules
|
||||
|
||||
install-man:
|
||||
- $(INSTALL_DATA) -D man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8
|
||||
+ $(INSTALL) -d $(DESTDIR)$(mandir)/man8
|
||||
+ $(INSTALL_DATA) man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8
|
||||
$(SYMLINK) pccardctl.8 $(DESTDIR)$(mandir)/man8/lspcmcia.8
|
||||
|
||||
uninstall-man:
|
||||
@@ -0,0 +1,29 @@
|
||||
"make src/lex_config.o"
|
||||
|
||||
results in:
|
||||
|
||||
src/lex_config.l:35:25: fatal error: yacc_config.h: No such file or directory
|
||||
|
||||
so add missing dependency through a missing rule. Also remove a rule which
|
||||
doesn't appear to do anything.
|
||||
|
||||
RP
|
||||
2016/1/31
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Index: pcmciautils-018/Makefile
|
||||
===================================================================
|
||||
--- pcmciautils-018.orig/Makefile
|
||||
+++ pcmciautils-018/Makefile
|
||||
@@ -246,8 +246,8 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/st
|
||||
$(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) src/startup.o src/yacc_config.o src/lex_config.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
|
||||
$(QUIET) $(STRIPCMD) $@
|
||||
|
||||
-yacc_config.o lex_config.o: %.o: %.c
|
||||
- $(CC) -c -MD -O -pipe $(CPPFLAGS) $<
|
||||
+src/lex_config.o : src/lex_config.c src/yacc_config.h ccdv
|
||||
+ $(QUIET) $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
|
||||
|
||||
debugtools: ccdv $(CBDUMP) $(CISDUMP)
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
SUMMARY = "Linux kernel userland utilities for the PCMCIA subsystem"
|
||||
HOMEPAGE = "https://www.kernel.org/pub/linux/utils/kernel/pcmcia/"
|
||||
SECTION = "kernel/userland"
|
||||
|
||||
LICENSE = "GPL-2.0-only"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
|
||||
|
||||
DEPENDS = "udev sysfsutils flex-native bison-native"
|
||||
RDEPENDS:${PN} = "udev module-init-tools"
|
||||
|
||||
PR = "r1"
|
||||
|
||||
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/pcmcia/${BP}.tar.xz \
|
||||
file://makefile_fix.patch \
|
||||
file://makefile_race.patch \
|
||||
file://lex_sys_types.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "885431c3cefb76ffdad8cb985134e996"
|
||||
SRC_URI[sha256sum] = "57c27be8f04ef4d535bcfa988567316cc57659fe69068327486dab53791e6558"
|
||||
|
||||
inherit pkgconfig
|
||||
|
||||
export HOSTCC = "${BUILD_CC}"
|
||||
export etcdir = "${sysconfdir}"
|
||||
export sbindir = "${base_sbindir}"
|
||||
export pcmciaconfdir = "${sysconfdir}/pcmcia"
|
||||
export udevdir = "`pkg-config --variable=udevdir udev`"
|
||||
export udevrulesdir = "`pkg-config --variable=udevdir udev`/rules.d"
|
||||
export UDEV = "1"
|
||||
LD = "${CC}"
|
||||
CFLAGS =+ "-I${S}/src"
|
||||
CFLAGS =+ "-DPCMCIAUTILS_VERSION=\\"${PV}\\""
|
||||
|
||||
EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs' 'LEX=flex'"
|
||||
|
||||
do_install () {
|
||||
oe_runmake 'DESTDIR=${D}' install
|
||||
}
|
||||
|
||||
CONFFILES:${PN} += "${sysconfdir}/pcmcia/config.opts"
|
||||
Reference in New Issue
Block a user