From 859e8f7f7d8bfbefd610d338d16498190cd51e15 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 21 Jun 2006 02:16:37 +0000 Subject: build system cleanup. move shared include files into $(TOPDIR)/include, move lzma, mkfs.* into toolchain/ git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4032 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- toolchain/Makefile | 3 +- toolchain/jffs2/Makefile | 29 ++ toolchain/jffs2/patches/100-gcc4_fix.patch | 24 ++ toolchain/lzma/Makefile | 53 ++++ toolchain/lzma/patches/100-lzma_zlib.patch | 408 +++++++++++++++++++++++++++++ toolchain/squashfs/Makefile | 27 ++ toolchain/squashfs/patches/100-lzma.patch | 25 ++ 7 files changed, 568 insertions(+), 1 deletion(-) create mode 100644 toolchain/jffs2/Makefile create mode 100644 toolchain/jffs2/patches/100-gcc4_fix.patch create mode 100644 toolchain/lzma/Makefile create mode 100644 toolchain/lzma/patches/100-lzma_zlib.patch create mode 100644 toolchain/squashfs/Makefile create mode 100644 toolchain/squashfs/patches/100-lzma.patch (limited to 'toolchain') diff --git a/toolchain/Makefile b/toolchain/Makefile index fac046828..f9fb3a54d 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -1,6 +1,6 @@ # Main makefile for the toolchain include $(TOPDIR)/rules.mk -TARGETS-y:=sed kernel-headers utils binutils gcc uClibc ipkg-utils libnotimpl +TARGETS-y:=sed kernel-headers utils binutils gcc uClibc ipkg-utils libnotimpl squashfs jffs2 lzma TARGETS-$(CONFIG_GDB) += gdb TARGETS_DOWNLOAD:=$(patsubst %,%-source,$(TARGETS-y)) @@ -17,6 +17,7 @@ binutils-prepare: uClibc-prepare gcc-prepare: binutils-install uClibc-compile: gcc-prepare gcc-compile: uClibc-install +squashfs-compile: lzma-compile TOOLCHAIN_STAMP_DIR:=$(STAGING_DIR)/stampfiles diff --git a/toolchain/jffs2/Makefile b/toolchain/jffs2/Makefile new file mode 100644 index 000000000..b673c438a --- /dev/null +++ b/toolchain/jffs2/Makefile @@ -0,0 +1,29 @@ +include $(TOPDIR)/rules.mk + +MTD_DIR:=$(BUILD_DIR)/mtd-20050122.orig +MTD_SOURCE=mtd_20050122.orig.tar.gz +MTD_SITE=http://ftp.debian.org/debian/pool/main/m/mtd +MTD_MD5SUM:=1f42c2cae08eb9e7b52d0c188f8d6338 +MKFS_JFFS2=$(MTD_DIR)/util/mkfs.jffs2 + +$(DL_DIR)/$(MTD_SOURCE): + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(MTD_SOURCE) $(MTD_MD5SUM) $(MTD_SITE) + +$(MTD_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE) + zcat $(DL_DIR)/$(MTD_SOURCE) | tar -C $(BUILD_DIR) -xvf - + $(PATCH) $(MTD_DIR) ./patches + touch $(MTD_DIR)/.unpacked + +$(MTD_DIR)/util/mkfs.jffs2: $(MTD_DIR)/.unpacked + $(MAKE) LINUXDIR=$(LINUX_DIR) -C $(MTD_DIR)/util + +$(STAGING_DIR)/bin/mkfs.jffs2: $(MTD_DIR)/util/mkfs.jffs2 + $(CP) $< $@ + +source: $(DL_DIR)/$(MTD_SOURCE) +prepare: $(MTD_DIR)/.unpacked +compile: $(MTD_DIR)/util/mkfs.jffs2 $(STAGING_DIR)/bin/mkfs.jffs2 +install: +clean: FORCE + rm -rf $(MTD_DIR) $(STAGING_DIR)/bin/mkfs.jffs2 + diff --git a/toolchain/jffs2/patches/100-gcc4_fix.patch b/toolchain/jffs2/patches/100-gcc4_fix.patch new file mode 100644 index 000000000..50c8edb47 --- /dev/null +++ b/toolchain/jffs2/patches/100-gcc4_fix.patch @@ -0,0 +1,24 @@ +diff -urN mtd-20050122.orig.old/include/mtd/jffs2-user.h mtd-20050122.orig.dev/include/mtd/jffs2-user.h +--- mtd-20050122.orig.old/include/mtd/jffs2-user.h 2004-05-05 13:57:54.000000000 +0200 ++++ mtd-20050122.orig.dev/include/mtd/jffs2-user.h 2005-07-02 10:03:09.000000000 +0200 +@@ -19,8 +19,6 @@ + #undef je32_to_cpu + #undef jemode_to_cpu + +-extern int target_endian; +- + #define t16(x) ({ uint16_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_16(__b); }) + #define t32(x) ({ uint32_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_32(__b); }) + +diff -urN mtd.old/util/jffs3.h mtd.dev/util/jffs3.h +--- mtd.old/util/jffs3.h 2005-01-22 00:00:13.000000000 +0100 ++++ mtd.dev/util/jffs3.h 2005-07-17 17:48:24.000000000 +0200 +@@ -177,8 +177,6 @@ + #undef je32_to_cpu + #undef jemode_to_cpu + +-extern int target_endian; +- + #define t16(x) ({ uint16_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_16(__b); }) + #define t32(x) ({ uint32_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_32(__b); }) + diff --git a/toolchain/lzma/Makefile b/toolchain/lzma/Makefile new file mode 100644 index 000000000..cace2a4e2 --- /dev/null +++ b/toolchain/lzma/Makefile @@ -0,0 +1,53 @@ +############################################################# +# +# lzma target +# +############################################################# + +include $(TOPDIR)/rules.mk + +LZMA_DIR=$(BUILD_DIR)/lzma +LZMA_SOURCE=lzma432.tar.bz2 +LZMA_SITE=@SF/sevenzip +LZMA_MD5=155c1ebce5bc6710ae7ecc926226d9d7 + +LZMA_LIB_DIR=$(LZMA_DIR)/C/7zip/Compress/LZMA_Lib +LZMA_ALONE_DIR=$(LZMA_DIR)/C/7zip/Compress/LZMA_Alone + +TARGETS=$(LZMA_LIB_DIR)/liblzma.a $(LZMA_ALONE_DIR)/lzma + +$(DL_DIR)/$(LZMA_SOURCE): + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LZMA_SOURCE) $(LZMA_MD5) $(LZMA_SITE) + +$(LZMA_DIR)/.unpacked: $(DL_DIR)/$(LZMA_SOURCE) + @rm -rf $(LZMA_DIR) && mkdir -p $(LZMA_DIR) + tar xjf $^ -C $(LZMA_DIR) + $(PATCH) $(LZMA_DIR) ./patches + touch $(LZMA_DIR)/.unpacked + +$(LZMA_ALONE_DIR)/lzma $(LZMA_LIB_DIR)/liblzma.a: $(LZMA_DIR)/.built +$(LZMA_DIR)/.built: $(LZMA_DIR)/.unpacked + $(MAKE) -C $(LZMA_LIB_DIR) + $(MAKE) -f makefile.gcc -C $(LZMA_ALONE_DIR) + touch $@ + +lzma: $(TARGETS) + $(CP) $^ $(LZMA_DIR) + + +lzma-clean: FORCE + -$(MAKE) -C $(LZMA_LIB_DIR) clean + -$(MAKE) -C $(LZMA_ALONE_DIR) clean + rm -f $(LZMA_DIR)/liblzma.a $(LZMA_DIR)/lzma + +lzma-dirclean: FORCE + rm -rf $(LZMA_DIR) + +############################################################# + +source: $(DL_DIR)/$(LZMA_SOURCE) +prepare: $(LZMA_DIR)/.unpacked +compile: lzma +install: lzma FORCE + $(CP) $(LZMA_DIR)/lzma $(STAGING_DIR)/bin/ +clean: lzma-dirclean diff --git a/toolchain/lzma/patches/100-lzma_zlib.patch b/toolchain/lzma/patches/100-lzma_zlib.patch new file mode 100644 index 000000000..3672a0efb --- /dev/null +++ b/toolchain/lzma/patches/100-lzma_zlib.patch @@ -0,0 +1,408 @@ +diff -Nur lzma/C/7zip/Compress/LZMA/LZMADecoder.cpp lzma.patched/C/7zip/Compress/LZMA/LZMADecoder.cpp +--- lzma/C/7zip/Compress/LZMA/LZMADecoder.cpp 2005-09-22 10:55:34.000000000 +0200 ++++ lzma.patched/C/7zip/Compress/LZMA/LZMADecoder.cpp 2006-03-25 11:04:53.000000000 +0100 +@@ -274,12 +274,17 @@ + Byte remainder = (Byte)(properties[0] / 9); + int lp = remainder % 5; + int pb = remainder / 5; +- if (pb > NLength::kNumPosStatesBitsMax) +- return E_INVALIDARG; +- _posStateMask = (1 << pb) - 1; + UInt32 dictionarySize = 0; + for (int i = 0; i < 4; i++) + dictionarySize += ((UInt32)(properties[1 + i])) << (i * 8); ++ return SetDecoderPropertiesRaw(lc, lp, pb, dictionarySize); ++} ++ ++STDMETHODIMP CDecoder::SetDecoderPropertiesRaw(int lc, int lp, int pb, UInt32 dictionarySize) ++{ ++ if (pb > NLength::kNumPosStatesBitsMax) ++ return E_INVALIDARG; ++ _posStateMask = (1 << pb) - 1; + if (!_outWindowStream.Create(dictionarySize)) + return E_OUTOFMEMORY; + if (!_literalDecoder.Create(lp, lc)) +diff -Nur lzma/C/7zip/Compress/LZMA/LZMADecoder.h lzma.patched/C/7zip/Compress/LZMA/LZMADecoder.h +--- lzma/C/7zip/Compress/LZMA/LZMADecoder.h 2005-09-19 08:10:06.000000000 +0200 ++++ lzma.patched/C/7zip/Compress/LZMA/LZMADecoder.h 2006-03-25 11:04:53.000000000 +0100 +@@ -228,6 +228,7 @@ + ICompressProgressInfo *progress); + + STDMETHOD(SetDecoderProperties2)(const Byte *data, UInt32 size); ++ STDMETHOD(SetDecoderPropertiesRaw)(int lc, int lp, int pb, UInt32 dictionarySize); + + STDMETHOD(GetInStreamProcessedSize)(UInt64 *value); + +diff -Nur lzma/C/7zip/Compress/LZMA_Lib/makefile lzma.patched/C/7zip/Compress/LZMA_Lib/makefile +--- lzma/C/7zip/Compress/LZMA_Lib/makefile 1970-01-01 01:00:00.000000000 +0100 ++++ lzma.patched/C/7zip/Compress/LZMA_Lib/makefile 2006-03-25 11:29:46.000000000 +0100 +@@ -0,0 +1,92 @@ ++PROG = liblzma.a ++CXX = g++ -O3 -Wall ++AR = ar ++RM = rm -f ++CFLAGS = -c -I ../../../ ++ ++OBJS = \ ++ ZLib.o \ ++ LZMADecoder.o \ ++ LZMAEncoder.o \ ++ LZInWindow.o \ ++ LZOutWindow.o \ ++ RangeCoderBit.o \ ++ InBuffer.o \ ++ OutBuffer.o \ ++ FileStreams.o \ ++ Alloc.o \ ++ C_FileIO.o \ ++ CommandLineParser.o \ ++ CRC.o \ ++ StreamUtils.o \ ++ String.o \ ++ StringConvert.o \ ++ StringToInt.o \ ++ Vector.o \ ++ ++ ++all: $(PROG) ++ ++$(PROG): $(OBJS) ++ $(AR) r $(PROG) $(OBJS) ++ ++ZLib.o: ZLib.cpp ++ $(CXX) $(CFLAGS) ZLib.cpp ++ ++LZMADecoder.o: ../LZMA/LZMADecoder.cpp ++ $(CXX) $(CFLAGS) ../LZMA/LZMADecoder.cpp ++ ++LZMAEncoder.o: ../LZMA/LZMAEncoder.cpp ++ $(CXX) $(CFLAGS) ../LZMA/LZMAEncoder.cpp ++ ++LZInWindow.o: ../LZ/LZInWindow.cpp ++ $(CXX) $(CFLAGS) ../LZ/LZInWindow.cpp ++ ++LZOutWindow.o: ../LZ/LZOutWindow.cpp ++ $(CXX) $(CFLAGS) ../LZ/LZOutWindow.cpp ++ ++RangeCoderBit.o: ../RangeCoder/RangeCoderBit.cpp ++ $(CXX) $(CFLAGS) ../RangeCoder/RangeCoderBit.cpp ++ ++InBuffer.o: ../../Common/InBuffer.cpp ++ $(CXX) $(CFLAGS) ../../Common/InBuffer.cpp ++ ++OutBuffer.o: ../../Common/OutBuffer.cpp ++ $(CXX) $(CFLAGS) ../../Common/OutBuffer.cpp ++ ++StreamUtils.o: ../../Common/StreamUtils.cpp ++ $(CXX) $(CFLAGS) ../../Common/StreamUtils.cpp ++ ++FileStreams.o: ../../Common/FileStreams.cpp ++ $(CXX) $(CFLAGS) ../../Common/FileStreams.cpp ++ ++Alloc.o: ../../../Common/Alloc.cpp ++ $(CXX) $(CFLAGS) ../../../Common/Alloc.cpp ++ ++C_FileIO.o: ../../../Common/C_FileIO.cpp ++ $(CXX) $(CFLAGS) ../../../Common/C_FileIO.cpp ++ ++CommandLineParser.o: ../../../Common/CommandLineParser.cpp ++ $(CXX) $(CFLAGS) ../../../Common/CommandLineParser.cpp ++ ++CRC.o: ../../../Common/CRC.cpp ++ $(CXX) $(CFLAGS) ../../../Common/CRC.cpp ++ ++MyWindows.o: ../../../Common/MyWindows.cpp ++ $(CXX) $(CFLAGS) ../../../Common/MyWindows.cpp ++ ++String.o: ../../../Common/String.cpp ++ $(CXX) $(CFLAGS) ../../../Common/String.cpp ++ ++StringConvert.o: ../../../Common/StringConvert.cpp ++ $(CXX) $(CFLAGS) ../../../Common/StringConvert.cpp ++ ++StringToInt.o: ../../../Common/StringToInt.cpp ++ $(CXX) $(CFLAGS) ../../../Common/StringToInt.cpp ++ ++Vector.o: ../../../Common/Vector.cpp ++ $(CXX) $(CFLAGS) ../../../Common/Vector.cpp ++ ++clean: ++ -$(RM) $(PROG) $(OBJS) ++ +diff -Nur lzma/C/7zip/Compress/LZMA_Lib/ZLib.cpp lzma.patched/C/7zip/Compress/LZMA_Lib/ZLib.cpp +--- lzma/C/7zip/Compress/LZMA_Lib/ZLib.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ lzma.patched/C/7zip/Compress/LZMA_Lib/ZLib.cpp 2006-03-25 11:04:53.000000000 +0100 +@@ -0,0 +1,273 @@ ++/* ++ * lzma zlib simplified wrapper ++ * ++ * Copyright (c) 2005-2006 Oleg I. Vdovikin ++ * ++ * This library is free software; you can redistribute ++ * it and/or modify it under the terms of the GNU Lesser ++ * General Public License as published by the Free Software ++ * Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be ++ * useful, but WITHOUT ANY WARRANTY; without even the implied ++ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ++ * PURPOSE. See the GNU Lesser General Public License ++ * for more details. ++ * ++ * You should have received a copy of the GNU Lesser General ++ * Public License along with this library; if not, write to ++ * the Free Software Foundation, Inc., 59 Temple Place, ++ * Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++/* ++ * default values for encoder/decoder used by wrapper ++ */ ++ ++#include ++ ++#define ZLIB_LC 3 ++#define ZLIB_LP 0 ++#define ZLIB_PB 2 ++ ++#ifdef WIN32 ++#include ++#else ++#define INITGUID ++#endif ++ ++#include "../../../Common/MyWindows.h" ++#include "../LZMA/LZMADecoder.h" ++#include "../LZMA/LZMAEncoder.h" ++ ++#define STG_E_SEEKERROR ((HRESULT)0x80030019L) ++#define STG_E_MEDIUMFULL ((HRESULT)0x80030070L) ++ ++class CInMemoryStream: ++ public IInStream, ++ public IStreamGetSize, ++ public CMyUnknownImp ++{ ++public: ++ CInMemoryStream(const Bytef *data, UInt64 size) : ++ m_data(data), m_size(size), m_offset(0) {} ++ ++ virtual ~CInMemoryStream() {} ++ ++ MY_UNKNOWN_IMP2(IInStream, IStreamGetSize) ++ ++ STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize) ++ { ++ if (size > m_size - m_offset) ++ size = m_size - m_offset; ++ ++ if (size) { ++ memcpy(data, m_data + m_offset, size); ++ } ++ ++ m_offset += size; ++ ++ if (processedSize) ++ *processedSize = size; ++ ++ return S_OK; ++ } ++ ++ STDMETHOD(ReadPart)(void *data, UInt32 size, UInt32 *processedSize) ++ { ++ return Read(data, size, processedSize); ++ } ++ ++ STDMETHOD(Seek)(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition) ++ { ++ UInt64 _offset; ++ ++ if (seekOrigin == STREAM_SEEK_SET) _offset = offset; ++ else if (seekOrigin == STREAM_SEEK_CUR) _offset = m_offset + offset; ++ else if (seekOrigin == STREAM_SEEK_END) _offset = m_size; ++ else return STG_E_INVALIDFUNCTION; ++ ++ if (_offset < 0 || _offset > m_size) ++ return STG_E_SEEKERROR; ++ ++ m_offset = _offset; ++ ++ if (newPosition) ++ *newPosition = m_offset; ++ ++ return S_OK; ++ } ++ ++ STDMETHOD(GetSize)(UInt64 *size) ++ { ++ *size = m_size; ++ return S_OK; ++ } ++protected: ++ const Bytef *m_data; ++ UInt64 m_size; ++ UInt64 m_offset; ++}; ++ ++class COutMemoryStream: ++ public IOutStream, ++ public CMyUnknownImp ++{ ++public: ++ COutMemoryStream(Bytef *data, UInt64 maxsize) : ++ m_data(data), m_size(0), m_maxsize(maxsize), m_offset(0) {} ++ virtual ~COutMemoryStream() {} ++ ++ MY_UNKNOWN_IMP1(IOutStream) ++ ++ STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize) ++ { ++ if (size > m_maxsize - m_offset) ++ size = m_maxsize - m_offset; ++ ++ if (size) { ++ memcpy(m_data + m_offset, data, size); ++ } ++ ++ m_offset += size; ++ ++ if (m_offset > m_size) ++ m_size = m_offset; ++ ++ if (processedSize) ++ *processedSize = size; ++ ++ return S_OK; ++ } ++ ++ STDMETHOD(WritePart)(const void *data, UInt32 size, UInt32 *processedSize) ++ { ++ return Write(data, size, processedSize); ++ } ++ ++ STDMETHOD(Seek)(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition) ++ { ++ UInt64 _offset; ++ ++ if (seekOrigin == STREAM_SEEK_SET) _offset = offset; ++ else if (seekOrigin == STREAM_SEEK_CUR) _offset = m_offset + offset; ++ else if (seekOrigin == STREAM_SEEK_END) _offset = m_size; ++ else return STG_E_INVALIDFUNCTION; ++ ++ if (_offset < 0 || _offset > m_maxsize) ++ return STG_E_SEEKERROR; ++ ++ m_offset = _offset; ++ ++ if (newPosition) ++ *newPosition = m_offset; ++ ++ return S_OK; ++ } ++ ++ STDMETHOD(SetSize)(Int64 newSize) ++ { ++ if ((UInt64)newSize > m_maxsize) ++ return STG_E_MEDIUMFULL; ++ ++ return S_OK; ++ } ++protected: ++ Bytef *m_data; ++ UInt64 m_size; ++ UInt64 m_maxsize; ++ UInt64 m_offset; ++}; ++ ++ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen, ++ const Bytef *source, uLong sourceLen, ++ int level)) ++{ ++ CInMemoryStream *inStreamSpec = new CInMemoryStream(source, sourceLen); ++ CMyComPtr inStream = inStreamSpec; ++ ++ COutMemoryStream *outStreamSpec = new COutMemoryStream(dest, *destLen); ++ CMyComPtr outStream = outStreamSpec; ++ ++ NCompress::NLZMA::CEncoder *encoderSpec = ++ new NCompress::NLZMA::CEncoder; ++ CMyComPtr encoder = encoderSpec; ++ ++ PROPID propIDs[] = ++ { ++ NCoderPropID::kDictionarySize, ++ NCoderPropID::kPosStateBits, ++ NCoderPropID::kLitContextBits, ++ NCoderPropID::kLitPosBits, ++ NCoderPropID::kAlgorithm, ++ NCoderPropID::kNumFastBytes, ++ NCoderPropID::kMatchFinder, ++ NCoderPropID::kEndMarker ++ }; ++ const int kNumProps = sizeof(propIDs) / sizeof(propIDs[0]); ++ ++ PROPVARIANT properties[kNumProps]; ++ for (int p = 0; p < 6; p++) ++ properties[p].vt = VT_UI4; ++ properties[0].ulVal = UInt32(1 << (level + 14)); ++ properties[1].ulVal = UInt32(ZLIB_PB); ++ properties[2].ulVal = UInt32(ZLIB_LC); // for normal files ++ properties[3].ulVal = UInt32(ZLIB_LP); // for normal files ++ properties[4].ulVal = UInt32(2); ++ properties[5].ulVal = UInt32(128); ++ ++ properties[6].vt = VT_BSTR; ++ properties[6].bstrVal = (BSTR)(const wchar_t *)L"BT4"; ++ ++ properties[7].vt = VT_BOOL; ++ properties[7].boolVal = VARIANT_TRUE; ++ ++ if (encoderSpec->SetCoderProperties(propIDs, properties, kNumProps) != S_OK) ++ return Z_MEM_ERROR; // should not happen ++ ++ HRESULT result = encoder->Code(inStream, outStream, 0, 0, 0); ++ if (result == E_OUTOFMEMORY) ++ { ++ return Z_MEM_ERROR; ++ } ++ else if (result != S_OK) ++ { ++ return Z_BUF_ERROR; // should not happen ++ } ++ ++ UInt64 fileSize; ++ outStreamSpec->Seek(0, STREAM_SEEK_END, &fileSize); ++ *destLen = fileSize; ++ ++ return Z_OK; ++} ++ ++ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, ++ const Bytef *source, uLong sourceLen)) ++{ ++ CInMemoryStream *inStreamSpec = new CInMemoryStream(source, sourceLen); ++ CMyComPtr inStream = inStreamSpec; ++ ++ COutMemoryStream *outStreamSpec = new COutMemoryStream(dest, *destLen); ++ CMyComPtr outStream = outStreamSpec; ++ ++ NCompress::NLZMA::CDecoder *decoderSpec = ++ new NCompress::NLZMA::CDecoder; ++ CMyComPtr decoder = decoderSpec; ++ ++ if (decoderSpec->SetDecoderPropertiesRaw(ZLIB_LC, ++ ZLIB_LP, ZLIB_PB, (1 << 23)) != S_OK) return Z_DATA_ERROR; ++ ++ UInt64 fileSize = *destLen; ++ ++ if (decoder->Code(inStream, outStream, 0, &fileSize, 0) != S_OK) ++ { ++ return Z_DATA_ERROR; ++ } ++ ++ outStreamSpec->Seek(0, STREAM_SEEK_END, &fileSize); ++ *destLen = fileSize; ++ ++ return Z_OK; ++} diff --git a/toolchain/squashfs/Makefile b/toolchain/squashfs/Makefile new file mode 100644 index 000000000..a2b367187 --- /dev/null +++ b/toolchain/squashfs/Makefile @@ -0,0 +1,27 @@ +include $(TOPDIR)/rules.mk + +SQUASHFSLZMA_DIR=$(BUILD_DIR)/squashfs3.0 +SQUASHFSLZMA_SOURCE=squashfs3.0.tar.gz +SQUASHFSLZMA_SITE=@SF/squashfs +SQUASHFSLZMA_MD5SUM=9fd05d0bfbb712f5fb95edafea5bc733 + +$(DL_DIR)/$(SQUASHFSLZMA_SOURCE): + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(SQUASHFSLZMA_SOURCE) $(SQUASHFSLZMA_MD5SUM) $(SQUASHFSLZMA_SITE) + +$(SQUASHFSLZMA_DIR)/.unpacked: $(DL_DIR)/$(SQUASHFSLZMA_SOURCE) + zcat $(DL_DIR)/$(SQUASHFSLZMA_SOURCE) | tar -C $(BUILD_DIR) -xvf - + $(PATCH) $(SQUASHFSLZMA_DIR) ./patches + touch $(SQUASHFSLZMA_DIR)/.unpacked + +$(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma: $(SQUASHFSLZMA_DIR)/.unpacked + $(MAKE) -C $(SQUASHFSLZMA_DIR)/squashfs-tools mksquashfs-lzma LZMAPATH=$(BUILD_DIR)/lzma + +$(STAGING_DIR)/bin/mksquashfs-lzma: $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma + $(CP) $< $@ + +source: $(DL_DIR)/$(SQUASHFSLZMA_SOURCE) +prepare: $(SQUASHFSLZMA_DIR)/.unpacked +compile: $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma $(STAGING_DIR)/bin/mksquashfs-lzma +install: +clean: FORCE + rm -rf $(SQUASHFSLZMA_DIR) diff --git a/toolchain/squashfs/patches/100-lzma.patch b/toolchain/squashfs/patches/100-lzma.patch new file mode 100644 index 000000000..85aa21fb9 --- /dev/null +++ b/toolchain/squashfs/patches/100-lzma.patch @@ -0,0 +1,25 @@ +diff -Nur squashfs3.0/squashfs-tools/Makefile squashfs3.0-owrt/squashfs-tools/Makefile +--- squashfs3.0/squashfs-tools/Makefile 2006-03-15 22:36:20.000000000 +0100 ++++ squashfs3.0-owrt/squashfs-tools/Makefile 2006-03-21 11:14:08.000000000 +0100 +@@ -1,4 +1,5 @@ + INCLUDEDIR = . ++#LZMAPATH = ../lzma/SRC/7zip/Compress/LZMA_Lib + + CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2 + +@@ -7,6 +8,9 @@ + mksquashfs: mksquashfs.o read_fs.o sort.o + $(CC) mksquashfs.o read_fs.o sort.o -lz -o $@ + ++mksquashfs-lzma: mksquashfs.o read_fs.o sort.o ++ $(CXX) mksquashfs.o read_fs.o sort.o -L$(LZMAPATH) -llzma -o $@ ++ + mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h + + read_fs.o: read_fs.c squashfs_fs.h read_fs.h global.h +@@ -17,3 +21,5 @@ + $(CC) unsquashfs.o -lz -o $@ + + unsquashfs.o: unsquashfs.c squashfs_fs.h read_fs.h global.h ++ ++clean: -- cgit v1.2.3