dumalogiya
/
openwrt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix 2.6 modules pattern using a common LINUX_KMOD_SUFFIX variable, fix alsa 2.6 build when arch != mipsel

Browse Source 
SVN-Revision: 2311
v19.07.3_mercusys_ac12_duma
Nicolas Thill 19 years ago
parent 8c5db04639
commit ea72d399ef
8 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File

3
openwrt/target/linux/package/alsa/Makefile
Unescape Escape View File

@ -43,6 +43,7 @@ $(PKG_BUILD_DIR)/.configured:
$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.built:
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
ARCH="$(LINUX_KARCH)" \
c_opts="$(KERNEL_C_OPTS)" c_opts="$(KERNEL_C_OPTS)"
touch $@ touch $@
@ -50,6 +51,6 @@ $(IPKG_KMOD_ALSA):
install -d -m0755 $(IDIR_KMOD_ALSA)/etc/modules.d install -d -m0755 $(IDIR_KMOD_ALSA)/etc/modules.d
install -m0644 ./files/alsa.modules $(IDIR_KMOD_ALSA)/etc/modules.d/70-alsa install -m0644 ./files/alsa.modules $(IDIR_KMOD_ALSA)/etc/modules.d/70-alsa
install -d -m0755 $(IDIR_KMOD_ALSA)/lib/modules/$(LINUX_VERSION) install -d -m0755 $(IDIR_KMOD_ALSA)/lib/modules/$(LINUX_VERSION)
install -m0644 $(PKG_BUILD_DIR)/modules/*.o \ install -m0644 $(PKG_BUILD_DIR)/modules/*.$(LINUX_KMOD_SUFFIX) \
$(IDIR_KMOD_ALSA)/lib/modules/$(LINUX_VERSION)/ $(IDIR_KMOD_ALSA)/lib/modules/$(LINUX_VERSION)/
$(IPKG_BUILD) $(IDIR_KMOD_ALSA) $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_KMOD_ALSA) $(PACKAGE_DIR)

2
openwrt/target/linux/package/fuse/Makefile
Unescape Escape View File

@ -77,7 +77,7 @@ $(PKG_BUILD_DIR)/.built:
$(IPKG_KMOD_FUSE): $(IPKG_KMOD_FUSE):
mkdir -p $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION) mkdir -p $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION)
cp -fpR $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.* \ cp -fpR $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) \
$(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION)/ $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION)/
$(IPKG_BUILD) $(IDIR_KMOD_FUSE) $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_KMOD_FUSE) $(PACKAGE_DIR)

12
openwrt/target/linux/package/hostap/Makefile
Unescape Escape View File

@ -38,10 +38,10 @@ $(PKG_BUILD_DIR)/.built:
$(IPKG_KMOD_HOSTAP): $(IPKG_KMOD_HOSTAP):
install -m0755 -d $(IDIR_KMOD_HOSTAP)/lib/modules/$(LINUX_VERSION) install -m0755 -d $(IDIR_KMOD_HOSTAP)/lib/modules/$(LINUX_VERSION)
cp -fpR \ cp -fpR \
$(PKG_BUILD_DIR)/driver/modules/hostap.o \ $(PKG_BUILD_DIR)/driver/modules/hostap.$(LINUX_KMOD_SUFFIX) \
$(PKG_BUILD_DIR)/driver/modules/hostap_crypt_ccmp.o \ $(PKG_BUILD_DIR)/driver/modules/hostap_crypt_ccmp.$(LINUX_KMOD_SUFFIX) \
$(PKG_BUILD_DIR)/driver/modules/hostap_crypt_tkip.o \ $(PKG_BUILD_DIR)/driver/modules/hostap_crypt_tkip.$(LINUX_KMOD_SUFFIX) \
$(PKG_BUILD_DIR)/driver/modules/hostap_crypt_wep.o \ $(PKG_BUILD_DIR)/driver/modules/hostap_crypt_wep.$(LINUX_KMOD_SUFFIX) \
$(IDIR_KMOD_HOSTAP)/lib/modules/$(LINUX_VERSION)/ $(IDIR_KMOD_HOSTAP)/lib/modules/$(LINUX_VERSION)/
$(RSTRIP_KMOD) $(IDIR_KMOD_HOSTAP) $(RSTRIP_KMOD) $(IDIR_KMOD_HOSTAP)
$(IPKG_BUILD) $(IDIR_KMOD_HOSTAP) $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_KMOD_HOSTAP) $(PACKAGE_DIR)
@ -49,7 +49,7 @@ $(IPKG_KMOD_HOSTAP):
$(IPKG_KMOD_HOSTAP_PCI): $(IPKG_KMOD_HOSTAP_PCI):
install -m0755 -d $(IDIR_KMOD_HOSTAP_PCI)/lib/modules/$(LINUX_VERSION) install -m0755 -d $(IDIR_KMOD_HOSTAP_PCI)/lib/modules/$(LINUX_VERSION)
cp -fpR \ cp -fpR \
$(PKG_BUILD_DIR)/driver/modules/hostap_pci.o \ $(PKG_BUILD_DIR)/driver/modules/hostap_pci.$(LINUX_KMOD_SUFFIX) \
$(IDIR_KMOD_HOSTAP_PCI)/lib/modules/$(LINUX_VERSION)/ $(IDIR_KMOD_HOSTAP_PCI)/lib/modules/$(LINUX_VERSION)/
$(RSTRIP_KMOD) $(IDIR_KMOD_HOSTAP_PCI) $(RSTRIP_KMOD) $(IDIR_KMOD_HOSTAP_PCI)
$(IPKG_BUILD) $(IDIR_KMOD_HOSTAP_PCI) $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_KMOD_HOSTAP_PCI) $(PACKAGE_DIR)
@ -57,7 +57,7 @@ $(IPKG_KMOD_HOSTAP_PCI):
$(IPKG_KMOD_HOSTAP_PLX): $(IPKG_KMOD_HOSTAP_PLX):
install -m0755 -d $(IDIR_KMOD_HOSTAP_PLX)/lib/modules/$(LINUX_VERSION) install -m0755 -d $(IDIR_KMOD_HOSTAP_PLX)/lib/modules/$(LINUX_VERSION)
cp -fpR \ cp -fpR \
$(PKG_BUILD_DIR)/driver/modules/hostap_plx.o \ $(PKG_BUILD_DIR)/driver/modules/hostap_plx.$(LINUX_KMOD_SUFFIX) \
$(IDIR_KMOD_HOSTAP_PLX)/lib/modules/$(LINUX_VERSION)/ $(IDIR_KMOD_HOSTAP_PLX)/lib/modules/$(LINUX_VERSION)/
$(RSTRIP_KMOD) $(IDIR_KMOD_HOSTAP_PLX) $(RSTRIP_KMOD) $(IDIR_KMOD_HOSTAP_PLX)
$(IPKG_BUILD) $(IDIR_KMOD_HOSTAP_PLX) $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_KMOD_HOSTAP_PLX) $(PACKAGE_DIR)

14
openwrt/target/linux/package/madwifi/Makefile
Unescape Escape View File

@ -28,12 +28,6 @@ ifeq ($(ARCH),i386)
HAL_TARGET:=i386-elf HAL_TARGET:=i386-elf
endif endif
ifeq ($(KERNEL),2.4)
MODUL_SUFFIX=o
else
MODUL_SUFFIX=ko
endif
include $(TOPDIR)/package/rules.mk include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,KMOD_MADWIFI,kmod-madwifi,$(LINUX_VERSION)$(BOARD)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kernel-$(LINUX_VERSION)-$(BOARD) ($(KERNEL_RELEASE)))) $(eval $(call PKG_template,KMOD_MADWIFI,kmod-madwifi,$(LINUX_VERSION)$(BOARD)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kernel-$(LINUX_VERSION)-$(BOARD) ($(KERNEL_RELEASE))))
@ -56,10 +50,10 @@ $(IPKG_KMOD_MADWIFI):
mkdir -p $(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION) mkdir -p $(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)
install -m0644 ./files/madwifi.modules $(IDIR_KMOD_MADWIFI)/etc/modules.d/20-madwifi 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 install -m0755 ./files/madwifi.init $(IDIR_KMOD_MADWIFI)/etc/init.d/S20madwifi
cp -fpR $(PKG_BUILD_DIR)/net80211/wlan*.$(MODUL_SUFFIX) \ cp -fpR $(PKG_BUILD_DIR)/net80211/wlan*.$(LINUX_KMOD_SUFFIX) \
$(PKG_BUILD_DIR)/ath_hal/ath_hal.$(MODUL_SUFFIX) \ $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \
$(PKG_BUILD_DIR)/ath_rate/onoe/ath_rate_onoe.$(MODUL_SUFFIX) \ $(PKG_BUILD_DIR)/ath_rate/onoe/ath_rate_onoe.$(LINUX_KMOD_SUFFIX) \
$(PKG_BUILD_DIR)/ath/ath_pci.$(MODUL_SUFFIX) \ $(PKG_BUILD_DIR)/ath/ath_pci.$(LINUX_KMOD_SUFFIX) \
$(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)/ $(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)/
$(IPKG_BUILD) $(IDIR_KMOD_MADWIFI) $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_KMOD_MADWIFI) $(PACKAGE_DIR)

2
openwrt/target/linux/package/mini_fo/Makefile
Unescape Escape View File

@ -39,7 +39,7 @@ $(PKG_BUILD_DIR)/.built:
$(IPKG_KMOD_MINI_FO): $(IPKG_KMOD_MINI_FO):
install -m0755 -d $(IDIR_KMOD_MINI_FO)/lib/modules/$(LINUX_VERSION) install -m0755 -d $(IDIR_KMOD_MINI_FO)/lib/modules/$(LINUX_VERSION)
install -m0755 -d $(IDIR_KMOD_MINI_FO)/etc/modules.d install -m0755 -d $(IDIR_KMOD_MINI_FO)/etc/modules.d
cp -fpR $(PKG_BUILD_DIR)/mini_fo.o \ cp -fpR $(PKG_BUILD_DIR)/mini_fo.$(LINUX_KMOD_SUFFIX) \
$(IDIR_KMOD_MINI_FO)/lib/modules/$(LINUX_VERSION)/ $(IDIR_KMOD_MINI_FO)/lib/modules/$(LINUX_VERSION)/
echo "mini_fo" > $(IDIR_KMOD_MINI_FO)/etc/modules.d/15-mini-fo echo "mini_fo" > $(IDIR_KMOD_MINI_FO)/etc/modules.d/15-mini-fo
$(RSTRIP_KMOD) $(IDIR_KMOD_MINI_FO) $(RSTRIP_KMOD) $(IDIR_KMOD_MINI_FO)

2
openwrt/target/linux/package/openswan/Makefile
Unescape Escape View File

@ -33,5 +33,5 @@ $(PKG_BUILD_DIR)/.built:
$(IPKG_KMOD_OPENSWAN): $(IPKG_KMOD_OPENSWAN):
mkdir -p $(IDIR_KMOD_OPENSWAN)/lib/modules/$(LINUX_VERSION) mkdir -p $(IDIR_KMOD_OPENSWAN)/lib/modules/$(LINUX_VERSION)
cp $(PKG_BUILD_DIR)/modobj/ipsec.*o $(IDIR_KMOD_OPENSWAN)/lib/modules/$(LINUX_VERSION)/ cp -fpR $(PKG_BUILD_DIR)/modobj*/ipsec.$(LINUX_KMOD_SUFFIX) $(IDIR_KMOD_OPENSWAN)/lib/modules/$(LINUX_VERSION)/
$(IPKG_BUILD) $(IDIR_KMOD_OPENSWAN) $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_KMOD_OPENSWAN) $(PACKAGE_DIR)

2
openwrt/target/linux/package/shfs/Makefile
Unescape Escape View File

@ -43,7 +43,7 @@ $(PKG_BUILD_DIR)/.built:
$(IPKG_KMOD_SHFS): $(IPKG_KMOD_SHFS):
install -m0755 -d $(IDIR_KMOD_SHFS)/lib/modules/$(LINUX_VERSION) install -m0755 -d $(IDIR_KMOD_SHFS)/lib/modules/$(LINUX_VERSION)
cp -fpR $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/shfs/shfs.*o \ cp -fpR $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/shfs/shfs.$(LINUX_KMOD_SUFFIX) \
$(IDIR_KMOD_SHFS)/lib/modules/$(LINUX_VERSION)/ $(IDIR_KMOD_SHFS)/lib/modules/$(LINUX_VERSION)/
$(RSTRIP_KMOD) $(IDIR_KMOD_SHFS) $(RSTRIP_KMOD) $(IDIR_KMOD_SHFS)
$(IPKG_BUILD) $(IDIR_KMOD_SHFS) $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_KMOD_SHFS) $(PACKAGE_DIR)

5
openwrt/target/linux/rules.mk
Unescape Escape View File

@ -4,6 +4,11 @@ LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
-e 's/sh[234]/sh/' \ -e 's/sh[234]/sh/' \
) )
ifeq ($(KERNEL),2.6)
LINUX_KMOD_SUFFIX=ko
else
LINUX_KMOD_SUFFIX=o
endif
define KMOD_template define KMOD_template
ifeq ($$(strip $(4)),) ifeq ($$(strip $(4)),)

Write Preview
Loading…
Cancel
Save