Changeset 9404987 in freewrt for target/linux


Ignore:
Timestamp:
Jul 21, 2006, 5:52:19 AM (19 years ago)
Author:
Thorsten Glaser <tg@…>
Branches:
freewrt_1_0, freewrt_2_0
Children:
1d8c05f
Parents:
3438ecb2
Message:

start the WRKDIR conversion here too

package/rules.mk is still broken. I don't get this GNU make shit
tonight any more. Please use r274, I know that one works, for now.

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@323 afb5a338-a214-0410-bd46-81f09a774fd1

Location:
target/linux/package
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • target/linux/package/alsa/Makefile

    r3438ecb2 r9404987  
    1313PKG_CAT:=bzcat
    1414
    15 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
     15WRKBUILD:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
    1616
    1717include $(TOPDIR)/package/rules.mk
    … …  
    2828$(eval $(call PKG_template,KMOD_ALSA,kmod-alsa,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))
    2929
    30 $(PKG_BUILD_DIR)/.configured:
    31         (cd $(PKG_BUILD_DIR); \
     30$(WRKBUILD)/.configured:
     31        (cd $(WRKBUILD); \
    3232                CFLAGS="$(KERNEL_C_INCS)" \
    3333                ./configure \
    … …  
    4444        touch $@
    4545
    46 $(PKG_BUILD_DIR)/.built:
    47         $(MAKE) -C $(PKG_BUILD_DIR) \
     46$(WRKBUILD)/.built:
     47        $(MAKE) -C $(WRKBUILD) \
    4848                ARCH="$(LINUX_KARCH)" \
    4949                CROSS_COMPILE="$(TARGET_CROSS)" \
    … …  
    5656        install -m0644 ./files/alsa.modules $(IDIR_KMOD_ALSA)/etc/modules.d/70-alsa
    5757        install -d -m0755 $(IDIR_KMOD_ALSA)/lib/modules/$(LINUX_VERSION)
    58         install -m0644 $(PKG_BUILD_DIR)/modules/*.$(LINUX_KMOD_SUFFIX) \
     58        install -m0644 $(WRKBUILD)/modules/*.$(LINUX_KMOD_SUFFIX) \
    5959                $(IDIR_KMOD_ALSA)/lib/modules/$(LINUX_VERSION)/
    6060        $(IPKG_BUILD) $(IDIR_KMOD_ALSA) $(PACKAGE_DIR)

  • target/linux/package/base-files/Makefile

    r3438ecb2 r9404987  
    55PKG_NAME := base-files-arch
    66PKG_RELEASE := 2
    7 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
     7WRKBUILD := $(BUILD_DIR)/$(PKG_NAME)
    88
    99DISTFILES:=
    1010include $(TOPDIR)/package/rules.mk
    1111
    12 IDIR_OPENWRT:=$(PKG_BUILD_DIR)/ipkg
     12IDIR_OPENWRT:=$(WRKBUILD)/ipkg
    1313IPKG_OPENWRT:=$(PACKAGE_DIR)/base-files-$(BOARD)-$(KERNEL)_$(PKG_RELEASE)_$(ARCH).ipk
    1414
    15 $(PKG_BUILD_DIR)/.prepared:
    16         mkdir -p $(PKG_BUILD_DIR)
     15$(WRKBUILD)/.prepared:
     16        mkdir -p $(WRKBUILD)
    1717        touch $@
    1818
    1919ifeq ($(BOARD),ar7)
    20 $(PKG_BUILD_DIR)/adam2patcher: src/adam2patcher.c
     20$(WRKBUILD)/adam2patcher: src/adam2patcher.c
    2121        $(TARGET_CC) -o $@ $<
    2222
    23 $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/adam2patcher
     23$(WRKBUILD)/.built: $(WRKBUILD)/adam2patcher
    2424
    25 $(IDIR_OPENWRT)/sbin/adam2patcher: $(PKG_BUILD_DIR)/adam2patcher
     25$(IDIR_OPENWRT)/sbin/adam2patcher: $(WRKBUILD)/adam2patcher
    2626        mkdir -p $(IDIR_OPENWRT)/sbin
    27         $(CP) $(PKG_BUILD_DIR)/adam2patcher $(IDIR_OPENWRT)/sbin
     27        $(CP) $(WRKBUILD)/adam2patcher $(IDIR_OPENWRT)/sbin
    2828
    2929$(IPKG_OPENWRT): $(IDIR_OPENWRT)/sbin/adam2patcher
    … …  
    3131
    3232ifeq ($(BOARD),brcm)
    33 $(PKG_BUILD_DIR)/jffs2root: src/jffs2root.c
     33$(WRKBUILD)/jffs2root: src/jffs2root.c
    3434        $(TARGET_CC) -o $@ $<
    3535
    36 $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/jffs2root
     36$(WRKBUILD)/.built: $(WRKBUILD)/jffs2root
    3737
    38 $(IDIR_OPENWRT)/sbin/jffs2root: $(PKG_BUILD_DIR)/jffs2root
     38$(IDIR_OPENWRT)/sbin/jffs2root: $(WRKBUILD)/jffs2root
    3939        mkdir -p $(IDIR_OPENWRT)/sbin
    40         $(CP) $(PKG_BUILD_DIR)/jffs2root $(IDIR_OPENWRT)/sbin
     40        $(CP) $(WRKBUILD)/jffs2root $(IDIR_OPENWRT)/sbin
    4141
    4242$(IPKG_OPENWRT): $(IDIR_OPENWRT)/sbin/jffs2root
    4343endif
    4444
    45 $(PKG_BUILD_DIR)/.built:
     45$(WRKBUILD)/.built:
    4646        touch $@
    4747       

  • target/linux/package/diag/Makefile

    r3438ecb2 r9404987  
    77PKG_NAME := kmod-diag
    88PKG_RELEASE := 1
    9 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
     9WRKBUILD := $(BUILD_DIR)/$(PKG_NAME)
    1010
    1111DISTFILES:=
    … …  
    1919                -iwithprefix include -I$(LINUX_DIR)/include -I$(LINUX_DIR)/include/asm/gcc -c -I$(LINUX_DIR)/arch/mips/bcm947xx/include -DBCMDRIVER
    2020
    21 $(PKG_BUILD_DIR)/.prepared:
    22         mkdir -p $(PKG_BUILD_DIR)
     21$(WRKBUILD)/.prepared:
     22        mkdir -p $(WRKBUILD)
    2323        touch $@
    2424
    25 $(PKG_BUILD_DIR)/.built:
    26         $(TARGET_CC) $(DIAG_FLAGS) -o $(PKG_BUILD_DIR)/diag.o diag_led.c
     25$(WRKBUILD)/.built:
     26        $(TARGET_CC) $(DIAG_FLAGS) -o $(WRKBUILD)/diag.o diag_led.c
    2727        touch $@
    2828       
    2929$(IPKG_KMOD_DIAG):
    3030        mkdir -p $(IDIR_KMOD_DIAG)/lib/modules/$(LINUX_VERSION)
    31         $(CP) $(PKG_BUILD_DIR)/diag.o $(IDIR_KMOD_DIAG)/lib/modules/$(LINUX_VERSION)/
     31        $(CP) $(WRKBUILD)/diag.o $(IDIR_KMOD_DIAG)/lib/modules/$(LINUX_VERSION)/
    3232        $(IPKG_BUILD) $(IDIR_KMOD_DIAG) $(PACKAGE_DIR)

  • target/linux/package/fuse/Makefile

    r3438ecb2 r9404987  
    11# $Id: Makefile 3527 2006-03-28 18:21:42Z wbx $
    2 
    3 include $(TOPDIR)/rules.mk
    4 include ../../rules.mk
    52
    63PKG_NAME:=fuse
    … …  
    107
    118PKG_SOURCE_URL:=@SF/$(PKG_NAME)
    12 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
    13 PKG_CAT:=zcat
    149
    15 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
    16 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
    17 
     10include $(TOPDIR)/rules.mk
     11include ../../rules.mk
    1812include $(TOPDIR)/package/rules.mk
    1913
    2014$(eval $(call PKG_template,KMOD_FUSE,kmod-fuse,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))
    2115
    22 $(PKG_BUILD_DIR)/.configured:
    23         (cd $(PKG_BUILD_DIR); \
     16$(WRKBUILD)/.configured:
     17        (cd $(WRKBUILD); \
    2418                rm -rf config.{cache,status} ; \
    2519                touch configure.in ; \
    … …  
    6256        touch $@
    6357
    64 $(PKG_BUILD_DIR)/.built:
     58$(WRKBUILD)/.built:
    6559        mkdir -p $(PKG_INSTALL_DIR)
    66         $(MAKE) -C $(PKG_BUILD_DIR) \
     60        $(MAKE) -C $(WRKBUILD) \
    6761                ARCH="$(LINUX_KARCH)" \
    6862                CROSS_COMPILE="$(TARGET_CROSS)" \
    … …  
    7872                $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION)/
    7973        $(IPKG_BUILD) $(IDIR_KMOD_FUSE) $(PACKAGE_DIR)
    80 

  • target/linux/package/hostap/Makefile

    r3438ecb2 r9404987  
    1313PKG_CAT:=zcat
    1414
    15 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
    16 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
     15WRKBUILD:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
     16PKG_INSTALL_DIR:=$(WRKBUILD)/ipkg-install
    1717
    1818include $(TOPDIR)/package/rules.mk
    … …  
    2222$(eval $(call PKG_template,KMOD_HOSTAP_PLX,kmod-hostap-plx,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))
    2323
    24 $(PKG_BUILD_DIR)/.configured:
     24$(WRKBUILD)/.configured:
    2525        touch $@
    2626
    27 $(PKG_BUILD_DIR)/.built:
     27$(WRKBUILD)/.built:
    2828        $(MAKE) -C $(LINUX_DIR)/ \
    2929                ARCH="$(LINUX_KARCH)" \
    3030                CROSS_COMPILE="$(TARGET_CROSS)" \
    31                 SUBDIRS="$(PKG_BUILD_DIR)/driver/modules" \
     31                SUBDIRS="$(WRKBUILD)/driver/modules" \
    3232                modules
    3333        touch $@
    … …  
    3636        install -m0755 -d $(IDIR_KMOD_HOSTAP)/lib/modules/$(LINUX_VERSION)
    3737        $(CP) \
    38                 $(PKG_BUILD_DIR)/driver/modules/hostap.$(LINUX_KMOD_SUFFIX) \
    39                 $(PKG_BUILD_DIR)/driver/modules/hostap_crypt_ccmp.$(LINUX_KMOD_SUFFIX) \
    40                 $(PKG_BUILD_DIR)/driver/modules/hostap_crypt_tkip.$(LINUX_KMOD_SUFFIX) \
    41                 $(PKG_BUILD_DIR)/driver/modules/hostap_crypt_wep.$(LINUX_KMOD_SUFFIX) \
     38                $(WRKBUILD)/driver/modules/hostap.$(LINUX_KMOD_SUFFIX) \
     39                $(WRKBUILD)/driver/modules/hostap_crypt_ccmp.$(LINUX_KMOD_SUFFIX) \
     40                $(WRKBUILD)/driver/modules/hostap_crypt_tkip.$(LINUX_KMOD_SUFFIX) \
     41                $(WRKBUILD)/driver/modules/hostap_crypt_wep.$(LINUX_KMOD_SUFFIX) \
    4242                $(IDIR_KMOD_HOSTAP)/lib/modules/$(LINUX_VERSION)/
    4343        $(IPKG_BUILD) $(IDIR_KMOD_HOSTAP) $(PACKAGE_DIR)
    … …  
    4646        install -m0755 -d $(IDIR_KMOD_HOSTAP_PCI)/lib/modules/$(LINUX_VERSION)
    4747        $(CP) \
    48                 $(PKG_BUILD_DIR)/driver/modules/hostap_pci.$(LINUX_KMOD_SUFFIX) \
     48                $(WRKBUILD)/driver/modules/hostap_pci.$(LINUX_KMOD_SUFFIX) \
    4949                $(IDIR_KMOD_HOSTAP_PCI)/lib/modules/$(LINUX_VERSION)/
    5050        $(IPKG_BUILD) $(IDIR_KMOD_HOSTAP_PCI) $(PACKAGE_DIR)
    … …  
    5353        install -m0755 -d $(IDIR_KMOD_HOSTAP_PLX)/lib/modules/$(LINUX_VERSION)
    5454        $(CP) \
    55                 $(PKG_BUILD_DIR)/driver/modules/hostap_plx.$(LINUX_KMOD_SUFFIX) \
     55                $(WRKBUILD)/driver/modules/hostap_plx.$(LINUX_KMOD_SUFFIX) \
    5656                $(IDIR_KMOD_HOSTAP_PLX)/lib/modules/$(LINUX_VERSION)/
    5757        $(IPKG_BUILD) $(IDIR_KMOD_HOSTAP_PLX) $(PACKAGE_DIR)

  • target/linux/package/madwifi-old/Makefile

    r3438ecb2 r9404987  
    1313PKG_CAT:=zcat
    1414
    15 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
     15WRKBUILD:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
    1616
    1717ifeq ($(ARCH),mips)
    … …  
    3636BUS_MODULES:=
    3737ifeq ($(findstring AHB,$(BUS)),AHB)
    38 BUS_MODULES+=$(PKG_BUILD_DIR)/ath/ath_ahb.$(LINUX_KMOD_SUFFIX)
     38BUS_MODULES+=$(WRKBUILD)/ath/ath_ahb.$(LINUX_KMOD_SUFFIX)
    3939endif
    4040ifeq ($(findstring PCI,$(BUS)),PCI)
    41 BUS_MODULES+=$(PKG_BUILD_DIR)/ath/ath_pci.$(LINUX_KMOD_SUFFIX)
     41BUS_MODULES+=$(WRKBUILD)/ath/ath_pci.$(LINUX_KMOD_SUFFIX)
    4242endif
    4343
    … …  
    4747$(eval $(call PKG_template,KMOD_MADWIFI_OLD,kmod-madwifi-old,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))
    4848
    49 $(PKG_BUILD_DIR)/.configured:
     49$(WRKBUILD)/.configured:
    5050        touch $@
    5151
    52 MADWIFI_OLD_MAKEOPTS= -C $(PKG_BUILD_DIR) \
     52MADWIFI_OLD_MAKEOPTS= -C $(WRKBUILD) \
    5353                PATH="$(TARGET_PATH)" \
    5454                ARCH="$(LINUX_KARCH)" \
    … …  
    6161
    6262
    63 $(PKG_BUILD_DIR)/.built:
     63$(WRKBUILD)/.built:
    6464ifeq ($(findstring AHB,$(BUS)),AHB)
    6565        $(MAKE) $(MADWIFI_OLD_MAKEOPTS) BUS="AHB" all
    … …  
    6969endif
    7070        $(MAKE) $(MADWIFI_OLD_MAKEOPTS) -C tools all
    71         $(RSTRIP) $(PKG_BUILD_DIR)/tools/madwifi_multi
     71        $(RSTRIP) $(WRKBUILD)/tools/madwifi_multi
    7272        touch $@
    7373
    … …  
    7878        install -m0755 ./files/madwifi.init $(IDIR_KMOD_MADWIFI_OLD)/etc/init.d/S20madwifi
    7979        install -d -m0755 $(IDIR_KMOD_MADWIFI_OLD)/lib/modules/$(LINUX_VERSION)
    80         $(CP)   $(PKG_BUILD_DIR)/net80211/wlan*.$(LINUX_KMOD_SUFFIX) \
    81                 $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \
     80        $(CP)   $(WRKBUILD)/net80211/wlan*.$(LINUX_KMOD_SUFFIX) \
     81                $(WRKBUILD)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \
    8282                $(BUS_MODULES) \
    83                 $(PKG_BUILD_DIR)/ath_rate/sample/ath_rate_sample.$(LINUX_KMOD_SUFFIX) \
    84                 $(PKG_BUILD_DIR)/net80211/*.$(LINUX_KMOD_SUFFIX) \
     83                $(WRKBUILD)/ath_rate/sample/ath_rate_sample.$(LINUX_KMOD_SUFFIX) \
     84                $(WRKBUILD)/net80211/*.$(LINUX_KMOD_SUFFIX) \
    8585                $(IDIR_KMOD_MADWIFI_OLD)/lib/modules/$(LINUX_VERSION)/
    8686        install -d -m0755 $(IDIR_KMOD_MADWIFI_OLD)/usr/sbin
    87         $(CP) $(PKG_BUILD_DIR)/tools/{80211debug,80211stats,athchans,athctrl,athdebug,athkey,athstats} $(IDIR_KMOD_MADWIFI_OLD)/usr/sbin/
     87        $(CP) $(WRKBUILD)/tools/{80211debug,80211stats,athchans,athctrl,athdebug,athkey,athstats} $(IDIR_KMOD_MADWIFI_OLD)/usr/sbin/
    8888        $(IPKG_BUILD) $(IDIR_KMOD_MADWIFI_OLD) $(PACKAGE_DIR)
    8989
    90 $(STAGING_DIR)/usr/include/madwifi-old/net80211/ieee80211.h: $(PKG_BUILD_DIR)/.built
     90$(STAGING_DIR)/usr/include/madwifi-old/net80211/ieee80211.h: $(WRKBUILD)/.built
    9191        mkdir -p $(STAGING_DIR)/usr/include/madwifi-old
    92         $(CP) $(PKG_BUILD_DIR)/include $(STAGING_DIR)/usr/include/madwifi-old
     92        $(CP) $(WRKBUILD)/include $(STAGING_DIR)/usr/include/madwifi-old
    9393        mkdir -p $(STAGING_DIR)/usr/include/madwifi-old/net80211
    94         $(CP) $(PKG_BUILD_DIR)/net80211/*.h $(STAGING_DIR)/usr/include/madwifi-old/net80211/
     94        $(CP) $(WRKBUILD)/net80211/*.h $(STAGING_DIR)/usr/include/madwifi-old/net80211/
    9595        touch $@
    9696

  • target/linux/package/madwifi/Makefile

    r3438ecb2 r9404987  
    1313PKG_CAT:=zcat
    1414
    15 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
     15WRKBUILD:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
    1616
    1717ifeq ($(ARCH),mips)
    … …  
    3939BUS_MODULES:=
    4040ifeq ($(findstring AHB,$(BUS)),AHB)
    41 BUS_MODULES+=$(PKG_BUILD_DIR)/ath/ath_ahb.$(LINUX_KMOD_SUFFIX)
     41BUS_MODULES+=$(WRKBUILD)/ath/ath_ahb.$(LINUX_KMOD_SUFFIX)
    4242endif
    4343ifeq ($(findstring PCI,$(BUS)),PCI)
    44 BUS_MODULES+=$(PKG_BUILD_DIR)/ath/ath_pci.$(LINUX_KMOD_SUFFIX)
     44BUS_MODULES+=$(WRKBUILD)/ath/ath_pci.$(LINUX_KMOD_SUFFIX)
    4545endif
    4646
    … …  
    5050$(eval $(call PKG_template,KMOD_MADWIFI,kmod-madwifi,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))
    5151
    52 $(PKG_BUILD_DIR)/.configured:
     52$(WRKBUILD)/.configured:
    5353        touch $@
    5454
    55 MADWIFI_MAKEOPTS= -C $(PKG_BUILD_DIR) \
     55MADWIFI_MAKEOPTS= -C $(WRKBUILD) \
    5656                PATH="$(TARGET_PATH)" \
    5757                ARCH="$(LINUX_KARCH)" \
    … …  
    6464
    6565
    66 $(PKG_BUILD_DIR)/.built:
     66$(WRKBUILD)/.built:
    6767ifeq ($(findstring AHB,$(BUS)),AHB)
    6868        $(MAKE) $(MADWIFI_MAKEOPTS) BUS="AHB" all
    … …  
    7171        $(MAKE) $(MADWIFI_MAKEOPTS) BUS="PCI" all
    7272endif
    73         $(RSTRIP) $(PKG_BUILD_DIR)/tools/madwifi_multi
     73        $(RSTRIP) $(WRKBUILD)/tools/madwifi_multi
    7474        touch $@
    7575
    … …  
    8181        install -m0644 ./files/madwifi.modules $(IDIR_KMOD_MADWIFI)/etc/modules.d/20-madwifi
    8282        install -m0755 ./files/madwifi.init $(IDIR_KMOD_MADWIFI)/etc/init.d/S20madwifi
    83         $(CP)   $(PKG_BUILD_DIR)/net80211/wlan*.$(LINUX_KMOD_SUFFIX) \
    84                 $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \
     83        $(CP)   $(WRKBUILD)/net80211/wlan*.$(LINUX_KMOD_SUFFIX) \
     84                $(WRKBUILD)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \
    8585                $(BUS_MODULES) \
    86                 $(PKG_BUILD_DIR)/ath_rate/sample/ath_rate_sample.$(LINUX_KMOD_SUFFIX) \
    87                 $(PKG_BUILD_DIR)/net80211/*.$(LINUX_KMOD_SUFFIX) \
     86                $(WRKBUILD)/ath_rate/sample/ath_rate_sample.$(LINUX_KMOD_SUFFIX) \
     87                $(WRKBUILD)/net80211/*.$(LINUX_KMOD_SUFFIX) \
    8888                $(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)/
    89         $(CP) $(PKG_BUILD_DIR)/tools/{madwifi_multi,80211debug,80211stats,athchans,athctrl,athdebug,athkey,athstats,wlanconfig} $(IDIR_KMOD_MADWIFI)/usr/sbin/
     89        $(CP) $(WRKBUILD)/tools/{madwifi_multi,80211debug,80211stats,athchans,athctrl,athdebug,athkey,athstats,wlanconfig} $(IDIR_KMOD_MADWIFI)/usr/sbin/
    9090        $(IPKG_BUILD) $(IDIR_KMOD_MADWIFI) $(PACKAGE_DIR)
    9191
    92 $(STAGING_DIR)/usr/include/madwifi/net80211/ieee80211.h: $(PKG_BUILD_DIR)/.built
     92$(STAGING_DIR)/usr/include/madwifi/net80211/ieee80211.h: $(WRKBUILD)/.built
    9393        mkdir -p $(STAGING_DIR)/usr/include/madwifi
    94         $(CP) $(PKG_BUILD_DIR)/include $(STAGING_DIR)/usr/include/madwifi/
     94        $(CP) $(WRKBUILD)/include $(STAGING_DIR)/usr/include/madwifi/
    9595        mkdir -p $(STAGING_DIR)/usr/include/madwifi/net80211
    96         $(CP) $(PKG_BUILD_DIR)/net80211/*.h $(STAGING_DIR)/usr/include/madwifi/net80211/
     96        $(CP) $(WRKBUILD)/net80211/*.h $(STAGING_DIR)/usr/include/madwifi/net80211/
    9797        touch $@
    9898

  • target/linux/package/mini_fo/Makefile

    r3438ecb2 r9404987  
    1010PKG_SOURCE := mini_fo-0-6-2-pre1.tar.bz2
    1111
    12 PKG_BUILD_DIR := $(BUILD_DIR)/mini_fo-0-6-2-pre1
    13 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
     12WRKBUILD := $(BUILD_DIR)/mini_fo-0-6-2-pre1
     13PKG_INSTALL_DIR:=$(WRKBUILD)/ipkg-install
    1414
    1515include $(TOPDIR)/package/rules.mk
    … …  
    1717$(eval $(call PKG_template,KMOD_MINI_FO,kmod-mini-fo,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))
    1818
    19 $(PKG_BUILD_DIR)/.configured:
    20         echo -e '%g/\\$$Id\\$$/s//$$Id$$/\nwq' | ed -s $(PKG_BUILD_DIR)/main.c
     19$(WRKBUILD)/.configured:
     20        echo -e '%g/\\$$Id\\$$/s//$$Id$$/\nwq' | ed -s $(WRKBUILD)/main.c
    2121        touch $@
    2222
    23 $(PKG_BUILD_DIR)/.built:
    24         $(MAKE) -C $(PKG_BUILD_DIR) \
     23$(WRKBUILD)/.built:
     24        $(MAKE) -C $(WRKBUILD) \
    2525                PATH="$(TARGET_PATH)" \
    2626                ARCH="$(LINUX_KARCH)" \
    … …  
    3434        install -m0755 -d $(IDIR_KMOD_MINI_FO)/lib/modules/$(LINUX_VERSION)
    3535        install -m0755 -d $(IDIR_KMOD_MINI_FO)/etc/modules.d
    36         $(CP) $(PKG_BUILD_DIR)/mini_fo.$(LINUX_KMOD_SUFFIX) \
     36        $(CP) $(WRKBUILD)/mini_fo.$(LINUX_KMOD_SUFFIX) \
    3737         $(IDIR_KMOD_MINI_FO)/lib/modules/$(LINUX_VERSION)/
    3838        echo "mini_fo" > $(IDIR_KMOD_MINI_FO)/etc/modules.d/15-mini-fo

  • target/linux/package/openswan/Makefile

    r3438ecb2 r9404987  
    1111PKG_SOURCE_URL:=http://www.openswan.org/download
    1212PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
    13 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
     13WRKBUILD:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
    1414PKG_CAT:=zcat
    1515
    … …  
    1818$(eval $(call PKG_template,KMOD_OPENSWAN,kmod-openswan,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))
    1919
    20 FLAGS := $(TARGET_CFLAGS) -I$(PKG_BUILD_DIR)/linux/include -L$(STAGING_DIR)/usr/lib -I$(STAGING_DIR)/usr/include
     20FLAGS := $(TARGET_CFLAGS) -I$(WRKBUILD)/linux/include -L$(STAGING_DIR)/usr/lib -I$(STAGING_DIR)/usr/include
    2121
    22 $(PKG_BUILD_DIR)/.built:
    23         $(MAKE) -C $(PKG_BUILD_DIR) \
     22$(WRKBUILD)/.built:
     23        $(MAKE) -C $(WRKBUILD) \
    2424                $(TARGET_CONFIGURE_OPTS) \
    2525                LINUX_RELEASE="$(LINUX_RELEASE)" \
    … …  
    3333$(IPKG_KMOD_OPENSWAN):
    3434        mkdir -p $(IDIR_KMOD_OPENSWAN)/lib/modules/$(LINUX_VERSION)
    35         $(CP) $(PKG_BUILD_DIR)/modobj*/ipsec.$(LINUX_KMOD_SUFFIX) $(IDIR_KMOD_OPENSWAN)/lib/modules/$(LINUX_VERSION)/
     35        $(CP) $(WRKBUILD)/modobj*/ipsec.$(LINUX_KMOD_SUFFIX) $(IDIR_KMOD_OPENSWAN)/lib/modules/$(LINUX_VERSION)/
    3636        $(IPKG_BUILD) $(IDIR_KMOD_OPENSWAN) $(PACKAGE_DIR)

  • target/linux/package/shfs/Makefile

    r3438ecb2 r9404987  
    1313PKG_CAT:=zcat
    1414
    15 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
    16 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
     15WRKBUILD:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
     16PKG_INSTALL_DIR:=$(WRKBUILD)/ipkg-install
    1717
    1818include $(TOPDIR)/package/rules.mk
    … …  
    2020$(eval $(call PKG_template,KMOD_SHFS,kmod-shfs,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))
    2121
    22 $(PKG_BUILD_DIR)/.configured:
     22$(WRKBUILD)/.configured:
    2323        touch $@
    2424
    25 $(PKG_BUILD_DIR)/.built:
     25$(WRKBUILD)/.built:
    2626        rm -rf $(PKG_INSTALL_DIR)
    2727        mkdir -p $(PKG_INSTALL_DIR)
    28         $(MAKE) -C $(PKG_BUILD_DIR) \
     28        $(MAKE) -C $(WRKBUILD) \
    2929                ARCH="$(LINUX_KARCH)" \
    3030                CROSS_COMPILE="$(TARGET_CROSS)" \

  • target/linux/package/spca5xx/Makefile

    r3438ecb2 r9404987  
    1313PKG_CAT:=zcat
    1414
    15 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
    16 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
     15WRKBUILD:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
     16PKG_INSTALL_DIR:=$(WRKBUILD)/ipkg-install
    1717
    1818include $(TOPDIR)/package/rules.mk
    … …  
    2020$(eval $(call PKG_template,KMOD_SPCA5XX,kmod-spca5xx,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))
    2121
    22 $(PKG_BUILD_DIR)/.configured:
     22$(WRKBUILD)/.configured:
    2323        touch $@
    2424
    25 $(PKG_BUILD_DIR)/.built:
     25$(WRKBUILD)/.built:
    2626        $(MAKE) -C $(LINUX_DIR) \
    2727                ARCH="$(LINUX_KARCH)" \
    2828                CROSS_COMPILE="$(TARGET_CROSS)" \
    2929                KERNELVERSION="$(KERNEL)" \
    30                 SUBDIRS="$(PKG_BUILD_DIR)" \
     30                SUBDIRS="$(WRKBUILD)" \
    3131                modules
    3232        touch $@
    … …  
    3434$(IPKG_KMOD_SPCA5XX):
    3535        install -m0755 -d $(IDIR_KMOD_SPCA5XX)/lib/modules/$(LINUX_VERSION)
    36         $(CP) $(PKG_BUILD_DIR)/spca5xx.$(LINUX_KMOD_SUFFIX) \
     36        $(CP) $(WRKBUILD)/spca5xx.$(LINUX_KMOD_SUFFIX) \
    3737                $(IDIR_KMOD_SPCA5XX)/lib/modules/$(LINUX_VERSION)/
    3838        $(RSTRIP_KMOD) $(IDIR_KMOD_SPCA5XX)

  • target/linux/package/switch/Makefile

    r3438ecb2 r9404987  
    66PKG_NAME := kmod-switch
    77PKG_RELEASE := 1
    8 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
     8WRKBUILD := $(BUILD_DIR)/$(PKG_NAME)
    99
    1010DISTFILES:=
    … …  
    1313$(eval $(call PKG_template,KMOD_SWITCH,$(PKG_NAME),$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))
    1414
    15 $(PKG_BUILD_DIR)/.prepared:
    16         mkdir -p $(PKG_BUILD_DIR)
    17         $(CP) ./src/* $(PKG_BUILD_DIR)/
     15$(WRKBUILD)/.prepared:
     16        mkdir -p $(WRKBUILD)
     17        $(CP) ./src/* $(WRKBUILD)/
    1818        touch $@
    1919
    20 $(PKG_BUILD_DIR)/.configured:
     20$(WRKBUILD)/.configured:
    2121        touch $@
    2222
    23 $(PKG_BUILD_DIR)/.built:
     23$(WRKBUILD)/.built:
    2424        $(MAKE) -C "$(LINUX_DIR)" \
    2525                CROSS_COMPILE="$(TARGET_CROSS)" \
    2626                ARCH="$(LINUX_KARCH)" \
    2727                PATH="$(TARGET_PATH)" \
    28                 SUBDIRS="$(PKG_BUILD_DIR)" \
     28                SUBDIRS="$(WRKBUILD)" \
    2929                EXTRA_CFLAGS="-DBCMGPIO2" \
    3030                modules
    … …  
    3333$(IPKG_KMOD_SWITCH):
    3434        install -m0755 -d $(IDIR_KMOD_SWITCH)/lib/modules/$(LINUX_VERSION)
    35         $(CP) $(PKG_BUILD_DIR)/*.$(LINUX_KMOD_SUFFIX) \
     35        $(CP) $(WRKBUILD)/*.$(LINUX_KMOD_SUFFIX) \
    3636                $(IDIR_KMOD_SWITCH)/lib/modules/$(LINUX_VERSION)
    3737        $(IPKG_BUILD) $(IDIR_KMOD_SWITCH) $(PACKAGE_DIR)

  • target/linux/package/ueagle-atm/Makefile

    r3438ecb2 r9404987  
    1313PKG_CAT:=zcat
    1414
    15 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
    16 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
     15WRKBUILD:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
     16PKG_INSTALL_DIR:=$(WRKBUILD)/ipkg-install
    1717
    1818include $(TOPDIR)/package/rules.mk
    … …  
    2020$(eval $(call PKG_template,KMOD_UEAGLE_ATM,kmod-ueagle-atm,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel-$(LINUX_VERSION)-$(BOARD) ($(LINUX_RELEASE))))
    2121
    22 $(PKG_BUILD_DIR)/.configured:
     22$(WRKBUILD)/.configured:
    2323        touch $@
    2424
    25 $(PKG_BUILD_DIR)/.built:
    26         $(MAKE) -C $(PKG_BUILD_DIR) \
     25$(WRKBUILD)/.built:
     26        $(MAKE) -C $(WRKBUILD) \
    2727                ARCH="$(LINUX_KARCH)" \
    2828                CROSS_COMPILE="$(TARGET_CROSS)" \
    … …  
    3535        install -m0755 -d $(IDIR_KMOD_UEAGLE_ATM)/lib/modules/$(LINUX_VERSION) $(IDIR_KMOD_UEAGLE_ATM)/etc/modules.d
    3636        install -m0644 ./files/$(PKG_NAME).modules $(IDIR_KMOD_UEAGLE_ATM)/etc/modules.d/10-$(PKG_NAME)
    37         $(CP)   $(PKG_BUILD_DIR)/driver/ueagle-atm.$(LINUX_KMOD_SUFFIX) \
    38                 $(PKG_BUILD_DIR)/usbatm_iso/usbatm.$(LINUX_KMOD_SUFFIX) \
     37        $(CP)   $(WRKBUILD)/driver/ueagle-atm.$(LINUX_KMOD_SUFFIX) \
     38                $(WRKBUILD)/usbatm_iso/usbatm.$(LINUX_KMOD_SUFFIX) \
    3939                $(IDIR_KMOD_UEAGLE_ATM)/lib/modules/$(LINUX_VERSION)/
    4040        $(RSTRIP_KMOD) $(IDIR_KMOD_UEAGLE_ATM)

  • target/linux/package/wlcompat/Makefile

    r3438ecb2 r9404987  
    55PKG_NAME := kmod-wlcompat
    66PKG_RELEASE := 3
    7 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
     7WRKBUILD := $(BUILD_DIR)/$(PKG_NAME)
    88
    99# empty
    … …  
    1919                -iwithprefix include -I$(LINUX_DIR)/include -I$(LINUX_DIR)/include/asm/gcc -I$(STAGING_DIR)/usr/include -c
    2020
    21 $(PKG_BUILD_DIR)/.prepared:
    22         mkdir -p $(PKG_BUILD_DIR)
     21$(WRKBUILD)/.prepared:
     22        mkdir -p $(WRKBUILD)
    2323        touch $@
    2424
    25 $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/wlcompat.o $(PKG_BUILD_DIR)/wlcompat-debug.o
     25$(WRKBUILD)/.built: $(WRKBUILD)/wlcompat.o $(WRKBUILD)/wlcompat-debug.o
    2626        touch $@
    2727       
    28 $(PKG_BUILD_DIR)/wlcompat.o: $(PKG_BUILD_DIR)/.prepared
     28$(WRKBUILD)/wlcompat.o: $(WRKBUILD)/.prepared
    2929        $(TARGET_CC) $(WLCOMPAT_FLAGS) -o $@ wlcompat.c
    3030
    31 $(PKG_BUILD_DIR)/wlcompat-debug.o: $(PKG_BUILD_DIR)/.prepared
     31$(WRKBUILD)/wlcompat-debug.o: $(WRKBUILD)/.prepared
    3232        $(TARGET_CC) -DDEBUG $(WLCOMPAT_FLAGS) -o $@ wlcompat.c
    3333
    34 $(IPKG_KMOD_WLCOMPAT): $(PKG_BUILD_DIR)/wlcompat.o
     34$(IPKG_KMOD_WLCOMPAT): $(WRKBUILD)/wlcompat.o
    3535        mkdir -p $(IDIR_KMOD_WLCOMPAT)/etc/modules.d
    3636        echo "wlcompat" > $(IDIR_KMOD_WLCOMPAT)/etc/modules.d/30-wlcompat
    3737        mkdir -p $(IDIR_KMOD_WLCOMPAT)/lib/modules/$(LINUX_VERSION)
    38         $(CP) $(PKG_BUILD_DIR)/wlcompat.o $(IDIR_KMOD_WLCOMPAT)/lib/modules/$(LINUX_VERSION)/
     38        $(CP) $(WRKBUILD)/wlcompat.o $(IDIR_KMOD_WLCOMPAT)/lib/modules/$(LINUX_VERSION)/
    3939        $(IPKG_BUILD) $(IDIR_KMOD_WLCOMPAT) $(PACKAGE_DIR)
    4040
    41 $(IPKG_KMOD_WLCOMPAT_DEBUG): $(PKG_BUILD_DIR)/wlcompat-debug.o
     41$(IPKG_KMOD_WLCOMPAT_DEBUG): $(WRKBUILD)/wlcompat-debug.o
    4242        mkdir -p $(IDIR_KMOD_WLCOMPAT_DEBUG)/lib/modules/$(LINUX_VERSION)
    43         $(CP) $(PKG_BUILD_DIR)/wlcompat-debug.o $(IDIR_KMOD_WLCOMPAT_DEBUG)/lib/modules/$(LINUX_VERSION)/
     43        $(CP) $(WRKBUILD)/wlcompat-debug.o $(IDIR_KMOD_WLCOMPAT_DEBUG)/lib/modules/$(LINUX_VERSION)/
    4444        $(IPKG_BUILD) $(IDIR_KMOD_WLCOMPAT_DEBUG) $(PACKAGE_DIR)
    4545

  • target/linux/package/zd1211/Makefile

    r3438ecb2 r9404987  
    1313PKG_CAT:=zcat
    1414
    15 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-driver-$(PKG_VERSION)
    16 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
     15WRKBUILD:=$(BUILD_DIR)/$(PKG_NAME)-driver-$(PKG_VERSION)
     16PKG_INSTALL_DIR:=$(WRKBUILD)/ipkg-install
    1717
    1818include $(TOPDIR)/package/rules.mk
    … …  
    2020$(eval $(call PKG_template,KMOD_ZD1211,kmod-$(PKG_NAME),$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))
    2121
    22 $(PKG_BUILD_DIR)/.configured:
     22$(WRKBUILD)/.configured:
    2323        touch $@
    2424
    25 $(PKG_BUILD_DIR)/.built:
    26         $(MAKE) -C $(PKG_BUILD_DIR) \
     25$(WRKBUILD)/.built:
     26        $(MAKE) -C $(WRKBUILD) \
    2727                ARCH="$(LINUX_KARCH)" \
    2828                CROSS_COMPILE="$(TARGET_CROSS)" \
    … …  
    3535                KERNEL_SOURCE="$(LINUX_DIR)" \
    3636                all
    37         $(TARGET_CC) $(PKG_BUILD_DIR)/apdbg.c -o $(PKG_BUILD_DIR)/apdbg
     37        $(TARGET_CC) $(WRKBUILD)/apdbg.c -o $(WRKBUILD)/apdbg
    3838        touch $@
    3939
    … …  
    4141        install -m0755 -d $(IDIR_KMOD_ZD1211)/lib/modules/$(LINUX_VERSION) \
    4242                          $(IDIR_KMOD_ZD1211)/usr/sbin
    43         $(CP) $(PKG_BUILD_DIR)/zd1211.$(LINUX_KMOD_SUFFIX) \
     43        $(CP) $(WRKBUILD)/zd1211.$(LINUX_KMOD_SUFFIX) \
    4444                $(IDIR_KMOD_ZD1211)/lib/modules/$(LINUX_VERSION)/
    45         $(CP) $(PKG_BUILD_DIR)/apdbg $(IDIR_KMOD_ZD1211)/usr/sbin/
    46         $(CP) $(PKG_BUILD_DIR)/sta $(IDIR_KMOD_ZD1211)/usr/sbin/$(PKG_NAME)-sta
     45        $(CP) $(WRKBUILD)/apdbg $(IDIR_KMOD_ZD1211)/usr/sbin/
     46        $(CP) $(WRKBUILD)/sta $(IDIR_KMOD_ZD1211)/usr/sbin/$(PKG_NAME)-sta
    4747        $(RSTRIP_KMOD) $(IDIR_KMOD_ZD1211)
    4848        $(IPKG_BUILD) $(IDIR_KMOD_ZD1211) $(PACKAGE_DIR)
Note: See TracChangeset for help on using the changeset viewer.