projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix dependencies for bcm43xx
[openwrt.git]
/
openwrt
/
target
/
linux
/
package
/
Makefile
diff --git
a/openwrt/target/linux/package/Makefile
b/openwrt/target/linux/package/Makefile
index
dc031fc
..
a2567ea
100644
(file)
--- a/
openwrt/target/linux/package/Makefile
+++ b/
openwrt/target/linux/package/Makefile
@@
-1,21
+1,25
@@
# Main makefile for the packages
include $(TOPDIR)/rules.mk
# Main makefile for the packages
include $(TOPDIR)/rules.mk
+include ../rules.mk
-ifneq ($(BOARD),ar7)
+package-y += base-files
package-$(BR2_PACKAGE_KMOD_ALSA) += alsa
package-$(BR2_PACKAGE_KMOD_ALSA) += alsa
-endif
package-$(BR2_PACKAGE_KMOD_FUSE) += fuse
package-$(BR2_PACKAGE_KMOD_FUSE) += fuse
+package-$(BR2_PACKAGE_KMOD_HOSTAP) += hostap
+package-$(BR2_PACKAGE_KMOD_BCM43XX_DSCAPE) += bcm43xx-dscape
+package-$(BR2_PACKAGE_KMOD_IEEE80211_DSCAPE) += ieee80211-dscape
+package-$(BR2_PACKAGE_KMOD_MADWIFI) += madwifi
package-$(BR2_PACKAGE_KMOD_MINI_FO) += mini_fo
package-$(BR2_PACKAGE_KMOD_MINI_FO) += mini_fo
-package-$(BR2_PACKAGE_KMOD_SHFS) += shfs
package-$(BR2_PACKAGE_KMOD_OPENSWAN) += openswan
package-$(BR2_PACKAGE_KMOD_OPENSWAN) += openswan
-package-$(BR2_PACKAGE_KMOD_MADWIFI) += madwifi
-package-y += openwrt
-
-ifeq ($(BOARD)-$(KERNEL),brcm-2.4)
-package-$(BR2_PACKAGE_KMOD_WLCOMPAT) += wlcompat
+package-$(BR2_PACKAGE_KMOD_SHFS) += shfs
+package-$(BR2_PACKAGE_KMOD_SPCA5XX) += spca5xx
+package-$(BR2_PACKAGE_KMOD_SWITCH) += switch
+package-$(BR2_PACKAGE_KMOD_UEAGLE_ATM) += ueagle-atm
package-$(BR2_PACKAGE_KMOD_DIAG) += diag
package-$(BR2_PACKAGE_KMOD_DIAG) += diag
-wlcompat-compile: openwrt-compile
-endif
+package-$(BR2_PACKAGE_KMOD_WLCOMPAT) += wlcompat
+
+bcm43xx-dscape-compile: ieee80211-dscape-compile
+wlcompat-compile: base-files-compile
all: compile install
clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
all: compile install
clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
@@
-23,35
+27,35
@@
prepare: $(patsubst %,%-prepare,$(package-y) $(package-m))
compile: $(patsubst %,%-compile,$(package-y) $(package-m))
install: $(patsubst %,%-install,$(package-y))
compile: $(patsubst %,%-compile,$(package-y) $(package-m))
install: $(patsubst %,%-install,$(package-y))
-MAKEOPTS:= BOARD="$(BOARD)" \
- KERNEL="$(KERNEL)" \
- IPKG="$(IPKG)" \
- TARGET_DIR="$(TARGET_DIR)" \
- BUILD_DIR="$(BUILD_DIR)" \
- KERNEL_DIR="$(KERNEL_DIR)" \
- LINUX_VERSION="$(LINUX_VERSION)" \
- KERNEL_RELEASE="$(KERNEL_RELEASE)"
-
+KPKG_MAKEOPTS += BUILD_DIR="$(LINUX_BUILD_DIR)"
%-prepare:
%-prepare:
- @$(
TRACE) target/linux/package/$(patsubst %-prepare,%,$@)-prepare
+ @$(
START_TRACE) "target/linux/package/$(patsubst %-prepare,%,$@)/prepare: "
$(MAKE) -C $(patsubst %-prepare,%,$@) \
$(MAKE) -C $(patsubst %-prepare,%,$@) \
- $(MAKEOPTS) \
+ $(
KPKG_
MAKEOPTS) \
prepare
prepare
+ @$(CMD_TRACE) " done"
+ @$(END_TRACE)
%-compile:
%-compile:
- @$(
TRACE) target/linux/package/$(patsubst %-compile,%,$@)-compile
+ @$(
START_TRACE) "target/linux/package/$(patsubst %-compile,%,$@)-compile: "
$(MAKE) -C $(patsubst %-compile,%,$@) \
$(MAKE) -C $(patsubst %-compile,%,$@) \
- $(MAKEOPTS) \
+ $(
KPKG_
MAKEOPTS) \
compile
compile
+ @$(CMD_TRACE) " done"
+ @$(END_TRACE)
-%-install:
%-compile
- @$(
TRACE) target/linux/package/$(patsubst %-install,%,$@)-install
+%-install:
+ @$(
START_TRACE) "target/linux/package/$(patsubst %-install,%,$@)-install: "
$(MAKE) -C $(patsubst %-install,%,$@) \
$(MAKE) -C $(patsubst %-install,%,$@) \
- $(MAKEOPTS) \
+ $(
KPKG_
MAKEOPTS) \
install
install
+ @$(CMD_TRACE) " done"
+ @$(END_TRACE)
%-clean:
%-clean:
- @$(
TRACE) target/linux/package/$(patsubst %-clean,%,$@)-clean
+ @$(
START_TRACE) "target/linux/package/$(patsubst %-clean,%,$@)-clean: "
@$(MAKE) -C $(patsubst %-clean,%,$@) clean
@$(MAKE) -C $(patsubst %-clean,%,$@) clean
+ @$(CMD_TRACE) " done"
+ @$(END_TRACE)
This page took
0.029814 seconds
and
4
git commands to generate.