Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=26a59813bd3eaa4f48b18ea799b5de10b43f736e
commit 26a59813bd3eaa4f48b18ea799b5de10b43f736e
Author: Janos Kovacs <[EMAIL PROTECTED]>
Date: Mon Jan 28 17:05:40 2008 +0100
squashfs-3.3-3-i686
* add squashfs-cvsfix.patch to sources
* correction all source path
* fixed patchig order
* correction and applying mksquashfs.quiet.patch in FrugalBuild
diff --git a/source/apps-extra/squashfs/FrugalBuild
b/source/apps-extra/squashfs/FrugalBuild
index 76ded38..a4d7604 100644
--- a/source/apps-extra/squashfs/FrugalBuild
+++ b/source/apps-extra/squashfs/FrugalBuild
@@ -3,50 +3,54 @@
pkgname=squashfs
pkgver=3.3
+lzmaver=457
kver=2.6.23-6
-kdir=/lib/modules/${kver/-/-fw}/kernel/fs/squashfs
-pkgrel=2
+kdir=/lib/modules/${kver/-/-fw}/kernel/fs/${pkgname}
+pkgrel=3
+url="http://www.squashfs-lzma.org";
pkgdesc="A highly compressed read-only filesystem for Linux."
depends=('zlib' "kernel-fwlive=$kver")
makedepends=("kernel-fwlive-source=$kver")
groups=('apps-extra')
archs=('i686' 'x86_64')
-#_F_kernel_name="-fwlive"
-Finclude sourceforge
up2date="lynx -dump
http://sourceforge.net/project/showfiles.php?group_id=63835|grep
squashfs[0-9]|sed 's/[^]]*][^]]*]squashfs\([^ ]*\) .*/\1/;s/-/_/g;q'"
-source=(${source/squashfs-/squashfs} \
-
http://$_F_sourceforge_mirror.dl.sourceforge.net/sevenzip/lzma449.tar.bz2 \
- http://www.squashfs-lzma.org/dl/sqlzma3.3-fixed.tar.bz2)
-# mksquashfs.quiet.patch)
-options=('scriptlet')
-sha1sums=('e610ee21fb910606615cd158eda3c650af8a61cc' \
- '5a8d39f7ff21abcdd60937d004f6ec797b5890ce' \
- '778dfeb029d78861d1373946fa2e0c4fd7ebbdcb')
-# '910679b57a7b30f2969cc9e8fd622d0b6a237bcd')
+source=(${url}/dl/lzma${lzmaver}.tar.bz2 ${url}/dl/${pkgname}-cvsfix.patch \
+ ${url}/dl/${pkgname}3.3.tar.gz ${url}/dl/sqlzma3.3-${lzmaver}.tar.bz2
mksquashfs.quiet.patch)
+options=('scriptlet' 'nobuild')
+sha1sums=('bd1b46ba42fe1ad7351a39c131e8b7657e909001' \
+ '17da1cd356cd50a1c1cefb86670437abcdb83986' \
+ 'e610ee21fb910606615cd158eda3c650af8a61cc' \
+ 'adec846e3b3b57337ccddbc8aafab3da0b049753' \
+ '11cbb2475fe34e94bc869ae33e52c343ee497977')
build()
{
- rm -rf lzma449
- mkdir -p lzma449 || Fdie
- tar -C lzma449 -xf lzma449.tar.bz2 || Fdie
- rm sqlzma2k-3.3.patch
+ rm -rf lzma${lzmaver} || Fdie
+ mkdir -p lzma${lzmaver} || Fdie
+ tar -C lzma${lzmaver} -xf lzma${lzmaver}.tar.bz2 || Fdie
+ Fmessage "copy /usr/src/linux/ ./"
+ cp -a /usr/src/linux/ ./ || Fdie
+ patch -p0 <squashfs-cvsfix.patch
patch -p0 <sqlzma2u-3.3.patch || Fdie
-# patch -p0 <mksquashfs.quiet.patch || Fdie
if [ "$CARCH" == "x86_64" ]; then
- sed -i 's/-Werror//' sqlzma1-449.patch || Fdie
+ sed -i 's/-Werror//' sqlzma1-${lzmaver}.patch || Fdie
sed -i 's/-Werror//' Makefile || Fdie
fi
- patch -p0 <sqlzma1-449.patch || Fdie
-# cat *.patch | patch -p0 || return 1
- cp -a /usr/src/linux/ ./
+ cd lzma${lzmaver} || Fdie
+ patch -p1 <../sqlzma1-449.patch || Fdie
+ cd ../${pkgname}${pkgver}/squashfs-tools || Fdie
+ patch -p0 <../../mksquashfs.quiet.patch || Fdie
+ cd ${Fsrcdir} || Fdie
sed -i "s|KDir =.*|KDir = $Fsrcdir/linux|" Makefile || Fdie
sed -i "s|SqFs =.*|SqFs = $Fsrcdir/linux/fs/squashfs|" Makefile || Fdie
+ sed -i "s/LzmaVer =.*/LzmaVer = lzma${lzmaver}/" Makefile || Fdie
+ sed -i "s/C=1/C=0/" Makefile || Fdie
make || Fdie
Fmkdir $kdir
Ffilerel linux/fs/squashfs/squashfs.ko $kdir
- Ffilerel lzma449/C/Compress/Lzma/kmod/{un,sq}lzma.ko $kdir
+ Ffilerel lzma${lzmaver}/C/Compress/Lzma/kmod/{un,sq}lzma.ko $kdir
Fexerel squashfs${pkgver/_/-}/squashfs-tools/{mk,un}squashfs /usr/bin/
}
diff --git a/source/apps-extra/squashfs/mksquashfs.quiet.patch
b/source/apps-extra/squashfs/mksquashfs.quiet.patch
index 0eadcb4..8195ea5 100644
--- a/source/apps-extra/squashfs/mksquashfs.quiet.patch
+++ b/source/apps-extra/squashfs/mksquashfs.quiet.patch
@@ -1,5 +1,5 @@
---- squashfs3.2-r2/squashfs-tools/mksquashfs.c 2007-01-16 01:33:13.000000000
+0000
-+++ squashfs3.2-r2/squashfs-tools/mksquashfs.c.new 2007-01-18
18:59:44.623963706 +0000
+--- mksquashfs.c 2007-01-16 01:33:13.000000000 +0000
++++ mksquashfs.c.new 2007-01-18 18:59:44.623963706 +0000
@@ -1832,17 +1832,17 @@
if(!progress || columns - used < 0)
return;
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
