Modify

Opened 12 years ago

Closed 12 years ago

Last modified 4 years ago

#414 closed defect (fixed)

madwifi-old makefile fix

Reported by: anonymous Owned by: nico
Priority: normal Milestone: Barrier Breaker 14.07
Component: packages Version: 2.0
Keywords: madwifi Cc:

Description

Does not build properly unless madwifi-ng has also been selected.

Index: target/linux/package/madwifi-old/Makefile
===================================================================
--- target/linux/package/madwifi-old/Makefile   (revision 3506)
+++ target/linux/package/madwifi-old/Makefile   (working copy)
@@ -44,12 +44,12 @@

 include $(TOPDIR)/package/rules.mk

-$(eval $(call PKG_template,KMOD_MADWIFI,kmod-madwifi-old,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))
+$(eval $(call PKG_template,KMOD_MADWIFI_OLD,kmod-madwifi-old,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))

 $(PKG_BUILD_DIR)/.configured:
        touch $@

-MADWIFI_MAKEOPTS= -C $(PKG_BUILD_DIR) \
+MADWIFI_OLD_MAKEOPTS= -C $(PKG_BUILD_DIR) \
                PATH="$(TARGET_PATH)" \
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
@@ -62,30 +62,30 @@

 $(PKG_BUILD_DIR)/.built:
 ifeq ($(findstring AHB,$(BUS)),AHB)
-       $(MAKE) $(MADWIFI_MAKEOPTS) BUS="AHB" all
+       $(MAKE) $(MADWIFI_OLD_MAKEOPTS) BUS="AHB" all
 endif
 ifeq ($(findstring PCI,$(BUS)),PCI)
-       $(MAKE) $(MADWIFI_MAKEOPTS) BUS="PCI" all
+       $(MAKE) $(MADWIFI_OLD_MAKEOPTS) BUS="PCI" all
 endif
-       $(MAKE) $(MADWIFI_MAKEOPTS) -C tools all
+       $(MAKE) $(MADWIFI_OLD_MAKEOPTS) -C tools all
        $(RSTRIP) $(PKG_BUILD_DIR)/tools/madwifi_multi
        touch $@

-$(IPKG_KMOD_MADWIFI):
-       mkdir -p $(IDIR_KMOD_MADWIFI)/etc/modules.d
-       mkdir -p $(IDIR_KMOD_MADWIFI)/etc/init.d
-       mkdir -p $(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)
-       mkdir -p $(IDIR_KMOD_MADWIFI)/usr/sbin
-       install -m0644 ./files/madwifi.modules $(IDIR_KMOD_MADWIFI)/etc/modules.d/20-madwifi
-       install -m0755 ./files/madwifi.init $(IDIR_KMOD_MADWIFI)/etc/init.d/S20madwifi
+$(IPKG_KMOD_MADWIFI_OLD):
+       mkdir -p $(IDIR_KMOD_MADWIFI_OLD)/etc/modules.d
+       mkdir -p $(IDIR_KMOD_MADWIFI_OLD)/etc/init.d
+       mkdir -p $(IDIR_KMOD_MADWIFI_OLD)/lib/modules/$(LINUX_VERSION)
+       mkdir -p $(IDIR_KMOD_MADWIFI_OLD)/usr/sbin
+       install -m0644 ./files/madwifi.modules $(IDIR_KMOD_MADWIFI_OLD)/etc/modules.d/20-madwifi
+       install -m0755 ./files/madwifi.init $(IDIR_KMOD_MADWIFI_OLD)/etc/init.d/S20madwifi
        $(CP)   $(PKG_BUILD_DIR)/net80211/wlan*.$(LINUX_KMOD_SUFFIX) \
                $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \
                $(BUS_MODULES) \
                $(PKG_BUILD_DIR)/ath_rate/sample/ath_rate_sample.$(LINUX_KMOD_SUFFIX) \
                $(PKG_BUILD_DIR)/net80211/*.$(LINUX_KMOD_SUFFIX) \
-               $(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)/
-       $(CP) $(PKG_BUILD_DIR)/tools/{80211debug,80211stats,athchans,athctrl,athdebug,athkey,athstats} $(IDIR_KMOD_MADWIFI)/usr/sbin/
-       $(IPKG_BUILD) $(IDIR_KMOD_MADWIFI) $(PACKAGE_DIR)
+               $(IDIR_KMOD_MADWIFI_OLD)/lib/modules/$(LINUX_VERSION)/
+       $(CP) $(PKG_BUILD_DIR)/tools/{80211debug,80211stats,athchans,athctrl,athdebug,athkey,athstats} $(IDIR_KMOD_MADWIFI_OLD)/usr/sbin/
+       $(IPKG_BUILD) $(IDIR_KMOD_MADWIFI_OLD) $(PACKAGE_DIR)

 $(STAGING_DIR)/usr/include/madwifi-old/net80211/ieee80211.h: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include/madwifi-old

Attachments (0)

Change History (3)

comment:1 Changed 12 years ago by nico

  • Owner changed from developers to nico
  • Status changed from new to assigned

comment:2 Changed 12 years ago by nico

  • Resolution set to fixed
  • Status changed from assigned to closed

Fixed in [3517]

comment:3 Changed 4 years ago by jow

  • Milestone changed from Attitude Adjustment 12.09 to Barrier Breaker 14.07

Milestone Attitude Adjustment 12.09 deleted

Add Comment

Modify Ticket

Action
as closed .
The resolution will be deleted. Next status will be 'reopened'.
Author


E-mail address and user name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.