diff options
| -rw-r--r-- | patches/pcmciautils-015/generic/pcmciautils-flags.diff | 30 | ||||
| -rw-r--r-- | patches/pcmciautils-015/generic/series | 1 | ||||
| -rw-r--r-- | rules/pcmciautils.in | 4 | ||||
| -rw-r--r-- | rules/pcmciautils.make | 139 |
4 files changed, 68 insertions, 106 deletions
diff --git a/patches/pcmciautils-015/generic/pcmciautils-flags.diff b/patches/pcmciautils-015/generic/pcmciautils-flags.diff new file mode 100644 index 000000000..e20f94f59 --- /dev/null +++ b/patches/pcmciautils-015/generic/pcmciautils-flags.diff @@ -0,0 +1,30 @@ +From: Marc Kleine-Budde <mkl@pengutronix.de> +Subject: don't overwrite CFLAGS, use CPP flags during compilation + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: pcmciautils-015/Makefile +=================================================================== +--- pcmciautils-015.orig/Makefile ++++ pcmciautils-015/Makefile +@@ -122,7 +122,7 @@ WARNINGS += $(call cc-supports,-Wno-poin + WARNINGS += $(call cc-supports,-Wdeclaration-after-statement) + WARNINGS += -Wshadow + +-CFLAGS := -pipe -DPCMCIAUTILS_VERSION=\"$(VERSION)\" ++CFLAGS += -pipe -DPCMCIAUTILS_VERSION=\"$(VERSION)\" + YFLAGS := -d + + HEADERS = \ +@@ -213,7 +213,7 @@ ccdv: + @$(HOSTCC) -O1 build/ccdv.c -o build/ccdv + + .c.o: +- $(QUIET) $(CC) $(CFLAGS) -c -o $@ $< ++ $(QUIET) $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + + %.c %.h : %.y + $(YACC) $(YFLAGS) $< diff --git a/patches/pcmciautils-015/generic/series b/patches/pcmciautils-015/generic/series new file mode 100644 index 000000000..2843766b9 --- /dev/null +++ b/patches/pcmciautils-015/generic/series @@ -0,0 +1 @@ +pcmciautils-flags.diff diff --git a/rules/pcmciautils.in b/rules/pcmciautils.in index 33ead268e..d74d2fa3d 100644 --- a/rules/pcmciautils.in +++ b/rules/pcmciautils.in @@ -1,9 +1,9 @@ ## SECTION=shell_and_console + menuconfig PCMCIAUTILS tristate prompt "pcmcia utils " - select SYSFSUTILS - select SYSFSUTILS_LIB + select LIBSYSFS help PCMCIAutils contains hotplug scripts and initialization tools necessary to allow the PCMCIA subsystem to behave (almost) as diff --git a/rules/pcmciautils.make b/rules/pcmciautils.make index edcdedfcd..60ec6fd4e 100644 --- a/rules/pcmciautils.make +++ b/rules/pcmciautils.make @@ -1,6 +1,8 @@ +# -*-makefile-*- # $Id: template 2680 2005-05-27 10:29:43Z rsc $ # # Copyright (C) 2005 by Steven Scholz <steven.scholz@imc-berlin.de> +# 2009 by Marc Kleine-Budde <mkl@pengutronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -16,145 +18,74 @@ PACKAGES-$(PTXCONF_PCMCIAUTILS) += pcmciautils # # Paths and names # -PCMCIAUTILS_VERSION = 015 -PCMCIAUTILS = pcmciautils-$(PCMCIAUTILS_VERSION) -PCMCIAUTILS_SUFFIX = tar.gz -PCMCIAUTILS_URL = http://www.kernel.org/pub/linux/utils/kernel/pcmcia/$(PCMCIAUTILS).$(PCMCIAUTILS_SUFFIX) -PCMCIAUTILS_SOURCE = $(SRCDIR)/$(PCMCIAUTILS).$(PCMCIAUTILS_SUFFIX) -PCMCIAUTILS_DIR = $(BUILDDIR)/$(PCMCIAUTILS) - +PCMCIAUTILS_VERSION := 015 +PCMCIAUTILS := pcmciautils-$(PCMCIAUTILS_VERSION) +PCMCIAUTILS_SUFFIX := tar.gz +PCMCIAUTILS_URL := http://www.kernel.org/pub/linux/utils/kernel/pcmcia/$(PCMCIAUTILS).$(PCMCIAUTILS_SUFFIX) +PCMCIAUTILS_SOURCE := $(SRCDIR)/$(PCMCIAUTILS).$(PCMCIAUTILS_SUFFIX) +PCMCIAUTILS_DIR := $(BUILDDIR)/$(PCMCIAUTILS) # ---------------------------------------------------------------------------- # Get # ---------------------------------------------------------------------------- -pcmciautils_get: $(STATEDIR)/pcmciautils.get - -$(STATEDIR)/pcmciautils.get: $(pcmciautils_get_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - $(PCMCIAUTILS_SOURCE): - @$(call targetinfo, $@) + @$(call targetinfo) @$(call get, PCMCIAUTILS) # ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -pcmciautils_extract: $(STATEDIR)/pcmciautils.extract - -$(STATEDIR)/pcmciautils.extract: $(pcmciautils_extract_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(PCMCIAUTILS_DIR)) - @$(call extract, PCMCIAUTILS) - @$(call patchin, PCMCIAUTILS) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -pcmciautils_prepare: $(STATEDIR)/pcmciautils.prepare - -PCMCIAUTILS_PATH = PATH=$(CROSS_PATH) -PCMCIAUTILS_ENV = $(CROSS_ENV) +PCMCIAUTILS_PATH := PATH=$(CROSS_PATH) +PCMCIAUTILS_ENV := $(CROSS_ENV) -# Get the latest revision of pcmciautils. -# If you have a static socket, open the file "Makefile" with an editor of your -# choice and modify the line which states STARTUP = true to STARTUP = false. -# see http://www.kernel.org/pub/linux/utils/kernel/pcmcia/howto.html +PCMCIAUTILS_COMPILE_ENV := \ + $(CROSS_ENV_CFLAGS) \ + $(CROSS_ENV_CPPFLAGS) \ + $(CROSS_ENV_LDFLAGS) -PCMCIAUTILS_MAKEVARS := ARCH=$(PTXCONF_ARCH_STRING) \ - prefix=$(SYSROOT) \ +PCMCIAUTILS_MAKEVARS := \ CROSS=$(COMPILER_PREFIX) \ - GCCINCDIR=$(SYSROOT)/usr/include + V=1 \ + STRIP=echo \ + $(call ptx/ifdef, PTXCONF_PCMCIAUTILS_STARTUP, STARTUP=true, STARTUP=false) -#PCMCIAUTILS_MAKEVARS += KERNEL_DIR=$(PTXCONF_KERNEL_DIR) - -$(STATEDIR)/pcmciautils.prepare: $(pcmciautils_prepare_deps_default) - @$(call targetinfo, $@) -ifndef PTXCONF_PCMCIAUTILS_STARTUP - @perl -p -i -e 's/STARTUP = true/STARTUP = false/' $(PCMCIAUTILS_DIR)/Makefile -endif - @perl -p -i -e 's/V=false/V=true/' $(PCMCIAUTILS_DIR)/Makefile - #@$(call clean, $(PCMCIAUTILS_DIR)/config.cache) - #cd $(PCMCIAUTILS_DIR) && \ - # $(PCMCIAUTILS_PATH) $(PCMCIAUTILS_ENV) \ - # ./configure $(PCMCIAUTILS_AUTOCONF) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -pcmciautils_compile: $(STATEDIR)/pcmciautils.compile - -$(STATEDIR)/pcmciautils.compile: $(pcmciautils_compile_deps_default) - @$(call targetinfo, $@) - cd $(PCMCIAUTILS_DIR) && $(PCMCIAUTILS_ENV) $(PCMCIAUTILS_PATH) make $(PCMCIAUTILS_MAKEVARS) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -pcmciautils_install: $(STATEDIR)/pcmciautils.install - -$(STATEDIR)/pcmciautils.install: $(pcmciautils_install_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) +$(STATEDIR)/pcmciautils.prepare: + @$(call targetinfo) + @$(call touch) # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -pcmciautils_targetinstall: $(STATEDIR)/pcmciautils.targetinstall - -$(STATEDIR)/pcmciautils.targetinstall: $(pcmciautils_targetinstall_deps_default) - @$(call targetinfo, $@) +$(STATEDIR)/pcmciautils.targetinstall: + @$(call targetinfo) @$(call install_init, pcmciautils) @$(call install_fixup, pcmciautils,PACKAGE,pcmciautils) @$(call install_fixup, pcmciautils,PRIORITY,optional) @$(call install_fixup, pcmciautils,VERSION,$(PCMCIAUTILS_VERSION)) @$(call install_fixup, pcmciautils,SECTION,base) - @$(call install_fixup, pcmciautils,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup, pcmciautils,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>") @$(call install_fixup, pcmciautils,DEPENDS,) @$(call install_fixup, pcmciautils,DESCRIPTION,missing) - # install-tools - @$(call install_copy, pcmciautils, 0, 0, 0755, $(PCMCIAUTILS_DIR)/pccardctl, /sbin/pccardctl); - @$(call install_copy, pcmciautils, 0, 0, 0755, $(PCMCIAUTILS_DIR)/pcmcia-check-broken-cis, \ - /sbin/pcmcia-check-broken-cis); +# # install-tools + @$(call install_copy, pcmciautils, 0, 0, 0755, -, \ + /sbin/pccardctl); + @$(call install_link, pcmciautils, pccardctl, /sbin/lspcmcia) - # install-hotplug - @$(call install_copy, pcmciautils, 0, 0, 0755, $(PCMCIAUTILS_DIR)/hotplug/pcmcia.agent, \ - /etc/hotplug/pcmcia.agent, n); - @$(call install_copy, pcmciautils, 0, 0, 0755, $(PCMCIAUTILS_DIR)/hotplug/pcmcia.rc, \ - /etc/hotplug/pcmcia.rc, n); + @$(call install_copy, pcmciautils, 0, 0, 0755, -, \ + /sbin/pcmcia-check-broken-cis); ifdef PTXCONF_PCMCIAUTILS_STARTUP - # if STARTUP is disabled, we can skip a few things - - # install-config - #$(INSTALL) -d $(DESTDIR)$(pcmciaconfdir) - #$(INSTALL_DATA) -D config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts - - # install-socket-hotplug - @$(call install_copy, pcmciautils, 0, 0, 0755, $(PCMCIAUTILS_DIR)/hotplug/pcmcia_socket.agent, \ - /etc/hotplug/pcmcia_socket.agent, n); - @$(call install_copy, pcmciautils, 0, 0, 0755, $(PCMCIAUTILS_DIR)/hotplug/pcmcia_socket.rc, \ - /etc/hotplug/pcmcia_socket.rc, n); - - # install-socket-tools - @$(call install_copy, pcmciautils, 0, 0, 0755, $(PCMCIAUTILS_DIR)/pcmcia-socket-startup, \ - /sbin/pcmcia-socket-startup); +# # install-socket-tools + @$(call install_copy, pcmciautils, 0, 0, 0755, -, \ + /sbin/pcmcia-socket-startup); endif - @$(call install_finish, pcmciautils) - - @$(call touch, $@) + @$(call touch) # ---------------------------------------------------------------------------- # Clean |