Author: nbd Date: 2016-01-10 17:35:46 +0100 (Sun, 10 Jan 2016) New Revision: 48174
Modified: trunk/package/firmware/linux-firmware/Makefile trunk/package/firmware/linux-firmware/realtek.mk Log: linux-firmware: remove duplication in package metadata Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/package/firmware/linux-firmware/Makefile =================================================================== --- trunk/package/firmware/linux-firmware/Makefile 2016-01-10 16:35:40 UTC (rev 48173) +++ trunk/package/firmware/linux-firmware/Makefile 2016-01-10 16:35:46 UTC (rev 48174) @@ -23,39 +23,33 @@ include $(INCLUDE_DIR)/package.mk -define Package/ibt-firmware +define Package/firmware-default SECTION:=firmware CATEGORY:=Firmware URL:=http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git - TITLE:=Intel bluetooth firmware + TITLE:=$(1) endef +define Build/Compile + +endef + +Package/ibt-firmware = $(call Package/firmware-default,Intel bluetooth firmware) define Package/ibt-firmware/install $(INSTALL_DIR) $(1)/lib/firmware/intel $(CP) \ $(PKG_BUILD_DIR)/intel/*.bseq \ $(1)/lib/firmware/intel endef +$(eval $(call BuildPackage,ibt-firmware)) -define Package/ar3k-firmware - SECTION:=firmware - CATEGORY:=Firmware - URL:=http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git - TITLE:=ath3k firmware -endef - +Package/ar3k-firmware = $(call Package/firmware-default,ath3k firmware) define Package/ar3k-firmware/install $(INSTALL_DIR) $(1)/lib/firmware/ar3k $(CP) \ $(PKG_BUILD_DIR)/ar3k/*.dfu \ $(1)/lib/firmware/ar3k endef +$(eval $(call BuildPackage,ar3k-firmware)) -define Build/Compile - -endef - include $(wildcard ./*.mk) - -$(eval $(call BuildPackage,ar3k-firmware)) -$(eval $(call BuildPackage,ibt-firmware)) Modified: trunk/package/firmware/linux-firmware/realtek.mk =================================================================== --- trunk/package/firmware/linux-firmware/realtek.mk 2016-01-10 16:35:40 UTC (rev 48173) +++ trunk/package/firmware/linux-firmware/realtek.mk 2016-01-10 16:35:46 UTC (rev 48174) @@ -1,32 +1,17 @@ -define Package/r8169-firmware - SECTION:=firmware - CATEGORY:=Firmware - URL:=http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git - TITLE:=RealTek r8169 firmware -endef - +Package/r8169-firmware = $(call Package/firmware-default,RealTek RTL8169 firmware) define Package/r8169-firmware/install $(INSTALL_DIR) $(1)/lib/firmware/rtl_nic $(CP) \ $(PKG_BUILD_DIR)/rtl_nic/* \ $(1)/lib/firmware/rtl_nic endef - $(eval $(call BuildPackage,r8169-firmware)) - -define Package/r8188eu-firmware - SECTION:=firmware - CATEGORY:=Firmware - URL:=http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git - TITLE:=RealTek r8188eu firmware -endef - +Package/r8188eu-firmware = $(call Package/firmware-default,RealTek RTL8188EU firmware) define Package/r8188eu-firmware/install $(INSTALL_DIR) $(1)/lib/firmware/rtlwifi $(CP) \ $(PKG_BUILD_DIR)/rtlwifi/rtl8188eufw.bin \ $(1)/lib/firmware/rtlwifi endef - $(eval $(call BuildPackage,r8188eu-firmware)) _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
