From d4b352bfeb515fb07f1b44c0332627de1d4fdeb0 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 14 Sep 2005 09:02:27 +0000 Subject: wlan-ng: move two patches that are used by more than one .bb to the files directory --- packages/wlan-ng/files/pcmciasrc.patch | 45 ++++++++++++++++++++++ .../wlan-ng/files/scripts-makefile-hostcc.patch | 16 ++++++++ .../wlan-ng/wlan-ng-modules-0.2.2/pcmciasrc.patch | 45 ---------------------- .../scripts-makefile-hostcc.patch | 16 -------- 4 files changed, 61 insertions(+), 61 deletions(-) create mode 100644 packages/wlan-ng/files/pcmciasrc.patch create mode 100644 packages/wlan-ng/files/scripts-makefile-hostcc.patch delete mode 100644 packages/wlan-ng/wlan-ng-modules-0.2.2/pcmciasrc.patch delete mode 100644 packages/wlan-ng/wlan-ng-modules-0.2.2/scripts-makefile-hostcc.patch diff --git a/packages/wlan-ng/files/pcmciasrc.patch b/packages/wlan-ng/files/pcmciasrc.patch new file mode 100644 index 0000000000..ea76baa98b --- /dev/null +++ b/packages/wlan-ng/files/pcmciasrc.patch @@ -0,0 +1,45 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- linux-wlan-ng-0.2.2/Configure~pcmciasrc ++++ linux-wlan-ng-0.2.2/Configure +@@ -358,37 +358,6 @@ + # kernel PCMCIA. + + if [ $WLAN_KERN_PCMCIA != "y" ] ; then +- if [ ! "$PCMCIA_SRC" ] ; then +- if [ -f /sbin/cardctl ] ; then +- PCMCIA_SRC=`/sbin/cardctl -V 2>&1 | sed -e 's/cardctl version //'` +- PCMCIA_SRC=/usr/src/pcmcia-cs-$PCMCIA_SRC +- fi +- fi +- ask_str "pcmcia-cs source dir" PCMCIA_SRC +- +- if [ ! -f $PCMCIA_SRC/Makefile ] ; then +- $ECHO "pcmcia-cs source tree $PCMCIA_SRC is incomplete or missing!" +- $ECHO "The wlan driver for pcmcia cannot be built without " +- $ECHO "the pcmcia-cs source tree present and configured." +- fail +- fi +- if [ ! -f $PCMCIA_SRC/include/pcmcia/config.h ] ; then +- $ECHO "The pcmcia-cs source tree does not appear to be configured." +- $ECHO "The wlan driver for pcmcia cannot be built without "\ +- $ECHO "the pcmcia-cs source tree present and configured." +- fail +- fi +- $ECHO "" +- +- # Now we need to generate the module options flags. +- # It's only relevant if modversions is turned on. +- grep CONFIG_MODVERSIONS=y < $PCMCIA_SRC/config.mk > /dev/null +- if [ $? = 0 ] ; then +- PCMCIA_MODFLAGS="-DMODULE -DMODVERSIONS -include $PCMCIA_SRC/include/linux/modversions.h" +- else +- PCMCIA_MODFLAGS="-DMODULE" +- fi +- + # new versions of pcmcia-cs don't generate their own modversion.h + # if they don't have it, use the kernel module flags instead. + if [ ! -f $PCMCIA_SRC/include/linux/modversions.h ] ; then diff --git a/packages/wlan-ng/files/scripts-makefile-hostcc.patch b/packages/wlan-ng/files/scripts-makefile-hostcc.patch new file mode 100644 index 0000000000..1746b8a359 --- /dev/null +++ b/packages/wlan-ng/files/scripts-makefile-hostcc.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- linux-wlan-ng-0.2.2/scripts/Makefile~scripts-makefile-hostcc ++++ linux-wlan-ng-0.2.2/scripts/Makefile +@@ -24,7 +24,7 @@ + exit 1;\ + fi + +- $(CC) -I$(KERNEL_SOURCE)/include get_version.c -o get_version ++ $(BUILD_CC) -I$(KERNEL_SOURCE)/include get_version.c -o get_version + + get_options: + $(MAKE) -f $(CURR_DIR)/Makefile.get_options -C $(KERNEL_SOURCE) get_version_target diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/pcmciasrc.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/pcmciasrc.patch deleted file mode 100644 index ea76baa98b..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.2/pcmciasrc.patch +++ /dev/null @@ -1,45 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- linux-wlan-ng-0.2.2/Configure~pcmciasrc -+++ linux-wlan-ng-0.2.2/Configure -@@ -358,37 +358,6 @@ - # kernel PCMCIA. - - if [ $WLAN_KERN_PCMCIA != "y" ] ; then -- if [ ! "$PCMCIA_SRC" ] ; then -- if [ -f /sbin/cardctl ] ; then -- PCMCIA_SRC=`/sbin/cardctl -V 2>&1 | sed -e 's/cardctl version //'` -- PCMCIA_SRC=/usr/src/pcmcia-cs-$PCMCIA_SRC -- fi -- fi -- ask_str "pcmcia-cs source dir" PCMCIA_SRC -- -- if [ ! -f $PCMCIA_SRC/Makefile ] ; then -- $ECHO "pcmcia-cs source tree $PCMCIA_SRC is incomplete or missing!" -- $ECHO "The wlan driver for pcmcia cannot be built without " -- $ECHO "the pcmcia-cs source tree present and configured." -- fail -- fi -- if [ ! -f $PCMCIA_SRC/include/pcmcia/config.h ] ; then -- $ECHO "The pcmcia-cs source tree does not appear to be configured." -- $ECHO "The wlan driver for pcmcia cannot be built without "\ -- $ECHO "the pcmcia-cs source tree present and configured." -- fail -- fi -- $ECHO "" -- -- # Now we need to generate the module options flags. -- # It's only relevant if modversions is turned on. -- grep CONFIG_MODVERSIONS=y < $PCMCIA_SRC/config.mk > /dev/null -- if [ $? = 0 ] ; then -- PCMCIA_MODFLAGS="-DMODULE -DMODVERSIONS -include $PCMCIA_SRC/include/linux/modversions.h" -- else -- PCMCIA_MODFLAGS="-DMODULE" -- fi -- - # new versions of pcmcia-cs don't generate their own modversion.h - # if they don't have it, use the kernel module flags instead. - if [ ! -f $PCMCIA_SRC/include/linux/modversions.h ] ; then diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/scripts-makefile-hostcc.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/scripts-makefile-hostcc.patch deleted file mode 100644 index 1746b8a359..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.2/scripts-makefile-hostcc.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- linux-wlan-ng-0.2.2/scripts/Makefile~scripts-makefile-hostcc -+++ linux-wlan-ng-0.2.2/scripts/Makefile -@@ -24,7 +24,7 @@ - exit 1;\ - fi - -- $(CC) -I$(KERNEL_SOURCE)/include get_version.c -o get_version -+ $(BUILD_CC) -I$(KERNEL_SOURCE)/include get_version.c -o get_version - - get_options: - $(MAKE) -f $(CURR_DIR)/Makefile.get_options -C $(KERNEL_SOURCE) get_version_target -- cgit v1.2.3