diff options
author | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-11-15 20:25:29 +0000 |
---|---|---|
committer | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-11-15 20:25:29 +0000 |
commit | 1300afab4c665f486b1a6e296f3290c2c25ca7c8 (patch) | |
tree | 7e85a59eb25fe6f4d6fcc380648e03b8a6557ebf /tools | |
parent | b74589690e9a124421651935d6713c408831b2a2 (diff) |
make the lzma version kernel version dependent, and only build the one we do need
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18426 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools')
-rw-r--r-- | tools/Makefile | 8 | ||||
-rw-r--r-- | tools/lzma/Makefile | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tools/Makefile b/tools/Makefile index b7c7f43db6..e3e26f3c4f 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -14,11 +14,15 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) tools-$(CONFIG_GCC_VERSION_4_3)$(CONFIG_GCC_VERSION_4_4) += gmp mpfr endif tools-y += m4 autoconf automake bison pkg-config sed mklibs -tools-y += sstrip ipkg-utils genext2fs squashfs squashfs4 mtd-utils lzma-old mkimage +tools-y += sstrip ipkg-utils genext2fs mtd-utils mkimage tools-y += firmware-utils patch-cmdline quilt yaffs2 +ifneq ($(CONFIG_LINUX_2_4)$(CONFIG_LINUX_2_6_21)$(CONFIG_LINUX_2_6_25)$(CONFIG_LINUX_2_6_28),) +tools-y += squashfs lzma-old +else +tools-y += squashfs4 lzma +endif tools-$(CONFIG_CCACHE) += ccache -tools-dep += lzma ifdef CONFIG_GCC_USE_GRAPHITE tools-y += ppl cloog diff --git a/tools/lzma/Makefile b/tools/lzma/Makefile index bebfbafd57..b39c8627ec 100644 --- a/tools/lzma/Makefile +++ b/tools/lzma/Makefile @@ -27,6 +27,7 @@ endef define Host/Install $(INSTALL_DIR) $(STAGING_DIR_HOST)/lib $(STAGING_DIR_HOST)/include $(STAGING_DIR_HOST)/bin + $(INSTALL_BIN) $(HOST_BUILD_DIR)/CPP/7zip/Compress/LZMA_Alone/lzma_alone $(STAGING_DIR_HOST)/bin/lzma $(CP) $(HOST_BUILD_DIR)/C/*.h $(STAGING_DIR_HOST)/include/ $(CP) $(UTIL_DIR)/liblzma.a $(STAGING_DIR_HOST)/lib/ endef |